summaryrefslogtreecommitdiffabout
path: root/korganizer/mainwindow.cpp
Unidiff
Diffstat (limited to 'korganizer/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp26
1 files changed, 15 insertions, 11 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a164fa4..4f2cccf 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -573,3 +573,4 @@ 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 mWeekAction->addTo( iconToolBar ); 574 if ( p-> mShowIconWeekNum )
575 mWeekAction->addTo( iconToolBar );
575 mWeekFont = font(); 576 mWeekFont = font();
@@ -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 );
@@ -708,2 +710,9 @@ void MainWindow::initActions()
708 mView->viewManager(), SLOT( showWeekView() ) ); 710 mView->viewManager(), SLOT( showWeekView() ) );
711
712 icon = loadPixmap( pathString + "workweek2" );
713 configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
714 QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
715 day6_action->addTo( viewMenu );
716 connect( day6_action, SIGNAL( activated() ),
717 mView->viewManager(), SLOT( showMonthViewWeek() ) );
709 718
@@ -716,9 +725,2 @@ void MainWindow::initActions()
716 725
717 icon = loadPixmap( pathString + "workweek2" );
718 configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
719 QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
720 day6_action->addTo( viewMenu );
721 connect( day6_action, SIGNAL( activated() ),
722 mView->viewManager(), SLOT( showMonthViewWeek() ) );
723
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();