-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 | |||
@@ -568,12 +568,13 @@ void MainWindow::initActions() | |||
568 | } | 568 | } |
569 | mWeekBgColor = iconToolBar->backgroundColor(); | 569 | mWeekBgColor = iconToolBar->backgroundColor(); |
570 | mWeekPixmap.resize( pixWid , pixHei ); | 570 | mWeekPixmap.resize( pixWid , pixHei ); |
571 | mWeekPixmap.fill( mWeekBgColor ); | 571 | mWeekPixmap.fill( mWeekBgColor ); |
572 | icon = mWeekPixmap; | 572 | icon = mWeekPixmap; |
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 ); |
575 | mWeekFont = font(); | 576 | mWeekFont = font(); |
576 | 577 | ||
577 | int fontPoint = mWeekFont.pointSize(); | 578 | int fontPoint = mWeekFont.pointSize(); |
578 | QFontMetrics f( mWeekFont ); | 579 | QFontMetrics f( mWeekFont ); |
579 | int fontWid = f.width( "30" ); | 580 | int fontWid = f.width( "30" ); |
@@ -620,12 +621,13 @@ void MainWindow::initActions() | |||
620 | mView, SLOT( undo_delete() ) ); | 621 | mView, SLOT( undo_delete() ) ); |
621 | actionMenu->insertSeparator(); | 622 | actionMenu->insertSeparator(); |
622 | 623 | ||
623 | icon = loadPixmap( pathString + "newevent" ); | 624 | icon = loadPixmap( pathString + "newevent" ); |
624 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); | 625 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); |
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 ); |
627 | QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); | 629 | QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); |
628 | ne_action->addTo( actionMenu ); | 630 | ne_action->addTo( actionMenu ); |
629 | connect( ne_action, SIGNAL( activated() ), | 631 | connect( ne_action, SIGNAL( activated() ), |
630 | mView, SLOT( newEvent() ) ); | 632 | mView, SLOT( newEvent() ) ); |
631 | icon = loadPixmap( pathString + "newtodo" ); | 633 | icon = loadPixmap( pathString + "newtodo" ); |
@@ -704,26 +706,26 @@ void MainWindow::initActions() | |||
704 | configureToolBarMenu->insertItem(icon, i18n("Week"), 60 ); | 706 | configureToolBarMenu->insertItem(icon, i18n("Week"), 60 ); |
705 | QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this ); | 707 | QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this ); |
706 | day7_action->addTo( viewMenu ); | 708 | day7_action->addTo( viewMenu ); |
707 | connect( day7_action, SIGNAL( activated() ), | 709 | connect( day7_action, SIGNAL( activated() ), |
708 | mView->viewManager(), SLOT( showWeekView() ) ); | 710 | mView->viewManager(), SLOT( showWeekView() ) ); |
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" ); |
718 | configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 ); | 713 | configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 ); |
719 | QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this ); | 714 | QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this ); |
720 | day6_action->addTo( viewMenu ); | 715 | day6_action->addTo( viewMenu ); |
721 | connect( day6_action, SIGNAL( activated() ), | 716 | connect( day6_action, SIGNAL( activated() ), |
722 | mView->viewManager(), SLOT( showMonthViewWeek() ) ); | 717 | mView->viewManager(), SLOT( showMonthViewWeek() ) ); |
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" ); |
725 | configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); | 727 | configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); |
726 | QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); | 728 | QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); |
727 | todoview_action->addTo( viewMenu ); | 729 | todoview_action->addTo( viewMenu ); |
728 | connect( todoview_action, SIGNAL( activated() ), | 730 | connect( todoview_action, SIGNAL( activated() ), |
729 | mView->viewManager(), SLOT( showTodoView() ) ); | 731 | mView->viewManager(), SLOT( showTodoView() ) ); |
@@ -998,16 +1000,16 @@ void MainWindow::initActions() | |||
998 | if (p-> mShowIconDay1) | 1000 | if (p-> mShowIconDay1) |
999 | day1_action->addTo( iconToolBar ); | 1001 | day1_action->addTo( iconToolBar ); |
1000 | if (p-> mShowIconDay5) | 1002 | if (p-> mShowIconDay5) |
1001 | day5_action->addTo( iconToolBar ); | 1003 | day5_action->addTo( iconToolBar ); |
1002 | if (p-> mShowIconDay7) | 1004 | if (p-> mShowIconDay7) |
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) |
1009 | todoview_action->addTo( iconToolBar ); | 1011 | todoview_action->addTo( iconToolBar ); |
1010 | if (p-> mShowIconJournal) | 1012 | if (p-> mShowIconJournal) |
1011 | viewjournal_action->addTo( iconToolBar ); | 1013 | viewjournal_action->addTo( iconToolBar ); |
1012 | icon = loadPixmap( pathString + "2leftarrowB" ); | 1014 | icon = loadPixmap( pathString + "2leftarrowB" ); |
1013 | configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14); | 1015 | configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14); |
@@ -1084,13 +1086,14 @@ void MainWindow::initActions() | |||
1084 | if (p-> mShowIconNext) | 1086 | if (p-> mShowIconNext) |
1085 | configureToolBarMenu->setItemChecked( 110, true ); | 1087 | configureToolBarMenu->setItemChecked( 110, true ); |
1086 | if (p-> mShowIconJournal) | 1088 | if (p-> mShowIconJournal) |
1087 | configureToolBarMenu->setItemChecked( 90, true ); | 1089 | configureToolBarMenu->setItemChecked( 90, true ); |
1088 | if (p-> mShowIconWhatsThis) | 1090 | if (p-> mShowIconWhatsThis) |
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 ); |
1092 | dummy->setBackgroundColor( iconToolBar->backgroundColor() ); | 1095 | dummy->setBackgroundColor( iconToolBar->backgroundColor() ); |
1093 | if (!p-> mShowIconStretch) | 1096 | if (!p-> mShowIconStretch) |
1094 | iconToolBar->setStretchableWidget ( dummy ) ; | 1097 | iconToolBar->setStretchableWidget ( dummy ) ; |
1095 | else | 1098 | else |
1096 | configureToolBarMenu->setItemChecked( 5, true ); | 1099 | configureToolBarMenu->setItemChecked( 5, true ); |
@@ -1825,12 +1828,13 @@ void MainWindow::configureToolBar( int item ) | |||
1825 | p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); | 1828 | p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); |
1826 | p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); | 1829 | p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); |
1827 | p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); | 1830 | p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); |
1828 | p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); | 1831 | p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); |
1829 | p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); | 1832 | p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); |
1830 | p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); | 1833 | p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); |
1834 | p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 ); | ||
1831 | // initActions(); | 1835 | // initActions(); |
1832 | } | 1836 | } |
1833 | 1837 | ||
1834 | void MainWindow::setCaptionToDates() | 1838 | void MainWindow::setCaptionToDates() |
1835 | { | 1839 | { |
1836 | QString selDates; | 1840 | QString selDates; |