summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/allday.pngbin279 -> 657 bytes
-rw-r--r--bin/kdepim/korganizer/navi.pngbin518 -> 667 bytes
-rw-r--r--korganizer/koprefs.cpp10
-rw-r--r--korganizer/koprefs.h4
-rw-r--r--korganizer/mainwindow.cpp30
5 files changed, 44 insertions, 0 deletions
diff --git a/bin/kdepim/korganizer/allday.png b/bin/kdepim/korganizer/allday.png
index 735eae2..41cefd5 100644
--- a/bin/kdepim/korganizer/allday.png
+++ b/bin/kdepim/korganizer/allday.png
Binary files differ
diff --git a/bin/kdepim/korganizer/navi.png b/bin/kdepim/korganizer/navi.png
index 9cb0fab..93c6aaa 100644
--- a/bin/kdepim/korganizer/navi.png
+++ b/bin/kdepim/korganizer/navi.png
Binary files differ
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 1e68a44..97ab4e8 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -83,24 +83,34 @@ KOPrefs::KOPrefs() :
83 addItemBool("ShowIconBack",&mShowIconBack,true); 83 addItemBool("ShowIconBack",&mShowIconBack,true);
84 addItemBool("ShowIconToday",&mShowIconToday,true); 84 addItemBool("ShowIconToday",&mShowIconToday,true);
85 addItemBool("ShowIconForward",&mShowIconForward,true); 85 addItemBool("ShowIconForward",&mShowIconForward,true);
86 addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true); 86 addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true);
87 addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true); 87 addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true);
88 addItemBool("ShowIconWeekNum",&mShowIconWeekNum,true); 88 addItemBool("ShowIconWeekNum",&mShowIconWeekNum,true);
89 addItemBool("ShowIconNextDays",&mShowIconNextDays,true); 89 addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
90 addItemBool("ShowIconNext",&mShowIconNext,true); 90 addItemBool("ShowIconNext",&mShowIconNext,true);
91 addItemBool("ShowIconJournal",&mShowIconJournal,true); 91 addItemBool("ShowIconJournal",&mShowIconJournal,true);
92 addItemBool("ShowIconStretch",&mShowIconStretch,true); 92 addItemBool("ShowIconStretch",&mShowIconStretch,true);
93 addItemBool("ShowIconFilter",&mShowIconFilter,false); 93 addItemBool("ShowIconFilter",&mShowIconFilter,false);
94 addItemBool("ShowIconOnetoolbar",&mShowIconOnetoolbar,true); 94 addItemBool("ShowIconOnetoolbar",&mShowIconOnetoolbar,true);
95
96 bool addIcons = false;
97#ifdef DESKTOP_VERSION
98 addIcons = true;
99#endif
100 addItemBool("ShowIconNavigator",&mShowIconNavigator,addIcons);
101 addItemBool("ShowIconAllday",&mShowIconAllday,addIcons);
102 addItemBool("ShowIconFilterview",&mShowIconFilterview,addIcons);
103 addItemBool("ShowIconToggleFull",&mShowIconToggleFull,addIcons);
104
95 addItemInt("LastLoadedLanguage",&mOldLanguage,0); 105 addItemInt("LastLoadedLanguage",&mOldLanguage,0);
96 106
97 addItemBool("AskForQuit",&mAskForQuit,false); 107 addItemBool("AskForQuit",&mAskForQuit,false);
98 108
99#ifndef DESKTOP_VERSION 109#ifndef DESKTOP_VERSION
100 addItemBool("ShowFullMenu",&mShowFullMenu,false); 110 addItemBool("ShowFullMenu",&mShowFullMenu,false);
101#else 111#else
102 addItemBool("ShowFullMenu",&mShowFullMenu,true); 112 addItemBool("ShowFullMenu",&mShowFullMenu,true);
103#endif 113#endif
104 addItemBool("ToolBarHor",&mToolBarHor, true ); 114 addItemBool("ToolBarHor",&mToolBarHor, true );
105 addItemBool("ToolBarUp",&mToolBarUp, false ); 115 addItemBool("ToolBarUp",&mToolBarUp, false );
106 addItemBool("ToolBarHorV",&mToolBarHorV, true ); 116 addItemBool("ToolBarHorV",&mToolBarHorV, true );
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index fbce6ea..3a07348 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -178,24 +178,28 @@ class KOPrefs : public KPimPrefs
178 bool mShowIconBackFast; 178 bool mShowIconBackFast;
179 bool mShowIconBack; 179 bool mShowIconBack;
180 bool mShowIconToday; 180 bool mShowIconToday;
181 bool mShowIconForward; 181 bool mShowIconForward;
182 bool mShowIconForwardFast; 182 bool mShowIconForwardFast;
183 bool mShowIconWhatsThis; 183 bool mShowIconWhatsThis;
184 bool mShowIconWeekNum; 184 bool mShowIconWeekNum;
185 bool mShowIconNextDays; 185 bool mShowIconNextDays;
186 bool mShowIconNext; 186 bool mShowIconNext;
187 bool mShowIconJournal; 187 bool mShowIconJournal;
188 bool mShowIconFilter; 188 bool mShowIconFilter;
189 bool mShowIconOnetoolbar; 189 bool mShowIconOnetoolbar;
190 bool mShowIconNavigator;
191 bool mShowIconAllday;
192 bool mShowIconFilterview;
193 bool mShowIconToggleFull;
190 194
191 bool mShowIconStretch; 195 bool mShowIconStretch;
192 196
193 bool mToolBarHor; 197 bool mToolBarHor;
194 bool mToolBarUp; 198 bool mToolBarUp;
195 bool mToolBarHorV; 199 bool mToolBarHorV;
196 bool mToolBarUpV; 200 bool mToolBarUpV;
197 bool mToolBarHorN; 201 bool mToolBarHorN;
198 bool mToolBarUpN; 202 bool mToolBarUpN;
199 bool mToolBarHorF; 203 bool mToolBarHorF;
200 bool mToolBarUpF; 204 bool mToolBarUpF;
201 bool mToolBarMiniIcons; 205 bool mToolBarMiniIcons;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8e52968..8a4c7eb 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -716,60 +716,80 @@ void MainWindow::initActions()
716 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); 716 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
717 nt_action->addTo( actionMenu ); 717 nt_action->addTo( actionMenu );
718 connect( nt_action, SIGNAL( activated() ), 718 connect( nt_action, SIGNAL( activated() ),
719 mView, SLOT( newTodo() ) ); 719 mView, SLOT( newTodo() ) );
720 720
721 icon = loadPixmap( pathString + "today" ); 721 icon = loadPixmap( pathString + "today" );
722 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); 722 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
723 today_action->addTo( viewMenu ); 723 today_action->addTo( viewMenu );
724 connect( today_action, SIGNAL( activated() ), 724 connect( today_action, SIGNAL( activated() ),
725 mView, SLOT( goToday() ) ); 725 mView, SLOT( goToday() ) );
726 viewMenu->insertSeparator(); 726 viewMenu->insertSeparator();
727 727
728 // ***********************
729 if ( KOPrefs::instance()->mVerticalScreen ) {
730 icon = SmallIcon( "1updownarrow" );
731 } else {
732 icon = SmallIcon("1leftrightarrow" );
733 }
734 configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 );
735 QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
736 FSaction->addTo( viewMenu );
737 connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() ));
738
728 icon = loadPixmap( pathString + "navi" ); 739 icon = loadPixmap( pathString + "navi" );
740 configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
729 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); 741 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
730 action->addTo( viewMenu ); 742 action->addTo( viewMenu );
731 connect( action, SIGNAL( activated() ), 743 connect( action, SIGNAL( activated() ),
732 mView, SLOT( toggleDateNavigatorWidget() ) ); 744 mView, SLOT( toggleDateNavigatorWidget() ) );
733 mToggleNav = action ; 745 mToggleNav = action ;
734 icon = loadPixmap( pathString + "filter" ); 746 icon = loadPixmap( pathString + "filter" );
747 configureToolBarMenu->insertItem(icon, i18n("Toggle FilterView"), 26 );
735 action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); 748 action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this );
736 action->addTo( viewMenu ); 749 action->addTo( viewMenu );
737 connect( action, SIGNAL( activated() ), 750 connect( action, SIGNAL( activated() ),
738 mView, SLOT( toggleFilter() ) ); 751 mView, SLOT( toggleFilter() ) );
739 mToggleFilter = action; 752 mToggleFilter = action;
740 icon = loadPixmap( pathString + "allday" ); 753 icon = loadPixmap( pathString + "allday" );
754 configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 );
741 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); 755 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
742 action->addTo( viewMenu ); 756 action->addTo( viewMenu );
743 connect( action, SIGNAL( activated() ), 757 connect( action, SIGNAL( activated() ),
744 mView, SLOT( toggleAllDaySize() ) ); 758 mView, SLOT( toggleAllDaySize() ) );
745 mToggleAllday = action; 759 mToggleAllday = action;
746 760
747 761
748 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 762 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
749 mToggleNav, SLOT( setEnabled ( bool ) ) ); 763 mToggleNav, SLOT( setEnabled ( bool ) ) );
750 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 764 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
751 mToggleFilter, SLOT( setEnabled ( bool ) ) ); 765 mToggleFilter, SLOT( setEnabled ( bool ) ) );
752 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), 766 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
753 mToggleAllday, SLOT( setEnabled ( bool ) ) ); 767 mToggleAllday, SLOT( setEnabled ( bool ) ) );
754 768
755 viewMenu->insertSeparator(); 769 viewMenu->insertSeparator();
756 icon = loadPixmap( pathString + "picker" ); 770 icon = loadPixmap( pathString + "picker" );
757 action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this ); 771 action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this );
758 action->addTo( viewMenu ); 772 action->addTo( viewMenu );
759 connect( action, SIGNAL( activated() ), 773 connect( action, SIGNAL( activated() ),
760 mView, SLOT( showDatePicker() ) ); 774 mView, SLOT( showDatePicker() ) );
761 action->addTo( iconToolBar ); 775 action->addTo( iconToolBar );
762 viewMenu->insertSeparator(); 776 viewMenu->insertSeparator();
763 777
778 if ( p-> mShowIconToggleFull )
779 FSaction->addTo( iconToolBar );
780 if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar );
781 if ( p->mShowIconFilterview ) mToggleFilter->addTo( iconToolBar );
782 if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar );
783
764 784
765 icon = loadPixmap( pathString + "whatsnext" ); 785 icon = loadPixmap( pathString + "whatsnext" );
766 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); 786 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
767 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); 787 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
768 whatsnext_action->addTo( viewMenu ); 788 whatsnext_action->addTo( viewMenu );
769 connect( whatsnext_action, SIGNAL( activated() ), 789 connect( whatsnext_action, SIGNAL( activated() ),
770 mView->viewManager(), SLOT( showWhatsNextView() ) ); 790 mView->viewManager(), SLOT( showWhatsNextView() ) );
771 791
772 icon = loadPixmap( pathString + "xdays" ); 792 icon = loadPixmap( pathString + "xdays" );
773 configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); 793 configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 );
774 QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); 794 QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
775 xdays_action->addTo( viewMenu ); 795 xdays_action->addTo( viewMenu );
@@ -1143,24 +1163,30 @@ void MainWindow::initActions()
1143 icon = loadPixmap( pathString + "2rightarrowB" ); 1163 icon = loadPixmap( pathString + "2rightarrowB" );
1144 configureToolBarMenu->insertItem(icon, i18n("Next month"), 230); 1164 configureToolBarMenu->insertItem(icon, i18n("Next month"), 230);
1145 if (p-> mShowIconForwardFast) { 1165 if (p-> mShowIconForwardFast) {
1146 action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this ); 1166 action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this );
1147 connect( action, SIGNAL( activated() ), 1167 connect( action, SIGNAL( activated() ),
1148 mView, SLOT( goNextMonth() ) ); 1168 mView, SLOT( goNextMonth() ) );
1149 action->addTo( navigatorToolBar ); 1169 action->addTo( navigatorToolBar );
1150 } 1170 }
1151 1171
1152 1172
1153 configureToolBarMenu->insertItem(i18n("What's This?"), 300, 6); 1173 configureToolBarMenu->insertItem(i18n("What's This?"), 300, 6);
1154 1174
1175
1176 if ( p->mShowIconNavigator ) configureToolBarMenu->setItemChecked( 22 , true);
1177 if ( p->mShowIconAllday ) configureToolBarMenu->setItemChecked( 24 , true);
1178 if ( p->mShowIconFilterview ) configureToolBarMenu->setItemChecked( 26 , true);
1179 if ( p->mShowIconToggleFull ) configureToolBarMenu->setItemChecked( 28 , true);
1180
1155 if (p-> mShowIconNewEvent) 1181 if (p-> mShowIconNewEvent)
1156 configureToolBarMenu->setItemChecked( 10, true ); 1182 configureToolBarMenu->setItemChecked( 10, true );
1157 if (p->mShowIconNewTodo ) 1183 if (p->mShowIconNewTodo )
1158 configureToolBarMenu->setItemChecked( 20, true ); 1184 configureToolBarMenu->setItemChecked( 20, true );
1159 if (p-> mShowIconSearch) 1185 if (p-> mShowIconSearch)
1160 configureToolBarMenu->setItemChecked( 120, true ); 1186 configureToolBarMenu->setItemChecked( 120, true );
1161 if (p-> mShowIconList) 1187 if (p-> mShowIconList)
1162 configureToolBarMenu->setItemChecked( 30, true ); 1188 configureToolBarMenu->setItemChecked( 30, true );
1163 if (p-> mShowIconDay1) 1189 if (p-> mShowIconDay1)
1164 configureToolBarMenu->setItemChecked( 40, true ); 1190 configureToolBarMenu->setItemChecked( 40, true );
1165 if (p-> mShowIconDay5) 1191 if (p-> mShowIconDay5)
1166 configureToolBarMenu->setItemChecked( 50, true ); 1192 configureToolBarMenu->setItemChecked( 50, true );
@@ -2009,24 +2035,28 @@ void MainWindow::selectFilterPopup( int fil )
2009 2035
2010} 2036}
2011void MainWindow::configureToolBar( int item ) 2037void MainWindow::configureToolBar( int item )
2012{ 2038{
2013 2039
2014 configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) ); 2040 configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) );
2015 KOPrefs *p = KOPrefs::instance(); 2041 KOPrefs *p = KOPrefs::instance();
2016 p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); 2042 p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 );
2017 p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 ); 2043 p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 );
2018 p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 ); 2044 p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 );
2019 p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); 2045 p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 );
2020 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); 2046 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 );
2047 p->mShowIconNavigator = configureToolBarMenu->isItemChecked( 22 );
2048 p->mShowIconAllday = configureToolBarMenu->isItemChecked( 24 );
2049 p->mShowIconFilterview = configureToolBarMenu->isItemChecked( 26 );
2050 p->mShowIconToggleFull = configureToolBarMenu->isItemChecked( 28 );
2021 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); 2051 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 );
2022 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 ); 2052 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 );
2023 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 ); 2053 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 );
2024 p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 ); 2054 p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 );
2025 p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 ); 2055 p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 );
2026 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 ); 2056 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 );
2027 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); 2057 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 );
2028 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); 2058 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 );
2029 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); 2059 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 );
2030 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); 2060 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 );
2031 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); 2061 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 );
2032 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); 2062 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 );