← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kdepim/quantal

« back to all changes in this revision

Viewing changes to korganizer/koviewmanager.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2011-12-15 14:17:51 UTC
  • mto: This revision was merged to the branch mainline in revision 193.
  • Revision ID: package-import@ubuntu.com-20111215141751-bmhdpiwl23wd9w26
Tags: upstream-4.7.90
Import upstream version 4.7.90

Show diffs side-by-side

added added

removed removed

Lines of Context:
korganizer/koviewmanager.cpp
318
318
           mMainView, SLOT(toggleAlarm(Akonadi::Item)) );
319
319
  connect( view, SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)),
320
320
           mMainView, SLOT(toggleTodoCompleted(Akonadi::Item)) );
321
 
  connect( view, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,const QString &)),
322
 
           mMainView, SLOT(copyIncidenceToResource(Akonadi::Item,const QString &)) );
323
 
  connect( view, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,const QString &)),
324
 
           mMainView, SLOT(moveIncidenceToResource(Akonadi::Item,const QString &)) );
 
321
  connect( view, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)),
 
322
           mMainView, SLOT(copyIncidenceToResource(Akonadi::Item,QString)) );
 
323
  connect( view, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)),
 
324
           mMainView, SLOT(moveIncidenceToResource(Akonadi::Item,QString)) );
325
325
  connect( view, SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)),
326
326
           mMainView, SLOT(dissociateOccurrences(Akonadi::Item,QDate)) );
327
327
 
330
330
           mMainView, SLOT(newEvent()) );
331
331
  connect( view, SIGNAL(newEventSignal(QDateTime)),
332
332
           mMainView, SLOT(newEvent(QDateTime)) );
333
 
  connect( view, SIGNAL(newEventSignal(QDateTime, QDateTime)),
 
333
  connect( view, SIGNAL(newEventSignal(QDateTime,QDateTime)),
334
334
           mMainView, SLOT(newEvent(QDateTime,QDateTime)) );
335
335
  connect( view, SIGNAL(newEventSignal(QDate)),
336
336
           mMainView, SLOT(newEvent(QDate)) );
346
346
  connect( mMainView, SIGNAL(configChanged()), view, SLOT(updateConfig()) );
347
347
 
348
348
  // Notifications about added, changed and deleted incidences
349
 
  connect( mMainView, SIGNAL(dayPassed(const QDate &)),
350
 
           view, SLOT(dayPassed(const QDate &)) );
351
 
  connect( view, SIGNAL(startMultiModify(const QString &)),
352
 
           mMainView, SLOT(startMultiModify(const QString &)) );
 
349
  connect( mMainView, SIGNAL(dayPassed(QDate)),
 
350
           view, SLOT(dayPassed(QDate)) );
 
351
  connect( view, SIGNAL(startMultiModify(QString)),
 
352
           mMainView, SLOT(startMultiModify(QString)) );
353
353
  connect( view, SIGNAL(endMultiModify()),
354
354
           mMainView, SLOT(endMultiModify()) );
355
355
 
356
 
  connect( mMainView, SIGNAL(newIncidenceChanger(CalendarSupport::IncidenceChanger *)),
357
 
           view, SLOT(setIncidenceChanger(CalendarSupport::IncidenceChanger *)) );
 
356
  connect( mMainView, SIGNAL(newIncidenceChanger(CalendarSupport::IncidenceChanger*)),
 
357
           view, SLOT(setIncidenceChanger(CalendarSupport::IncidenceChanger*)) );
358
358
 
359
359
  view->setIncidenceChanger( mMainView->incidenceChanger() );
360
360
}
475
475
  if ( showBoth ) {
476
476
    if ( !mAgendaViewTabs && showBoth ) {
477
477
      mAgendaViewTabs = new KTabWidget( mMainView->viewStack() );
478
 
      connect( mAgendaViewTabs, SIGNAL(currentChanged(QWidget *)),
479
 
              this, SLOT(currentAgendaViewTabChanged(QWidget *)) );
 
478
      connect( mAgendaViewTabs, SIGNAL(currentChanged(QWidget*)),
 
479
              this, SLOT(currentAgendaViewTabChanged(QWidget*)) );
480
480
      mMainView->viewStack()->addWidget( mAgendaViewTabs );
481
481
 
482
482
      KConfig *config = KOGlobals::self()->config();
494
494
 
495
495
      addView( mAgendaView, showBoth );
496
496
 
497
 
      connect( mAgendaView,SIGNAL(zoomViewHorizontally(const QDate &,int)),
498
 
               mMainView->dateNavigator(), SLOT(selectDates(const QDate &,int)) );
 
497
      connect( mAgendaView,SIGNAL(zoomViewHorizontally(QDate,int)),
 
498
               mMainView->dateNavigator(), SLOT(selectDates(QDate,int)) );
499
499
      mAgendaView->readSettings( KOGlobals::self()->config() );
500
500
    }
501
501
    if ( showBoth && mAgendaViewTabs->indexOf( mAgendaView ) < 0 ) {
514
514
      addView( mAgendaSideBySideView, showBoth );
515
515
 
516
516
/*
517
 
    connect( mAgendaSideBySideView,SIGNAL(zoomViewHorizontally(const QDate &,int)),
518
 
             mMainView->dateNavigator(),SLOT(selectDates(const QDate &,int)) );*/
 
517
    connect( mAgendaSideBySideView,SIGNAL(zoomViewHorizontally(QDate,int)),
 
518
             mMainView->dateNavigator(),SLOT(selectDates(QDate,int)) );*/
519
519
    }
520
520
    if ( showBoth && mAgendaViewTabs->indexOf( mAgendaSideBySideView ) < 0 ) {
521
521
      mAgendaViewTabs->addTab( mAgendaSideBySideView, i18n( "Calendars Side by Side" ) );
574
574
void KOViewManager::showTodoView()
575
575
{
576
576
  if ( !mTodoView ) {
577
 
    mTodoView = new KOTodoView( false /*not sidebar*/, mMainView->viewStack() );
 
577
    mTodoView = new KOTodoView( false/*not sidebar*/, mMainView->viewStack() );
578
578
    mTodoView->setCalendar( mMainView->calendar() );
579
579
    mTodoView->setIdentifier( "DefaultTodoView" );
580
580
    mTodoView->setCalendar( mMainView->calendar() );
677
677
 
678
678
void KOViewManager::addChange( EventViews::EventView::Change change )
679
679
{
680
 
  foreach( BaseView *view, mViews ) {
 
680
  foreach ( BaseView *view, mViews ) {
681
681
    if ( view ) {
682
682
      view->setChanges( view->changes() | change );
683
683
    }