| -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() mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); + if ( p-> mShowIconWeekNum ) mWeekAction->addTo( iconToolBar ); @@ -625,2 +626,3 @@ void MainWindow::initActions() configureToolBarMenu->insertSeparator(); + configureToolBarMenu->insertItem(i18n("Week Number"), 400); configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); @@ -709,9 +711,2 @@ void MainWindow::initActions() - icon = loadPixmap( pathString + "month" ); - configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); - QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); - month_action->addTo( viewMenu ); - connect( month_action, SIGNAL( activated() ), - mView->viewManager(), SLOT( showMonthView() ) ); - icon = loadPixmap( pathString + "workweek2" ); @@ -723,2 +718,9 @@ void MainWindow::initActions() + icon = loadPixmap( pathString + "month" ); + configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); + QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); + month_action->addTo( viewMenu ); + connect( month_action, SIGNAL( activated() ), + mView->viewManager(), SLOT( showMonthView() ) ); + icon = loadPixmap( pathString + "todo" ); @@ -1003,6 +1005,6 @@ void MainWindow::initActions() day7_action->addTo( iconToolBar ); - if (p-> mShowIconMonth) - month_action->addTo( iconToolBar ); if (p-> mShowIconDay6) day6_action->addTo( iconToolBar ); + if (p-> mShowIconMonth) + month_action->addTo( iconToolBar ); if (p-> mShowIconTodoview) @@ -1089,3 +1091,4 @@ void MainWindow::initActions() configureToolBarMenu->setItemChecked( 300, true ); - + if (p-> mShowIconWeekNum) + configureToolBarMenu->setItemChecked( 400, true ); QLabel* dummy = new QLabel( iconToolBar ); @@ -1830,2 +1833,3 @@ void MainWindow::configureToolBar( int item ) p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); + p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 ); // initActions(); |