← Back to branch summary

~ubuntu-branches/ubuntu/raring/kdepim/raring-proposed

« back to all changes in this revision

Viewing changes to korganizer/koviewmanager.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-06-07 07:56:38 UTC
  • mfrom: (0.2.27)
  • Revision ID: package-import@ubuntu.com-20120607075638-0luhdq11z7sgvs4m
Tags: 4:4.8.80-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
korganizer/koviewmanager.cpp
24
24
*/
25
25
 
26
26
#include "koviewmanager.h"
27
 
#include "koglobals.h"
28
 
#include "koprefs.h"
29
27
#include "actionmanager.h"
30
28
#include "calendarview.h"
31
29
#include "datenavigator.h"
 
30
#include "koglobals.h"
 
31
#include "koprefs.h"
32
32
#include "navigatorbar.h"
33
 
#include "datenavigatorcontainer.h"
34
33
#include "korganizer/mainwindow.h"
35
34
#include "views/agendaview/koagendaview.h"
 
35
#include "views/journalview/kojournalview.h"
36
36
#include "views/listview/kolistview.h"
37
 
#include "views/journalview/kojournalview.h"
38
37
#include "views/monthview/monthview.h"
39
38
#include "views/multiagendaview/multiagendaview.h"
 
39
#include "views/timelineview/kotimelineview.h"
 
40
#include "views/timespentview/kotimespentview.h"
40
41
#include "views/todoview/kotodoview.h"
41
42
#include "views/whatsnextview/kowhatsnextview.h"
42
 
#include "views/timelineview/kotimelineview.h"
43
 
#include "views/timespentview/kotimespentview.h"
44
43
 
45
44
#include <KActionCollection>
46
 
#include <KConfig>
47
 
#include <KGlobal>
 
45
#include <KMessageBox>
48
46
#include <KTabWidget>
49
47
 
50
48
#include <QAction>
51
49
#include <QStackedWidget>
52
50
 
53
 
#include "koviewmanager.moc"
54
 
 
55
 
using namespace Akonadi;
56
 
 
57
51
KOViewManager::KOViewManager( CalendarView *mainView )
58
52
  : QObject(), mMainView( mainView )
59
53
{
192
186
  }
193
187
 
194
188
  raiseCurrentView();
195
 
  mMainView->processIncidenceSelection( Item(), QDate() );
 
189
  mMainView->processIncidenceSelection( Akonadi::Item(), QDate() );
196
190
  mMainView->updateView();
197
191
  mMainView->adaptNavigationUnits();
198
192
  KOrg::MainWindow *w = ActionManager::findInstance( KUrl() );
623
617
  }
624
618
}
625
619
 
626
 
Item KOViewManager::currentSelection()
 
620
Akonadi::Item KOViewManager::currentSelection()
627
621
{
628
622
  if ( !mCurrentView ) {
629
 
    return Item();
 
623
    return Akonadi::Item();
630
624
  }
631
625
 
632
 
  Item::List incidenceList = mCurrentView->selectedIncidences();
 
626
  Akonadi::Item::List incidenceList = mCurrentView->selectedIncidences();
633
627
  if ( incidenceList.isEmpty() ) {
634
 
    return Item();
 
628
    return Akonadi::Item();
635
629
  }
636
630
  return incidenceList.first();
637
631
}
699
693
         mCurrentView == mAgendaSideBySideView  ||
700
694
        ( mAgendaViewTabs && mCurrentView == mAgendaViewTabs->currentWidget() );
701
695
}
 
696
 
 
697
#include "koviewmanager.moc"
 
698