-rw-r--r-- | korganizer/mainwindow.cpp | 48 |
1 files changed, 31 insertions, 17 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index fc2d59b..65566b5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -828,90 +828,97 @@ void MainWindow::initActions() | |||
828 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); | 828 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); |
829 | action->addTo( importMenu ); | 829 | action->addTo( importMenu ); |
830 | connect( action, SIGNAL( activated() ), | 830 | connect( action, SIGNAL( activated() ), |
831 | this, SLOT( printCal() ) ); | 831 | this, SLOT( printCal() ) ); |
832 | 832 | ||
833 | icon = loadPixmap( pathString + "print" ); | 833 | icon = loadPixmap( pathString + "print" ); |
834 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); | 834 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); |
835 | action->addTo( importMenu ); | 835 | action->addTo( importMenu ); |
836 | connect( action, SIGNAL( activated() ), | 836 | connect( action, SIGNAL( activated() ), |
837 | this, SLOT( printSel() ) ); | 837 | this, SLOT( printSel() ) ); |
838 | #endif | 838 | #endif |
839 | importMenu->insertSeparator(); | 839 | importMenu->insertSeparator(); |
840 | action = new QAction( "beam all", i18n("Save"), 0, | 840 | action = new QAction( "beam all", i18n("Save"), 0, |
841 | this ); | 841 | this ); |
842 | action->addTo( importMenu ); | 842 | action->addTo( importMenu ); |
843 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); | 843 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); |
844 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, | 844 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, |
845 | this ); | 845 | this ); |
846 | action->addTo( importMenu ); | 846 | action->addTo( importMenu ); |
847 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); | 847 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); |
848 | 848 | ||
849 | //menuBar->insertItem( "Configure",configureMenu ); | 849 | //menuBar->insertItem( "Configure",configureMenu ); |
850 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); | 850 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); |
851 | icon = loadPixmap( "korganizer/korganizer" ); | 851 | icon = loadPixmap( "korganizer/korganizer" ); |
852 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); | 852 | |
853 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); | ||
853 | action->addTo( helpMenu ); | 854 | action->addTo( helpMenu ); |
854 | connect( action, SIGNAL( activated() ), | 855 | connect( action, SIGNAL( activated() ), |
855 | SLOT( keyBindings() ) ); | 856 | SLOT( whatsNew() ) ); |
856 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); | 857 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); |
857 | action->addTo( helpMenu ); | 858 | action->addTo( helpMenu ); |
858 | connect( action, SIGNAL( activated() ), | 859 | connect( action, SIGNAL( activated() ), |
859 | SLOT( features() ) ); | 860 | SLOT( features() ) ); |
861 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); | ||
862 | action->addTo( helpMenu ); | ||
863 | connect( action, SIGNAL( activated() ), | ||
864 | SLOT( keyBindings() ) ); | ||
865 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); | ||
866 | action->addTo( helpMenu ); | ||
867 | connect( action, SIGNAL( activated() ), | ||
868 | SLOT( synchowto() ) ); | ||
869 | action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); | ||
870 | action->addTo( helpMenu ); | ||
871 | connect( action, SIGNAL( activated() ), | ||
872 | SLOT( kdesynchowto() ) ); | ||
873 | action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); | ||
874 | action->addTo( helpMenu ); | ||
875 | connect( action, SIGNAL( activated() ), | ||
876 | SLOT( multisynchowto() ) ); | ||
860 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); | 877 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); |
861 | action->addTo( helpMenu ); | 878 | action->addTo( helpMenu ); |
862 | connect( action, SIGNAL( activated() ), | 879 | connect( action, SIGNAL( activated() ), |
863 | SLOT( aboutAutoSaving() ) ); | 880 | SLOT( aboutAutoSaving() ) ); |
864 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); | 881 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); |
865 | action->addTo( helpMenu ); | 882 | action->addTo( helpMenu ); |
866 | connect( action, SIGNAL( activated() ), | 883 | connect( action, SIGNAL( activated() ), |
867 | SLOT( aboutKnownBugs() ) ); | 884 | SLOT( aboutKnownBugs() ) ); |
868 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); | 885 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); |
869 | action->addTo( helpMenu ); | 886 | action->addTo( helpMenu ); |
870 | connect( action, SIGNAL( activated() ), | 887 | connect( action, SIGNAL( activated() ), |
871 | SLOT( usertrans() ) ); | 888 | SLOT( usertrans() ) ); |
872 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); | ||
873 | action->addTo( helpMenu ); | ||
874 | connect( action, SIGNAL( activated() ), | ||
875 | SLOT( synchowto() ) ); | ||
876 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); | ||
877 | action->addTo( helpMenu ); | ||
878 | connect( action, SIGNAL( activated() ), | ||
879 | SLOT( whatsNew() ) ); | ||
880 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); | 889 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); |
881 | action->addTo( helpMenu ); | 890 | action->addTo( helpMenu ); |
882 | connect( action, SIGNAL( activated() ), | 891 | connect( action, SIGNAL( activated() ), |
883 | SLOT( faq() ) ); | 892 | SLOT( faq() ) ); |
884 | |||
885 | |||
886 | action = new QAction( "about", i18n("About..."), 0, this ); | ||
887 | action->addTo( helpMenu ); | ||
888 | connect( action, SIGNAL( activated() ), | ||
889 | SLOT( about() ) ); | ||
890 | action = new QAction( "licence", i18n("Licence..."), 0, this ); | 893 | action = new QAction( "licence", i18n("Licence..."), 0, this ); |
891 | action->addTo( helpMenu ); | 894 | action->addTo( helpMenu ); |
892 | connect( action, SIGNAL( activated() ), | 895 | connect( action, SIGNAL( activated() ), |
893 | SLOT( licence() ) ); | 896 | SLOT( licence() ) ); |
897 | action = new QAction( "about", i18n("About..."), 0, this ); | ||
898 | action->addTo( helpMenu ); | ||
899 | connect( action, SIGNAL( activated() ), | ||
900 | SLOT( about() ) ); | ||
894 | //menuBar->insertSeparator(); | 901 | //menuBar->insertSeparator(); |
895 | 902 | ||
896 | // ****************************************************** | 903 | // ****************************************************** |
897 | // menubar icons | 904 | // menubar icons |
898 | 905 | ||
899 | 906 | ||
900 | iconToolBar->setHorizontalStretchable (true ); | 907 | iconToolBar->setHorizontalStretchable (true ); |
901 | //menuBar->insertItem( iconToolBar ); | 908 | //menuBar->insertItem( iconToolBar ); |
902 | //xdays_action | 909 | //xdays_action |
903 | if (p-> mShowIconNewEvent) | 910 | if (p-> mShowIconNewEvent) |
904 | ne_action->addTo( iconToolBar ); | 911 | ne_action->addTo( iconToolBar ); |
905 | if (p->mShowIconNewTodo ) | 912 | if (p->mShowIconNewTodo ) |
906 | nt_action->addTo( iconToolBar ); | 913 | nt_action->addTo( iconToolBar ); |
907 | if (p-> mShowIconSearch) | 914 | if (p-> mShowIconSearch) |
908 | search_action->addTo( iconToolBar ); | 915 | search_action->addTo( iconToolBar ); |
909 | if (p-> mShowIconNext) | 916 | if (p-> mShowIconNext) |
910 | whatsnext_action->addTo( iconToolBar ); | 917 | whatsnext_action->addTo( iconToolBar ); |
911 | if (p-> mShowIconNextDays) | 918 | if (p-> mShowIconNextDays) |
912 | xdays_action->addTo( iconToolBar ); | 919 | xdays_action->addTo( iconToolBar ); |
913 | if (p-> mShowIconList) | 920 | if (p-> mShowIconList) |
914 | showlist_action->addTo( iconToolBar ); | 921 | showlist_action->addTo( iconToolBar ); |
915 | if (p-> mShowIconDay1) | 922 | if (p-> mShowIconDay1) |
916 | day1_action->addTo( iconToolBar ); | 923 | day1_action->addTo( iconToolBar ); |
917 | if (p-> mShowIconDay5) | 924 | if (p-> mShowIconDay5) |
@@ -1126,51 +1133,58 @@ void MainWindow::displayFile( QString fn, QString cap ) | |||
1126 | QString fileName = resourcePath() + fn; | 1133 | QString fileName = resourcePath() + fn; |
1127 | QString text; | 1134 | QString text; |
1128 | QFile file( fileName ); | 1135 | QFile file( fileName ); |
1129 | if (!file.open( IO_ReadOnly ) ) { | 1136 | if (!file.open( IO_ReadOnly ) ) { |
1130 | return ; | 1137 | return ; |
1131 | 1138 | ||
1132 | } | 1139 | } |
1133 | QTextStream ts( &file ); | 1140 | QTextStream ts( &file ); |
1134 | text = ts.read(); | 1141 | text = ts.read(); |
1135 | file.close(); | 1142 | file.close(); |
1136 | displayText( text, cap); | 1143 | displayText( text, cap); |
1137 | } | 1144 | } |
1138 | void MainWindow::features() | 1145 | void MainWindow::features() |
1139 | { | 1146 | { |
1140 | 1147 | ||
1141 | displayFile( "featuresKOPI.txt",i18n("KO/Pi Features and hints") ); | 1148 | displayFile( "featuresKOPI.txt",i18n("KO/Pi Features and hints") ); |
1142 | } | 1149 | } |
1143 | 1150 | ||
1144 | void MainWindow::usertrans() | 1151 | void MainWindow::usertrans() |
1145 | { | 1152 | { |
1146 | 1153 | ||
1147 | displayFile( "usertranslationHOWTO.txt",i18n("KO/Pi User translation HowTo") ); | 1154 | displayFile( "usertranslationHOWTO.txt",i18n("KO/Pi User translation HowTo") ); |
1148 | } | 1155 | } |
1149 | 1156 | ||
1157 | void MainWindow::kdesynchowto() | ||
1158 | { | ||
1159 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); | ||
1160 | } | ||
1161 | void MainWindow::multisynchowto() | ||
1162 | { | ||
1163 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); | ||
1164 | } | ||
1150 | void MainWindow::synchowto() | 1165 | void MainWindow::synchowto() |
1151 | { | 1166 | { |
1152 | |||
1153 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); | 1167 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); |
1154 | } | 1168 | } |
1155 | void MainWindow::faq() | 1169 | void MainWindow::faq() |
1156 | { | 1170 | { |
1157 | displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") ); | 1171 | displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") ); |
1158 | 1172 | ||
1159 | } | 1173 | } |
1160 | void MainWindow::whatsNew() | 1174 | void MainWindow::whatsNew() |
1161 | { | 1175 | { |
1162 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); | 1176 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); |
1163 | 1177 | ||
1164 | } | 1178 | } |
1165 | void MainWindow::licence() | 1179 | void MainWindow::licence() |
1166 | { | 1180 | { |
1167 | KApplication::showLicence(); | 1181 | KApplication::showLicence(); |
1168 | 1182 | ||
1169 | } | 1183 | } |
1170 | void MainWindow::about() | 1184 | void MainWindow::about() |
1171 | { | 1185 | { |
1172 | QString version; | 1186 | QString version; |
1173 | #include <../version> | 1187 | #include <../version> |
1174 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), | 1188 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), |
1175 | i18n("KOrganizer/Platform-independent\n") + | 1189 | i18n("KOrganizer/Platform-independent\n") + |
1176 | "(KO/Pi) " + version + " - " + | 1190 | "(KO/Pi) " + version + " - " + |