author | zautrix <zautrix> | 2005-03-26 23:07:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-26 23:07:01 (UTC) |
commit | 9963563126c91d721406f24a49548b1d8f3dc415 (patch) (unidiff) | |
tree | 925a37684d46d8e89e9f5cbfb647d5b625a50c00 /korganizer/mainwindow.cpp | |
parent | 46b94158f6b115e175516a8432ec5b71f1403834 (diff) | |
download | kdepimpi-9963563126c91d721406f24a49548b1d8f3dc415.zip kdepimpi-9963563126c91d721406f24a49548b1d8f3dc415.tar.gz kdepimpi-9963563126c91d721406f24a49548b1d8f3dc415.tar.bz2 |
fix
-rw-r--r-- | korganizer/mainwindow.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index b947cac..24055af 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -964,112 +964,113 @@ void MainWindow::initActions() | |||
964 | action->addTo( helpMenu ); | 964 | action->addTo( helpMenu ); |
965 | connect( action, SIGNAL( activated() ), | 965 | connect( action, SIGNAL( activated() ), |
966 | SLOT( multisynchowto() ) ); | 966 | SLOT( multisynchowto() ) ); |
967 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); | 967 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); |
968 | action->addTo( helpMenu ); | 968 | action->addTo( helpMenu ); |
969 | connect( action, SIGNAL( activated() ), | 969 | connect( action, SIGNAL( activated() ), |
970 | SLOT( aboutAutoSaving() ) ); | 970 | SLOT( aboutAutoSaving() ) ); |
971 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); | 971 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); |
972 | action->addTo( helpMenu ); | 972 | action->addTo( helpMenu ); |
973 | connect( action, SIGNAL( activated() ), | 973 | connect( action, SIGNAL( activated() ), |
974 | SLOT( aboutKnownBugs() ) ); | 974 | SLOT( aboutKnownBugs() ) ); |
975 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); | 975 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); |
976 | action->addTo( helpMenu ); | 976 | action->addTo( helpMenu ); |
977 | connect( action, SIGNAL( activated() ), | 977 | connect( action, SIGNAL( activated() ), |
978 | SLOT( usertrans() ) ); | 978 | SLOT( usertrans() ) ); |
979 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); | 979 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); |
980 | action->addTo( helpMenu ); | 980 | action->addTo( helpMenu ); |
981 | connect( action, SIGNAL( activated() ), | 981 | connect( action, SIGNAL( activated() ), |
982 | SLOT( faq() ) ); | 982 | SLOT( faq() ) ); |
983 | action = new QAction( "licence", i18n("Licence..."), 0, this ); | 983 | action = new QAction( "licence", i18n("Licence..."), 0, this ); |
984 | action->addTo( helpMenu ); | 984 | action->addTo( helpMenu ); |
985 | connect( action, SIGNAL( activated() ), | 985 | connect( action, SIGNAL( activated() ), |
986 | SLOT( licence() ) ); | 986 | SLOT( licence() ) ); |
987 | action = new QAction( "about", i18n("About..."), 0, this ); | 987 | action = new QAction( "about", i18n("About..."), 0, this ); |
988 | action->addTo( helpMenu ); | 988 | action->addTo( helpMenu ); |
989 | connect( action, SIGNAL( activated() ), | 989 | connect( action, SIGNAL( activated() ), |
990 | SLOT( about() ) ); | 990 | SLOT( about() ) ); |
991 | //menuBar->insertSeparator(); | 991 | //menuBar->insertSeparator(); |
992 | 992 | ||
993 | // ****************************************************** | 993 | // ****************************************************** |
994 | // menubar icons | 994 | // menubar icons |
995 | 995 | ||
996 | 996 | ||
997 | iconToolBar->setHorizontalStretchable (true ); | 997 | iconToolBar->setHorizontalStretchable (true ); |
998 | //menuBar->insertItem( iconToolBar ); | 998 | //menuBar->insertItem( iconToolBar ); |
999 | //xdays_action | 999 | //xdays_action |
1000 | if (p-> mShowIconNewEvent) | 1000 | if (p-> mShowIconNewEvent) |
1001 | ne_action->addTo( iconToolBar ); | 1001 | ne_action->addTo( iconToolBar ); |
1002 | if (p->mShowIconNewTodo ) | 1002 | if (p->mShowIconNewTodo ) |
1003 | nt_action->addTo( iconToolBar ); | 1003 | nt_action->addTo( iconToolBar ); |
1004 | if (p-> mShowIconSearch) | 1004 | if (p-> mShowIconSearch) |
1005 | search_action->addTo( iconToolBar ); | 1005 | search_action->addTo( iconToolBar ); |
1006 | if (p-> mShowIconWhatsThis) | 1006 | if (p-> mShowIconWhatsThis) |
1007 | QWhatsThis::whatsThisButton ( iconToolBar ); | 1007 | QWhatsThis::whatsThisButton ( iconToolBar ); |
1008 | if (p-> mShowIconNext) | 1008 | if (p-> mShowIconNext) |
1009 | whatsnext_action->addTo( iconToolBar ); | 1009 | whatsnext_action->addTo( iconToolBar ); |
1010 | if (p-> mShowIconNextDays) | 1010 | if (p-> mShowIconNextDays) |
1011 | xdays_action->addTo( iconToolBar ); | 1011 | xdays_action->addTo( iconToolBar ); |
1012 | if (p-> mShowIconList) | 1012 | if (p-> mShowIconJournal) |
1013 | showlist_action->addTo( iconToolBar ); | 1013 | viewjournal_action->addTo( iconToolBar ); |
1014 | if (p-> mShowIconDay1) | 1014 | if (p-> mShowIconDay1) |
1015 | day1_action->addTo( iconToolBar ); | 1015 | day1_action->addTo( iconToolBar ); |
1016 | if (p-> mShowIconDay5) | 1016 | if (p-> mShowIconDay5) |
1017 | day5_action->addTo( iconToolBar ); | 1017 | day5_action->addTo( iconToolBar ); |
1018 | if (p-> mShowIconDay7) | 1018 | if (p-> mShowIconDay7) |
1019 | day7_action->addTo( iconToolBar ); | 1019 | day7_action->addTo( iconToolBar ); |
1020 | if (p-> mShowIconDay6) | 1020 | if (p-> mShowIconDay6) |
1021 | day6_action->addTo( iconToolBar ); | 1021 | day6_action->addTo( iconToolBar ); |
1022 | if (p-> mShowIconMonth) | 1022 | if (p-> mShowIconMonth) |
1023 | month_action->addTo( iconToolBar ); | 1023 | month_action->addTo( iconToolBar ); |
1024 | if (p-> mShowIconList) | ||
1025 | showlist_action->addTo( iconToolBar ); | ||
1024 | if (p-> mShowIconTodoview) | 1026 | if (p-> mShowIconTodoview) |
1025 | todoview_action->addTo( iconToolBar ); | 1027 | todoview_action->addTo( iconToolBar ); |
1026 | if (p-> mShowIconJournal) | 1028 | |
1027 | viewjournal_action->addTo( iconToolBar ); | ||
1028 | icon = loadPixmap( pathString + "2leftarrowB" ); | 1029 | icon = loadPixmap( pathString + "2leftarrowB" ); |
1029 | configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14); | 1030 | configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14); |
1030 | if (p-> mShowIconBackFast) { | 1031 | if (p-> mShowIconBackFast) { |
1031 | action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); | 1032 | action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); |
1032 | connect( action, SIGNAL( activated() ), | 1033 | connect( action, SIGNAL( activated() ), |
1033 | mView, SLOT( goPreviousMonth() ) ); | 1034 | mView, SLOT( goPreviousMonth() ) ); |
1034 | action->addTo( iconToolBar ); | 1035 | action->addTo( iconToolBar ); |
1035 | } | 1036 | } |
1036 | icon = loadPixmap( pathString + "1leftarrowB" ); | 1037 | icon = loadPixmap( pathString + "1leftarrowB" ); |
1037 | configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210,15); | 1038 | configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210,15); |
1038 | if (p-> mShowIconBack) { | 1039 | if (p-> mShowIconBack) { |
1039 | action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); | 1040 | action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); |
1040 | connect( action, SIGNAL( activated() ), | 1041 | connect( action, SIGNAL( activated() ), |
1041 | mView, SLOT( goPrevious() ) ); | 1042 | mView, SLOT( goPrevious() ) ); |
1042 | action->addTo( iconToolBar ); | 1043 | action->addTo( iconToolBar ); |
1043 | } | 1044 | } |
1044 | icon = loadPixmap( pathString + "today" ); | 1045 | icon = loadPixmap( pathString + "today" ); |
1045 | configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); | 1046 | configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); |
1046 | if (p-> mShowIconToday) | 1047 | if (p-> mShowIconToday) |
1047 | today_action->addTo( iconToolBar ); | 1048 | today_action->addTo( iconToolBar ); |
1048 | icon = loadPixmap( pathString + "1rightarrowB" ); | 1049 | icon = loadPixmap( pathString + "1rightarrowB" ); |
1049 | configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220); | 1050 | configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220); |
1050 | if (p-> mShowIconForward) { | 1051 | if (p-> mShowIconForward) { |
1051 | action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this ); | 1052 | action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this ); |
1052 | connect( action, SIGNAL( activated() ), | 1053 | connect( action, SIGNAL( activated() ), |
1053 | mView, SLOT( goNext() ) ); | 1054 | mView, SLOT( goNext() ) ); |
1054 | action->addTo( iconToolBar ); | 1055 | action->addTo( iconToolBar ); |
1055 | } | 1056 | } |
1056 | icon = loadPixmap( pathString + "2rightarrowB" ); | 1057 | icon = loadPixmap( pathString + "2rightarrowB" ); |
1057 | configureToolBarMenu->insertItem(icon, i18n("Next month"), 230); | 1058 | configureToolBarMenu->insertItem(icon, i18n("Next month"), 230); |
1058 | if (p-> mShowIconForwardFast) { | 1059 | if (p-> mShowIconForwardFast) { |
1059 | action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this ); | 1060 | action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this ); |
1060 | connect( action, SIGNAL( activated() ), | 1061 | connect( action, SIGNAL( activated() ), |
1061 | mView, SLOT( goNextMonth() ) ); | 1062 | mView, SLOT( goNextMonth() ) ); |
1062 | action->addTo( iconToolBar ); | 1063 | action->addTo( iconToolBar ); |
1063 | } | 1064 | } |
1064 | 1065 | ||
1065 | 1066 | ||
1066 | configureToolBarMenu->insertItem(i18n("What's This?"), 300); | 1067 | configureToolBarMenu->insertItem(i18n("What's This?"), 300); |
1067 | 1068 | ||
1068 | if (p-> mShowIconNewEvent) | 1069 | if (p-> mShowIconNewEvent) |
1069 | configureToolBarMenu->setItemChecked( 10, true ); | 1070 | configureToolBarMenu->setItemChecked( 10, true ); |
1070 | if (p->mShowIconNewTodo ) | 1071 | if (p->mShowIconNewTodo ) |
1071 | configureToolBarMenu->setItemChecked( 20, true ); | 1072 | configureToolBarMenu->setItemChecked( 20, true ); |
1072 | if (p-> mShowIconSearch) | 1073 | if (p-> mShowIconSearch) |
1073 | configureToolBarMenu->setItemChecked( 120, true ); | 1074 | configureToolBarMenu->setItemChecked( 120, true ); |
1074 | if (p-> mShowIconList) | 1075 | if (p-> mShowIconList) |
1075 | configureToolBarMenu->setItemChecked( 30, true ); | 1076 | configureToolBarMenu->setItemChecked( 30, true ); |