author | zautrix <zautrix> | 2005-03-08 11:09:44 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-08 11:09:44 (UTC) |
commit | 90f53697a44fdcccec00ef8c53fe5c9c15aca713 (patch) (unidiff) | |
tree | 85d2e38b4ccffbc5414c22938d8c6fccd3cf8b58 /korganizer | |
parent | 91e7aeec0b15d28eb263c0699fdce4a00a3669c6 (diff) | |
download | kdepimpi-90f53697a44fdcccec00ef8c53fe5c9c15aca713.zip kdepimpi-90f53697a44fdcccec00ef8c53fe5c9c15aca713.tar.gz kdepimpi-90f53697a44fdcccec00ef8c53fe5c9c15aca713.tar.bz2 |
menu cleanup
-rw-r--r-- | korganizer/kodialogmanager.cpp | 5 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 59 |
2 files changed, 37 insertions, 27 deletions
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index 41a4dc1..1af9dad 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp | |||
@@ -193,5 +193,4 @@ void KODialogManager::showSearchDialog() | |||
193 | #ifndef DESKTOP_VERSION | 193 | #ifndef DESKTOP_VERSION |
194 | mSearchDialog->setMaximumSize( QApplication::desktop()->size()); | 194 | mSearchDialog->setMaximumSize( QApplication::desktop()->size()); |
195 | //mSearchDialog->setGeometry( 40,40, 400, 300); | ||
196 | mSearchDialog->showMaximized(); | 195 | mSearchDialog->showMaximized(); |
197 | #else | 196 | #else |
@@ -213,5 +212,9 @@ void KODialogManager::showSearchDialog() | |||
213 | } | 212 | } |
214 | // make sure the widget is on top again | 213 | // make sure the widget is on top again |
214 | #ifdef DESKTOP_VERSION | ||
215 | mSearchDialog->show(); | 215 | mSearchDialog->show(); |
216 | #else | ||
217 | mSearchDialog->showMaximized(); | ||
218 | #endif | ||
216 | mSearchDialog->raise(); | 219 | mSearchDialog->raise(); |
217 | } | 220 | } |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 019f41f..4f71788 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -514,4 +514,7 @@ void MainWindow::initActions() | |||
514 | QPopupMenu *actionMenu = new QPopupMenu( this ); | 514 | QPopupMenu *actionMenu = new QPopupMenu( this ); |
515 | QPopupMenu *importMenu = new QPopupMenu( this ); | 515 | QPopupMenu *importMenu = new QPopupMenu( this ); |
516 | QPopupMenu *importMenu_X = new QPopupMenu( this ); | ||
517 | QPopupMenu *exportMenu_X = new QPopupMenu( this ); | ||
518 | QPopupMenu *beamMenu_X = new QPopupMenu( this ); | ||
516 | selectFilterMenu = new QPopupMenu( this ); | 519 | selectFilterMenu = new QPopupMenu( this ); |
517 | selectFilterMenu->setCheckable( true ); | 520 | selectFilterMenu->setCheckable( true ); |
@@ -520,5 +523,4 @@ void MainWindow::initActions() | |||
520 | configureToolBarMenu = new QPopupMenu( this ); | 523 | configureToolBarMenu = new QPopupMenu( this ); |
521 | QPopupMenu *helpMenu = new QPopupMenu( this ); | 524 | QPopupMenu *helpMenu = new QPopupMenu( this ); |
522 | |||
523 | QIconSet icon; | 525 | QIconSet icon; |
524 | int pixWid = 22, pixHei = 22; | 526 | int pixWid = 22, pixHei = 22; |
@@ -826,32 +828,32 @@ void MainWindow::initActions() | |||
826 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, | 828 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, |
827 | this ); | 829 | this ); |
828 | action->addTo( importMenu ); | 830 | action->addTo( importMenu_X ); |
829 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); | 831 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); |
830 | action = new QAction( "import_quick", i18n("Import last file"), 0, | 832 | action = new QAction( "import_quick", i18n("Import last file"), 0, |
831 | this ); | 833 | this ); |
832 | action->addTo( importMenu ); | 834 | action->addTo( importMenu_X ); |
833 | connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); | 835 | connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); |
834 | importMenu->insertSeparator(); | 836 | importMenu_X->insertSeparator(); |
835 | action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, | 837 | action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, |
836 | this ); | 838 | this ); |
837 | action->addTo( importMenu ); | 839 | action->addTo( importMenu_X ); |
838 | connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); | 840 | connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); |
839 | //#ifndef DESKTOP_VERSION | 841 | //#ifndef DESKTOP_VERSION |
840 | importMenu->insertSeparator(); | 842 | importMenu_X->insertSeparator(); |
841 | action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, | 843 | action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, |
842 | this ); | 844 | this ); |
843 | action->addTo( importMenu ); | 845 | action->addTo( importMenu_X ); |
844 | connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); | 846 | connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); |
845 | //#else | 847 | //#else |
846 | #ifdef _OL_IMPORT_ | 848 | #ifdef _OL_IMPORT_ |
847 | importMenu->insertSeparator(); | 849 | importMenu_X->insertSeparator(); |
848 | action = new QAction( "import_ol", i18n("Import from OL"), 0, | 850 | action = new QAction( "import_ol", i18n("Import from OL"), 0, |
849 | this ); | 851 | this ); |
850 | action->addTo( importMenu ); | 852 | action->addTo( importMenu_X ); |
851 | connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); | 853 | connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); |
852 | #endif | 854 | #endif |
853 | //#endif | 855 | //#endif |
854 | 856 | ||
855 | importMenu->insertSeparator(); | 857 | //importMenu->insertSeparator(); |
856 | action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, | 858 | action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, |
857 | this ); | 859 | this ); |
@@ -863,9 +865,11 @@ void MainWindow::initActions() | |||
863 | action->addTo( importMenu ); | 865 | action->addTo( importMenu ); |
864 | connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); | 866 | connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); |
865 | |||
866 | importMenu->insertSeparator(); | 867 | importMenu->insertSeparator(); |
868 | importMenu->insertItem( i18n("Import"), importMenu_X ); | ||
869 | //importMenu->insertSeparator(); | ||
867 | action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, | 870 | action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, |
868 | this ); | 871 | this ); |
869 | action->addTo( importMenu ); connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); | 872 | action->addTo( exportMenu_X ); |
873 | connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); | ||
870 | 874 | ||
871 | 875 | ||
@@ -875,16 +879,12 @@ void MainWindow::initActions() | |||
875 | ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); | 879 | ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); |
876 | connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); | 880 | connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); |
877 | importMenu->insertItem( i18n("Export to phone"), ex2phone ); | 881 | exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); |
878 | 882 | ||
879 | importMenu->insertSeparator(); | 883 | importMenu->insertItem( i18n("Export"), exportMenu_X ); |
880 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, | ||
881 | this ); | ||
882 | action->addTo( importMenu ); | ||
883 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); | ||
884 | #ifndef DESKTOP_VERSION | 884 | #ifndef DESKTOP_VERSION |
885 | importMenu->insertSeparator(); | 885 | //importMenu->insertSeparator(); |
886 | brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, | 886 | brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, |
887 | this ); | 887 | this ); |
888 | brAction->addTo( importMenu ); | 888 | brAction->addTo( beamMenu_X ); |
889 | brAction->setToggleAction (true ) ; | 889 | brAction->setToggleAction (true ) ; |
890 | connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); | 890 | connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); |
@@ -892,16 +892,17 @@ void MainWindow::initActions() | |||
892 | action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, | 892 | action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, |
893 | this ); | 893 | this ); |
894 | action->addTo( importMenu ); | 894 | action->addTo( beamMenu_X ); |
895 | connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); | 895 | connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); |
896 | 896 | ||
897 | action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, | 897 | action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, |
898 | this ); | 898 | this ); |
899 | action->addTo( importMenu ); | 899 | action->addTo( beamMenu_X ); |
900 | connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); | 900 | connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); |
901 | importMenu->insertItem( i18n("Beam"), beamMenu_X ); | ||
901 | #else | 902 | #else |
902 | importMenu->insertSeparator(); | 903 | //importMenu->insertSeparator(); |
903 | icon = loadPixmap( pathString + "print" ); | 904 | icon = loadPixmap( pathString + "print" ); |
904 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); | 905 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); |
905 | action->addTo( importMenu ); | 906 | action->addTo( beamMenu_X ); |
906 | connect( action, SIGNAL( activated() ), | 907 | connect( action, SIGNAL( activated() ), |
907 | this, SLOT( printCal() ) ); | 908 | this, SLOT( printCal() ) ); |
@@ -909,13 +910,19 @@ void MainWindow::initActions() | |||
909 | icon = loadPixmap( pathString + "print" ); | 910 | icon = loadPixmap( pathString + "print" ); |
910 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); | 911 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); |
911 | action->addTo( importMenu ); | 912 | action->addTo( beamMenu_X ); |
912 | connect( action, SIGNAL( activated() ), | 913 | connect( action, SIGNAL( activated() ), |
913 | this, SLOT( printSel() ) ); | 914 | this, SLOT( printSel() ) ); |
914 | action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); | 915 | action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); |
915 | action->addTo( importMenu ); | 916 | action->addTo( beamMenu_X ); |
916 | connect( action, SIGNAL( activated() ), | 917 | connect( action, SIGNAL( activated() ), |
917 | mView->viewManager(), SIGNAL( printWNV() ) ); | 918 | mView->viewManager(), SIGNAL( printWNV() ) ); |
919 | importMenu->insertItem( i18n("Print"), beamMenu_X ); | ||
918 | #endif | 920 | #endif |
919 | importMenu->insertSeparator(); | 921 | importMenu->insertSeparator(); |
922 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, | ||
923 | this ); | ||
924 | action->addTo( importMenu ); | ||
925 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); | ||
926 | importMenu->insertSeparator(); | ||
920 | action = new QAction( "beam all", i18n("Save"), 0, | 927 | action = new QAction( "beam all", i18n("Save"), 0, |
921 | this ); | 928 | this ); |