-rw-r--r-- | korganizer/mainwindow.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 94d7293..1320231 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -327,96 +327,98 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
327 | SLOT( disableBR(bool) ) ); | 327 | SLOT( disableBR(bool) ) ); |
328 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); | 328 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); |
329 | mView->setModified( false ); | 329 | mView->setModified( false ); |
330 | mBlockAtStartup = false; | 330 | mBlockAtStartup = false; |
331 | mView->setModified( false ); | 331 | mView->setModified( false ); |
332 | setCentralWidget( mView ); | 332 | setCentralWidget( mView ); |
333 | globalFlagBlockStartup = 0; | 333 | globalFlagBlockStartup = 0; |
334 | mView->show(); | 334 | mView->show(); |
335 | delete splash; | 335 | delete splash; |
336 | if ( newFile ) | 336 | if ( newFile ) |
337 | mView->updateConfig(); | 337 | mView->updateConfig(); |
338 | // qApp->processEvents(); | 338 | // qApp->processEvents(); |
339 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); | 339 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); |
340 | //fillSyncMenu(); | 340 | //fillSyncMenu(); |
341 | 341 | ||
342 | 342 | ||
343 | connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); | 343 | connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); |
344 | connect(mView , SIGNAL( save() ), this, SLOT( save() ) ); | 344 | connect(mView , SIGNAL( save() ), this, SLOT( save() ) ); |
345 | connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) ); | 345 | connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) ); |
346 | connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); | 346 | connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); |
347 | connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); | 347 | connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); |
348 | mSyncManager->setDefaultFileName( sentSyncFile()); | 348 | mSyncManager->setDefaultFileName( sentSyncFile()); |
349 | connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); | 349 | connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); |
350 | mSyncManager->fillSyncMenu(); | 350 | mSyncManager->fillSyncMenu(); |
351 | 351 | ||
352 | 352 | ||
353 | 353 | ||
354 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); | 354 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); |
355 | if ( showWarning ) { | 355 | if ( showWarning ) { |
356 | KMessageBox::information( this, | 356 | KMessageBox::information( this, |
357 | "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); | 357 | "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); |
358 | qApp->processEvents(); | 358 | qApp->processEvents(); |
359 | mView->dialogManager()->showSyncOptions(); | 359 | mView->dialogManager()->showSyncOptions(); |
360 | } | 360 | } |
361 | 361 | ||
362 | //US listen for result adressed from Ka/Pi | 362 | //US listen for result adressed from Ka/Pi |
363 | #ifndef DESKTOP_VERSION | 363 | #ifndef DESKTOP_VERSION |
364 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 364 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
365 | #endif | 365 | #endif |
366 | #ifndef DESKTOP_VERSION | 366 | #ifndef DESKTOP_VERSION |
367 | infrared = 0; | 367 | infrared = 0; |
368 | #endif | 368 | #endif |
369 | updateFilterToolbar(); | 369 | updateFilterToolbar(); |
370 | updateWeek( mView->startDate() ); | 370 | updateWeek( mView->startDate() ); |
371 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), | 371 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), |
372 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); | 372 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); |
373 | mBRdisabled = false; | 373 | mBRdisabled = false; |
374 | //toggleBeamReceive(); | 374 | //toggleBeamReceive(); |
375 | |||
376 | QTimer::singleShot( 1000, mView, SLOT ( checkAlarms() )); | ||
375 | } | 377 | } |
376 | MainWindow::~MainWindow() | 378 | MainWindow::~MainWindow() |
377 | { | 379 | { |
378 | //qDebug("MainWindow::~MainWindow() "); | 380 | //qDebug("MainWindow::~MainWindow() "); |
379 | //save toolbar location | 381 | //save toolbar location |
380 | delete mCalendar; | 382 | delete mCalendar; |
381 | delete mSyncManager; | 383 | delete mSyncManager; |
382 | #ifndef DESKTOP_VERSION | 384 | #ifndef DESKTOP_VERSION |
383 | if ( infrared ) | 385 | if ( infrared ) |
384 | delete infrared; | 386 | delete infrared; |
385 | #endif | 387 | #endif |
386 | 388 | ||
387 | 389 | ||
388 | } | 390 | } |
389 | 391 | ||
390 | void MainWindow::disableBR(bool b) | 392 | void MainWindow::disableBR(bool b) |
391 | { | 393 | { |
392 | #ifndef DESKTOP_VERSION | 394 | #ifndef DESKTOP_VERSION |
393 | if ( b ) { | 395 | if ( b ) { |
394 | if ( infrared ) { | 396 | if ( infrared ) { |
395 | toggleBeamReceive(); | 397 | toggleBeamReceive(); |
396 | mBRdisabled = true; | 398 | mBRdisabled = true; |
397 | } | 399 | } |
398 | mBRdisabled = true; | 400 | mBRdisabled = true; |
399 | } else { | 401 | } else { |
400 | if ( mBRdisabled ) { | 402 | if ( mBRdisabled ) { |
401 | mBRdisabled = false; | 403 | mBRdisabled = false; |
402 | //makes no sense,because other cal ap is probably running | 404 | //makes no sense,because other cal ap is probably running |
403 | // toggleBeamReceive(); | 405 | // toggleBeamReceive(); |
404 | } | 406 | } |
405 | } | 407 | } |
406 | #endif | 408 | #endif |
407 | 409 | ||
408 | } | 410 | } |
409 | bool MainWindow::beamReceiveEnabled() | 411 | bool MainWindow::beamReceiveEnabled() |
410 | { | 412 | { |
411 | #ifndef DESKTOP_VERSION | 413 | #ifndef DESKTOP_VERSION |
412 | return ( infrared != 0 ); | 414 | return ( infrared != 0 ); |
413 | #endif | 415 | #endif |
414 | return false; | 416 | return false; |
415 | } | 417 | } |
416 | 418 | ||
417 | void MainWindow::toggleBeamReceive() | 419 | void MainWindow::toggleBeamReceive() |
418 | { | 420 | { |
419 | if ( mBRdisabled ) | 421 | if ( mBRdisabled ) |
420 | return; | 422 | return; |
421 | #ifndef DESKTOP_VERSION | 423 | #ifndef DESKTOP_VERSION |
422 | if ( infrared ) { | 424 | if ( infrared ) { |
@@ -752,96 +754,98 @@ void MainWindow::initActions() | |||
752 | 754 | ||
753 | icon = loadPixmap( pathString + "today" ); | 755 | icon = loadPixmap( pathString + "today" ); |
754 | QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); | 756 | QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); |
755 | today_action->addTo( viewMenu ); | 757 | today_action->addTo( viewMenu ); |
756 | connect( today_action, SIGNAL( activated() ), | 758 | connect( today_action, SIGNAL( activated() ), |
757 | mView, SLOT( goToday() ) ); | 759 | mView, SLOT( goToday() ) ); |
758 | viewMenu->insertSeparator(); | 760 | viewMenu->insertSeparator(); |
759 | 761 | ||
760 | // *********************** | 762 | // *********************** |
761 | if ( KOPrefs::instance()->mVerticalScreen ) { | 763 | if ( KOPrefs::instance()->mVerticalScreen ) { |
762 | icon = SmallIcon( "1updownarrow" ); | 764 | icon = SmallIcon( "1updownarrow" ); |
763 | } else { | 765 | } else { |
764 | icon = SmallIcon("1leftrightarrow" ); | 766 | icon = SmallIcon("1leftrightarrow" ); |
765 | } | 767 | } |
766 | configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); | 768 | configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); |
767 | QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); | 769 | QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); |
768 | FSaction->addTo( viewMenu ); | 770 | FSaction->addTo( viewMenu ); |
769 | connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() )); | 771 | connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() )); |
770 | 772 | ||
771 | icon = loadPixmap( pathString + "navi" ); | 773 | icon = loadPixmap( pathString + "navi" ); |
772 | configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); | 774 | configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); |
773 | action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); | 775 | action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); |
774 | action->addTo( viewMenu ); | 776 | action->addTo( viewMenu ); |
775 | connect( action, SIGNAL( activated() ), | 777 | connect( action, SIGNAL( activated() ), |
776 | mView, SLOT( toggleDateNavigatorWidget() ) ); | 778 | mView, SLOT( toggleDateNavigatorWidget() ) ); |
777 | mToggleNav = action ; | 779 | mToggleNav = action ; |
778 | icon = loadPixmap( pathString + "filter" ); | 780 | icon = loadPixmap( pathString + "filter" ); |
779 | configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); | 781 | configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); |
780 | action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); | 782 | action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); |
781 | action->addTo( viewMenu ); | 783 | action->addTo( viewMenu ); |
782 | connect( action, SIGNAL( activated() ), | 784 | connect( action, SIGNAL( activated() ), |
783 | mView, SLOT( toggleFilter() ) ); | 785 | mView, SLOT( toggleFilter() ) ); |
784 | mToggleFilter = action; | 786 | mToggleFilter = action; |
785 | icon = loadPixmap( pathString + "allday" ); | 787 | icon = loadPixmap( pathString + "allday" ); |
786 | configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); | 788 | configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); |
787 | action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); | 789 | action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); |
788 | action->addTo( viewMenu ); | 790 | action->addTo( viewMenu ); |
789 | connect( action, SIGNAL( activated() ), | 791 | connect( action, SIGNAL( activated() ), |
790 | mView, SLOT( toggleAllDaySize() ) ); | 792 | mView, SLOT( toggleAllDaySize() ) ); |
791 | mToggleAllday = action; | 793 | mToggleAllday = action; |
792 | 794 | ||
793 | 795 | ||
794 | connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), | 796 | connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), |
795 | mToggleNav, SLOT( setEnabled ( bool ) ) ); | 797 | mToggleNav, SLOT( setEnabled ( bool ) ) ); |
796 | connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), | 798 | connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), |
797 | mToggleFilter, SLOT( setEnabled ( bool ) ) ); | 799 | mToggleFilter, SLOT( setEnabled ( bool ) ) ); |
798 | connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), | 800 | connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), |
799 | mToggleAllday, SLOT( setEnabled ( bool ) ) ); | 801 | mToggleAllday, SLOT( setEnabled ( bool ) ) ); |
802 | // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), | ||
803 | // configureAgendaMenu, SLOT( setEnabled ( bool ) ) ); | ||
800 | 804 | ||
801 | viewMenu->insertSeparator(); | 805 | viewMenu->insertSeparator(); |
802 | icon = loadPixmap( pathString + "picker" ); | 806 | icon = loadPixmap( pathString + "picker" ); |
803 | action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this ); | 807 | action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this ); |
804 | action->addTo( viewMenu ); | 808 | action->addTo( viewMenu ); |
805 | connect( action, SIGNAL( activated() ), | 809 | connect( action, SIGNAL( activated() ), |
806 | mView, SLOT( showDatePicker() ) ); | 810 | mView, SLOT( showDatePicker() ) ); |
807 | action->addTo( iconToolBar ); | 811 | action->addTo( iconToolBar ); |
808 | viewMenu->insertSeparator(); | 812 | viewMenu->insertSeparator(); |
809 | 813 | ||
810 | if ( p-> mShowIconToggleFull ) | 814 | if ( p-> mShowIconToggleFull ) |
811 | FSaction->addTo( iconToolBar ); | 815 | FSaction->addTo( iconToolBar ); |
812 | if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); | 816 | if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); |
813 | 817 | ||
814 | //******************** | 818 | //******************** |
815 | if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); | 819 | if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); |
816 | 820 | ||
817 | 821 | ||
818 | icon = loadPixmap( pathString + "whatsnext" ); | 822 | icon = loadPixmap( pathString + "whatsnext" ); |
819 | configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); | 823 | configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); |
820 | QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); | 824 | QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); |
821 | whatsnext_action->addTo( viewMenu ); | 825 | whatsnext_action->addTo( viewMenu ); |
822 | connect( whatsnext_action, SIGNAL( activated() ), | 826 | connect( whatsnext_action, SIGNAL( activated() ), |
823 | mView->viewManager(), SLOT( showWhatsNextView() ) ); | 827 | mView->viewManager(), SLOT( showWhatsNextView() ) ); |
824 | 828 | ||
825 | icon = loadPixmap( pathString + "xdays" ); | 829 | icon = loadPixmap( pathString + "xdays" ); |
826 | configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); | 830 | configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); |
827 | QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); | 831 | QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); |
828 | xdays_action->addTo( viewMenu ); | 832 | xdays_action->addTo( viewMenu ); |
829 | connect( xdays_action, SIGNAL( activated() ), | 833 | connect( xdays_action, SIGNAL( activated() ), |
830 | mView->viewManager(), SLOT( showNextXView() ) ); | 834 | mView->viewManager(), SLOT( showNextXView() ) ); |
831 | 835 | ||
832 | 836 | ||
833 | icon = loadPixmap( pathString + "journal" ); | 837 | icon = loadPixmap( pathString + "journal" ); |
834 | configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); | 838 | configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); |
835 | QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); | 839 | QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); |
836 | viewjournal_action->addTo( viewMenu ); | 840 | viewjournal_action->addTo( viewMenu ); |
837 | connect( viewjournal_action, SIGNAL( activated() ), | 841 | connect( viewjournal_action, SIGNAL( activated() ), |
838 | mView->viewManager(), SLOT( showJournalView() ) ); | 842 | mView->viewManager(), SLOT( showJournalView() ) ); |
839 | 843 | ||
840 | 844 | ||
841 | icon = loadPixmap( pathString + "day" ); | 845 | icon = loadPixmap( pathString + "day" ); |
842 | configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); | 846 | configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); |
843 | QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this ); | 847 | QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this ); |
844 | day1_action->addTo( viewMenu ); | 848 | day1_action->addTo( viewMenu ); |
845 | // action->addTo( toolBar ); | 849 | // action->addTo( toolBar ); |
846 | connect( day1_action, SIGNAL( activated() ), | 850 | connect( day1_action, SIGNAL( activated() ), |
847 | mView->viewManager(), SLOT( showDayView() ) ); | 851 | mView->viewManager(), SLOT( showDayView() ) ); |