-rw-r--r-- | korganizer/mainwindow.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index a164fa4..4f2cccf 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -573,2 +573,3 @@ void MainWindow::initActions() | |||
573 | mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); | 573 | mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); |
574 | if ( p-> mShowIconWeekNum ) | ||
574 | mWeekAction->addTo( iconToolBar ); | 575 | mWeekAction->addTo( iconToolBar ); |
@@ -625,2 +626,3 @@ void MainWindow::initActions() | |||
625 | configureToolBarMenu->insertSeparator(); | 626 | configureToolBarMenu->insertSeparator(); |
627 | configureToolBarMenu->insertItem(i18n("Week Number"), 400); | ||
626 | configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); | 628 | configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); |
@@ -709,9 +711,2 @@ void MainWindow::initActions() | |||
709 | 711 | ||
710 | icon = loadPixmap( pathString + "month" ); | ||
711 | configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); | ||
712 | QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); | ||
713 | month_action->addTo( viewMenu ); | ||
714 | connect( month_action, SIGNAL( activated() ), | ||
715 | mView->viewManager(), SLOT( showMonthView() ) ); | ||
716 | |||
717 | icon = loadPixmap( pathString + "workweek2" ); | 712 | icon = loadPixmap( pathString + "workweek2" ); |
@@ -723,2 +718,9 @@ void MainWindow::initActions() | |||
723 | 718 | ||
719 | icon = loadPixmap( pathString + "month" ); | ||
720 | configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); | ||
721 | QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); | ||
722 | month_action->addTo( viewMenu ); | ||
723 | connect( month_action, SIGNAL( activated() ), | ||
724 | mView->viewManager(), SLOT( showMonthView() ) ); | ||
725 | |||
724 | icon = loadPixmap( pathString + "todo" ); | 726 | icon = loadPixmap( pathString + "todo" ); |
@@ -1003,6 +1005,6 @@ void MainWindow::initActions() | |||
1003 | day7_action->addTo( iconToolBar ); | 1005 | day7_action->addTo( iconToolBar ); |
1004 | if (p-> mShowIconMonth) | ||
1005 | month_action->addTo( iconToolBar ); | ||
1006 | if (p-> mShowIconDay6) | 1006 | if (p-> mShowIconDay6) |
1007 | day6_action->addTo( iconToolBar ); | 1007 | day6_action->addTo( iconToolBar ); |
1008 | if (p-> mShowIconMonth) | ||
1009 | month_action->addTo( iconToolBar ); | ||
1008 | if (p-> mShowIconTodoview) | 1010 | if (p-> mShowIconTodoview) |
@@ -1089,3 +1091,4 @@ void MainWindow::initActions() | |||
1089 | configureToolBarMenu->setItemChecked( 300, true ); | 1091 | configureToolBarMenu->setItemChecked( 300, true ); |
1090 | 1092 | if (p-> mShowIconWeekNum) | |
1093 | configureToolBarMenu->setItemChecked( 400, true ); | ||
1091 | QLabel* dummy = new QLabel( iconToolBar ); | 1094 | QLabel* dummy = new QLabel( iconToolBar ); |
@@ -1830,2 +1833,3 @@ void MainWindow::configureToolBar( int item ) | |||
1830 | p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); | 1833 | p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); |
1834 | p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 ); | ||
1831 | // initActions(); | 1835 | // initActions(); |