-rw-r--r-- | korganizer/koprefs.cpp | 7 | ||||
-rw-r--r-- | korganizer/koprefs.h | 7 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 200 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 9 |
4 files changed, 192 insertions, 31 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 7e3deff..2168094 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -87,23 +87,30 @@ KOPrefs::KOPrefs() : | |||
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 | addItemInt("LastLoadedLanguage",&mOldLanguage,0); | 94 | addItemInt("LastLoadedLanguage",&mOldLanguage,0); |
94 | 95 | ||
95 | addItemBool("AskForQuit",&mAskForQuit,false); | 96 | addItemBool("AskForQuit",&mAskForQuit,false); |
96 | 97 | ||
97 | #ifndef DESKTOP_VERSION | 98 | #ifndef DESKTOP_VERSION |
98 | addItemBool("ShowFullMenu",&mShowFullMenu,false); | 99 | addItemBool("ShowFullMenu",&mShowFullMenu,false); |
99 | #else | 100 | #else |
100 | addItemBool("ShowFullMenu",&mShowFullMenu,true); | 101 | addItemBool("ShowFullMenu",&mShowFullMenu,true); |
101 | #endif | 102 | #endif |
102 | addItemBool("ToolBarHor",&mToolBarHor, true ); | 103 | addItemBool("ToolBarHor",&mToolBarHor, true ); |
103 | addItemBool("ToolBarUp",&mToolBarUp, false ); | 104 | addItemBool("ToolBarUp",&mToolBarUp, false ); |
105 | addItemBool("ToolBarHorV",&mToolBarHorV, true ); | ||
106 | addItemBool("ToolBarUpV",&mToolBarUpV, false ); | ||
107 | addItemBool("ToolBarHorN",&mToolBarHorN, true ); | ||
108 | addItemBool("ToolBarUpN",&mToolBarUpN, false ); | ||
109 | addItemBool("ToolBarHorF",&mToolBarHorF, true ); | ||
110 | addItemBool("ToolBarUpF",&mToolBarUpF, false ); | ||
104 | addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false ); | 111 | addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false ); |
105 | addItemInt("Whats Next Days",&mWhatsNextDays,3); | 112 | addItemInt("Whats Next Days",&mWhatsNextDays,3); |
106 | addItemInt("Whats Next Prios",&mWhatsNextPrios,1); | 113 | addItemInt("Whats Next Prios",&mWhatsNextPrios,1); |
107 | 114 | ||
108 | addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true); | 115 | addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true); |
109 | addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true); | 116 | addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true); |
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 09a0dce..8dfdf69 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -182,17 +182,24 @@ class KOPrefs : public KPimPrefs | |||
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 | 189 | ||
189 | bool mShowIconStretch; | 190 | bool mShowIconStretch; |
190 | 191 | ||
191 | bool mToolBarHor; | 192 | bool mToolBarHor; |
192 | bool mToolBarUp; | 193 | bool mToolBarUp; |
194 | bool mToolBarHorV; | ||
195 | bool mToolBarUpV; | ||
196 | bool mToolBarHorN; | ||
197 | bool mToolBarUpN; | ||
198 | bool mToolBarHorF; | ||
199 | bool mToolBarUpF; | ||
193 | bool mToolBarMiniIcons; | 200 | bool mToolBarMiniIcons; |
194 | 201 | ||
195 | bool mAskForQuit; | 202 | bool mAskForQuit; |
196 | bool mUsePassWd; | 203 | bool mUsePassWd; |
197 | bool mShowSyncEvents; | 204 | bool mShowSyncEvents; |
198 | bool mShowTodoInAgenda; | 205 | bool mShowTodoInAgenda; |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index ca0d542..c6ae868 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -54,12 +54,13 @@ | |||
54 | #include "kofilterview.h" | 54 | #include "kofilterview.h" |
55 | #include "kstandarddirs.h" | 55 | #include "kstandarddirs.h" |
56 | #include "koprefs.h" | 56 | #include "koprefs.h" |
57 | #include "kfiledialog.h" | 57 | #include "kfiledialog.h" |
58 | #include "koglobals.h" | 58 | #include "koglobals.h" |
59 | #include "kglobal.h" | 59 | #include "kglobal.h" |
60 | #include "ktoolbar.h" | ||
60 | #include "klocale.h" | 61 | #include "klocale.h" |
61 | #include "kconfig.h" | 62 | #include "kconfig.h" |
62 | #include "simplealarmclient.h" | 63 | #include "simplealarmclient.h" |
63 | #include "externalapphandler.h" | 64 | #include "externalapphandler.h" |
64 | 65 | ||
65 | using namespace KCal; | 66 | using namespace KCal; |
@@ -161,12 +162,74 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
161 | } | 162 | } |
162 | if ( KOPrefs::instance()->mUseAppColors ) | 163 | if ( KOPrefs::instance()->mUseAppColors ) |
163 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); | 164 | QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); |
164 | globalFlagBlockStartup = 1; | 165 | globalFlagBlockStartup = 1; |
165 | iconToolBar = new QPEToolBar( this ); | 166 | iconToolBar = new QPEToolBar( this ); |
166 | addToolBar (iconToolBar , tbd ); | 167 | addToolBar (iconToolBar , tbd ); |
168 | |||
169 | if ( KOPrefs::instance()->mShowIconFilter ) { | ||
170 | if ( p->mToolBarHorF ) { | ||
171 | if ( p->mToolBarUpF ) | ||
172 | tbd = Bottom; | ||
173 | else | ||
174 | tbd = Top; | ||
175 | } | ||
176 | else { | ||
177 | if ( p->mToolBarUpF ) | ||
178 | tbd = Right; | ||
179 | else | ||
180 | tbd = Left; | ||
181 | } | ||
182 | filterToolBar = new QPEToolBar ( this ); | ||
183 | filterMenubar = new QPEMenuBar( filterToolBar ); | ||
184 | QFontMetrics fm ( filterMenubar->font() ); | ||
185 | |||
186 | filterPopupMenu = new QPopupMenu( this ); | ||
187 | filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); | ||
188 | filterMenubar->setFixedWidth( fm.width( i18n("No Filter")+"Ax" ) ); | ||
189 | addToolBar (filterToolBar , tbd ); | ||
190 | connect ( filterPopupMenu , SIGNAL( activated ( int ) ), this, SLOT (selectFilterPopup( int ) ) ); | ||
191 | connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) ); | ||
192 | } else { | ||
193 | filterToolBar = 0; | ||
194 | filterMenubar = 0; | ||
195 | filterPopupMenu = 0; | ||
196 | } | ||
197 | |||
198 | if ( p->mToolBarHorV ) { | ||
199 | if ( p->mToolBarUpV ) | ||
200 | tbd = Bottom; | ||
201 | else | ||
202 | tbd = Top; | ||
203 | } | ||
204 | else { | ||
205 | if ( p->mToolBarUpV ) | ||
206 | tbd = Right; | ||
207 | else | ||
208 | tbd = Left; | ||
209 | } | ||
210 | viewToolBar = new QPEToolBar( this ); | ||
211 | addToolBar (viewToolBar , tbd ); | ||
212 | if ( p->mToolBarHorN ) { | ||
213 | if ( p->mToolBarUpN ) | ||
214 | tbd = Bottom; | ||
215 | else | ||
216 | tbd = Top; | ||
217 | } | ||
218 | else { | ||
219 | if ( p->mToolBarUpN ) | ||
220 | tbd = Right; | ||
221 | else | ||
222 | tbd = Left; | ||
223 | } | ||
224 | navigatorToolBar = new QPEToolBar( this ); | ||
225 | addToolBar (navigatorToolBar , tbd ); | ||
226 | |||
227 | |||
228 | |||
229 | |||
167 | mCalendarModifiedFlag = false; | 230 | mCalendarModifiedFlag = false; |
168 | QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); | 231 | QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); |
169 | splash->setAlignment ( AlignCenter ); | 232 | splash->setAlignment ( AlignCenter ); |
170 | setCentralWidget( splash ); | 233 | setCentralWidget( splash ); |
171 | #ifndef DESKTOP_VERSION | 234 | #ifndef DESKTOP_VERSION |
172 | showMaximized(); | 235 | showMaximized(); |
@@ -628,12 +691,14 @@ void MainWindow::initActions() | |||
628 | mView, SLOT( undo_delete() ) ); | 691 | mView, SLOT( undo_delete() ) ); |
629 | actionMenu->insertSeparator(); | 692 | actionMenu->insertSeparator(); |
630 | 693 | ||
631 | icon = loadPixmap( pathString + "newevent" ); | 694 | icon = loadPixmap( pathString + "newevent" ); |
632 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); | 695 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); |
633 | configureToolBarMenu->insertSeparator(); | 696 | configureToolBarMenu->insertSeparator(); |
697 | configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); | ||
698 | configureToolBarMenu->insertSeparator(); | ||
634 | configureToolBarMenu->insertItem(i18n("Week Number"), 400); | 699 | configureToolBarMenu->insertItem(i18n("Week Number"), 400); |
635 | configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); | 700 | configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); |
636 | QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); | 701 | QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); |
637 | ne_action->addTo( actionMenu ); | 702 | ne_action->addTo( actionMenu ); |
638 | connect( ne_action, SIGNAL( activated() ), | 703 | connect( ne_action, SIGNAL( activated() ), |
639 | mView, SLOT( newEvent() ) ); | 704 | mView, SLOT( newEvent() ) ); |
@@ -996,79 +1061,79 @@ void MainWindow::initActions() | |||
996 | //menuBar->insertSeparator(); | 1061 | //menuBar->insertSeparator(); |
997 | 1062 | ||
998 | // ****************************************************** | 1063 | // ****************************************************** |
999 | // menubar icons | 1064 | // menubar icons |
1000 | 1065 | ||
1001 | 1066 | ||
1002 | iconToolBar->setHorizontalStretchable (true ); | 1067 | |
1003 | //menuBar->insertItem( iconToolBar ); | 1068 | //menuBar->insertItem( iconToolBar ); |
1004 | //xdays_action | 1069 | //xdays_action |
1005 | if (p-> mShowIconNewEvent) | 1070 | if (p-> mShowIconNewEvent) |
1006 | ne_action->addTo( iconToolBar ); | 1071 | ne_action->addTo( iconToolBar ); |
1007 | if (p->mShowIconNewTodo ) | 1072 | if (p->mShowIconNewTodo ) |
1008 | nt_action->addTo( iconToolBar ); | 1073 | nt_action->addTo( iconToolBar ); |
1009 | if (p-> mShowIconSearch) | 1074 | if (p-> mShowIconSearch) |
1010 | search_action->addTo( iconToolBar ); | 1075 | search_action->addTo( iconToolBar ); |
1011 | if (p-> mShowIconWhatsThis) | 1076 | if (p-> mShowIconWhatsThis) |
1012 | QWhatsThis::whatsThisButton ( iconToolBar ); | 1077 | QWhatsThis::whatsThisButton ( iconToolBar ); |
1013 | if (p-> mShowIconNext) | 1078 | if (p-> mShowIconNext) |
1014 | whatsnext_action->addTo( iconToolBar ); | 1079 | whatsnext_action->addTo( viewToolBar ); |
1015 | if (p-> mShowIconNextDays) | 1080 | if (p-> mShowIconNextDays) |
1016 | xdays_action->addTo( iconToolBar ); | 1081 | xdays_action->addTo( viewToolBar ); |
1017 | if (p-> mShowIconJournal) | 1082 | if (p-> mShowIconJournal) |
1018 | viewjournal_action->addTo( iconToolBar ); | 1083 | viewjournal_action->addTo( viewToolBar ); |
1019 | if (p-> mShowIconDay1) | 1084 | if (p-> mShowIconDay1) |
1020 | day1_action->addTo( iconToolBar ); | 1085 | day1_action->addTo( viewToolBar ); |
1021 | if (p-> mShowIconDay5) | 1086 | if (p-> mShowIconDay5) |
1022 | day5_action->addTo( iconToolBar ); | 1087 | day5_action->addTo( viewToolBar ); |
1023 | if (p-> mShowIconDay7) | 1088 | if (p-> mShowIconDay7) |
1024 | day7_action->addTo( iconToolBar ); | 1089 | day7_action->addTo( viewToolBar ); |
1025 | if (p-> mShowIconDay6) | 1090 | if (p-> mShowIconDay6) |
1026 | day6_action->addTo( iconToolBar ); | 1091 | day6_action->addTo( viewToolBar ); |
1027 | if (p-> mShowIconMonth) | 1092 | if (p-> mShowIconMonth) |
1028 | month_action->addTo( iconToolBar ); | 1093 | month_action->addTo( viewToolBar ); |
1029 | if (p-> mShowIconList) | 1094 | if (p-> mShowIconList) |
1030 | showlist_action->addTo( iconToolBar ); | 1095 | showlist_action->addTo( viewToolBar ); |
1031 | if (p-> mShowIconTodoview) | 1096 | if (p-> mShowIconTodoview) |
1032 | todoview_action->addTo( iconToolBar ); | 1097 | todoview_action->addTo( viewToolBar ); |
1033 | 1098 | ||
1034 | icon = loadPixmap( pathString + "2leftarrowB" ); | 1099 | icon = loadPixmap( pathString + "2leftarrowB" ); |
1035 | configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200); | 1100 | configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200); |
1036 | if (p-> mShowIconBackFast) { | 1101 | if (p-> mShowIconBackFast) { |
1037 | action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); | 1102 | action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); |
1038 | connect( action, SIGNAL( activated() ), | 1103 | connect( action, SIGNAL( activated() ), |
1039 | mView, SLOT( goPreviousMonth() ) ); | 1104 | mView, SLOT( goPreviousMonth() ) ); |
1040 | action->addTo( iconToolBar ); | 1105 | action->addTo( navigatorToolBar ); |
1041 | } | 1106 | } |
1042 | icon = loadPixmap( pathString + "1leftarrowB" ); | 1107 | icon = loadPixmap( pathString + "1leftarrowB" ); |
1043 | configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210); | 1108 | configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210); |
1044 | if (p-> mShowIconBack) { | 1109 | if (p-> mShowIconBack) { |
1045 | action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); | 1110 | action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); |
1046 | connect( action, SIGNAL( activated() ), | 1111 | connect( action, SIGNAL( activated() ), |
1047 | mView, SLOT( goPrevious() ) ); | 1112 | mView, SLOT( goPrevious() ) ); |
1048 | action->addTo( iconToolBar ); | 1113 | action->addTo( navigatorToolBar ); |
1049 | } | 1114 | } |
1050 | icon = loadPixmap( pathString + "today" ); | 1115 | icon = loadPixmap( pathString + "today" ); |
1051 | configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); | 1116 | configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); |
1052 | if (p-> mShowIconToday) | 1117 | if (p-> mShowIconToday) |
1053 | today_action->addTo( iconToolBar ); | 1118 | today_action->addTo( navigatorToolBar ); |
1054 | icon = loadPixmap( pathString + "1rightarrowB" ); | 1119 | icon = loadPixmap( pathString + "1rightarrowB" ); |
1055 | configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220); | 1120 | configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220); |
1056 | if (p-> mShowIconForward) { | 1121 | if (p-> mShowIconForward) { |
1057 | action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this ); | 1122 | action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this ); |
1058 | connect( action, SIGNAL( activated() ), | 1123 | connect( action, SIGNAL( activated() ), |
1059 | mView, SLOT( goNext() ) ); | 1124 | mView, SLOT( goNext() ) ); |
1060 | action->addTo( iconToolBar ); | 1125 | action->addTo( navigatorToolBar ); |
1061 | } | 1126 | } |
1062 | icon = loadPixmap( pathString + "2rightarrowB" ); | 1127 | icon = loadPixmap( pathString + "2rightarrowB" ); |
1063 | configureToolBarMenu->insertItem(icon, i18n("Next month"), 230); | 1128 | configureToolBarMenu->insertItem(icon, i18n("Next month"), 230); |
1064 | if (p-> mShowIconForwardFast) { | 1129 | if (p-> mShowIconForwardFast) { |
1065 | action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this ); | 1130 | action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this ); |
1066 | connect( action, SIGNAL( activated() ), | 1131 | connect( action, SIGNAL( activated() ), |
1067 | mView, SLOT( goNextMonth() ) ); | 1132 | mView, SLOT( goNextMonth() ) ); |
1068 | action->addTo( iconToolBar ); | 1133 | action->addTo( navigatorToolBar ); |
1069 | } | 1134 | } |
1070 | 1135 | ||
1071 | 1136 | ||
1072 | configureToolBarMenu->insertItem(i18n("What's This?"), 300, 6); | 1137 | configureToolBarMenu->insertItem(i18n("What's This?"), 300, 6); |
1073 | 1138 | ||
1074 | if (p-> mShowIconNewEvent) | 1139 | if (p-> mShowIconNewEvent) |
@@ -1108,18 +1173,33 @@ void MainWindow::initActions() | |||
1108 | if (p-> mShowIconJournal) | 1173 | if (p-> mShowIconJournal) |
1109 | configureToolBarMenu->setItemChecked( 90, true ); | 1174 | configureToolBarMenu->setItemChecked( 90, true ); |
1110 | if (p-> mShowIconWhatsThis) | 1175 | if (p-> mShowIconWhatsThis) |
1111 | configureToolBarMenu->setItemChecked( 300, true ); | 1176 | configureToolBarMenu->setItemChecked( 300, true ); |
1112 | if (p-> mShowIconWeekNum) | 1177 | if (p-> mShowIconWeekNum) |
1113 | configureToolBarMenu->setItemChecked( 400, true ); | 1178 | configureToolBarMenu->setItemChecked( 400, true ); |
1179 | if (!p-> mShowIconStretch) { | ||
1114 | QLabel* dummy = new QLabel( iconToolBar ); | 1180 | QLabel* dummy = new QLabel( iconToolBar ); |
1115 | dummy->setBackgroundColor( iconToolBar->backgroundColor() ); | 1181 | dummy->setBackgroundColor( iconToolBar->backgroundColor() ); |
1116 | if (!p-> mShowIconStretch) | 1182 | dummy->setMinimumWidth( 0 ); |
1117 | iconToolBar->setStretchableWidget ( dummy ) ; | 1183 | iconToolBar->setStretchableWidget ( dummy ) ; |
1118 | else | 1184 | } |
1185 | else { | ||
1186 | iconToolBar->setHorizontalStretchable (true ); | ||
1187 | viewToolBar->setHorizontalStretchable (true ); | ||
1188 | navigatorToolBar->setHorizontalStretchable (true ); | ||
1189 | iconToolBar->setVerticalStretchable (true ); | ||
1190 | viewToolBar->setVerticalStretchable (true ); | ||
1191 | navigatorToolBar->setVerticalStretchable (true ); | ||
1119 | configureToolBarMenu->setItemChecked( 5, true ); | 1192 | configureToolBarMenu->setItemChecked( 5, true ); |
1193 | } | ||
1194 | if (p-> mShowIconFilter) | ||
1195 | configureToolBarMenu->setItemChecked( 7, true ); | ||
1196 | |||
1197 | |||
1198 | if ( filterMenubar ) | ||
1199 | connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) ); | ||
1120 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); | 1200 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); |
1121 | configureAgenda( p->mHourSize ); | 1201 | configureAgenda( p->mHourSize ); |
1122 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); | 1202 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); |
1123 | } | 1203 | } |
1124 | 1204 | ||
1125 | void MainWindow::exportToPhone( int mode ) | 1205 | void MainWindow::exportToPhone( int mode ) |
@@ -1558,14 +1638,33 @@ void MainWindow::importQtopia() | |||
1558 | } | 1638 | } |
1559 | 1639 | ||
1560 | void MainWindow::saveOnClose() | 1640 | void MainWindow::saveOnClose() |
1561 | { | 1641 | { |
1562 | KOPrefs *p = KOPrefs::instance(); | 1642 | KOPrefs *p = KOPrefs::instance(); |
1563 | p->mToolBarHor = ( iconToolBar->orientation () == Qt:: Horizontal ); | 1643 | p->mToolBarHor = ( iconToolBar->orientation () == Qt:: Horizontal ); |
1564 | p->mToolBarUp = iconToolBar->x() > width()/2 || | 1644 | if ( p->mToolBarHor ) |
1565 | iconToolBar->y() > height()/2; | 1645 | p->mToolBarUp = iconToolBar->y() > height()/2; |
1646 | else | ||
1647 | p->mToolBarUp = iconToolBar->x() > width()/2; | ||
1648 | p->mToolBarHorV = ( viewToolBar->orientation () == Qt:: Horizontal ); | ||
1649 | if ( p->mToolBarHorV ) | ||
1650 | p->mToolBarUpV = viewToolBar->y() > height()/2; | ||
1651 | else | ||
1652 | p->mToolBarUpV = viewToolBar->x() > width()/2 ; | ||
1653 | p->mToolBarHorN = ( navigatorToolBar->orientation () == Qt:: Horizontal ); | ||
1654 | if ( p->mToolBarHorN ) | ||
1655 | p->mToolBarUpN = navigatorToolBar->y() > height()/2; | ||
1656 | else | ||
1657 | p->mToolBarUpN = navigatorToolBar->x() > width()/2 ; | ||
1658 | if ( filterToolBar ) { | ||
1659 | p->mToolBarHorF = ( filterToolBar->orientation () == Qt:: Horizontal ); | ||
1660 | if ( p->mToolBarHorF ) | ||
1661 | p->mToolBarUpF = filterToolBar->y() > height()/2; | ||
1662 | else | ||
1663 | p->mToolBarUpF = filterToolBar->x() > width()/2 ; | ||
1664 | } | ||
1566 | mView->writeSettings(); | 1665 | mView->writeSettings(); |
1567 | if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName())) | 1666 | if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName())) |
1568 | save(); | 1667 | save(); |
1569 | } | 1668 | } |
1570 | void MainWindow::slotModifiedChanged( bool changed ) | 1669 | void MainWindow::slotModifiedChanged( bool changed ) |
1571 | { | 1670 | { |
@@ -1802,53 +1901,92 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) | |||
1802 | 1901 | ||
1803 | } | 1902 | } |
1804 | 1903 | ||
1805 | void MainWindow::fillFilterMenu() | 1904 | void MainWindow::fillFilterMenu() |
1806 | { | 1905 | { |
1807 | selectFilterMenu->clear(); | 1906 | selectFilterMenu->clear(); |
1808 | bool disable = false; | ||
1809 | selectFilterMenu->insertItem(i18n ( "Edit Filters" ), 0 ); | 1907 | selectFilterMenu->insertItem(i18n ( "Edit Filters" ), 0 ); |
1810 | selectFilterMenu->insertSeparator(); | 1908 | selectFilterMenu->insertSeparator(); |
1811 | if ( mView->filterView()->filtersEnabled() ) { | 1909 | selectFilterMenu->insertItem(i18n ( "No Filter" ), 1 ); |
1812 | selectFilterMenu->insertItem(i18n ( "Turn filter off" ), 1 ); | 1910 | |
1813 | } | ||
1814 | else { | ||
1815 | selectFilterMenu->insertItem(i18n ( "Turn filter on" ), 1 ); | ||
1816 | disable = true; | ||
1817 | } | ||
1818 | selectFilterMenu->insertSeparator(); | 1911 | selectFilterMenu->insertSeparator(); |
1819 | QPtrList<CalFilter> fili = mView->filters(); | 1912 | QPtrList<CalFilter> fili = mView->filters(); |
1820 | CalFilter *curfilter = mView->filterView()->selectedFilter(); | 1913 | CalFilter *curfilter = mView->filterView()->selectedFilter(); |
1821 | CalFilter *filter = fili.first(); | 1914 | CalFilter *filter = fili.first(); |
1822 | int iii = 2; | 1915 | int iii = 2; |
1916 | bool checkitem = mView->filterView()->filtersEnabled(); | ||
1823 | while(filter) { | 1917 | while(filter) { |
1824 | selectFilterMenu->insertItem( filter->name(), iii ); | 1918 | selectFilterMenu->insertItem( filter->name(), iii ); |
1825 | if ( filter == curfilter) | 1919 | if ( filter == curfilter) |
1826 | selectFilterMenu->setItemChecked( iii, true ); | 1920 | selectFilterMenu->setItemChecked( iii, checkitem ); |
1827 | if ( disable ) | ||
1828 | selectFilterMenu->setItemEnabled( iii, false ); | ||
1829 | filter = fili.next(); | 1921 | filter = fili.next(); |
1830 | ++iii; | 1922 | ++iii; |
1831 | } | 1923 | } |
1924 | if ( !checkitem ) | ||
1925 | selectFilterMenu->setItemChecked( 1, true ); | ||
1926 | } | ||
1927 | void MainWindow::fillFilterMenuPopup() | ||
1928 | { | ||
1929 | filterPopupMenu->clear(); | ||
1930 | filterPopupMenu->insertItem(i18n ( "No Filter" ), 0 ); | ||
1931 | |||
1932 | filterPopupMenu->insertSeparator(); | ||
1933 | QPtrList<CalFilter> fili = mView->filters(); | ||
1934 | CalFilter *curfilter = mView->filterView()->selectedFilter(); | ||
1935 | CalFilter *filter = fili.first(); | ||
1936 | int iii = 1; | ||
1937 | bool checkitem = mView->filterView()->filtersEnabled(); | ||
1938 | while(filter) { | ||
1939 | filterPopupMenu->insertItem( filter->name(), iii ); | ||
1940 | if ( filter == curfilter) | ||
1941 | filterPopupMenu->setItemChecked( iii, checkitem ); | ||
1942 | filter = fili.next(); | ||
1943 | ++iii; | ||
1944 | } | ||
1945 | if ( !checkitem ) | ||
1946 | filterPopupMenu->setItemChecked( 0, true ); | ||
1832 | } | 1947 | } |
1833 | void MainWindow::selectFilter( int fil ) | 1948 | void MainWindow::selectFilter( int fil ) |
1834 | { | 1949 | { |
1950 | |||
1835 | if ( fil == 0 ) { | 1951 | if ( fil == 0 ) { |
1836 | mView->editFilters( ); | 1952 | mView->editFilters( ); |
1837 | } else if ( fil == 1 ){ | 1953 | } else if ( fil == 1 ){ |
1954 | if ( mView->filterView()->filtersEnabled() ) | ||
1838 | mView->toggleFilerEnabled( ); | 1955 | mView->toggleFilerEnabled( ); |
1839 | } else { | 1956 | } else { |
1957 | if ( !mView->filterView()->filtersEnabled() ) | ||
1958 | mView->toggleFilerEnabled( ); | ||
1840 | mView->selectFilter( fil-2 ); | 1959 | mView->selectFilter( fil-2 ); |
1841 | } | 1960 | } |
1842 | } | 1961 | } |
1962 | void MainWindow::updateFilterToolbar() | ||
1963 | { | ||
1964 | if ( filterMenubar ) { | ||
1965 | if ( !mView->filterView()->filtersEnabled() ) { | ||
1966 | filterMenubar->changeItem( 0, i18n("No Filter") ); | ||
1967 | } else { | ||
1968 | CalFilter *curfilter = mView->filterView()->selectedFilter(); | ||
1969 | if ( curfilter ) { | ||
1970 | filterMenubar->changeItem( 0, curfilter->name() ); | ||
1971 | } | ||
1972 | } | ||
1973 | } | ||
1974 | } | ||
1975 | void MainWindow::selectFilterPopup( int fil ) | ||
1976 | { | ||
1977 | selectFilter( fil + 1 ); | ||
1978 | |||
1979 | } | ||
1843 | void MainWindow::configureToolBar( int item ) | 1980 | void MainWindow::configureToolBar( int item ) |
1844 | { | 1981 | { |
1845 | 1982 | ||
1846 | configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) ); | 1983 | configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) ); |
1847 | KOPrefs *p = KOPrefs::instance(); | 1984 | KOPrefs *p = KOPrefs::instance(); |
1848 | p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); | 1985 | p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); |
1986 | p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 ); | ||
1849 | p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); | 1987 | p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); |
1850 | p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); | 1988 | p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); |
1851 | p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); | 1989 | p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); |
1852 | p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 ); | 1990 | p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 ); |
1853 | p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 ); | 1991 | p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 ); |
1854 | p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 ); | 1992 | p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 ); |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index b3041dc..79fb305 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -21,12 +21,13 @@ class KSyncProfile; | |||
21 | #ifdef DESKTOP_VERSION | 21 | #ifdef DESKTOP_VERSION |
22 | 22 | ||
23 | #define QPEToolBar QToolBar | 23 | #define QPEToolBar QToolBar |
24 | #define QPEMenuBar QMenuBar | 24 | #define QPEMenuBar QMenuBar |
25 | #endif | 25 | #endif |
26 | class QPEToolBar; | 26 | class QPEToolBar; |
27 | class QPEMenuBar; | ||
27 | 28 | ||
28 | 29 | ||
29 | namespace KCal { | 30 | namespace KCal { |
30 | class CalendarLocal; | 31 | class CalendarLocal; |
31 | } | 32 | } |
32 | 33 | ||
@@ -50,12 +51,13 @@ class MainWindow : public QMainWindow | |||
50 | static QString syncFileName(); | 51 | static QString syncFileName(); |
51 | static QString resourcePath(); | 52 | static QString resourcePath(); |
52 | public slots: | 53 | public slots: |
53 | void setCaption ( const QString & ); | 54 | void setCaption ( const QString & ); |
54 | void updateWeekNum(const KCal::DateList &); | 55 | void updateWeekNum(const KCal::DateList &); |
55 | void updateWeek(QDate); | 56 | void updateWeek(QDate); |
57 | void updateFilterToolbar(); | ||
56 | virtual void showMaximized (); | 58 | virtual void showMaximized (); |
57 | void configureAgenda( int ); | 59 | void configureAgenda( int ); |
58 | void recieve( const QCString& msg, const QByteArray& data ); | 60 | void recieve( const QCString& msg, const QByteArray& data ); |
59 | protected slots: | 61 | protected slots: |
60 | void setCaptionToDates(); | 62 | void setCaptionToDates(); |
61 | void weekAction(); | 63 | void weekAction(); |
@@ -90,12 +92,14 @@ class MainWindow : public QMainWindow | |||
90 | void printCal(); | 92 | void printCal(); |
91 | void saveCalendar(); | 93 | void saveCalendar(); |
92 | void loadCalendar(); | 94 | void loadCalendar(); |
93 | void exportVCalendar(); | 95 | void exportVCalendar(); |
94 | void fillFilterMenu(); | 96 | void fillFilterMenu(); |
95 | void selectFilter( int ); | 97 | void selectFilter( int ); |
98 | void fillFilterMenuPopup(); | ||
99 | void selectFilterPopup( int ); | ||
96 | void exportToPhone( int ); | 100 | void exportToPhone( int ); |
97 | void toggleBeamReceive(); | 101 | void toggleBeamReceive(); |
98 | void disableBR(bool); | 102 | void disableBR(bool); |
99 | signals: | 103 | signals: |
100 | void selectWeek ( int ); | 104 | void selectWeek ( int ); |
101 | private slots: | 105 | private slots: |
@@ -118,12 +122,17 @@ class MainWindow : public QMainWindow | |||
118 | KSyncManager* mSyncManager; | 122 | KSyncManager* mSyncManager; |
119 | bool mClosed; | 123 | bool mClosed; |
120 | void saveOnClose(); | 124 | void saveOnClose(); |
121 | bool mFlagKeyPressed; | 125 | bool mFlagKeyPressed; |
122 | bool mBlockAtStartup; | 126 | bool mBlockAtStartup; |
123 | QPEToolBar *iconToolBar; | 127 | QPEToolBar *iconToolBar; |
128 | QPEToolBar *viewToolBar; | ||
129 | QPEToolBar *navigatorToolBar; | ||
130 | QPEToolBar *filterToolBar; | ||
131 | QPEMenuBar *filterMenubar; | ||
132 | QPopupMenu * filterPopupMenu; | ||
124 | void initActions(); | 133 | void initActions(); |
125 | void setDefaultPreferences(); | 134 | void setDefaultPreferences(); |
126 | void keyPressEvent ( QKeyEvent * ) ; | 135 | void keyPressEvent ( QKeyEvent * ) ; |
127 | void keyReleaseEvent ( QKeyEvent * ) ; | 136 | void keyReleaseEvent ( QKeyEvent * ) ; |
128 | QPopupMenu *configureToolBarMenu; | 137 | QPopupMenu *configureToolBarMenu; |
129 | QPopupMenu *selectFilterMenu; | 138 | QPopupMenu *selectFilterMenu; |