summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-09 08:40:10 (UTC)
committer zautrix <zautrix>2005-06-09 08:40:10 (UTC)
commita9a6a8f4eb0200fb5fbf67091e6348a3859976f9 (patch) (unidiff)
treee7b3fd38bb51895d188bb83fd140f33190322422
parentd7265f0e400f0613340d43beabdf99d9ec0e904c (diff)
downloadkdepimpi-a9a6a8f4eb0200fb5fbf67091e6348a3859976f9.zip
kdepimpi-a9a6a8f4eb0200fb5fbf67091e6348a3859976f9.tar.gz
kdepimpi-a9a6a8f4eb0200fb5fbf67091e6348a3859976f9.tar.bz2
print
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt2
-rw-r--r--korganizer/mainwindow.cpp12
-rw-r--r--korganizer/mainwindow.h1
3 files changed, 12 insertions, 3 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index af994ae..ec6a4ec 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,100 +1,100 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 2.1.6 ************ 3********** VERSION 2.1.6 ************
4 4
5KO/Pi: 5KO/Pi:
6Added to the list view (the list view is used in search dialog as well) the possibility to print it. 6Added to the list view (the list view is used in search dialog as well) the possibility to print it.
7Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view. 7Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view.
8Added to the list view the possibility to add all subtodos of selected todos to an export. 8Added to the list view the possibility to add all subtodos of selected todos to an export/beam.
9Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout. 9Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout.
10 10
11********** VERSION 2.1.5 ************ 11********** VERSION 2.1.5 ************
12 12
13This is the new stable version. 13This is the new stable version.
14Bugfix: 14Bugfix:
15Fixed a problem with agenda popup on the desktop in KO/Pi. 15Fixed a problem with agenda popup on the desktop in KO/Pi.
16Fixed a crash when reloading file, e.g. after a passive pi-sync synchronization. 16Fixed a crash when reloading file, e.g. after a passive pi-sync synchronization.
17Added config option to not display completed todos in agenda view. 17Added config option to not display completed todos in agenda view.
18Addressee view is now using the formatted name, if defined. 18Addressee view is now using the formatted name, if defined.
19That makes it possible to display "lastname, firstname" in that view now. 19That makes it possible to display "lastname, firstname" in that view now.
20To set the formatted name for all contacts, please use menu: 20To set the formatted name for all contacts, please use menu:
21Edit->Change->Set formatted name. 21Edit->Change->Set formatted name.
22Fixed the bug in KA/Pi that is was not possible to add images to a contact on Windows. 22Fixed the bug in KA/Pi that is was not possible to add images to a contact on Windows.
23 23
24********** VERSION 2.1.4 ************ 24********** VERSION 2.1.4 ************
25 25
26Fixed two more bugs in the KA/Pi CSV import dialog: 26Fixed two more bugs in the KA/Pi CSV import dialog:
27Made it possible to read multi-line fields and import it to the "Note" field. 27Made it possible to read multi-line fields and import it to the "Note" field.
28Fixed a problem in mapping custom fields, whatever a custem field is... 28Fixed a problem in mapping custom fields, whatever a custem field is...
29 29
30********** VERSION 2.1.3 ************ 30********** VERSION 2.1.3 ************
31 31
32Changed the menu structure of the alarm applet: 32Changed the menu structure of the alarm applet:
33Moved "Simulate" to " Play Beeps" submenu and re-added "Todo List". 33Moved "Simulate" to " Play Beeps" submenu and re-added "Todo List".
34 34
35Fixed several problems in the KA/Pi CSV import dialog: 35Fixed several problems in the KA/Pi CSV import dialog:
36Added "Category", made codec configureable and made it possible to map many fields to the "Note" field. 36Added "Category", made codec configureable and made it possible to map many fields to the "Note" field.
37 37
38 38
39********** VERSION 2.1.2 ************ 39********** VERSION 2.1.2 ************
40 40
41Fixed a problem closing the alarm dialog on Zaurus with "OK" button. 41Fixed a problem closing the alarm dialog on Zaurus with "OK" button.
42 42
43Fixed a problem when importing data from Outlook with mutiple categories set. 43Fixed a problem when importing data from Outlook with mutiple categories set.
44 44
45Changed display of days in datenavigator: 45Changed display of days in datenavigator:
46Birthdays are now blue, not dark green. 46Birthdays are now blue, not dark green.
47When todo view is shown, no birtdays are shown and days with due todos are shown blue. 47When todo view is shown, no birtdays are shown and days with due todos are shown blue.
48When journal view is shown, only holidays are shown and days with journals are blue. 48When journal view is shown, only holidays are shown and days with journals are blue.
49 49
50Added Backup options to global config: 50Added Backup options to global config:
51You can create now x-daily backups for KO/Pi, KA/Pi (for file resources only, file resource is the standard type) and PwM/Pi ( all files you will open ). 51You can create now x-daily backups for KO/Pi, KA/Pi (for file resources only, file resource is the standard type) and PwM/Pi ( all files you will open ).
52It is recommended to use another HDD/Memory card for the backup directory. If (very useful on the Zaurus) the specified backup directory does not exist you are asked if you want to try again to create a backup. That makes it possible to insert your memory card in the Zaurus and then trying again. 52It is recommended to use another HDD/Memory card for the backup directory. If (very useful on the Zaurus) the specified backup directory does not exist you are asked if you want to try again to create a backup. That makes it possible to insert your memory card in the Zaurus and then trying again.
53The backup is created when the application wants to save for the first time on a backup-day. You can specify the amount of backups and the day interval of backups. 53The backup is created when the application wants to save for the first time on a backup-day. You can specify the amount of backups and the day interval of backups.
54 54
55********** VERSION 2.1.1 ************ 55********** VERSION 2.1.1 ************
56 56
57Stable release 2.1.1! 57Stable release 2.1.1!
58 58
59KO/Pi: 59KO/Pi:
60Fixed one problem in the layout of the edit dialogs on the Zaurus with 640x480 display. 60Fixed one problem in the layout of the edit dialogs on the Zaurus with 640x480 display.
61 61
62********** VERSION 2.1.0 ************ 62********** VERSION 2.1.0 ************
63 63
64Stable release 2.1.0! 64Stable release 2.1.0!
65 65
66Summary of changes/fixes compared to version 2.0.6: 66Summary of changes/fixes compared to version 2.0.6:
67 67
68Many bugs of version 2.0.6 fixed. 68Many bugs of version 2.0.6 fixed.
69Most of them were small bugs, but some of them were important. 69Most of them were small bugs, but some of them were important.
70It is recommended to use version 2.1.0 and not version 2.0.6. 70It is recommended to use version 2.1.0 and not version 2.0.6.
71 71
72Important changes: 72Important changes:
73 73
74Added recurring todos to KO/Pi. 74Added recurring todos to KO/Pi.
75 75
76Added global application font settings (for all KDE-Pim/Pi apps) to the general settings. 76Added global application font settings (for all KDE-Pim/Pi apps) to the general settings.
77 77
78Made Passwordmanager PwM/Pi more userfriendly: Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more. 78Made Passwordmanager PwM/Pi more userfriendly: Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more.
79 79
80Datenavigator can now display many months. Very useful on the desktop. 80Datenavigator can now display many months. Very useful on the desktop.
81 81
82KO/Pi alarm applet changed: Made buttons in alarm dialog much bigger and other usebility enhancements. 82KO/Pi alarm applet changed: Made buttons in alarm dialog much bigger and other usebility enhancements.
83 83
84Made alarm sound working on Linux desktop. 84Made alarm sound working on Linux desktop.
85 85
86Made KO/Pi and KA/Pi running from a memory stick. Please read storage HowTo for details. 86Made KO/Pi and KA/Pi running from a memory stick. Please read storage HowTo for details.
87 87
88Added timetracking feature in KO/Pi todo view. Please read timetraker HowTo for details. 88Added timetracking feature in KO/Pi todo view. Please read timetraker HowTo for details.
89 89
90Many other usebility enhancements. 90Many other usebility enhancements.
91Special thanks to Ben for his suggestions! 91Special thanks to Ben for his suggestions!
92 92
93You can find the complete changelog 93You can find the complete changelog
94from version 1.7.7 to 2.1.0 94from version 1.7.7 to 2.1.0
95in the source package or on 95in the source package or on
96 96
97http://www.pi-sync.net/html/changelog.html 97http://www.pi-sync.net/html/changelog.html
98 98
99 99
100 100
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 481eab4..20f8b57 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -534,1045 +534,1050 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
534 msg = allmsg.left( nextC ); 534 msg = allmsg.left( nextC );
535 allmsg = allmsg.mid( nextC, allmsg.length()-nextC ); 535 allmsg = allmsg.mid( nextC, allmsg.length()-nextC );
536 } 536 }
537 //qDebug("msg: %s all: %s ", msg.latin1(), allmsg.latin1() ); 537 //qDebug("msg: %s all: %s ", msg.latin1(), allmsg.latin1() );
538 if ( msg == "-newEvent" ) { 538 if ( msg == "-newEvent" ) {
539 mView->newEvent(); 539 mView->newEvent();
540 } 540 }
541 if ( msg == "-newTodo" ) { 541 if ( msg == "-newTodo" ) {
542 mView->newTodo(); 542 mView->newTodo();
543 543
544 } 544 }
545 if ( msg == "-showWN" ) { 545 if ( msg == "-showWN" ) {
546 mView->viewManager()->showWhatsNextView(); 546 mView->viewManager()->showWhatsNextView();
547 } 547 }
548 if ( msg == "-showTodo" ) { 548 if ( msg == "-showTodo" ) {
549 mView->viewManager()->showTodoView(); 549 mView->viewManager()->showTodoView();
550 } 550 }
551 if ( msg == "-showList" ) { 551 if ( msg == "-showList" ) {
552 mView->viewManager()->showListView(); 552 mView->viewManager()->showListView();
553 } 553 }
554 else if ( msg == "-showDay" ) { 554 else if ( msg == "-showDay" ) {
555 mView->viewManager()->showDayView(); 555 mView->viewManager()->showDayView();
556 } 556 }
557 else if ( msg == "-showWWeek" ) { 557 else if ( msg == "-showWWeek" ) {
558 mView->viewManager()->showWorkWeekView(); 558 mView->viewManager()->showWorkWeekView();
559 } 559 }
560 else if ( msg == "-ringSync" ) { 560 else if ( msg == "-ringSync" ) {
561 mSyncManager->multiSync( false ); 561 mSyncManager->multiSync( false );
562 } 562 }
563 else if ( msg == "-showWeek" ) { 563 else if ( msg == "-showWeek" ) {
564 mView->viewManager()->showWeekView(); 564 mView->viewManager()->showWeekView();
565 } 565 }
566 else if ( msg == "-showTodo" ) { 566 else if ( msg == "-showTodo" ) {
567 mView->viewManager()->showTodoView(); 567 mView->viewManager()->showTodoView();
568 } 568 }
569 else if ( msg == "-showJournal" ) { 569 else if ( msg == "-showJournal" ) {
570 mView->dateNavigator()->selectDates( 1 ); 570 mView->dateNavigator()->selectDates( 1 );
571 mView->dateNavigator()->selectToday(); 571 mView->dateNavigator()->selectToday();
572 mView->viewManager()->showJournalView(); 572 mView->viewManager()->showJournalView();
573 } 573 }
574 else if ( msg == "-showKO" ) { 574 else if ( msg == "-showKO" ) {
575 mView->viewManager()->showNextXView(); 575 mView->viewManager()->showNextXView();
576 } 576 }
577 else if ( msg == "-showWNext" ) { 577 else if ( msg == "-showWNext" ) {
578 mView->viewManager()->showWhatsNextView(); 578 mView->viewManager()->showWhatsNextView();
579 } 579 }
580 else if ( msg == "nextView()" ) { 580 else if ( msg == "nextView()" ) {
581 mView->viewManager()->showNextView(); 581 mView->viewManager()->showNextView();
582 } 582 }
583 else if ( msg == "-showNextXView" ) { 583 else if ( msg == "-showNextXView" ) {
584 mView->viewManager()->showNextXView(); 584 mView->viewManager()->showNextXView();
585 } 585 }
586 586
587 587
588 } 588 }
589 589
590 showMaximized(); 590 showMaximized();
591 raise(); 591 raise();
592} 592}
593 593
594QPixmap MainWindow::loadPixmap( QString name ) 594QPixmap MainWindow::loadPixmap( QString name )
595{ 595{
596 return SmallIcon( name ); 596 return SmallIcon( name );
597 597
598} 598}
599void MainWindow::setUsesBigPixmaps ( bool b ) 599void MainWindow::setUsesBigPixmaps ( bool b )
600{ 600{
601 qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b); 601 qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b);
602 if ( b ) 602 if ( b )
603 qDebug("KO: BigPixmaps are not supported "); 603 qDebug("KO: BigPixmaps are not supported ");
604} 604}
605void MainWindow::initActions() 605void MainWindow::initActions()
606{ 606{
607 //KOPrefs::instance()->mShowFullMenu 607 //KOPrefs::instance()->mShowFullMenu
608 iconToolBar->clear(); 608 iconToolBar->clear();
609 KOPrefs *p = KOPrefs::instance(); 609 KOPrefs *p = KOPrefs::instance();
610 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); 610 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
611 611
612 QPopupMenu *viewMenu = new QPopupMenu( this ); 612 QPopupMenu *viewMenu = new QPopupMenu( this );
613 QPopupMenu *actionMenu = new QPopupMenu( this ); 613 QPopupMenu *actionMenu = new QPopupMenu( this );
614 QPopupMenu *importMenu = new QPopupMenu( this ); 614 QPopupMenu *importMenu = new QPopupMenu( this );
615 QPopupMenu *importMenu_X = new QPopupMenu( this ); 615 QPopupMenu *importMenu_X = new QPopupMenu( this );
616 QPopupMenu *exportMenu_X = new QPopupMenu( this ); 616 QPopupMenu *exportMenu_X = new QPopupMenu( this );
617 QPopupMenu *beamMenu_X = new QPopupMenu( this ); 617 QPopupMenu *beamMenu_X = new QPopupMenu( this );
618 selectFilterMenu = new QPopupMenu( this ); 618 selectFilterMenu = new QPopupMenu( this );
619 selectFilterMenu->setCheckable( true ); 619 selectFilterMenu->setCheckable( true );
620 syncMenu = new QPopupMenu( this ); 620 syncMenu = new QPopupMenu( this );
621 configureAgendaMenu = new QPopupMenu( this ); 621 configureAgendaMenu = new QPopupMenu( this );
622 configureToolBarMenu = new QPopupMenu( this ); 622 configureToolBarMenu = new QPopupMenu( this );
623 QPopupMenu *helpMenu = new QPopupMenu( this ); 623 QPopupMenu *helpMenu = new QPopupMenu( this );
624 QIconSet icon; 624 QIconSet icon;
625 int pixWid = 22, pixHei = 22; 625 int pixWid = 22, pixHei = 22;
626 QString pathString = ""; 626 QString pathString = "";
627 if ( !p->mToolBarMiniIcons ) { 627 if ( !p->mToolBarMiniIcons ) {
628 if ( QApplication::desktop()->width() < 480 ) { 628 if ( QApplication::desktop()->width() < 480 ) {
629 pathString += "icons16/"; 629 pathString += "icons16/";
630 pixWid = 18; pixHei = 16; 630 pixWid = 18; pixHei = 16;
631 } 631 }
632 } else { 632 } else {
633 pathString += "iconsmini/"; 633 pathString += "iconsmini/";
634 pixWid = 18; pixHei = 16; 634 pixWid = 18; pixHei = 16;
635 } 635 }
636 if ( KOPrefs::instance()->mShowFullMenu ) { 636 if ( KOPrefs::instance()->mShowFullMenu ) {
637 QMenuBar *menuBar1; 637 QMenuBar *menuBar1;
638 menuBar1 = menuBar(); 638 menuBar1 = menuBar();
639 menuBar1->insertItem( i18n("File"), importMenu ); 639 menuBar1->insertItem( i18n("File"), importMenu );
640 menuBar1->insertItem( i18n("View"), viewMenu ); 640 menuBar1->insertItem( i18n("View"), viewMenu );
641 menuBar1->insertItem( i18n("Actions"), actionMenu ); 641 menuBar1->insertItem( i18n("Actions"), actionMenu );
642#ifdef DESKTOP_VERSION 642#ifdef DESKTOP_VERSION
643 menuBar1->insertItem( i18n("Synchronize"), syncMenu ); 643 menuBar1->insertItem( i18n("Synchronize"), syncMenu );
644 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 644 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu );
645#else 645#else
646 menuBar1->insertItem( i18n("Sync"), syncMenu ); 646 menuBar1->insertItem( i18n("Sync"), syncMenu );
647 menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu ); 647 menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu );
648#endif 648#endif
649 //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); 649 //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
650 menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); 650 menuBar1->insertItem( i18n("Filter"),selectFilterMenu );
651 menuBar1->insertItem( i18n("Help"), helpMenu ); 651 menuBar1->insertItem( i18n("Help"), helpMenu );
652 } else { 652 } else {
653 QPEMenuBar *menuBar1; 653 QPEMenuBar *menuBar1;
654 menuBar1 = new QPEMenuBar( iconToolBar ); 654 menuBar1 = new QPEMenuBar( iconToolBar );
655 QPopupMenu *menuBar = new QPopupMenu( this ); 655 QPopupMenu *menuBar = new QPopupMenu( this );
656 icon = loadPixmap( pathString + "z_menu" ); 656 icon = loadPixmap( pathString + "z_menu" );
657 menuBar1->insertItem( icon.pixmap(), menuBar); 657 menuBar1->insertItem( icon.pixmap(), menuBar);
658 //menuBar1->insertItem( i18n("ME"), menuBar); 658 //menuBar1->insertItem( i18n("ME"), menuBar);
659 menuBar->insertItem( i18n("File"), importMenu ); 659 menuBar->insertItem( i18n("File"), importMenu );
660 menuBar->insertItem( i18n("View"), viewMenu ); 660 menuBar->insertItem( i18n("View"), viewMenu );
661 menuBar->insertItem( i18n("Actions"), actionMenu ); 661 menuBar->insertItem( i18n("Actions"), actionMenu );
662 menuBar->insertItem( i18n("Synchronize"), syncMenu ); 662 menuBar->insertItem( i18n("Synchronize"), syncMenu );
663 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 663 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu );
664 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); 664 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
665 menuBar->insertItem( i18n("Filter"),selectFilterMenu ); 665 menuBar->insertItem( i18n("Filter"),selectFilterMenu );
666 menuBar->insertItem( i18n("Help"), helpMenu ); 666 menuBar->insertItem( i18n("Help"), helpMenu );
667 //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); 667 //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
668 menuBar1->setMaximumSize( menuBar1->sizeHint( )); 668 menuBar1->setMaximumSize( menuBar1->sizeHint( ));
669 } 669 }
670 connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); 670 connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) );
671 connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); 671 connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );
672 672
673 673
674 mWeekBgColor = iconToolBar->backgroundColor(); 674 mWeekBgColor = iconToolBar->backgroundColor();
675 mWeekPixmap.resize( pixWid , pixHei ); 675 mWeekPixmap.resize( pixWid , pixHei );
676 mWeekPixmap.fill( mWeekBgColor ); 676 mWeekPixmap.fill( mWeekBgColor );
677 icon = mWeekPixmap; 677 icon = mWeekPixmap;
678 mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); 678 mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
679 if ( p-> mShowIconWeekNum ) 679 if ( p-> mShowIconWeekNum )
680 mWeekAction->addTo( iconToolBar ); 680 mWeekAction->addTo( iconToolBar );
681 mWeekFont = font(); 681 mWeekFont = font();
682 682
683 int fontPoint = mWeekFont.pointSize(); 683 int fontPoint = mWeekFont.pointSize();
684 QFontMetrics f( mWeekFont ); 684 QFontMetrics f( mWeekFont );
685 int fontWid = f.width( "30" ); 685 int fontWid = f.width( "30" );
686 while ( fontWid > pixWid ) { 686 while ( fontWid > pixWid ) {
687 --fontPoint; 687 --fontPoint;
688 mWeekFont.setPointSize( fontPoint ); 688 mWeekFont.setPointSize( fontPoint );
689 QFontMetrics f( mWeekFont ); 689 QFontMetrics f( mWeekFont );
690 fontWid = f.width( "30" ); 690 fontWid = f.width( "30" );
691 //qDebug("dec-- "); 691 //qDebug("dec-- ");
692 } 692 }
693 693
694 connect( mWeekAction, SIGNAL( activated() ), 694 connect( mWeekAction, SIGNAL( activated() ),
695 this, SLOT( weekAction() ) ); 695 this, SLOT( weekAction() ) );
696 696
697 connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) ); 697 connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) );
698 if ( p->mShowIconFilterview ) { 698 if ( p->mShowIconFilterview ) {
699 icon = loadPixmap( pathString + "filter" ); 699 icon = loadPixmap( pathString + "filter" );
700 actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this ); 700 actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this );
701 connect( actionFilterMenuTB, SIGNAL( activated() ), 701 connect( actionFilterMenuTB, SIGNAL( activated() ),
702 this, SLOT( fillFilterMenuTB() ) ); 702 this, SLOT( fillFilterMenuTB() ) );
703 actionFilterMenuTB->addTo( iconToolBar ); 703 actionFilterMenuTB->addTo( iconToolBar );
704 selectFilterMenuTB = new QPopupMenu( this ); 704 selectFilterMenuTB = new QPopupMenu( this );
705 selectFilterMenuTB->setCheckable( true ); 705 selectFilterMenuTB->setCheckable( true );
706 connect ( selectFilterMenuTB, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); 706 connect ( selectFilterMenuTB, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) );
707 } 707 }
708 708
709 //#endif 709 //#endif
710 // ****************** 710 // ******************
711 QAction *action; 711 QAction *action;
712 // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); 712 // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
713 configureToolBarMenu->setCheckable( true ); 713 configureToolBarMenu->setCheckable( true );
714 714
715 715
716 configureAgendaMenu->setCheckable( true ); 716 configureAgendaMenu->setCheckable( true );
717 int iii ; 717 int iii ;
718 for ( iii = 1;iii<= 10 ;++iii ){ 718 for ( iii = 1;iii<= 10 ;++iii ){
719 configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 ); 719 configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 );
720 } 720 }
721 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu ); 721 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu );
722 722
723 connect( configureAgendaMenu, SIGNAL( aboutToShow()), 723 connect( configureAgendaMenu, SIGNAL( aboutToShow()),
724 this, SLOT( showConfigureAgenda( ) ) ); 724 this, SLOT( showConfigureAgenda( ) ) );
725 725
726 icon = loadPixmap( pathString + "configure" ); 726 icon = loadPixmap( pathString + "configure" );
727 action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this ); 727 action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this );
728 action->addTo( actionMenu ); 728 action->addTo( actionMenu );
729 connect( action, SIGNAL( activated() ), 729 connect( action, SIGNAL( activated() ),
730 mView, SLOT( edit_options() ) ); 730 mView, SLOT( edit_options() ) );
731 actionMenu->insertSeparator(); 731 actionMenu->insertSeparator();
732 732
733 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); 733 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
734 action->addTo( actionMenu ); 734 action->addTo( actionMenu );
735 connect( action, SIGNAL( activated() ), 735 connect( action, SIGNAL( activated() ),
736 mView, SLOT( undo_delete() ) ); 736 mView, SLOT( undo_delete() ) );
737 actionMenu->insertSeparator(); 737 actionMenu->insertSeparator();
738 738
739 icon = loadPixmap( pathString + "newevent" ); 739 icon = loadPixmap( pathString + "newevent" );
740 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); 740 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
741 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); 741 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
742 configureToolBarMenu->insertSeparator(); 742 configureToolBarMenu->insertSeparator();
743 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); 743 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
744 configureToolBarMenu->insertSeparator(); 744 configureToolBarMenu->insertSeparator();
745 configureToolBarMenu->insertItem(i18n("Week Number"), 400); 745 configureToolBarMenu->insertItem(i18n("Week Number"), 400);
746 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 746 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
747 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); 747 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
748 ne_action->addTo( actionMenu ); 748 ne_action->addTo( actionMenu );
749 connect( ne_action, SIGNAL( activated() ), 749 connect( ne_action, SIGNAL( activated() ),
750 mView, SLOT( newEvent() ) ); 750 mView, SLOT( newEvent() ) );
751 icon = loadPixmap( pathString + "newtodo" ); 751 icon = loadPixmap( pathString + "newtodo" );
752 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); 752 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
753 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); 753 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
754 nt_action->addTo( actionMenu ); 754 nt_action->addTo( actionMenu );
755 connect( nt_action, SIGNAL( activated() ), 755 connect( nt_action, SIGNAL( activated() ),
756 mView, SLOT( newTodo() ) ); 756 mView, SLOT( newTodo() ) );
757 757
758 icon = loadPixmap( pathString + "today" ); 758 icon = loadPixmap( pathString + "today" );
759 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); 759 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
760 today_action->addTo( viewMenu ); 760 today_action->addTo( viewMenu );
761 connect( today_action, SIGNAL( activated() ), 761 connect( today_action, SIGNAL( activated() ),
762 mView, SLOT( goToday() ) ); 762 mView, SLOT( goToday() ) );
763 viewMenu->insertSeparator(); 763 viewMenu->insertSeparator();
764 764
765 // *********************** 765 // ***********************
766 if ( KOPrefs::instance()->mVerticalScreen ) { 766 if ( KOPrefs::instance()->mVerticalScreen ) {
767 icon = SmallIcon( "1updownarrow" ); 767 icon = SmallIcon( "1updownarrow" );
768 } else { 768 } else {
769 icon = SmallIcon("1leftrightarrow" ); 769 icon = SmallIcon("1leftrightarrow" );
770 } 770 }
771 configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); 771 configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 );
772 QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); 772 QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
773 FSaction->addTo( viewMenu ); 773 FSaction->addTo( viewMenu );
774 connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() )); 774 connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() ));
775 775
776 icon = loadPixmap( pathString + "navi" ); 776 icon = loadPixmap( pathString + "navi" );
777 configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); 777 configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
778 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); 778 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
779 action->addTo( viewMenu ); 779 action->addTo( viewMenu );
780 connect( action, SIGNAL( activated() ), 780 connect( action, SIGNAL( activated() ),
781 mView, SLOT( toggleDateNavigatorWidget() ) ); 781 mView, SLOT( toggleDateNavigatorWidget() ) );
782 mToggleNav = action ; 782 mToggleNav = action ;
783 icon = loadPixmap( pathString + "filter" ); 783 icon = loadPixmap( pathString + "filter" );
784 configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); 784 configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 );
785 action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); 785 action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this );
786 action->addTo( viewMenu ); 786 action->addTo( viewMenu );
787 connect( action, SIGNAL( activated() ), 787 connect( action, SIGNAL( activated() ),
788 mView, SLOT( toggleFilter() ) ); 788 mView, SLOT( toggleFilter() ) );
789 mToggleFilter = action; 789 mToggleFilter = action;
790 icon = loadPixmap( pathString + "allday" ); 790 icon = loadPixmap( pathString + "allday" );
791 configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); 791 configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 );
792 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); 792 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
793 action->addTo( viewMenu ); 793 action->addTo( viewMenu );
794 connect( action, SIGNAL( activated() ), 794 connect( action, SIGNAL( activated() ),
795 mView, SLOT( toggleAllDaySize() ) ); 795 mView, SLOT( toggleAllDaySize() ) );
796 mToggleAllday = action; 796 mToggleAllday = action;
797 797
798 798
799 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 799 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
800 mToggleNav, SLOT( setEnabled ( bool ) ) ); 800 mToggleNav, SLOT( setEnabled ( bool ) ) );
801 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 801 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
802 mToggleFilter, SLOT( setEnabled ( bool ) ) ); 802 mToggleFilter, SLOT( setEnabled ( bool ) ) );
803 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), 803 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
804 mToggleAllday, SLOT( setEnabled ( bool ) ) ); 804 mToggleAllday, SLOT( setEnabled ( bool ) ) );
805 // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), 805 // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
806 // configureAgendaMenu, SLOT( setEnabled ( bool ) ) ); 806 // configureAgendaMenu, SLOT( setEnabled ( bool ) ) );
807 807
808 viewMenu->insertSeparator(); 808 viewMenu->insertSeparator();
809 icon = loadPixmap( pathString + "picker" ); 809 icon = loadPixmap( pathString + "picker" );
810 action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this ); 810 action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this );
811 action->addTo( viewMenu ); 811 action->addTo( viewMenu );
812 connect( action, SIGNAL( activated() ), 812 connect( action, SIGNAL( activated() ),
813 mView, SLOT( showDatePicker() ) ); 813 mView, SLOT( showDatePicker() ) );
814 action->addTo( iconToolBar ); 814 action->addTo( iconToolBar );
815 viewMenu->insertSeparator(); 815 viewMenu->insertSeparator();
816 816
817 if ( p-> mShowIconToggleFull ) 817 if ( p-> mShowIconToggleFull )
818 FSaction->addTo( iconToolBar ); 818 FSaction->addTo( iconToolBar );
819 if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); 819 if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar );
820 820
821 //******************** 821 //********************
822 if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); 822 if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar );
823 823
824 824
825 icon = loadPixmap( pathString + "whatsnext" ); 825 icon = loadPixmap( pathString + "whatsnext" );
826 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); 826 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
827 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); 827 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
828 whatsnext_action->addTo( viewMenu ); 828 whatsnext_action->addTo( viewMenu );
829 connect( whatsnext_action, SIGNAL( activated() ), 829 connect( whatsnext_action, SIGNAL( activated() ),
830 mView->viewManager(), SLOT( showWhatsNextView() ) ); 830 mView->viewManager(), SLOT( showWhatsNextView() ) );
831 831
832 icon = loadPixmap( pathString + "xdays" ); 832 icon = loadPixmap( pathString + "xdays" );
833 configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); 833 configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 );
834 QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); 834 QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
835 xdays_action->addTo( viewMenu ); 835 xdays_action->addTo( viewMenu );
836 connect( xdays_action, SIGNAL( activated() ), 836 connect( xdays_action, SIGNAL( activated() ),
837 mView->viewManager(), SLOT( showNextXView() ) ); 837 mView->viewManager(), SLOT( showNextXView() ) );
838 838
839 839
840 icon = loadPixmap( pathString + "journal" ); 840 icon = loadPixmap( pathString + "journal" );
841 configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); 841 configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 );
842 QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); 842 QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this );
843 viewjournal_action->addTo( viewMenu ); 843 viewjournal_action->addTo( viewMenu );
844 connect( viewjournal_action, SIGNAL( activated() ), 844 connect( viewjournal_action, SIGNAL( activated() ),
845 mView->viewManager(), SLOT( showJournalView() ) ); 845 mView->viewManager(), SLOT( showJournalView() ) );
846 846
847 847
848 icon = loadPixmap( pathString + "day" ); 848 icon = loadPixmap( pathString + "day" );
849 configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); 849 configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 );
850 QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this ); 850 QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this );
851 day1_action->addTo( viewMenu ); 851 day1_action->addTo( viewMenu );
852 // action->addTo( toolBar ); 852 // action->addTo( toolBar );
853 connect( day1_action, SIGNAL( activated() ), 853 connect( day1_action, SIGNAL( activated() ),
854 mView->viewManager(), SLOT( showDayView() ) ); 854 mView->viewManager(), SLOT( showDayView() ) );
855 855
856 icon = loadPixmap( pathString + "workweek" ); 856 icon = loadPixmap( pathString + "workweek" );
857 configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 ); 857 configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 );
858 QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this ); 858 QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this );
859 day5_action->addTo( viewMenu ); 859 day5_action->addTo( viewMenu );
860 connect( day5_action, SIGNAL( activated() ), 860 connect( day5_action, SIGNAL( activated() ),
861 mView->viewManager(), SLOT( showWorkWeekView() ) ); 861 mView->viewManager(), SLOT( showWorkWeekView() ) );
862 862
863 icon = loadPixmap( pathString + "week" ); 863 icon = loadPixmap( pathString + "week" );
864 configureToolBarMenu->insertItem(icon, i18n("Week"), 60 ); 864 configureToolBarMenu->insertItem(icon, i18n("Week"), 60 );
865 QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this ); 865 QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this );
866 day7_action->addTo( viewMenu ); 866 day7_action->addTo( viewMenu );
867 connect( day7_action, SIGNAL( activated() ), 867 connect( day7_action, SIGNAL( activated() ),
868 mView->viewManager(), SLOT( showWeekView() ) ); 868 mView->viewManager(), SLOT( showWeekView() ) );
869 869
870 icon = loadPixmap( pathString + "workweek2" ); 870 icon = loadPixmap( pathString + "workweek2" );
871 configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 ); 871 configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
872 QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this ); 872 QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
873 day6_action->addTo( viewMenu ); 873 day6_action->addTo( viewMenu );
874 connect( day6_action, SIGNAL( activated() ), 874 connect( day6_action, SIGNAL( activated() ),
875 mView->viewManager(), SLOT( showMonthViewWeek() ) ); 875 mView->viewManager(), SLOT( showMonthViewWeek() ) );
876 876
877 icon = loadPixmap( pathString + "month" ); 877 icon = loadPixmap( pathString + "month" );
878 configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); 878 configureToolBarMenu->insertItem(icon, i18n("Month"), 70 );
879 QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); 879 QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this );
880 month_action->addTo( viewMenu ); 880 month_action->addTo( viewMenu );
881 connect( month_action, SIGNAL( activated() ), 881 connect( month_action, SIGNAL( activated() ),
882 mView->viewManager(), SLOT( showMonthView() ) ); 882 mView->viewManager(), SLOT( showMonthView() ) );
883 883
884 icon = loadPixmap( pathString + "list" ); 884 icon = loadPixmap( pathString + "list" );
885 configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); 885 configureToolBarMenu->insertItem(icon, i18n("List View"), 30 );
886 QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this ); 886 QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this );
887 showlist_action->addTo( viewMenu ); 887 showlist_action->addTo( viewMenu );
888 connect( showlist_action, SIGNAL( activated() ), 888 connect( showlist_action, SIGNAL( activated() ),
889 mView->viewManager(), SLOT( showListView() ) ); 889 mView->viewManager(), SLOT( showListView() ) );
890 890
891 icon = loadPixmap( pathString + "todo" ); 891 icon = loadPixmap( pathString + "todo" );
892 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); 892 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
893 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); 893 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
894 todoview_action->addTo( viewMenu ); 894 todoview_action->addTo( viewMenu );
895 connect( todoview_action, SIGNAL( activated() ), 895 connect( todoview_action, SIGNAL( activated() ),
896 mView->viewManager(), SLOT( showTodoView() ) ); 896 mView->viewManager(), SLOT( showTodoView() ) );
897 897
898 898
899 899
900#if 0 900#if 0
901 action = new QAction( "view_timespan", "Time Span", 0, this ); 901 action = new QAction( "view_timespan", "Time Span", 0, this );
902 action->addTo( viewMenu ); 902 action->addTo( viewMenu );
903 connect( action, SIGNAL( activated() ), 903 connect( action, SIGNAL( activated() ),
904 mView->viewManager(), SLOT( showTimeSpanView() ) ); 904 mView->viewManager(), SLOT( showTimeSpanView() ) );
905#endif 905#endif
906 906
907 mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0, 907 mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0,
908 this ); 908 this );
909 mNewSubTodoAction->addTo( actionMenu ); 909 mNewSubTodoAction->addTo( actionMenu );
910 connect( mNewSubTodoAction, SIGNAL( activated() ), 910 connect( mNewSubTodoAction, SIGNAL( activated() ),
911 mView, SLOT( newSubTodo() ) ); 911 mView, SLOT( newSubTodo() ) );
912 912
913 actionMenu->insertSeparator(); 913 actionMenu->insertSeparator();
914 914
915 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); 915 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
916 mShowAction->addTo( actionMenu ); 916 mShowAction->addTo( actionMenu );
917 connect( mShowAction, SIGNAL( activated() ), 917 connect( mShowAction, SIGNAL( activated() ),
918 mView, SLOT( showIncidence() ) ); 918 mView, SLOT( showIncidence() ) );
919 919
920 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); 920 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
921 mEditAction->addTo( actionMenu ); 921 mEditAction->addTo( actionMenu );
922 connect( mEditAction, SIGNAL( activated() ), 922 connect( mEditAction, SIGNAL( activated() ),
923 mView, SLOT( editIncidence() ) ); 923 mView, SLOT( editIncidence() ) );
924 924
925 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); 925 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
926 mDeleteAction->addTo( actionMenu ); 926 mDeleteAction->addTo( actionMenu );
927 connect( mDeleteAction, SIGNAL( activated() ), 927 connect( mDeleteAction, SIGNAL( activated() ),
928 mView, SLOT( deleteIncidence() ) ); 928 mView, SLOT( deleteIncidence() ) );
929 929
930 930
931 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this ); 931 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
932 mCloneAction->addTo( actionMenu ); 932 mCloneAction->addTo( actionMenu );
933 connect( mCloneAction, SIGNAL( activated() ), 933 connect( mCloneAction, SIGNAL( activated() ),
934 mView, SLOT( cloneIncidence() ) ); 934 mView, SLOT( cloneIncidence() ) );
935 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this ); 935 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
936 mMoveAction->addTo( actionMenu ); 936 mMoveAction->addTo( actionMenu );
937 connect( mMoveAction, SIGNAL( activated() ), 937 connect( mMoveAction, SIGNAL( activated() ),
938 mView, SLOT( moveIncidence() ) ); 938 mView, SLOT( moveIncidence() ) );
939 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); 939 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
940 mBeamAction->addTo( actionMenu ); 940 mBeamAction->addTo( actionMenu );
941 connect( mBeamAction, SIGNAL( activated() ), 941 connect( mBeamAction, SIGNAL( activated() ),
942 mView, SLOT( beamIncidence() ) ); 942 mView, SLOT( beamIncidence() ) );
943 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); 943 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
944 mCancelAction->addTo( actionMenu ); 944 mCancelAction->addTo( actionMenu );
945 connect( mCancelAction, SIGNAL( activated() ), 945 connect( mCancelAction, SIGNAL( activated() ),
946 mView, SLOT( toggleCancelIncidence() ) ); 946 mView, SLOT( toggleCancelIncidence() ) );
947 947
948 actionMenu->insertSeparator(); 948 actionMenu->insertSeparator();
949 949
950 action = new QAction( "purge_completed", i18n("Purge Completed"), 0, 950 action = new QAction( "purge_completed", i18n("Purge Completed"), 0,
951 this ); 951 this );
952 action->addTo( actionMenu ); 952 action->addTo( actionMenu );
953 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); 953 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
954 954
955 icon = loadPixmap( pathString + "search" ); 955 icon = loadPixmap( pathString + "search" );
956 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); 956 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
957 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); 957 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
958 search_action->addTo( actionMenu ); 958 search_action->addTo( actionMenu );
959 connect( search_action, SIGNAL( activated() ), 959 connect( search_action, SIGNAL( activated() ),
960 mView->dialogManager(), SLOT( showSearchDialog() ) ); 960 mView->dialogManager(), SLOT( showSearchDialog() ) );
961 961
962 962
963 963
964 if ( KOPrefs::instance()->mShowFullMenu ) { 964 if ( KOPrefs::instance()->mShowFullMenu ) {
965 actionMenu->insertSeparator(); 965 actionMenu->insertSeparator();
966 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); 966 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
967 967
968 } 968 }
969 // actionMenu->insertSeparator(); 969 // actionMenu->insertSeparator();
970 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, 970 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
971 this ); 971 this );
972 action->addTo( importMenu_X ); 972 action->addTo( importMenu_X );
973 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); 973 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
974 action = new QAction( "import_quick", i18n("Import last file"), 0, 974 action = new QAction( "import_quick", i18n("Import last file"), 0,
975 this ); 975 this );
976 action->addTo( importMenu_X ); 976 action->addTo( importMenu_X );
977 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); 977 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
978 importMenu_X->insertSeparator(); 978 importMenu_X->insertSeparator();
979 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, 979 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
980 this ); 980 this );
981 action->addTo( importMenu_X ); 981 action->addTo( importMenu_X );
982 connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); 982 connect( action, SIGNAL( activated() ), SLOT( importBday() ) );
983 //#ifndef DESKTOP_VERSION 983 //#ifndef DESKTOP_VERSION
984 importMenu_X->insertSeparator(); 984 importMenu_X->insertSeparator();
985 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, 985 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
986 this ); 986 this );
987 action->addTo( importMenu_X ); 987 action->addTo( importMenu_X );
988 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); 988 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
989 //#else 989 //#else
990#ifdef _OL_IMPORT_ 990#ifdef _OL_IMPORT_
991 importMenu_X->insertSeparator(); 991 importMenu_X->insertSeparator();
992 action = new QAction( "import_ol", i18n("Import from OL"), 0, 992 action = new QAction( "import_ol", i18n("Import from OL"), 0,
993 this ); 993 this );
994 action->addTo( importMenu_X ); 994 action->addTo( importMenu_X );
995 connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); 995 connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
996#endif 996#endif
997 //#endif 997 //#endif
998 998
999 //importMenu->insertSeparator(); 999 //importMenu->insertSeparator();
1000 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, 1000 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
1001 this ); 1001 this );
1002 action->addTo( importMenu ); 1002 action->addTo( importMenu );
1003 connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); 1003 connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) );
1004 1004
1005 action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0, 1005 action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0,
1006 this ); 1006 this );
1007 action->addTo( importMenu ); 1007 action->addTo( importMenu );
1008 connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); 1008 connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) );
1009 importMenu->insertSeparator(); 1009 importMenu->insertSeparator();
1010 importMenu->insertItem( i18n("Import"), importMenu_X ); 1010 importMenu->insertItem( i18n("Import"), importMenu_X );
1011 //importMenu->insertSeparator(); 1011 //importMenu->insertSeparator();
1012 action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, 1012 action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
1013 this ); 1013 this );
1014 action->addTo( exportMenu_X ); 1014 action->addTo( exportMenu_X );
1015 connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); 1015 connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
1016 1016
1017 1017
1018 //LR 1018 //LR
1019 QPopupMenu *ex2phone = new QPopupMenu( this ); 1019 QPopupMenu *ex2phone = new QPopupMenu( this );
1020 ex2phone->insertItem(i18n("Complete calendar..."), 1 ); 1020 ex2phone->insertItem(i18n("Complete calendar..."), 1 );
1021 ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); 1021 ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
1022 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); 1022 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) );
1023 exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); 1023 exportMenu_X->insertItem( i18n("Export to phone"), ex2phone );
1024 1024
1025 importMenu->insertItem( i18n("Export"), exportMenu_X ); 1025 importMenu->insertItem( i18n("Export"), exportMenu_X );
1026#ifndef DESKTOP_VERSION 1026#ifndef DESKTOP_VERSION
1027 //importMenu->insertSeparator(); 1027 //importMenu->insertSeparator();
1028 brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, 1028 brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0,
1029 this ); 1029 this );
1030 brAction->addTo( beamMenu_X ); 1030 brAction->addTo( beamMenu_X );
1031 brAction->setToggleAction (true ) ; 1031 brAction->setToggleAction (true ) ;
1032 connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); 1032 connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) );
1033 1033
1034 action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, 1034 action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
1035 this ); 1035 this );
1036 action->addTo( beamMenu_X ); 1036 action->addTo( beamMenu_X );
1037 connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); 1037 connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) );
1038 1038
1039 action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, 1039 action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0,
1040 this ); 1040 this );
1041 action->addTo( beamMenu_X ); 1041 action->addTo( beamMenu_X );
1042 connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); 1042 connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) );
1043 importMenu->insertItem( i18n("Beam"), beamMenu_X ); 1043 importMenu->insertItem( i18n("Beam"), beamMenu_X );
1044#else 1044#else
1045 //importMenu->insertSeparator(); 1045 //importMenu->insertSeparator();
1046 icon = loadPixmap( pathString + "print" ); 1046 icon = loadPixmap( pathString + "print" );
1047 action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); 1047 action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
1048 action->addTo( beamMenu_X ); 1048 action->addTo( beamMenu_X );
1049 connect( action, SIGNAL( activated() ), 1049 connect( action, SIGNAL( activated() ),
1050 this, SLOT( printCal() ) ); 1050 this, SLOT( printCal() ) );
1051 1051
1052 icon = loadPixmap( pathString + "print" ); 1052 icon = loadPixmap( pathString + "print" );
1053 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); 1053 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
1054 action->addTo( beamMenu_X ); 1054 action->addTo( beamMenu_X );
1055 connect( action, SIGNAL( activated() ), 1055 connect( action, SIGNAL( activated() ),
1056 this, SLOT( printSel() ) ); 1056 this, SLOT( printSel() ) );
1057 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); 1057 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
1058 action->addTo( beamMenu_X ); 1058 action->addTo( beamMenu_X );
1059 connect( action, SIGNAL( activated() ), 1059 connect( action, SIGNAL( activated() ),
1060 mView->viewManager(), SLOT( slotprintWNV() ) ); 1060 mView->viewManager(), SLOT( slotprintWNV() ) );
1061 1061
1062 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); 1062 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
1063 action->addTo( beamMenu_X ); 1063 action->addTo( beamMenu_X );
1064 connect( action, SIGNAL( activated() ), 1064 connect( action, SIGNAL( activated() ),
1065 mView, SLOT( slotprintSelInc() ) ); 1065 mView, SLOT( slotprintSelInc() ) );
1066 1066
1067 icon = loadPixmap( pathString + "print" );
1068 action = new QAction( i18n("Print list view..."),icon,i18n("Print list view..."), 0, this );
1069 action->addTo( beamMenu_X );
1070 connect( action, SIGNAL( activated() ),
1071 this, SLOT( printListView() ) );
1067 1072
1068 importMenu->insertItem( i18n("Print"), beamMenu_X ); 1073 importMenu->insertItem( i18n("Print"), beamMenu_X );
1069#endif 1074#endif
1070 importMenu->insertSeparator(); 1075 importMenu->insertSeparator();
1071 action = new QAction( "manage cat", i18n("Manage new categories..."), 0, 1076 action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
1072 this ); 1077 this );
1073 action->addTo( importMenu ); 1078 action->addTo( importMenu );
1074 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); 1079 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
1075 importMenu->insertSeparator(); 1080 importMenu->insertSeparator();
1076 action = new QAction( "beam all", i18n("Save"), 0, 1081 action = new QAction( "beam all", i18n("Save"), 0,
1077 this ); 1082 this );
1078 action->addTo( importMenu ); 1083 action->addTo( importMenu );
1079 connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); 1084 connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
1080 action = new QAction( "beam all", i18n("Exit (+save)"), 0, 1085 action = new QAction( "beam all", i18n("Exit (+save)"), 0,
1081 this ); 1086 this );
1082 action->addTo( importMenu ); 1087 action->addTo( importMenu );
1083 connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); 1088 connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
1084 1089
1085 //menuBar->insertItem( "Configure",configureMenu ); 1090 //menuBar->insertItem( "Configure",configureMenu );
1086 //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); 1091 //configureMenu->insertItem( "Toolbar",configureToolBarMenu );
1087 icon = loadPixmap( "korganizer/korganizer" ); 1092 icon = loadPixmap( "korganizer/korganizer" );
1088 1093
1089 action = new QAction( "Whats New", i18n("What's new?"), 0,this ); 1094 action = new QAction( "Whats New", i18n("What's new?"), 0,this );
1090 action->addTo( helpMenu ); 1095 action->addTo( helpMenu );
1091 connect( action, SIGNAL( activated() ), 1096 connect( action, SIGNAL( activated() ),
1092 SLOT( whatsNew() ) ); 1097 SLOT( whatsNew() ) );
1093 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); 1098 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this );
1094 action->addTo( helpMenu ); 1099 action->addTo( helpMenu );
1095 connect( action, SIGNAL( activated() ), 1100 connect( action, SIGNAL( activated() ),
1096 SLOT( features() ) ); 1101 SLOT( features() ) );
1097 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); 1102 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
1098 action->addTo( helpMenu ); 1103 action->addTo( helpMenu );
1099 connect( action, SIGNAL( activated() ), 1104 connect( action, SIGNAL( activated() ),
1100 SLOT( keyBindings() ) ); 1105 SLOT( keyBindings() ) );
1101 action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this ); 1106 action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this );
1102 action->addTo( helpMenu ); 1107 action->addTo( helpMenu );
1103 connect( action, SIGNAL( activated() ), 1108 connect( action, SIGNAL( activated() ),
1104 SLOT( storagehowto() ) ); 1109 SLOT( storagehowto() ) );
1105 action = new QAction( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this ); 1110 action = new QAction( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this );
1106 action->addTo( helpMenu ); 1111 action->addTo( helpMenu );
1107 connect( action, SIGNAL( activated() ), 1112 connect( action, SIGNAL( activated() ),
1108 SLOT( timetrackinghowto() ) ); 1113 SLOT( timetrackinghowto() ) );
1109 action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); 1114 action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this );
1110 action->addTo( helpMenu ); 1115 action->addTo( helpMenu );
1111 connect( action, SIGNAL( activated() ), 1116 connect( action, SIGNAL( activated() ),
1112 SLOT( synchowto() ) ); 1117 SLOT( synchowto() ) );
1113 action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); 1118 action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this );
1114 action->addTo( helpMenu ); 1119 action->addTo( helpMenu );
1115 connect( action, SIGNAL( activated() ), 1120 connect( action, SIGNAL( activated() ),
1116 SLOT( kdesynchowto() ) ); 1121 SLOT( kdesynchowto() ) );
1117 action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); 1122 action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this );
1118 action->addTo( helpMenu ); 1123 action->addTo( helpMenu );
1119 connect( action, SIGNAL( activated() ), 1124 connect( action, SIGNAL( activated() ),
1120 SLOT( multisynchowto() ) ); 1125 SLOT( multisynchowto() ) );
1121 action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); 1126 action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this );
1122 action->addTo( helpMenu ); 1127 action->addTo( helpMenu );
1123 connect( action, SIGNAL( activated() ), 1128 connect( action, SIGNAL( activated() ),
1124 SLOT( aboutAutoSaving() ) ); 1129 SLOT( aboutAutoSaving() ) );
1125 action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); 1130 action = new QAction( "Problemd", i18n("Known Problems..."), 0,this );
1126 action->addTo( helpMenu ); 1131 action->addTo( helpMenu );
1127 connect( action, SIGNAL( activated() ), 1132 connect( action, SIGNAL( activated() ),
1128 SLOT( aboutKnownBugs() ) ); 1133 SLOT( aboutKnownBugs() ) );
1129 action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); 1134 action = new QAction( "Translate Howto", i18n("User translation..."), 0,this );
1130 action->addTo( helpMenu ); 1135 action->addTo( helpMenu );
1131 connect( action, SIGNAL( activated() ), 1136 connect( action, SIGNAL( activated() ),
1132 SLOT( usertrans() ) ); 1137 SLOT( usertrans() ) );
1133 action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); 1138 action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this );
1134 action->addTo( helpMenu ); 1139 action->addTo( helpMenu );
1135 connect( action, SIGNAL( activated() ), 1140 connect( action, SIGNAL( activated() ),
1136 SLOT( faq() ) ); 1141 SLOT( faq() ) );
1137 action = new QAction( "licence", i18n("Licence..."), 0, this ); 1142 action = new QAction( "licence", i18n("Licence..."), 0, this );
1138 action->addTo( helpMenu ); 1143 action->addTo( helpMenu );
1139 connect( action, SIGNAL( activated() ), 1144 connect( action, SIGNAL( activated() ),
1140 SLOT( licence() ) ); 1145 SLOT( licence() ) );
1141 action = new QAction( "about", i18n("About..."), 0, this ); 1146 action = new QAction( "about", i18n("About..."), 0, this );
1142 action->addTo( helpMenu ); 1147 action->addTo( helpMenu );
1143 connect( action, SIGNAL( activated() ), 1148 connect( action, SIGNAL( activated() ),
1144 SLOT( about() ) ); 1149 SLOT( about() ) );
1145 //menuBar->insertSeparator(); 1150 //menuBar->insertSeparator();
1146 1151
1147 // ****************************************************** 1152 // ******************************************************
1148 // menubar icons 1153 // menubar icons
1149 1154
1150 1155
1151 1156
1152 //menuBar->insertItem( iconToolBar ); 1157 //menuBar->insertItem( iconToolBar );
1153 //xdays_action 1158 //xdays_action
1154 if (p-> mShowIconNewEvent) 1159 if (p-> mShowIconNewEvent)
1155 ne_action->addTo( iconToolBar ); 1160 ne_action->addTo( iconToolBar );
1156 if (p->mShowIconNewTodo ) 1161 if (p->mShowIconNewTodo )
1157 nt_action->addTo( iconToolBar ); 1162 nt_action->addTo( iconToolBar );
1158 if (p-> mShowIconSearch) 1163 if (p-> mShowIconSearch)
1159 search_action->addTo( iconToolBar ); 1164 search_action->addTo( iconToolBar );
1160 if (p-> mShowIconWhatsThis) 1165 if (p-> mShowIconWhatsThis)
1161 QWhatsThis::whatsThisButton ( iconToolBar ); 1166 QWhatsThis::whatsThisButton ( iconToolBar );
1162 if (p-> mShowIconNext) 1167 if (p-> mShowIconNext)
1163 whatsnext_action->addTo( viewToolBar ); 1168 whatsnext_action->addTo( viewToolBar );
1164 if (p-> mShowIconNextDays) 1169 if (p-> mShowIconNextDays)
1165 xdays_action->addTo( viewToolBar ); 1170 xdays_action->addTo( viewToolBar );
1166 if (p-> mShowIconJournal) 1171 if (p-> mShowIconJournal)
1167 viewjournal_action->addTo( viewToolBar ); 1172 viewjournal_action->addTo( viewToolBar );
1168 if (p-> mShowIconDay1) 1173 if (p-> mShowIconDay1)
1169 day1_action->addTo( viewToolBar ); 1174 day1_action->addTo( viewToolBar );
1170 if (p-> mShowIconDay5) 1175 if (p-> mShowIconDay5)
1171 day5_action->addTo( viewToolBar ); 1176 day5_action->addTo( viewToolBar );
1172 if (p-> mShowIconDay7) 1177 if (p-> mShowIconDay7)
1173 day7_action->addTo( viewToolBar ); 1178 day7_action->addTo( viewToolBar );
1174 if (p-> mShowIconDay6) 1179 if (p-> mShowIconDay6)
1175 day6_action->addTo( viewToolBar ); 1180 day6_action->addTo( viewToolBar );
1176 if (p-> mShowIconMonth) 1181 if (p-> mShowIconMonth)
1177 month_action->addTo( viewToolBar ); 1182 month_action->addTo( viewToolBar );
1178 if (p-> mShowIconList) 1183 if (p-> mShowIconList)
1179 showlist_action->addTo( viewToolBar ); 1184 showlist_action->addTo( viewToolBar );
1180 if (p-> mShowIconTodoview) 1185 if (p-> mShowIconTodoview)
1181 todoview_action->addTo( viewToolBar ); 1186 todoview_action->addTo( viewToolBar );
1182 1187
1183 icon = loadPixmap( pathString + "2leftarrowB" ); 1188 icon = loadPixmap( pathString + "2leftarrowB" );
1184 configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200); 1189 configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200);
1185 if (p-> mShowIconBackFast) { 1190 if (p-> mShowIconBackFast) {
1186 action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); 1191 action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this );
1187 connect( action, SIGNAL( activated() ), 1192 connect( action, SIGNAL( activated() ),
1188 mView, SLOT( goPreviousMonth() ) ); 1193 mView, SLOT( goPreviousMonth() ) );
1189 action->addTo( navigatorToolBar ); 1194 action->addTo( navigatorToolBar );
1190 } 1195 }
1191 icon = loadPixmap( pathString + "1leftarrowB" ); 1196 icon = loadPixmap( pathString + "1leftarrowB" );
1192 configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210); 1197 configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210);
1193 if (p-> mShowIconBack) { 1198 if (p-> mShowIconBack) {
1194 action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); 1199 action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
1195 connect( action, SIGNAL( activated() ), 1200 connect( action, SIGNAL( activated() ),
1196 mView, SLOT( goPrevious() ) ); 1201 mView, SLOT( goPrevious() ) );
1197 action->addTo( navigatorToolBar ); 1202 action->addTo( navigatorToolBar );
1198 } 1203 }
1199 icon = loadPixmap( pathString + "today" ); 1204 icon = loadPixmap( pathString + "today" );
1200 configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); 1205 configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130);
1201 if (p-> mShowIconToday) 1206 if (p-> mShowIconToday)
1202 today_action->addTo( navigatorToolBar ); 1207 today_action->addTo( navigatorToolBar );
1203 icon = loadPixmap( pathString + "1rightarrowB" ); 1208 icon = loadPixmap( pathString + "1rightarrowB" );
1204 configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220); 1209 configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220);
1205 if (p-> mShowIconForward) { 1210 if (p-> mShowIconForward) {
1206 action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this ); 1211 action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this );
1207 connect( action, SIGNAL( activated() ), 1212 connect( action, SIGNAL( activated() ),
1208 mView, SLOT( goNext() ) ); 1213 mView, SLOT( goNext() ) );
1209 action->addTo( navigatorToolBar ); 1214 action->addTo( navigatorToolBar );
1210 } 1215 }
1211 icon = loadPixmap( pathString + "2rightarrowB" ); 1216 icon = loadPixmap( pathString + "2rightarrowB" );
1212 configureToolBarMenu->insertItem(icon, i18n("Next month"), 230); 1217 configureToolBarMenu->insertItem(icon, i18n("Next month"), 230);
1213 if (p-> mShowIconForwardFast) { 1218 if (p-> mShowIconForwardFast) {
1214 action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this ); 1219 action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this );
1215 connect( action, SIGNAL( activated() ), 1220 connect( action, SIGNAL( activated() ),
1216 mView, SLOT( goNextMonth() ) ); 1221 mView, SLOT( goNextMonth() ) );
1217 action->addTo( navigatorToolBar ); 1222 action->addTo( navigatorToolBar );
1218 } 1223 }
1219 1224
1220 1225
1221 configureToolBarMenu->insertItem(i18n("What's This?"), 300, 6); 1226 configureToolBarMenu->insertItem(i18n("What's This?"), 300, 6);
1222 1227
1223 1228
1224 if ( p->mShowIconNavigator ) configureToolBarMenu->setItemChecked( 22 , true); 1229 if ( p->mShowIconNavigator ) configureToolBarMenu->setItemChecked( 22 , true);
1225 if ( p->mShowIconAllday ) configureToolBarMenu->setItemChecked( 24 , true); 1230 if ( p->mShowIconAllday ) configureToolBarMenu->setItemChecked( 24 , true);
1226 if ( p->mShowIconFilterview ) configureToolBarMenu->setItemChecked( 26 , true); 1231 if ( p->mShowIconFilterview ) configureToolBarMenu->setItemChecked( 26 , true);
1227 if ( p->mShowIconToggleFull ) configureToolBarMenu->setItemChecked( 28 , true); 1232 if ( p->mShowIconToggleFull ) configureToolBarMenu->setItemChecked( 28 , true);
1228 1233
1229 if (p-> mShowIconNewEvent) 1234 if (p-> mShowIconNewEvent)
1230 configureToolBarMenu->setItemChecked( 10, true ); 1235 configureToolBarMenu->setItemChecked( 10, true );
1231 if (p->mShowIconNewTodo ) 1236 if (p->mShowIconNewTodo )
1232 configureToolBarMenu->setItemChecked( 20, true ); 1237 configureToolBarMenu->setItemChecked( 20, true );
1233 if (p-> mShowIconSearch) 1238 if (p-> mShowIconSearch)
1234 configureToolBarMenu->setItemChecked( 120, true ); 1239 configureToolBarMenu->setItemChecked( 120, true );
1235 if (p-> mShowIconList) 1240 if (p-> mShowIconList)
1236 configureToolBarMenu->setItemChecked( 30, true ); 1241 configureToolBarMenu->setItemChecked( 30, true );
1237 if (p-> mShowIconDay1) 1242 if (p-> mShowIconDay1)
1238 configureToolBarMenu->setItemChecked( 40, true ); 1243 configureToolBarMenu->setItemChecked( 40, true );
1239 if (p-> mShowIconDay5) 1244 if (p-> mShowIconDay5)
1240 configureToolBarMenu->setItemChecked( 50, true ); 1245 configureToolBarMenu->setItemChecked( 50, true );
1241 if (p-> mShowIconDay6) 1246 if (p-> mShowIconDay6)
1242 configureToolBarMenu->setItemChecked( 75, true ); 1247 configureToolBarMenu->setItemChecked( 75, true );
1243 if (p-> mShowIconDay7) 1248 if (p-> mShowIconDay7)
1244 configureToolBarMenu->setItemChecked( 60, true ); 1249 configureToolBarMenu->setItemChecked( 60, true );
1245 if (p-> mShowIconMonth) 1250 if (p-> mShowIconMonth)
1246 configureToolBarMenu->setItemChecked( 70, true ); 1251 configureToolBarMenu->setItemChecked( 70, true );
1247 if (p-> mShowIconTodoview) 1252 if (p-> mShowIconTodoview)
1248 configureToolBarMenu->setItemChecked( 80, true ); 1253 configureToolBarMenu->setItemChecked( 80, true );
1249 if (p-> mShowIconBackFast) 1254 if (p-> mShowIconBackFast)
1250 configureToolBarMenu->setItemChecked( 200, true ); 1255 configureToolBarMenu->setItemChecked( 200, true );
1251 if (p-> mShowIconBack) 1256 if (p-> mShowIconBack)
1252 configureToolBarMenu->setItemChecked( 210, true ); 1257 configureToolBarMenu->setItemChecked( 210, true );
1253 if (p-> mShowIconToday) 1258 if (p-> mShowIconToday)
1254 configureToolBarMenu->setItemChecked( 130, true ); 1259 configureToolBarMenu->setItemChecked( 130, true );
1255 if (p-> mShowIconForward) 1260 if (p-> mShowIconForward)
1256 configureToolBarMenu->setItemChecked( 220, true ); 1261 configureToolBarMenu->setItemChecked( 220, true );
1257 if (p-> mShowIconForwardFast) 1262 if (p-> mShowIconForwardFast)
1258 configureToolBarMenu->setItemChecked( 230, true ); 1263 configureToolBarMenu->setItemChecked( 230, true );
1259 if (p-> mShowIconNextDays) 1264 if (p-> mShowIconNextDays)
1260 configureToolBarMenu->setItemChecked( 100, true ); 1265 configureToolBarMenu->setItemChecked( 100, true );
1261 if (p-> mShowIconNext) 1266 if (p-> mShowIconNext)
1262 configureToolBarMenu->setItemChecked( 110, true ); 1267 configureToolBarMenu->setItemChecked( 110, true );
1263 if (p-> mShowIconJournal) 1268 if (p-> mShowIconJournal)
1264 configureToolBarMenu->setItemChecked( 90, true ); 1269 configureToolBarMenu->setItemChecked( 90, true );
1265 if (p-> mShowIconWhatsThis) 1270 if (p-> mShowIconWhatsThis)
1266 configureToolBarMenu->setItemChecked( 300, true ); 1271 configureToolBarMenu->setItemChecked( 300, true );
1267 if (p-> mShowIconWeekNum) 1272 if (p-> mShowIconWeekNum)
1268 configureToolBarMenu->setItemChecked( 400, true ); 1273 configureToolBarMenu->setItemChecked( 400, true );
1269 if (!p-> mShowIconStretch) { 1274 if (!p-> mShowIconStretch) {
1270 QLabel* dummy = new QLabel( iconToolBar ); 1275 QLabel* dummy = new QLabel( iconToolBar );
1271 dummy->setBackgroundColor( iconToolBar->backgroundColor() ); 1276 dummy->setBackgroundColor( iconToolBar->backgroundColor() );
1272 dummy->setMinimumWidth( 0 ); 1277 dummy->setMinimumWidth( 0 );
1273 iconToolBar->setStretchableWidget ( dummy ) ; 1278 iconToolBar->setStretchableWidget ( dummy ) ;
1274 } 1279 }
1275 else { 1280 else {
1276 iconToolBar->setHorizontalStretchable (true ); 1281 iconToolBar->setHorizontalStretchable (true );
1277 viewToolBar->setHorizontalStretchable (true ); 1282 viewToolBar->setHorizontalStretchable (true );
1278 navigatorToolBar->setHorizontalStretchable (true ); 1283 navigatorToolBar->setHorizontalStretchable (true );
1279 iconToolBar->setVerticalStretchable (true ); 1284 iconToolBar->setVerticalStretchable (true );
1280 viewToolBar->setVerticalStretchable (true ); 1285 viewToolBar->setVerticalStretchable (true );
1281 navigatorToolBar->setVerticalStretchable (true ); 1286 navigatorToolBar->setVerticalStretchable (true );
1282 configureToolBarMenu->setItemChecked( 5, true ); 1287 configureToolBarMenu->setItemChecked( 5, true );
1283 } 1288 }
1284 if (p-> mShowIconFilter) 1289 if (p-> mShowIconFilter)
1285 configureToolBarMenu->setItemChecked( 7, true ); 1290 configureToolBarMenu->setItemChecked( 7, true );
1286 if (p-> mShowIconOnetoolbar) 1291 if (p-> mShowIconOnetoolbar)
1287 configureToolBarMenu->setItemChecked( 6, true ); 1292 configureToolBarMenu->setItemChecked( 6, true );
1288 1293
1289 1294
1290 if ( filterMenubar ) { 1295 if ( filterMenubar ) {
1291 filterMenubar->reparent(filterToolBar,0,QPoint(0,0) ); 1296 filterMenubar->reparent(filterToolBar,0,QPoint(0,0) );
1292 connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) ); 1297 connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) );
1293 } 1298 }
1294 connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); 1299 connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) );
1295 configureAgenda( p->mHourSize ); 1300 configureAgenda( p->mHourSize );
1296 connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); 1301 connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) );
1297} 1302}
1298 1303
1299void MainWindow::exportToPhone( int mode ) 1304void MainWindow::exportToPhone( int mode )
1300{ 1305{
1301 1306
1302 //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); 1307 //ex2phone->insertItem(i18n("Complete calendar..."), 1 );
1303 //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); 1308 //ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
1304 KOex2phonePrefs ex2phone; 1309 KOex2phonePrefs ex2phone;
1305 1310
1306 ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); 1311 ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection );
1307 ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); 1312 ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice );
1308 ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); 1313 ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel );
1309 if ( mode == 1 ) 1314 if ( mode == 1 )
1310 ex2phone.setCaption(i18n("Export complete calendar")); 1315 ex2phone.setCaption(i18n("Export complete calendar"));
1311 if ( mode == 2 ) 1316 if ( mode == 2 )
1312 ex2phone.setCaption(i18n("Export filtered calendar")); 1317 ex2phone.setCaption(i18n("Export filtered calendar"));
1313 1318
1314 if ( !ex2phone.exec() ) { 1319 if ( !ex2phone.exec() ) {
1315 return; 1320 return;
1316 } 1321 }
1317 KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); 1322 KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text();
1318 KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); 1323 KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text();
1319 KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); 1324 KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text();
1320 1325
1321 int inFuture = 0; 1326 int inFuture = 0;
1322 if ( ex2phone.mWriteBackFuture->isChecked() ) 1327 if ( ex2phone.mWriteBackFuture->isChecked() )
1323 inFuture = ex2phone.mWriteBackFutureWeeks->value(); 1328 inFuture = ex2phone.mWriteBackFutureWeeks->value();
1324 QPtrList<Incidence> delSel; 1329 QPtrList<Incidence> delSel;
1325 if ( mode == 1 ) 1330 if ( mode == 1 )
1326 delSel = mCalendar->rawIncidences(); 1331 delSel = mCalendar->rawIncidences();
1327 if ( mode == 2 ) 1332 if ( mode == 2 )
1328 delSel = mCalendar->incidences(); 1333 delSel = mCalendar->incidences();
1329 CalendarLocal* cal = new CalendarLocal(); 1334 CalendarLocal* cal = new CalendarLocal();
1330 cal->setLocalTime(); 1335 cal->setLocalTime();
1331 Incidence *incidence = delSel.first(); 1336 Incidence *incidence = delSel.first();
1332 QDateTime cur = QDateTime::currentDateTime().addDays( -7 ); 1337 QDateTime cur = QDateTime::currentDateTime().addDays( -7 );
1333 QDateTime end = cur.addDays( ( inFuture +1 ) *7 ); 1338 QDateTime end = cur.addDays( ( inFuture +1 ) *7 );
1334 while ( incidence ) { 1339 while ( incidence ) {
1335 if ( incidence->typeID() != journalID ) { 1340 if ( incidence->typeID() != journalID ) {
1336 bool add = true; 1341 bool add = true;
1337 if ( inFuture ) { 1342 if ( inFuture ) {
1338 QDateTime dt; 1343 QDateTime dt;
1339 if ( incidence->typeID() == todoID ) { 1344 if ( incidence->typeID() == todoID ) {
1340 Todo * t = (Todo*)incidence; 1345 Todo * t = (Todo*)incidence;
1341 if ( t->hasDueDate() ) 1346 if ( t->hasDueDate() )
1342 dt = t->dtDue(); 1347 dt = t->dtDue();
1343 else 1348 else
1344 dt = cur.addSecs( 62 ); 1349 dt = cur.addSecs( 62 );
1345 } 1350 }
1346 else { 1351 else {
1347 bool ok; 1352 bool ok;
1348 dt = incidence->getNextOccurence( cur, &ok ); 1353 dt = incidence->getNextOccurence( cur, &ok );
1349 if ( !ok ) 1354 if ( !ok )
1350 dt = cur.addSecs( -62 ); 1355 dt = cur.addSecs( -62 );
1351 } 1356 }
1352 if ( dt < cur || dt > end ) { 1357 if ( dt < cur || dt > end ) {
1353 add = false; 1358 add = false;
1354 } 1359 }
1355 } 1360 }
1356 if ( add ) { 1361 if ( add ) {
1357 Incidence *in = incidence->clone(); 1362 Incidence *in = incidence->clone();
1358 cal->addIncidence( in ); 1363 cal->addIncidence( in );
1359 } 1364 }
1360 } 1365 }
1361 incidence = delSel.next(); 1366 incidence = delSel.next();
1362 } 1367 }
1363 PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice, 1368 PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice,
1364 KPimGlobalPrefs::instance()->mEx2PhoneConnection, 1369 KPimGlobalPrefs::instance()->mEx2PhoneConnection,
1365 KPimGlobalPrefs::instance()->mEx2PhoneModel ); 1370 KPimGlobalPrefs::instance()->mEx2PhoneModel );
1366 1371
1367 setCaption( i18n("Writing to phone...")); 1372 setCaption( i18n("Writing to phone..."));
1368 if ( PhoneFormat::writeToPhone( cal ) ) 1373 if ( PhoneFormat::writeToPhone( cal ) )
1369 setCaption( i18n("Export to phone successful!")); 1374 setCaption( i18n("Export to phone successful!"));
1370 else 1375 else
1371 setCaption( i18n("Error exporting to phone!")); 1376 setCaption( i18n("Error exporting to phone!"));
1372 delete cal; 1377 delete cal;
1373} 1378}
1374 1379
1375 1380
1376void MainWindow::setDefaultPreferences() 1381void MainWindow::setDefaultPreferences()
1377{ 1382{
1378 KOPrefs *p = KOPrefs::instance(); 1383 KOPrefs *p = KOPrefs::instance();
1379 1384
1380 p->mCompactDialogs = true; 1385 p->mCompactDialogs = true;
1381 p->mConfirm = true; 1386 p->mConfirm = true;
1382 // p->mEnableQuickTodo = false; 1387 // p->mEnableQuickTodo = false;
1383 1388
1384} 1389}
1385 1390
1386QString MainWindow::resourcePath() 1391QString MainWindow::resourcePath()
1387{ 1392{
1388 return KGlobal::iconLoader()->iconPath(); 1393 return KGlobal::iconLoader()->iconPath();
1389} 1394}
1390 1395
1391void MainWindow::displayText( QString text ,QString cap ) 1396void MainWindow::displayText( QString text ,QString cap )
1392{ 1397{
1393 QDialog dia( this, "name", true ); ; 1398 QDialog dia( this, "name", true ); ;
1394 dia.setCaption( cap ); 1399 dia.setCaption( cap );
1395 QVBoxLayout* lay = new QVBoxLayout( &dia ); 1400 QVBoxLayout* lay = new QVBoxLayout( &dia );
1396 lay->setSpacing( 3 ); 1401 lay->setSpacing( 3 );
1397 lay->setMargin( 3 ); 1402 lay->setMargin( 3 );
1398 QTextBrowser tb ( &dia ); 1403 QTextBrowser tb ( &dia );
1399 lay->addWidget( &tb ); 1404 lay->addWidget( &tb );
1400 tb.setText( text ); 1405 tb.setText( text );
1401#ifdef DESKTOP_VERSION 1406#ifdef DESKTOP_VERSION
1402 dia.resize( 640, 480); 1407 dia.resize( 640, 480);
1403#else 1408#else
1404 dia.showMaximized(); 1409 dia.showMaximized();
1405#endif 1410#endif
1406 dia.exec(); 1411 dia.exec();
1407} 1412}
1408 1413
1409void MainWindow::features() 1414void MainWindow::features()
1410{ 1415{
1411 1416
1412 KApplication::showFile( i18n("KO/Pi Features and hints"), "kdepim/korganizer/featuresKOPI.txt" ); 1417 KApplication::showFile( i18n("KO/Pi Features and hints"), "kdepim/korganizer/featuresKOPI.txt" );
1413} 1418}
1414 1419
1415void MainWindow::usertrans() 1420void MainWindow::usertrans()
1416{ 1421{
1417 1422
1418 KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" ); 1423 KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" );
1419} 1424}
1420 1425
1421void MainWindow::storagehowto() 1426void MainWindow::storagehowto()
1422{ 1427{
1423 KApplication::showFile( "KDE-Pim/Pi Storage HowTo", "kdepim/storagehowto.txt" ); 1428 KApplication::showFile( "KDE-Pim/Pi Storage HowTo", "kdepim/storagehowto.txt" );
1424} 1429}
1425void MainWindow::timetrackinghowto() 1430void MainWindow::timetrackinghowto()
1426{ 1431{
1427 KApplication::showFile( "KO/Pi Timetracking HowTo", "kdepim/timetrackerhowto.txt" ); 1432 KApplication::showFile( "KO/Pi Timetracking HowTo", "kdepim/timetrackerhowto.txt" );
1428} 1433}
1429void MainWindow::kdesynchowto() 1434void MainWindow::kdesynchowto()
1430{ 1435{
1431 KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); 1436 KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" );
1432} 1437}
1433void MainWindow::multisynchowto() 1438void MainWindow::multisynchowto()
1434{ 1439{
1435 KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); 1440 KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" );
1436} 1441}
1437void MainWindow::synchowto() 1442void MainWindow::synchowto()
1438{ 1443{
1439 KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); 1444 KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" );
1440} 1445}
1441void MainWindow::faq() 1446void MainWindow::faq()
1442{ 1447{
1443 KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" ); 1448 KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" );
1444 1449
1445} 1450}
1446void MainWindow::whatsNew() 1451void MainWindow::whatsNew()
1447{ 1452{
1448 KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); 1453 KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" );
1449 1454
1450} 1455}
1451void MainWindow::licence() 1456void MainWindow::licence()
1452{ 1457{
1453 KApplication::showLicence(); 1458 KApplication::showLicence();
1454 1459
1455} 1460}
1456void MainWindow::about() 1461void MainWindow::about()
1457{ 1462{
1458 QString version; 1463 QString version;
1459#include <../version> 1464#include <../version>
1460 QMessageBox::about( this, i18n("About KOrganizer/Pi"), 1465 QMessageBox::about( this, i18n("About KOrganizer/Pi"),
1461 i18n("KOrganizer/Platform-independent\n") + 1466 i18n("KOrganizer/Platform-independent\n") +
1462 "(KO/Pi) " + version + " - " + 1467 "(KO/Pi) " + version + " - " +
1463 1468
1464#ifdef DESKTOP_VERSION 1469#ifdef DESKTOP_VERSION
1465 i18n("Desktop Edition\n") + 1470 i18n("Desktop Edition\n") +
1466#else 1471#else
1467 i18n("PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n") + 1472 i18n("PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n") +
1468#endif 1473#endif
1469 i18n("(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.info --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!") ); 1474 i18n("(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.info --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!") );
1470} 1475}
1471void MainWindow::keyBindings() 1476void MainWindow::keyBindings()
1472{ 1477{
1473 QString cap = i18n("KO/Pi Keys + Colors"); 1478 QString cap = i18n("KO/Pi Keys + Colors");
1474 QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") + 1479 QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") +
1475 i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+ 1480 i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+
1476 i18n("<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n") + 1481 i18n("<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n") +
1477 i18n("<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n") + 1482 i18n("<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n") +
1478 i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") + 1483 i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") +
1479 i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+ 1484 i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+
1480 i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+ 1485 i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+
1481 i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ 1486 i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+
1482 i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ 1487 i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+
1483 i18n("<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ")+ 1488 i18n("<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ")+
1484 i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+ 1489 i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+
1485 i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+ 1490 i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+
1486 i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+ 1491 i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+
1487 i18n("<p><b>K</b>: Week view in Month view syle</p>\n")+ 1492 i18n("<p><b>K</b>: Week view in Month view syle</p>\n")+
1488 i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+ 1493 i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+
1489 i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+ 1494 i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+
1490 i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X+ctrl</b>: Toggle datenavigator</p>\n")+ 1495 i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X+ctrl</b>: Toggle datenavigator</p>\n")+
1491 i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+ 1496 i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+
1492 i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+ 1497 i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+
1493 i18n("<p><b>B</b>: Edit description (details) of selected item</p>\n")+ 1498 i18n("<p><b>B</b>: Edit description (details) of selected item</p>\n")+
1494 i18n("<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n")+ 1499 i18n("<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n")+
1495 i18n("<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n")+ 1500 i18n("<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n")+
1496 i18n("<p><b>del,backspace</b>: Delete selected item</p>\n")+ 1501 i18n("<p><b>del,backspace</b>: Delete selected item</p>\n")+
1497 i18n("<p><h3>In agenda view:</h3></p>\n") + 1502 i18n("<p><h3>In agenda view:</h3></p>\n") +
1498 i18n("<p><b>up/down</b>: Scroll agenda view</p>\n")+ 1503 i18n("<p><b>up/down</b>: Scroll agenda view</p>\n")+
1499 i18n("<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n")+ 1504 i18n("<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n")+
1500 i18n("<p><h3>In todo view:</h3></p>\n") + 1505 i18n("<p><h3>In todo view:</h3></p>\n") +
1501 i18n("<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n")+ 1506 i18n("<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n")+
1502 i18n("<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n")+ 1507 i18n("<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n")+
1503 i18n("<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n")+ 1508 i18n("<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n")+
1504 i18n("<p><b>Q</b>: Toggle quick todo line edit.</p>\n")+ 1509 i18n("<p><b>Q</b>: Toggle quick todo line edit.</p>\n")+
1505 i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+ 1510 i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+
1506 i18n("<p><b>return</b>: Mark item as completed+one step down.</p>\n")+ 1511 i18n("<p><b>return</b>: Mark item as completed+one step down.</p>\n")+
1507 i18n("<p><b>return+shift</b>: Mark item as not completed+one step down</p>\n")+ 1512 i18n("<p><b>return+shift</b>: Mark item as not completed+one step down</p>\n")+
1508 i18n("<p><h3>In list view:</h3></p>\n") + 1513 i18n("<p><h3>In list view:</h3></p>\n") +
1509 i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+ 1514 i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+
1510 i18n("<p><b>return</b>: Select item+one step down</p>\n")+ 1515 i18n("<p><b>return</b>: Select item+one step down</p>\n")+
1511 i18n("<p><b>return+shift</b>: Deselect item+one step down</p>\n")+ 1516 i18n("<p><b>return+shift</b>: Deselect item+one step down</p>\n")+
1512 i18n("<p><b>up/down</b>: Next/prev item</p>\n")+ 1517 i18n("<p><b>up/down</b>: Next/prev item</p>\n")+
1513 i18n("<p><b>ctrl+up/down</b>: Goto up/down by 20% of items</p>\n")+ 1518 i18n("<p><b>ctrl+up/down</b>: Goto up/down by 20% of items</p>\n")+
1514 i18n("<p><b>shift+up/down</b>: Goto first/last item</p>\n")+ 1519 i18n("<p><b>shift+up/down</b>: Goto first/last item</p>\n")+
1515 i18n("<p><h3>In event/todo viewer:</h3></p>\n") + 1520 i18n("<p><h3>In event/todo viewer:</h3></p>\n") +
1516 i18n("<p><b>I,C</b>: Close dialog.</p>\n")+ 1521 i18n("<p><b>I,C</b>: Close dialog.</p>\n")+
1517 i18n("<p><b>A</b>: Show agenda view.</p>\n")+ 1522 i18n("<p><b>A</b>: Show agenda view.</p>\n")+
1518 i18n("<p><b>E</b>: Edit item</p>\n") + 1523 i18n("<p><b>E</b>: Edit item</p>\n") +
1519 i18n("<p><h2>KO/Pi icon colors:</h2></p>\n") + 1524 i18n("<p><h2>KO/Pi icon colors:</h2></p>\n") +
1520 i18n("<p><b>(for square icons in agenda and month view)</b></p>\n") + 1525 i18n("<p><b>(for square icons in agenda and month view)</b></p>\n") +
1521 i18n("<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n")+ 1526 i18n("<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n")+
1522 i18n("<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n")+ 1527 i18n("<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n")+
1523 i18n("<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n")+ 1528 i18n("<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n")+
1524 i18n("<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n")+ 1529 i18n("<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n")+
1525 i18n("<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n")+ 1530 i18n("<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n")+
1526 i18n("<p><b>Dark yellow</b>: Event/todo with attendees.</p>\n") + 1531 i18n("<p><b>Dark yellow</b>: Event/todo with attendees.</p>\n") +
1527 i18n("<p><b>White</b>: Item readonly</p>\n"); 1532 i18n("<p><b>White</b>: Item readonly</p>\n");
1528 displayText( text, cap); 1533 displayText( text, cap);
1529} 1534}
1530void MainWindow::aboutAutoSaving() 1535void MainWindow::aboutAutoSaving()
1531{ 1536{
1532 QString text = i18n("After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configurable) three minutes.\nFor safety reasons there is one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n"); 1537 QString text = i18n("After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configurable) three minutes.\nFor safety reasons there is one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n");
1533 1538
1534 KApplication::showText( i18n("Auto Saving in KOrganizer/Pi"), text); 1539 KApplication::showText( i18n("Auto Saving in KOrganizer/Pi"), text);
1535 1540
1536} 1541}
1537void MainWindow::aboutKnownBugs() 1542void MainWindow::aboutKnownBugs()
1538{ 1543{
1539 QMessageBox* msg; 1544 QMessageBox* msg;
1540 msg = new QMessageBox( i18n("Known Problems in KOrganizer/Pi"), 1545 msg = new QMessageBox( i18n("Known Problems in KOrganizer/Pi"),
1541 i18n("1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n")+ 1546 i18n("1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n")+
1542 i18n("2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n")+ 1547 i18n("2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n")+
1543 i18n("\nPlease report unexpected behaviour to\nlutz@pi-sync.info\n") + 1548 i18n("\nPlease report unexpected behaviour to\nlutz@pi-sync.info\n") +
1544 i18n("\nor report them in the bugtracker on\n") + 1549 i18n("\nor report them in the bugtracker on\n") +
1545 i18n("\nhttp://sourceforge.net/projects/kdepimpi\n"), 1550 i18n("\nhttp://sourceforge.net/projects/kdepimpi\n"),
1546 QMessageBox::NoIcon, 1551 QMessageBox::NoIcon,
1547 QMessageBox::Ok, 1552 QMessageBox::Ok,
1548 QMessageBox::NoButton, 1553 QMessageBox::NoButton,
1549 QMessageBox::NoButton); 1554 QMessageBox::NoButton);
1550 msg->exec(); 1555 msg->exec();
1551 delete msg; 1556 delete msg;
1552 1557
1553} 1558}
1554 1559
1555QString MainWindow::defaultFileName() 1560QString MainWindow::defaultFileName()
1556{ 1561{
1557 return locateLocal( "data", "korganizer/mycalendar.ics" ); 1562 return locateLocal( "data", "korganizer/mycalendar.ics" );
1558} 1563}
1559QString MainWindow::syncFileName() 1564QString MainWindow::syncFileName()
1560{ 1565{
1561#ifdef DESKTOP_VERSION 1566#ifdef DESKTOP_VERSION
1562 return locateLocal( "tmp", "synccalendar.ics" ); 1567 return locateLocal( "tmp", "synccalendar.ics" );
1563#else 1568#else
1564 return QString( "/tmp/synccalendar.ics" ); 1569 return QString( "/tmp/synccalendar.ics" );
1565#endif 1570#endif
1566} 1571}
1567#include "koglobals.h" 1572#include "koglobals.h"
1568#include <kcalendarsystem.h> 1573#include <kcalendarsystem.h>
1569void MainWindow::updateWeek(QDate seda) 1574void MainWindow::updateWeek(QDate seda)
1570{ 1575{
1571 int weekNum = KGlobal::locale()->weekNum ( seda ); 1576 int weekNum = KGlobal::locale()->weekNum ( seda );
1572 mWeekPixmap.fill( mWeekBgColor ); 1577 mWeekPixmap.fill( mWeekBgColor );
1573 QPainter p ( &mWeekPixmap ); 1578 QPainter p ( &mWeekPixmap );
1574 p.setFont( mWeekFont ); 1579 p.setFont( mWeekFont );
1575 p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),AlignCenter, QString::number( weekNum) ); 1580 p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),AlignCenter, QString::number( weekNum) );
1576 p.end(); 1581 p.end();
1577 QIconSet icon3 ( mWeekPixmap ); 1582 QIconSet icon3 ( mWeekPixmap );
1578 mWeekAction->setIconSet ( icon3 ); 1583 mWeekAction->setIconSet ( icon3 );
@@ -1911,590 +1916,593 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
1911 break; 1916 break;
1912 case Qt::Key_D: 1917 case Qt::Key_D:
1913 mView->viewManager()->showDayView(); 1918 mView->viewManager()->showDayView();
1914 showSelectedDates = true; 1919 showSelectedDates = true;
1915 break; 1920 break;
1916 case Qt::Key_O: 1921 case Qt::Key_O:
1917 mView->toggleFilerEnabled( ); 1922 mView->toggleFilerEnabled( );
1918 break; 1923 break;
1919 case Qt::Key_0: 1924 case Qt::Key_0:
1920 case Qt::Key_1: 1925 case Qt::Key_1:
1921 case Qt::Key_2: 1926 case Qt::Key_2:
1922 case Qt::Key_3: 1927 case Qt::Key_3:
1923 case Qt::Key_4: 1928 case Qt::Key_4:
1924 case Qt::Key_5: 1929 case Qt::Key_5:
1925 case Qt::Key_6: 1930 case Qt::Key_6:
1926 case Qt::Key_7: 1931 case Qt::Key_7:
1927 case Qt::Key_8: 1932 case Qt::Key_8:
1928 case Qt::Key_9: 1933 case Qt::Key_9:
1929 pro = e->key()-48; 1934 pro = e->key()-48;
1930 if ( pro == 0 ) 1935 if ( pro == 0 )
1931 pro = 10; 1936 pro = 10;
1932 if ( e->state() == Qt::ControlButton) 1937 if ( e->state() == Qt::ControlButton)
1933 pro += 10; 1938 pro += 10;
1934 break; 1939 break;
1935 case Qt::Key_M: 1940 case Qt::Key_M:
1936 mView->viewManager()->showMonthView(); 1941 mView->viewManager()->showMonthView();
1937 showSelectedDates = true; 1942 showSelectedDates = true;
1938 break; 1943 break;
1939 case Qt::Key_Insert: 1944 case Qt::Key_Insert:
1940 mView->newEvent(); 1945 mView->newEvent();
1941 break; 1946 break;
1942 case Qt::Key_S : 1947 case Qt::Key_S :
1943 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton) 1948 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton)
1944 mView->newSubTodo(); 1949 mView->newSubTodo();
1945 else 1950 else
1946 mView->dialogManager()->showSearchDialog(); 1951 mView->dialogManager()->showSearchDialog();
1947 break; 1952 break;
1948 case Qt::Key_Y : 1953 case Qt::Key_Y :
1949 case Qt::Key_Z : 1954 case Qt::Key_Z :
1950 mView->viewManager()->showWorkWeekView(); 1955 mView->viewManager()->showWorkWeekView();
1951 showSelectedDates = true; 1956 showSelectedDates = true;
1952 break; 1957 break;
1953 case Qt::Key_U : 1958 case Qt::Key_U :
1954 mView->viewManager()->showWeekView(); 1959 mView->viewManager()->showWeekView();
1955 showSelectedDates = true; 1960 showSelectedDates = true;
1956 break; 1961 break;
1957 case Qt::Key_H : 1962 case Qt::Key_H :
1958 keyBindings(); 1963 keyBindings();
1959 break; 1964 break;
1960 case Qt::Key_W: 1965 case Qt::Key_W:
1961 mView->viewManager()->showWhatsNextView(); 1966 mView->viewManager()->showWhatsNextView();
1962 break; 1967 break;
1963 case Qt::Key_L: 1968 case Qt::Key_L:
1964 mView->viewManager()->showListView(); 1969 mView->viewManager()->showListView();
1965 break; 1970 break;
1966 case Qt::Key_N: 1971 case Qt::Key_N:
1967 mView->viewManager()->showNextView(); 1972 mView->viewManager()->showNextView();
1968 break; 1973 break;
1969 case Qt::Key_V: 1974 case Qt::Key_V:
1970 mView->viewManager()->showTodoView(); 1975 mView->viewManager()->showTodoView();
1971 break; 1976 break;
1972 case Qt::Key_C: 1977 case Qt::Key_C:
1973 mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() ); 1978 mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() );
1974 break; 1979 break;
1975 case Qt::Key_P: 1980 case Qt::Key_P:
1976 mView->showDatePicker( ); 1981 mView->showDatePicker( );
1977 break; 1982 break;
1978 case Qt::Key_F: 1983 case Qt::Key_F:
1979 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) 1984 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton )
1980 mView->editFilters(); 1985 mView->editFilters();
1981 else 1986 else
1982 mView->toggleFilter(); 1987 mView->toggleFilter();
1983 break; 1988 break;
1984 case Qt::Key_X: 1989 case Qt::Key_X:
1985 if ( e->state() == Qt::ControlButton ) 1990 if ( e->state() == Qt::ControlButton )
1986 mView->toggleDateNavigatorWidget(); 1991 mView->toggleDateNavigatorWidget();
1987 else { 1992 else {
1988 mView->viewManager()->showNextXView(); 1993 mView->viewManager()->showNextXView();
1989 showSelectedDates = true; 1994 showSelectedDates = true;
1990 } 1995 }
1991 break; 1996 break;
1992 case Qt::Key_Space: 1997 case Qt::Key_Space:
1993 mView->toggleExpand(); 1998 mView->toggleExpand();
1994 break; 1999 break;
1995 case Qt::Key_A: 2000 case Qt::Key_A:
1996 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) 2001 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton )
1997 mView->showNextAlarms(); 2002 mView->showNextAlarms();
1998 else 2003 else
1999 mView->toggleAllDaySize(); 2004 mView->toggleAllDaySize();
2000 break; 2005 break;
2001 case Qt::Key_T: 2006 case Qt::Key_T:
2002 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) 2007 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton )
2003 mView->newTodo(); 2008 mView->newTodo();
2004 else { 2009 else {
2005 mView->goToday(); 2010 mView->goToday();
2006 showSelectedDates = true; 2011 showSelectedDates = true;
2007 } 2012 }
2008 break; 2013 break;
2009 case Qt::Key_J: 2014 case Qt::Key_J:
2010 mView->viewManager()->showJournalView(); 2015 mView->viewManager()->showJournalView();
2011 break; 2016 break;
2012 case Qt::Key_B: 2017 case Qt::Key_B:
2013 mView->editIncidenceDescription();; 2018 mView->editIncidenceDescription();;
2014 break; 2019 break;
2015 // case Qt::Key_Return: 2020 // case Qt::Key_Return:
2016 case Qt::Key_E: 2021 case Qt::Key_E:
2017 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) 2022 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton )
2018 mView->newEvent(); 2023 mView->newEvent();
2019 else 2024 else
2020 mView->editIncidence(); 2025 mView->editIncidence();
2021 break; 2026 break;
2022 case Qt::Key_Plus: 2027 case Qt::Key_Plus:
2023 size = p->mHourSize +2; 2028 size = p->mHourSize +2;
2024 if ( size <= 22 ) 2029 if ( size <= 22 )
2025 configureAgenda( size ); 2030 configureAgenda( size );
2026 break; 2031 break;
2027 case Qt::Key_Minus: 2032 case Qt::Key_Minus:
2028 size = p->mHourSize - 2; 2033 size = p->mHourSize - 2;
2029 if ( size >= 4 ) 2034 if ( size >= 4 )
2030 configureAgenda( size ); 2035 configureAgenda( size );
2031 break; 2036 break;
2032 2037
2033 2038
2034 default: 2039 default:
2035 e->ignore(); 2040 e->ignore();
2036 } 2041 }
2037 if ( pro > 0 ) { 2042 if ( pro > 0 ) {
2038 mView->selectFilter( pro-1 ); 2043 mView->selectFilter( pro-1 );
2039 } 2044 }
2040 if ( showSelectedDates ) { 2045 if ( showSelectedDates ) {
2041 ;// setCaptionToDates(); 2046 ;// setCaptionToDates();
2042 } 2047 }
2043 2048
2044} 2049}
2045void MainWindow::fillFilterMenuTB() 2050void MainWindow::fillFilterMenuTB()
2046{ 2051{
2047 selectFilterMenuTB->clear(); 2052 selectFilterMenuTB->clear();
2048 selectFilterMenuTB->insertItem(i18n ( "Edit Filters" ), 0 ); 2053 selectFilterMenuTB->insertItem(i18n ( "Edit Filters" ), 0 );
2049 selectFilterMenuTB->insertSeparator(); 2054 selectFilterMenuTB->insertSeparator();
2050 selectFilterMenuTB->insertItem(i18n ( "No Filter" ), 1 ); 2055 selectFilterMenuTB->insertItem(i18n ( "No Filter" ), 1 );
2051 2056
2052 selectFilterMenuTB->insertSeparator(); 2057 selectFilterMenuTB->insertSeparator();
2053 QPtrList<CalFilter> fili = mView->filters(); 2058 QPtrList<CalFilter> fili = mView->filters();
2054 CalFilter *curfilter = mView->filterView()->selectedFilter(); 2059 CalFilter *curfilter = mView->filterView()->selectedFilter();
2055 CalFilter *filter = fili.first(); 2060 CalFilter *filter = fili.first();
2056 int iii = 2; 2061 int iii = 2;
2057 bool checkitem = mView->filterView()->filtersEnabled(); 2062 bool checkitem = mView->filterView()->filtersEnabled();
2058 while(filter) { 2063 while(filter) {
2059 selectFilterMenuTB->insertItem( filter->name(), iii ); 2064 selectFilterMenuTB->insertItem( filter->name(), iii );
2060 if ( filter == curfilter) 2065 if ( filter == curfilter)
2061 selectFilterMenuTB->setItemChecked( iii, checkitem ); 2066 selectFilterMenuTB->setItemChecked( iii, checkitem );
2062 filter = fili.next(); 2067 filter = fili.next();
2063 ++iii; 2068 ++iii;
2064 } 2069 }
2065 if ( !checkitem ) 2070 if ( !checkitem )
2066 selectFilterMenuTB->setItemChecked( 1, true ); 2071 selectFilterMenuTB->setItemChecked( 1, true );
2067 2072
2068 int x = 0; 2073 int x = 0;
2069 int y = iconToolBar->height(); 2074 int y = iconToolBar->height();
2070 int dX = 0; 2075 int dX = 0;
2071 int dY = 0; 2076 int dY = 0;
2072 if ( iconToolBar->orientation () == Qt:: Horizontal ) { 2077 if ( iconToolBar->orientation () == Qt:: Horizontal ) {
2073 if ( iconToolBar->y() > height()/2 ) { 2078 if ( iconToolBar->y() > height()/2 ) {
2074 dY = selectFilterMenuTB->sizeHint().height()+8; 2079 dY = selectFilterMenuTB->sizeHint().height()+8;
2075 y = 0; 2080 y = 0;
2076 } 2081 }
2077 } else { 2082 } else {
2078 if ( iconToolBar->x() > width()/2 ) { // right side 2083 if ( iconToolBar->x() > width()/2 ) { // right side
2079 x=0; 2084 x=0;
2080 dX= selectFilterMenuTB->sizeHint().width()+8; 2085 dX= selectFilterMenuTB->sizeHint().width()+8;
2081 y = 0; 2086 y = 0;
2082 } else { 2087 } else {
2083 x= iconToolBar->width(); 2088 x= iconToolBar->width();
2084 y = 0; 2089 y = 0;
2085 } 2090 }
2086 } 2091 }
2087 //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() ); 2092 //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() );
2088 selectFilterMenuTB->popup(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY))); 2093 selectFilterMenuTB->popup(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY)));
2089} 2094}
2090void MainWindow::fillFilterMenu() 2095void MainWindow::fillFilterMenu()
2091{ 2096{
2092 selectFilterMenu->clear(); 2097 selectFilterMenu->clear();
2093 selectFilterMenu->insertItem(i18n ( "Edit Filters" ), 0 ); 2098 selectFilterMenu->insertItem(i18n ( "Edit Filters" ), 0 );
2094 selectFilterMenu->insertSeparator(); 2099 selectFilterMenu->insertSeparator();
2095 selectFilterMenu->insertItem(i18n ( "No Filter" ), 1 ); 2100 selectFilterMenu->insertItem(i18n ( "No Filter" ), 1 );
2096 2101
2097 selectFilterMenu->insertSeparator(); 2102 selectFilterMenu->insertSeparator();
2098 QPtrList<CalFilter> fili = mView->filters(); 2103 QPtrList<CalFilter> fili = mView->filters();
2099 CalFilter *curfilter = mView->filterView()->selectedFilter(); 2104 CalFilter *curfilter = mView->filterView()->selectedFilter();
2100 CalFilter *filter = fili.first(); 2105 CalFilter *filter = fili.first();
2101 int iii = 2; 2106 int iii = 2;
2102 bool checkitem = mView->filterView()->filtersEnabled(); 2107 bool checkitem = mView->filterView()->filtersEnabled();
2103 while(filter) { 2108 while(filter) {
2104 selectFilterMenu->insertItem( filter->name(), iii ); 2109 selectFilterMenu->insertItem( filter->name(), iii );
2105 if ( filter == curfilter) 2110 if ( filter == curfilter)
2106 selectFilterMenu->setItemChecked( iii, checkitem ); 2111 selectFilterMenu->setItemChecked( iii, checkitem );
2107 filter = fili.next(); 2112 filter = fili.next();
2108 ++iii; 2113 ++iii;
2109 } 2114 }
2110 if ( !checkitem ) 2115 if ( !checkitem )
2111 selectFilterMenu->setItemChecked( 1, true ); 2116 selectFilterMenu->setItemChecked( 1, true );
2112} 2117}
2113void MainWindow::fillFilterMenuPopup() 2118void MainWindow::fillFilterMenuPopup()
2114{ 2119{
2115 filterPopupMenu->clear(); 2120 filterPopupMenu->clear();
2116 filterPopupMenu->insertItem(i18n ( "No Filter" ), 0 ); 2121 filterPopupMenu->insertItem(i18n ( "No Filter" ), 0 );
2117 2122
2118 filterPopupMenu->insertSeparator(); 2123 filterPopupMenu->insertSeparator();
2119 QPtrList<CalFilter> fili = mView->filters(); 2124 QPtrList<CalFilter> fili = mView->filters();
2120 CalFilter *curfilter = mView->filterView()->selectedFilter(); 2125 CalFilter *curfilter = mView->filterView()->selectedFilter();
2121 CalFilter *filter = fili.first(); 2126 CalFilter *filter = fili.first();
2122 int iii = 1; 2127 int iii = 1;
2123 bool checkitem = mView->filterView()->filtersEnabled(); 2128 bool checkitem = mView->filterView()->filtersEnabled();
2124 while(filter) { 2129 while(filter) {
2125 filterPopupMenu->insertItem( filter->name(), iii ); 2130 filterPopupMenu->insertItem( filter->name(), iii );
2126 if ( filter == curfilter) 2131 if ( filter == curfilter)
2127 filterPopupMenu->setItemChecked( iii, checkitem ); 2132 filterPopupMenu->setItemChecked( iii, checkitem );
2128 filter = fili.next(); 2133 filter = fili.next();
2129 ++iii; 2134 ++iii;
2130 } 2135 }
2131 if ( !checkitem ) 2136 if ( !checkitem )
2132 filterPopupMenu->setItemChecked( 0, true ); 2137 filterPopupMenu->setItemChecked( 0, true );
2133} 2138}
2134void MainWindow::selectFilter( int fil ) 2139void MainWindow::selectFilter( int fil )
2135{ 2140{
2136 2141
2137 if ( fil == 0 ) { 2142 if ( fil == 0 ) {
2138 mView->editFilters( ); 2143 mView->editFilters( );
2139 } else if ( fil == 1 ){ 2144 } else if ( fil == 1 ){
2140 if ( mView->filterView()->filtersEnabled() ) 2145 if ( mView->filterView()->filtersEnabled() )
2141 mView->toggleFilerEnabled( ); 2146 mView->toggleFilerEnabled( );
2142 } else { 2147 } else {
2143 if ( !mView->filterView()->filtersEnabled() ) { 2148 if ( !mView->filterView()->filtersEnabled() ) {
2144 mView->filterView()->blockSignals( true ); 2149 mView->filterView()->blockSignals( true );
2145 mView->toggleFilerEnabled( ); 2150 mView->toggleFilerEnabled( );
2146 mView->filterView()->blockSignals( false ); 2151 mView->filterView()->blockSignals( false );
2147 } 2152 }
2148 mView->selectFilter( fil-2 ); 2153 mView->selectFilter( fil-2 );
2149 } 2154 }
2150} 2155}
2151void MainWindow::updateFilterToolbar() 2156void MainWindow::updateFilterToolbar()
2152{ 2157{
2153 if ( filterMenubar ) { 2158 if ( filterMenubar ) {
2154 if ( !mView->filterView()->filtersEnabled() ) { 2159 if ( !mView->filterView()->filtersEnabled() ) {
2155 filterMenubar->changeItem( 0, i18n("No Filter") ); 2160 filterMenubar->changeItem( 0, i18n("No Filter") );
2156 } else { 2161 } else {
2157 CalFilter *curfilter = mView->filterView()->selectedFilter(); 2162 CalFilter *curfilter = mView->filterView()->selectedFilter();
2158 if ( curfilter ) { 2163 if ( curfilter ) {
2159 filterMenubar->changeItem( 0, curfilter->name() ); 2164 filterMenubar->changeItem( 0, curfilter->name() );
2160 } 2165 }
2161 } 2166 }
2162 } 2167 }
2163} 2168}
2164void MainWindow::selectFilterPopup( int fil ) 2169void MainWindow::selectFilterPopup( int fil )
2165{ 2170{
2166 selectFilter( fil + 1 ); 2171 selectFilter( fil + 1 );
2167 2172
2168} 2173}
2169void MainWindow::configureToolBar( int item ) 2174void MainWindow::configureToolBar( int item )
2170{ 2175{
2171 2176
2172 configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) ); 2177 configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) );
2173 KOPrefs *p = KOPrefs::instance(); 2178 KOPrefs *p = KOPrefs::instance();
2174 p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); 2179 p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 );
2175 p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 ); 2180 p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 );
2176 p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 ); 2181 p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 );
2177 p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); 2182 p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 );
2178 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); 2183 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 );
2179 p->mShowIconNavigator = configureToolBarMenu->isItemChecked( 22 ); 2184 p->mShowIconNavigator = configureToolBarMenu->isItemChecked( 22 );
2180 p->mShowIconAllday = configureToolBarMenu->isItemChecked( 24 ); 2185 p->mShowIconAllday = configureToolBarMenu->isItemChecked( 24 );
2181 p->mShowIconFilterview = configureToolBarMenu->isItemChecked( 26 ); 2186 p->mShowIconFilterview = configureToolBarMenu->isItemChecked( 26 );
2182 p->mShowIconToggleFull = configureToolBarMenu->isItemChecked( 28 ); 2187 p->mShowIconToggleFull = configureToolBarMenu->isItemChecked( 28 );
2183 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); 2188 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 );
2184 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 ); 2189 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 );
2185 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 ); 2190 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 );
2186 p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 ); 2191 p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 );
2187 p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 ); 2192 p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 );
2188 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 ); 2193 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 );
2189 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); 2194 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 );
2190 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); 2195 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 );
2191 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); 2196 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 );
2192 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); 2197 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 );
2193 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); 2198 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 );
2194 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); 2199 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 );
2195 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); 2200 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 );
2196 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); 2201 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 );
2197 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); 2202 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 );
2198 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); 2203 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 );
2199 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); 2204 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 );
2200 p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 ); 2205 p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 );
2201 // initActions(); 2206 // initActions();
2202} 2207}
2203void MainWindow::setCaption ( const QString & c ) 2208void MainWindow::setCaption ( const QString & c )
2204{ 2209{
2205 QString cap = c; 2210 QString cap = c;
2206 cap.replace( QRegExp("\n"), " " ); 2211 cap.replace( QRegExp("\n"), " " );
2207 cap = cap.stripWhiteSpace(); 2212 cap = cap.stripWhiteSpace();
2208 if ( cap.isEmpty() ) 2213 if ( cap.isEmpty() )
2209 cap = "KO/Pi"; 2214 cap = "KO/Pi";
2210 QWidget::setCaption( cap ); 2215 QWidget::setCaption( cap );
2211} 2216}
2212void MainWindow::setCaptionToDates() 2217void MainWindow::setCaptionToDates()
2213{ 2218{
2214 QString selDates; 2219 QString selDates;
2215 QDate date = mView->startDate(); 2220 QDate date = mView->startDate();
2216 if ( ! date.isValid() ) { 2221 if ( ! date.isValid() ) {
2217 setCaption(""); 2222 setCaption("");
2218 return; 2223 return;
2219 } 2224 }
2220 selDates = KGlobal::locale()->formatDate( date, true); 2225 selDates = KGlobal::locale()->formatDate( date, true);
2221 if (mView->startDate() < mView->endDate() ) 2226 if (mView->startDate() < mView->endDate() )
2222 selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); 2227 selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true);
2223 else { 2228 else {
2224 QString addString; 2229 QString addString;
2225 if ( date == QDateTime::currentDateTime().date() ) 2230 if ( date == QDateTime::currentDateTime().date() )
2226 addString = i18n("Today"); 2231 addString = i18n("Today");
2227 else if ( date == QDateTime::currentDateTime().date().addDays(1) ) 2232 else if ( date == QDateTime::currentDateTime().date().addDays(1) )
2228 addString = i18n("Tomorrow"); 2233 addString = i18n("Tomorrow");
2229 if ( !addString.isEmpty() ) 2234 if ( !addString.isEmpty() )
2230 selDates = addString+", "+selDates ; 2235 selDates = addString+", "+selDates ;
2231 } 2236 }
2232 setCaption( i18n("Dates: ") + selDates ); 2237 setCaption( i18n("Dates: ") + selDates );
2233 2238
2234} 2239}
2235void MainWindow::showConfigureAgenda( ) 2240void MainWindow::showConfigureAgenda( )
2236{ 2241{
2237 int iii; 2242 int iii;
2238 for ( iii = 1;iii<= 10 ;++iii ){ 2243 for ( iii = 1;iii<= 10 ;++iii ){
2239 configureAgendaMenu->setItemChecked( (iii+1)*2, false ); 2244 configureAgendaMenu->setItemChecked( (iii+1)*2, false );
2240 } 2245 }
2241 configureAgendaMenu->setItemChecked( (KOPrefs::instance()->mHourSize/2)*2, true ); 2246 configureAgendaMenu->setItemChecked( (KOPrefs::instance()->mHourSize/2)*2, true );
2242} 2247}
2243void MainWindow::configureAgenda( int item ) 2248void MainWindow::configureAgenda( int item )
2244{ 2249{
2245 if ( KOPrefs::instance()->mHourSize == item ) 2250 if ( KOPrefs::instance()->mHourSize == item )
2246 return; 2251 return;
2247 KOPrefs::instance()->mHourSize=item; 2252 KOPrefs::instance()->mHourSize=item;
2248 mView->viewManager()->agendaView()->updateConfig(); 2253 mView->viewManager()->agendaView()->updateConfig();
2249} 2254}
2250 2255
2251void MainWindow::saveCalendar() 2256void MainWindow::saveCalendar()
2252{ 2257{
2253 QString fn = KOPrefs::instance()->mLastSaveFile; 2258 QString fn = KOPrefs::instance()->mLastSaveFile;
2254 fn = KFileDialog::getSaveFileName( fn, i18n("Save backup filename"), this ); 2259 fn = KFileDialog::getSaveFileName( fn, i18n("Save backup filename"), this );
2255 2260
2256 if ( fn == "" ) 2261 if ( fn == "" )
2257 return; 2262 return;
2258 QFileInfo info; 2263 QFileInfo info;
2259 info.setFile( fn ); 2264 info.setFile( fn );
2260 QString mes; 2265 QString mes;
2261 bool createbup = true; 2266 bool createbup = true;
2262 if ( info. exists() ) { 2267 if ( info. exists() ) {
2263 mes = i18n("Backup file\nalready exists!\nOld backup file from:\n%1\nOverwrite?\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )) ; 2268 mes = i18n("Backup file\nalready exists!\nOld backup file from:\n%1\nOverwrite?\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )) ;
2264 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes, 2269 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
2265 i18n("Overwrite!"), i18n("Cancel"), 0, 2270 i18n("Overwrite!"), i18n("Cancel"), 0,
2266 0, 1 ); 2271 0, 1 );
2267 if ( result != 0 ) { 2272 if ( result != 0 ) {
2268 createbup = false; 2273 createbup = false;
2269 } 2274 }
2270 } 2275 }
2271 if ( createbup ) { 2276 if ( createbup ) {
2272 mView->saveCalendar( fn ); 2277 mView->saveCalendar( fn );
2273 mes = i18n("KO/Pi:Saved %1").arg(fn); 2278 mes = i18n("KO/Pi:Saved %1").arg(fn);
2274 KOPrefs::instance()->mLastSaveFile = fn; 2279 KOPrefs::instance()->mLastSaveFile = fn;
2275 setCaption(mes); 2280 setCaption(mes);
2276 } 2281 }
2277} 2282}
2278void MainWindow::loadCalendar() 2283void MainWindow::loadCalendar()
2279{ 2284{
2280 2285
2281 QString fn = KOPrefs::instance()->mLastLoadFile; 2286 QString fn = KOPrefs::instance()->mLastLoadFile;
2282 fn = KFileDialog::getOpenFileName( fn, i18n("Load backup filename"), this ); 2287 fn = KFileDialog::getOpenFileName( fn, i18n("Load backup filename"), this );
2283 2288
2284 if ( fn == "" ) 2289 if ( fn == "" )
2285 return; 2290 return;
2286 QFileInfo info; 2291 QFileInfo info;
2287 info.setFile( fn ); 2292 info.setFile( fn );
2288 QString mess; 2293 QString mess;
2289 bool loadbup = true; 2294 bool loadbup = true;
2290 if ( info. exists() ) { 2295 if ( info. exists() ) {
2291 mess = i18n("Backup file from:\n%1\nLoading backup\nfile will delete\nyour current Data!\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); 2296 mess = i18n("Backup file from:\n%1\nLoading backup\nfile will delete\nyour current Data!\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
2292 int result = QMessageBox::warning( this, "KO/Pi: Warning!", 2297 int result = QMessageBox::warning( this, "KO/Pi: Warning!",
2293 mess, 2298 mess,
2294 i18n("Load!"), i18n("Cancel"), 0, 2299 i18n("Load!"), i18n("Cancel"), 0,
2295 0, 1 ); 2300 0, 1 );
2296 if ( result != 0 ) { 2301 if ( result != 0 ) {
2297 loadbup = false; 2302 loadbup = false;
2298 } 2303 }
2299 } else { 2304 } else {
2300 QMessageBox::warning( this, i18n("KO/Pi: Warning!"), 2305 QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
2301 i18n("Backup file\ndoes not exist!\nNothing loaded!"), 0, 0, 2306 i18n("Backup file\ndoes not exist!\nNothing loaded!"), 0, 0,
2302 0, 1 ); 2307 0, 1 );
2303 2308
2304 return; 2309 return;
2305 } 2310 }
2306 if ( loadbup ) { 2311 if ( loadbup ) {
2307 mView->openCalendar( fn ); 2312 mView->openCalendar( fn );
2308 KOPrefs::instance()->mLastLoadFile = fn; 2313 KOPrefs::instance()->mLastLoadFile = fn;
2309 mess = i18n("KO/Pi:Loaded %1").arg(fn) ; 2314 mess = i18n("KO/Pi:Loaded %1").arg(fn) ;
2310 setCaption(mess); 2315 setCaption(mess);
2311 } 2316 }
2312 2317
2313} 2318}
2314void MainWindow::quickImportIcal() 2319void MainWindow::quickImportIcal()
2315{ 2320{
2316 importFile( KOPrefs::instance()->mLastImportFile, false ); 2321 importFile( KOPrefs::instance()->mLastImportFile, false );
2317} 2322}
2318void MainWindow::importFile( QString fn, bool quick ) 2323void MainWindow::importFile( QString fn, bool quick )
2319{ 2324{
2320 QFileInfo info; 2325 QFileInfo info;
2321 info.setFile( fn ); 2326 info.setFile( fn );
2322 QString mess; 2327 QString mess;
2323 bool loadbup = true; 2328 bool loadbup = true;
2324 if ( !info. exists() ) { 2329 if ( !info. exists() ) {
2325 mess = i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30)); 2330 mess = i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30));
2326 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), 2331 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
2327 mess ); 2332 mess );
2328 return; 2333 return;
2329 } 2334 }
2330 int result = 0; 2335 int result = 0;
2331 if ( !quick ) { 2336 if ( !quick ) {
2332 mess = i18n( "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); 2337 mess = i18n( "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
2333 result = QMessageBox::warning( this, "KO/Pi: Warning!", 2338 result = QMessageBox::warning( this, "KO/Pi: Warning!",
2334 mess, 2339 mess,
2335 "Import", "Cancel", 0, 2340 "Import", "Cancel", 0,
2336 0, 1 ); 2341 0, 1 );
2337 } 2342 }
2338 if ( result == 0 ) { 2343 if ( result == 0 ) {
2339 if ( mView->openCalendar( fn, true )) { 2344 if ( mView->openCalendar( fn, true )) {
2340 KOPrefs::instance()->mLastImportFile = fn; 2345 KOPrefs::instance()->mLastImportFile = fn;
2341 setCaption(i18n("Imported file successfully")); 2346 setCaption(i18n("Imported file successfully"));
2342 } else { 2347 } else {
2343 setCaption(i18n("Error importing file")); 2348 setCaption(i18n("Error importing file"));
2344 } 2349 }
2345 } 2350 }
2346} 2351}
2347 2352
2348void MainWindow::importIcal() 2353void MainWindow::importIcal()
2349{ 2354{
2350 2355
2351 QString fn =KOPrefs::instance()->mLastImportFile; 2356 QString fn =KOPrefs::instance()->mLastImportFile;
2352 2357
2353 fn =KFileDialog:: getOpenFileName( fn, i18n("Import filename(*.ics/*.vcs)"), this ); 2358 fn =KFileDialog:: getOpenFileName( fn, i18n("Import filename(*.ics/*.vcs)"), this );
2354 if ( fn == "" ) 2359 if ( fn == "" )
2355 return; 2360 return;
2356 importFile( fn, true ); 2361 importFile( fn, true );
2357 2362
2358} 2363}
2359 2364
2360void MainWindow::exportVCalendar() 2365void MainWindow::exportVCalendar()
2361{ 2366{
2362 QString fn = KOPrefs::instance()->mLastVcalFile; 2367 QString fn = KOPrefs::instance()->mLastVcalFile;
2363 fn = KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this ); 2368 fn = KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this );
2364 if ( fn == "" ) 2369 if ( fn == "" )
2365 return; 2370 return;
2366 QFileInfo info; 2371 QFileInfo info;
2367 info.setFile( fn ); 2372 info.setFile( fn );
2368 QString mes; 2373 QString mes;
2369 bool createbup = true; 2374 bool createbup = true;
2370 if ( info. exists() ) { 2375 if ( info. exists() ) {
2371 mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) ); 2376 mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) );
2372 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes, 2377 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
2373 i18n("Overwrite!"), i18n("Cancel"), 0, 2378 i18n("Overwrite!"), i18n("Cancel"), 0,
2374 0, 1 ); 2379 0, 1 );
2375 if ( result != 0 ) { 2380 if ( result != 0 ) {
2376 createbup = false; 2381 createbup = false;
2377 } 2382 }
2378 } 2383 }
2379 if ( createbup ) { 2384 if ( createbup ) {
2380 if ( mView->exportVCalendar( fn ) ) { 2385 if ( mView->exportVCalendar( fn ) ) {
2381 KOPrefs::instance()->mLastVcalFile = fn; 2386 KOPrefs::instance()->mLastVcalFile = fn;
2382 if ( fn.length() > 20 ) 2387 if ( fn.length() > 20 )
2383 mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ; 2388 mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ;
2384 else 2389 else
2385 mes = i18n("KO/Pi:Exported to %1").arg(fn ); 2390 mes = i18n("KO/Pi:Exported to %1").arg(fn );
2386 setCaption(mes); 2391 setCaption(mes);
2387 } 2392 }
2388 } 2393 }
2389 2394
2390} 2395}
2391QString MainWindow::sentSyncFile() 2396QString MainWindow::sentSyncFile()
2392{ 2397{
2393#ifdef DESKTOP_VERSION 2398#ifdef DESKTOP_VERSION
2394 return locateLocal( "tmp", "copysynccal.ics" ); 2399 return locateLocal( "tmp", "copysynccal.ics" );
2395#else 2400#else
2396 return QString( "/tmp/copysynccal.ics" ); 2401 return QString( "/tmp/copysynccal.ics" );
2397#endif 2402#endif
2398} 2403}
2399 2404
2400void MainWindow::syncFileRequest() 2405void MainWindow::syncFileRequest()
2401{ 2406{
2402 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { 2407 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
2403 mSyncManager->slotSyncMenu( 999 ); 2408 mSyncManager->slotSyncMenu( 999 );
2404 } 2409 }
2405 2410
2406 setCaption(i18n("Saving Data to temp file ..." )); 2411 setCaption(i18n("Saving Data to temp file ..." ));
2407 mView->saveCalendar( sentSyncFile() ); 2412 mView->saveCalendar( sentSyncFile() );
2408 setCaption(i18n("Data saved to temp file!" )); 2413 setCaption(i18n("Data saved to temp file!" ));
2409 2414
2410} 2415}
2411void MainWindow::getFile( bool success ) 2416void MainWindow::getFile( bool success )
2412{ 2417{
2413 if ( ! success ) { 2418 if ( ! success ) {
2414 setCaption( i18n("Error receiving file. Nothing changed!") ); 2419 setCaption( i18n("Error receiving file. Nothing changed!") );
2415 return; 2420 return;
2416 } 2421 }
2417 mView->openCalendar( sentSyncFile() ); 2422 mView->openCalendar( sentSyncFile() );
2418 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { 2423 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
2419 mSyncManager->slotSyncMenu( 999 ); 2424 mSyncManager->slotSyncMenu( 999 );
2420 } 2425 }
2421 setCaption( i18n("Pi-Sync successful!") ); 2426 setCaption( i18n("Pi-Sync successful!") );
2422} 2427}
2423 2428void MainWindow::printListView()
2429{
2430 qDebug("MainWindow::printListView() ");
2431}
2424void MainWindow::printSel( ) 2432void MainWindow::printSel( )
2425{ 2433{
2426 mView->viewManager()->agendaView()->agenda()->printSelection(); 2434 mView->viewManager()->agendaView()->agenda()->printSelection();
2427} 2435}
2428 2436
2429void MainWindow::printCal() 2437void MainWindow::printCal()
2430{ 2438{
2431 mView->print();//mCp->showDialog(); 2439 mView->print();//mCp->showDialog();
2432} 2440}
2433 2441
2434 2442
2435#include "libkdepim/kdatepicker.h" 2443#include "libkdepim/kdatepicker.h"
2436#include <kdatetbl.h> 2444#include <kdatetbl.h>
2437 2445
2438void MainWindow::weekAction() 2446void MainWindow::weekAction()
2439{ 2447{
2440 int month; 2448 int month;
2441 KPopupFrame* popup = new KPopupFrame(this); 2449 KPopupFrame* popup = new KPopupFrame(this);
2442 KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup); 2450 KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup);
2443 // ----- 2451 // -----
2444 picker->resize(picker->sizeHint()); 2452 picker->resize(picker->sizeHint());
2445 popup->setMainWidget(picker); 2453 popup->setMainWidget(picker);
2446 picker->setFocus(); 2454 picker->setFocus();
2447 connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); 2455 connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int)));
2448 int x = 0; 2456 int x = 0;
2449 int y = iconToolBar->height(); 2457 int y = iconToolBar->height();
2450 int dX = 0; 2458 int dX = 0;
2451 int dY = 0; 2459 int dY = 0;
2452 if ( iconToolBar->orientation () == Qt:: Horizontal ) { 2460 if ( iconToolBar->orientation () == Qt:: Horizontal ) {
2453 if ( iconToolBar->y() > height()/2 ) { 2461 if ( iconToolBar->y() > height()/2 ) {
2454 dY = picker->sizeHint().height()+8; 2462 dY = picker->sizeHint().height()+8;
2455 y = 0; 2463 y = 0;
2456 } 2464 }
2457 } else { 2465 } else {
2458 if ( iconToolBar->x() > width()/2 ) { // right side 2466 if ( iconToolBar->x() > width()/2 ) { // right side
2459 x=0; 2467 x=0;
2460 dX= picker->sizeHint().width()+8; 2468 dX= picker->sizeHint().width()+8;
2461 y = 0; 2469 y = 0;
2462 } else { 2470 } else {
2463 x= iconToolBar->width(); 2471 x= iconToolBar->width();
2464 y = 0; 2472 y = 0;
2465 } 2473 }
2466 } 2474 }
2467 //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() ); 2475 //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() );
2468 if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY)))) 2476 if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY))))
2469 { 2477 {
2470 month = picker->getResult(); 2478 month = picker->getResult();
2471 emit selectWeek ( month ); 2479 emit selectWeek ( month );
2472 //qDebug("weekSelected %d ", month); 2480 //qDebug("weekSelected %d ", month);
2473 } 2481 }
2474 delete popup; 2482 delete popup;
2475} 2483}
2476 2484
2477void MainWindow::hideEvent ( QHideEvent * ) 2485void MainWindow::hideEvent ( QHideEvent * )
2478{ 2486{
2479 QString message; 2487 QString message;
2480 QDateTime nextA = mCalendar->nextAlarmEventDateTime(); 2488 QDateTime nextA = mCalendar->nextAlarmEventDateTime();
2481 if ( nextA.isValid() ) { 2489 if ( nextA.isValid() ) {
2482 QString sum = mCalendar->nextSummary(); 2490 QString sum = mCalendar->nextSummary();
2483 2491
2484 message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false)); 2492 message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false));
2485 setCaption( message ); 2493 setCaption( message );
2486 } 2494 }
2487} 2495}
2488 2496
2489void MainWindow::resizeEvent( QResizeEvent* e) 2497void MainWindow::resizeEvent( QResizeEvent* e)
2490{ 2498{
2491#ifndef DESKTOP_VERSION 2499#ifndef DESKTOP_VERSION
2492 if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar && QApplication::desktop()->width() > 320) { 2500 if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar && QApplication::desktop()->width() > 320) {
2493 if (QApplication::desktop()->width() > QApplication::desktop()->height() ) 2501 if (QApplication::desktop()->width() > QApplication::desktop()->height() )
2494 filterToolBar->hide(); 2502 filterToolBar->hide();
2495 else 2503 else
2496 filterToolBar->show(); 2504 filterToolBar->show();
2497 } 2505 }
2498#endif 2506#endif
2499 QMainWindow::resizeEvent( e); 2507 QMainWindow::resizeEvent( e);
2500} 2508}
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 6895e36..1105783 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -1,167 +1,168 @@
1#ifndef KORGE_MAINWINDOW_H 1#ifndef KORGE_MAINWINDOW_H
2#define KORGE_MAINWINDOW_H 2#define KORGE_MAINWINDOW_H
3 3
4#include <qmainwindow.h> 4#include <qmainwindow.h>
5#include <qtimer.h> 5#include <qtimer.h>
6#include <qdict.h> 6#include <qdict.h>
7#include <qfile.h> 7#include <qfile.h>
8#include <qmenubar.h> 8#include <qmenubar.h>
9#include <qtextstream.h> 9#include <qtextstream.h>
10#include <qregexp.h> 10#include <qregexp.h>
11 11
12#include <libkcal/incidence.h> 12#include <libkcal/incidence.h>
13#include <ksyncmanager.h> 13#include <ksyncmanager.h>
14#ifndef DESKTOP_VERSION 14#ifndef DESKTOP_VERSION
15#include <qcopchannel_qws.h> 15#include <qcopchannel_qws.h>
16#endif 16#endif
17class QAction; 17class QAction;
18class CalendarView; 18class CalendarView;
19class KSyncProfile; 19class KSyncProfile;
20#ifdef DESKTOP_VERSION 20#ifdef DESKTOP_VERSION
21 21
22#define QPEToolBar QToolBar 22#define QPEToolBar QToolBar
23#define QPEMenuBar QMenuBar 23#define QPEMenuBar QMenuBar
24#endif 24#endif
25class QPEToolBar; 25class QPEToolBar;
26class QPEMenuBar; 26class QPEMenuBar;
27 27
28 28
29namespace KCal { 29namespace KCal {
30class CalendarLocal; 30class CalendarLocal;
31} 31}
32 32
33using namespace KCal; 33using namespace KCal;
34 34
35class MainWindow : public QMainWindow 35class MainWindow : public QMainWindow
36{ 36{
37 Q_OBJECT 37 Q_OBJECT
38 public: 38 public:
39 MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); 39 MainWindow( QWidget *parent = 0, const char *name = 0, QString command = "");
40 ~MainWindow(); 40 ~MainWindow();
41 bool beamReceiveEnabled(); 41 bool beamReceiveEnabled();
42 static QString defaultFileName(); 42 static QString defaultFileName();
43 static QString syncFileName(); 43 static QString syncFileName();
44 static QString resourcePath(); 44 static QString resourcePath();
45 public slots: 45 public slots:
46 void setUsesBigPixmaps ( bool ); 46 void setUsesBigPixmaps ( bool );
47 void setCaption ( const QString & ); 47 void setCaption ( const QString & );
48 void updateWeekNum(const KCal::DateList &); 48 void updateWeekNum(const KCal::DateList &);
49 void updateWeek(QDate); 49 void updateWeek(QDate);
50 void updateFilterToolbar(); 50 void updateFilterToolbar();
51 virtual void showMaximized (); 51 virtual void showMaximized ();
52 void configureAgenda( int ); 52 void configureAgenda( int );
53 void recieve( const QCString& msg, const QByteArray& data ); 53 void recieve( const QCString& msg, const QByteArray& data );
54 protected slots: 54 protected slots:
55 void setCaptionToDates(); 55 void setCaptionToDates();
56 void weekAction(); 56 void weekAction();
57 void about(); 57 void about();
58 void licence(); 58 void licence();
59 void faq(); 59 void faq();
60 void usertrans(); 60 void usertrans();
61 void features(); 61 void features();
62 void synchowto(); 62 void synchowto();
63 void storagehowto(); 63 void storagehowto();
64 void timetrackinghowto(); 64 void timetrackinghowto();
65 void kdesynchowto(); 65 void kdesynchowto();
66 void multisynchowto(); 66 void multisynchowto();
67 void whatsNew(); 67 void whatsNew();
68 void keyBindings(); 68 void keyBindings();
69 void aboutAutoSaving();; 69 void aboutAutoSaving();;
70 void aboutKnownBugs(); 70 void aboutKnownBugs();
71 71
72 void processIncidenceSelection( Incidence * ); 72 void processIncidenceSelection( Incidence * );
73 73
74 void importQtopia(); 74 void importQtopia();
75 void importBday(); 75 void importBday();
76 void importOL(); 76 void importOL();
77 void importIcal(); 77 void importIcal();
78 void importFile( QString, bool ); 78 void importFile( QString, bool );
79 void quickImportIcal(); 79 void quickImportIcal();
80 80
81 void slotModifiedChanged( bool ); 81 void slotModifiedChanged( bool );
82 82
83 void save(); 83 void save();
84 void saveStopTimer(); 84 void saveStopTimer();
85 void configureToolBar( int ); 85 void configureToolBar( int );
86 void printSel(); 86 void printSel();
87 void printCal(); 87 void printCal();
88 void printListView();
88 void saveCalendar(); 89 void saveCalendar();
89 void loadCalendar(); 90 void loadCalendar();
90 void exportVCalendar(); 91 void exportVCalendar();
91 void fillFilterMenu(); 92 void fillFilterMenu();
92 void fillFilterMenuTB(); 93 void fillFilterMenuTB();
93 void selectFilter( int ); 94 void selectFilter( int );
94 void fillFilterMenuPopup(); 95 void fillFilterMenuPopup();
95 void selectFilterPopup( int ); 96 void selectFilterPopup( int );
96 void exportToPhone( int ); 97 void exportToPhone( int );
97 void toggleBeamReceive(); 98 void toggleBeamReceive();
98 void disableBR(bool); 99 void disableBR(bool);
99 signals: 100 signals:
100 void selectWeek ( int ); 101 void selectWeek ( int );
101 private slots: 102 private slots:
102 void showConfigureAgenda(); 103 void showConfigureAgenda();
103 void getFile( bool ); 104 void getFile( bool );
104 void syncFileRequest(); 105 void syncFileRequest();
105 106
106 protected: 107 protected:
107 void hideEvent ( QHideEvent * ); 108 void hideEvent ( QHideEvent * );
108 QString sentSyncFile(); 109 QString sentSyncFile();
109 void displayText( QString, QString); 110 void displayText( QString, QString);
110 void enableIncidenceActions( bool ); 111 void enableIncidenceActions( bool );
111 112
112 private: 113 private:
113 bool mBRdisabled; 114 bool mBRdisabled;
114#ifndef DESKTOP_VERSION 115#ifndef DESKTOP_VERSION
115 QCopChannel* infrared; 116 QCopChannel* infrared;
116#endif 117#endif
117 QAction* brAction; 118 QAction* brAction;
118 KSyncManager* mSyncManager; 119 KSyncManager* mSyncManager;
119 bool mClosed; 120 bool mClosed;
120 void saveOnClose(); 121 void saveOnClose();
121 bool mFlagKeyPressed; 122 bool mFlagKeyPressed;
122 bool mBlockAtStartup; 123 bool mBlockAtStartup;
123 QPEToolBar *iconToolBar; 124 QPEToolBar *iconToolBar;
124 QPEToolBar *viewToolBar; 125 QPEToolBar *viewToolBar;
125 QPEToolBar *navigatorToolBar; 126 QPEToolBar *navigatorToolBar;
126 QPEToolBar *filterToolBar; 127 QPEToolBar *filterToolBar;
127 QMenuBar *filterMenubar; 128 QMenuBar *filterMenubar;
128 QPopupMenu * filterPopupMenu; 129 QPopupMenu * filterPopupMenu;
129 void initActions(); 130 void initActions();
130 void setDefaultPreferences(); 131 void setDefaultPreferences();
131 void resizeEvent( QResizeEvent* e); 132 void resizeEvent( QResizeEvent* e);
132 void keyPressEvent ( QKeyEvent * ) ; 133 void keyPressEvent ( QKeyEvent * ) ;
133 void keyReleaseEvent ( QKeyEvent * ) ; 134 void keyReleaseEvent ( QKeyEvent * ) ;
134 QPopupMenu *configureToolBarMenu; 135 QPopupMenu *configureToolBarMenu;
135 QPopupMenu *selectFilterMenu; 136 QPopupMenu *selectFilterMenu;
136 QPopupMenu *selectFilterMenuTB; 137 QPopupMenu *selectFilterMenuTB;
137 QPopupMenu *configureAgendaMenu, *syncMenu; 138 QPopupMenu *configureAgendaMenu, *syncMenu;
138 CalendarLocal *mCalendar; 139 CalendarLocal *mCalendar;
139 CalendarView *mView; 140 CalendarView *mView;
140 QAction *mNewSubTodoAction; 141 QAction *mNewSubTodoAction;
141 QAction *mWeekAction; 142 QAction *mWeekAction;
142 QFont mWeekFont; 143 QFont mWeekFont;
143 QPixmap mWeekPixmap; 144 QPixmap mWeekPixmap;
144 QColor mWeekBgColor; 145 QColor mWeekBgColor;
145 146
146 QAction *mShowAction; 147 QAction *mShowAction;
147 QAction *mEditAction; 148 QAction *mEditAction;
148 QAction *mDeleteAction; 149 QAction *mDeleteAction;
149 QAction *mCloneAction; 150 QAction *mCloneAction;
150 QAction *mMoveAction; 151 QAction *mMoveAction;
151 QAction *mBeamAction; 152 QAction *mBeamAction;
152 QAction *mCancelAction; 153 QAction *mCancelAction;
153 154
154 QAction *mToggleNav; 155 QAction *mToggleNav;
155 QAction *mToggleFilter; 156 QAction *mToggleFilter;
156 QAction *mToggleAllday; 157 QAction *mToggleAllday;
157 QAction *actionFilterMenuTB; 158 QAction *actionFilterMenuTB;
158 159
159 void closeEvent( QCloseEvent* ce ); 160 void closeEvent( QCloseEvent* ce );
160 QTimer mSaveTimer; 161 QTimer mSaveTimer;
161 //bool mBlockSaveFlag; 162 //bool mBlockSaveFlag;
162 bool mCalendarModifiedFlag; 163 bool mCalendarModifiedFlag;
163 QPixmap loadPixmap( QString ); 164 QPixmap loadPixmap( QString );
164}; 165};
165 166
166 167
167#endif 168#endif