-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 | |||
@@ -562,24 +562,25 @@ void MainWindow::initActions() | |||
562 | pathString += "icons16/"; | 562 | pathString += "icons16/"; |
563 | pixWid = 18; pixHei = 16; | 563 | pixWid = 18; pixHei = 16; |
564 | } | 564 | } |
565 | } else { | 565 | } else { |
566 | pathString += "iconsmini/"; | 566 | pathString += "iconsmini/"; |
567 | pixWid = 18; pixHei = 16; | 567 | pixWid = 18; pixHei = 16; |
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" ); |
580 | while ( fontWid > pixWid ) { | 581 | while ( fontWid > pixWid ) { |
581 | --fontPoint; | 582 | --fontPoint; |
582 | mWeekFont.setPointSize( fontPoint ); | 583 | mWeekFont.setPointSize( fontPoint ); |
583 | QFontMetrics f( mWeekFont ); | 584 | QFontMetrics f( mWeekFont ); |
584 | fontWid = f.width( "30" ); | 585 | fontWid = f.width( "30" ); |
585 | qDebug("dec-- "); | 586 | qDebug("dec-- "); |
@@ -614,24 +615,25 @@ void MainWindow::initActions() | |||
614 | mView, SLOT( edit_options() ) ); | 615 | mView, SLOT( edit_options() ) ); |
615 | actionMenu->insertSeparator(); | 616 | actionMenu->insertSeparator(); |
616 | 617 | ||
617 | action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); | 618 | action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); |
618 | action->addTo( actionMenu ); | 619 | action->addTo( actionMenu ); |
619 | connect( action, SIGNAL( activated() ), | 620 | connect( action, SIGNAL( activated() ), |
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" ); |
632 | configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); | 634 | configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); |
633 | QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); | 635 | QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); |
634 | nt_action->addTo( actionMenu ); | 636 | nt_action->addTo( actionMenu ); |
635 | connect( nt_action, SIGNAL( activated() ), | 637 | connect( nt_action, SIGNAL( activated() ), |
636 | mView, SLOT( newTodo() ) ); | 638 | mView, SLOT( newTodo() ) ); |
637 | 639 | ||
@@ -698,38 +700,38 @@ void MainWindow::initActions() | |||
698 | QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this ); | 700 | QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this ); |
699 | day5_action->addTo( viewMenu ); | 701 | day5_action->addTo( viewMenu ); |
700 | connect( day5_action, SIGNAL( activated() ), | 702 | connect( day5_action, SIGNAL( activated() ), |
701 | mView->viewManager(), SLOT( showWorkWeekView() ) ); | 703 | mView->viewManager(), SLOT( showWorkWeekView() ) ); |
702 | 704 | ||
703 | icon = loadPixmap( pathString + "week" ); | 705 | icon = loadPixmap( pathString + "week" ); |
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() ) ); |
730 | 732 | ||
731 | icon = loadPixmap( pathString + "journal" ); | 733 | icon = loadPixmap( pathString + "journal" ); |
732 | configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); | 734 | configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); |
733 | QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); | 735 | QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); |
734 | viewjournal_action->addTo( viewMenu ); | 736 | viewjournal_action->addTo( viewMenu ); |
735 | connect( viewjournal_action, SIGNAL( activated() ), | 737 | connect( viewjournal_action, SIGNAL( activated() ), |
@@ -992,28 +994,28 @@ void MainWindow::initActions() | |||
992 | if (p-> mShowIconNext) | 994 | if (p-> mShowIconNext) |
993 | whatsnext_action->addTo( iconToolBar ); | 995 | whatsnext_action->addTo( iconToolBar ); |
994 | if (p-> mShowIconNextDays) | 996 | if (p-> mShowIconNextDays) |
995 | xdays_action->addTo( iconToolBar ); | 997 | xdays_action->addTo( iconToolBar ); |
996 | if (p-> mShowIconList) | 998 | if (p-> mShowIconList) |
997 | showlist_action->addTo( iconToolBar ); | 999 | showlist_action->addTo( iconToolBar ); |
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); |
1014 | if (p-> mShowIconBackFast) { | 1016 | if (p-> mShowIconBackFast) { |
1015 | action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); | 1017 | action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); |
1016 | connect( action, SIGNAL( activated() ), | 1018 | connect( action, SIGNAL( activated() ), |
1017 | mView, SLOT( goPreviousMonth() ) ); | 1019 | mView, SLOT( goPreviousMonth() ) ); |
1018 | action->addTo( iconToolBar ); | 1020 | action->addTo( iconToolBar ); |
1019 | } | 1021 | } |
@@ -1078,25 +1080,26 @@ void MainWindow::initActions() | |||
1078 | if (p-> mShowIconForward) | 1080 | if (p-> mShowIconForward) |
1079 | configureToolBarMenu->setItemChecked( 220, true ); | 1081 | configureToolBarMenu->setItemChecked( 220, true ); |
1080 | if (p-> mShowIconForwardFast) | 1082 | if (p-> mShowIconForwardFast) |
1081 | configureToolBarMenu->setItemChecked( 230, true ); | 1083 | configureToolBarMenu->setItemChecked( 230, true ); |
1082 | if (p-> mShowIconNextDays) | 1084 | if (p-> mShowIconNextDays) |
1083 | configureToolBarMenu->setItemChecked( 100, true ); | 1085 | configureToolBarMenu->setItemChecked( 100, true ); |
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 ); |
1097 | if (p-> mShowIconWhatsThis) | 1100 | if (p-> mShowIconWhatsThis) |
1098 | QWhatsThis::whatsThisButton ( iconToolBar ); | 1101 | QWhatsThis::whatsThisButton ( iconToolBar ); |
1099 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); | 1102 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); |
1100 | configureAgenda( p->mHourSize ); | 1103 | configureAgenda( p->mHourSize ); |
1101 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); | 1104 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); |
1102 | } | 1105 | } |
@@ -1819,24 +1822,25 @@ void MainWindow::configureToolBar( int item ) | |||
1819 | p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 ); | 1822 | p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 ); |
1820 | p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); | 1823 | p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); |
1821 | p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); | 1824 | p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); |
1822 | p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); | 1825 | p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); |
1823 | p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); | 1826 | p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); |
1824 | p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); | 1827 | p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); |
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; |
1837 | selDates = KGlobal::locale()->formatDate(mView->startDate(), true); | 1841 | selDates = KGlobal::locale()->formatDate(mView->startDate(), true); |
1838 | if (mView->startDate() < mView->endDate() ) | 1842 | if (mView->startDate() < mView->endDate() ) |
1839 | selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); | 1843 | selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); |
1840 | else { | 1844 | else { |
1841 | QString addString; | 1845 | QString addString; |
1842 | if ( mView->startDate() == QDateTime::currentDateTime().date() ) | 1846 | if ( mView->startDate() == QDateTime::currentDateTime().date() ) |