-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 | |||
@@ -988,64 +988,65 @@ void MainWindow::initActions() | |||
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 ); |