summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koprefs.cpp7
-rw-r--r--korganizer/koprefs.h7
-rw-r--r--korganizer/mainwindow.cpp206
-rw-r--r--korganizer/mainwindow.h11
4 files changed, 196 insertions, 35 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 7e3deff..2168094 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -29,139 +29,146 @@
29#include <qtextstream.h> 29#include <qtextstream.h>
30#include <qtextcodec.h> 30#include <qtextcodec.h>
31#include <qstring.h> 31#include <qstring.h>
32#include <qregexp.h> 32#include <qregexp.h>
33#include <qfont.h> 33#include <qfont.h>
34#include <qcolor.h> 34#include <qcolor.h>
35#include <qstringlist.h> 35#include <qstringlist.h>
36#include <stdlib.h> 36#include <stdlib.h>
37 37
38#include <kglobal.h> 38#include <kglobal.h>
39#include <kglobalsettings.h> 39#include <kglobalsettings.h>
40#include <kconfig.h> 40#include <kconfig.h>
41#include <klocale.h> 41#include <klocale.h>
42#include <kdebug.h> 42#include <kdebug.h>
43#include <kemailsettings.h> 43#include <kemailsettings.h>
44#include <kstaticdeleter.h> 44#include <kstaticdeleter.h>
45#include <libkdepim/kpimglobalprefs.h> 45#include <libkdepim/kpimglobalprefs.h>
46 46
47#include "koprefs.h" 47#include "koprefs.h"
48#include "mainwindow.h" 48#include "mainwindow.h"
49 49
50KOPrefs *KOPrefs::mInstance = 0; 50KOPrefs *KOPrefs::mInstance = 0;
51static KStaticDeleter<KOPrefs> insd; 51static KStaticDeleter<KOPrefs> insd;
52 52
53KOPrefs::KOPrefs() : 53KOPrefs::KOPrefs() :
54 KPimPrefs("korganizerrc") 54 KPimPrefs("korganizerrc")
55{ 55{
56 mCategoryColors.setAutoDelete(true); 56 mCategoryColors.setAutoDelete(true);
57 fillMailDefaults(); 57 fillMailDefaults();
58 mDefaultCategoryColor = QColor(175,210,255);//196,196,196); 58 mDefaultCategoryColor = QColor(175,210,255);//196,196,196);
59 QColor defaultHolidayColor = QColor(255,0,0); 59 QColor defaultHolidayColor = QColor(255,0,0);
60 QColor defaultHighlightColor = QColor(129,112,255);//64,64,255); 60 QColor defaultHighlightColor = QColor(129,112,255);//64,64,255);
61 QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128); 61 QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128);
62 QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160); 62 QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160);
63 QColor defaultTodoDueTodayColor = QColor(255,220,100); 63 QColor defaultTodoDueTodayColor = QColor(255,220,100);
64 QColor defaultTodoOverdueColor = QColor(255,153,125); 64 QColor defaultTodoOverdueColor = QColor(255,153,125);
65 65
66 66
67 KPrefs::setCurrentGroup("General"); 67 KPrefs::setCurrentGroup("General");
68 68
69 69
70 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); 70 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
71 71
72 addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true); 72 addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true);
73 addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true); 73 addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true);
74 addItemBool("ShowIconSearch",&mShowIconSearch,true); 74 addItemBool("ShowIconSearch",&mShowIconSearch,true);
75 addItemBool("ShowIconList",&mShowIconList,true); 75 addItemBool("ShowIconList",&mShowIconList,true);
76 addItemBool("ShowIconDay1",&mShowIconDay1,true); 76 addItemBool("ShowIconDay1",&mShowIconDay1,true);
77 addItemBool("ShowIconDay5",&mShowIconDay5,true); 77 addItemBool("ShowIconDay5",&mShowIconDay5,true);
78 addItemBool("ShowIconDay6",&mShowIconDay6,true); 78 addItemBool("ShowIconDay6",&mShowIconDay6,true);
79 addItemBool("ShowIconDay7",&mShowIconDay7,true); 79 addItemBool("ShowIconDay7",&mShowIconDay7,true);
80 addItemBool("ShowIconMonth",&mShowIconMonth,true); 80 addItemBool("ShowIconMonth",&mShowIconMonth,true);
81 addItemBool("ShowIconTodoview",&mShowIconTodoview,true); 81 addItemBool("ShowIconTodoview",&mShowIconTodoview,true);
82 addItemBool("ShowIconBackFast",&mShowIconBackFast,true); 82 addItemBool("ShowIconBackFast",&mShowIconBackFast,true);
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 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);
110 addItemBool("HideNonStartedTodos",&mHideNonStartedTodos,false); 117 addItemBool("HideNonStartedTodos",&mHideNonStartedTodos,false);
111 addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true); 118 addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
112 addItemInt("AllDay Size",&mAllDaySize,28); 119 addItemInt("AllDay Size",&mAllDaySize,28);
113 QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav"; 120 QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav";
114 addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm ); 121 addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm );
115 122
116 addItemStringList("LocationDefaults",&mLocationDefaults ); 123 addItemStringList("LocationDefaults",&mLocationDefaults );
117 addItemStringList("EventSummary User",&mEventSummaryUser); 124 addItemStringList("EventSummary User",&mEventSummaryUser);
118 addItemStringList("TodoSummary User",&mTodoSummaryUser); 125 addItemStringList("TodoSummary User",&mTodoSummaryUser);
119 126
120 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); 127 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
121 addItemBool("Enable Project View",&mEnableProjectView,false); 128 addItemBool("Enable Project View",&mEnableProjectView,false);
122 addItemBool("Auto Save",&mAutoSave,false); 129 addItemBool("Auto Save",&mAutoSave,false);
123 addItemInt("Auto Save Interval",&mAutoSaveInterval,3); 130 addItemInt("Auto Save Interval",&mAutoSaveInterval,3);
124 addItemBool("Confirm Deletes",&mConfirm,true); 131 addItemBool("Confirm Deletes",&mConfirm,true);
125 addItemString("Archive File",&mArchiveFile); 132 addItemString("Archive File",&mArchiveFile);
126 addItemString("Html Export File",&mHtmlExportFile, 133 addItemString("Html Export File",&mHtmlExportFile,
127 QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html")); 134 QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html"));
128 addItemBool("Html With Save",&mHtmlWithSave,false); 135 addItemBool("Html With Save",&mHtmlWithSave,false);
129 136
130 KPrefs::setCurrentGroup("Personal Settings"); 137 KPrefs::setCurrentGroup("Personal Settings");
131 138
132 addItemInt("Mail Client",&mMailClient,MailClientKMail); 139 addItemInt("Mail Client",&mMailClient,MailClientKMail);
133 addItemBool("Use Control Center Email",&mEmailControlCenter,false); 140 addItemBool("Use Control Center Email",&mEmailControlCenter,false);
134 addItemBool("Bcc",&mBcc,false); 141 addItemBool("Bcc",&mBcc,false);
135 142
136 KPrefs::setCurrentGroup("Time & Date"); 143 KPrefs::setCurrentGroup("Time & Date");
137 144
138 145
139 addItemInt("Default Start Time",&mStartTime,10); 146 addItemInt("Default Start Time",&mStartTime,10);
140 addItemInt("Default Duration",&mDefaultDuration,2); 147 addItemInt("Default Duration",&mDefaultDuration,2);
141 addItemInt("Default Alarm Time",&mAlarmTime,3); 148 addItemInt("Default Alarm Time",&mAlarmTime,3);
142 KPrefs::setCurrentGroup("AlarmSettings"); 149 KPrefs::setCurrentGroup("AlarmSettings");
143 addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20); 150 addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
144 addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7); 151 addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
145 addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5); 152 addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
146 addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3); 153 addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
147 154
148 155
149 KPrefs::setCurrentGroup("Calendar"); 156 KPrefs::setCurrentGroup("Calendar");
150 157
151 addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar); 158 addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
152 159
153 KPrefs::setCurrentGroup("Fonts"); 160 KPrefs::setCurrentGroup("Fonts");
154 // qDebug(" KPrefs::setCurrentGroup(Fonts); "); 161 // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
155 addItemFont("TimeBar Font",&mTimeBarFont,KGlobalSettings::generalFont() ); 162 addItemFont("TimeBar Font",&mTimeBarFont,KGlobalSettings::generalFont() );
156 addItemFont("MonthView Font",&mMonthViewFont,KGlobalSettings::generalFont()); 163 addItemFont("MonthView Font",&mMonthViewFont,KGlobalSettings::generalFont());
157 addItemFont("AgendaView Font",&mAgendaViewFont,KGlobalSettings::generalFont()); 164 addItemFont("AgendaView Font",&mAgendaViewFont,KGlobalSettings::generalFont());
158 addItemFont("MarcusBains Font",&mMarcusBainsFont,KGlobalSettings::generalFont()); 165 addItemFont("MarcusBains Font",&mMarcusBainsFont,KGlobalSettings::generalFont());
159 addItemFont("TimeLabels Font",&mTimeLabelsFont,KGlobalSettings::generalFont()); 166 addItemFont("TimeLabels Font",&mTimeLabelsFont,KGlobalSettings::generalFont());
160 addItemFont("TodoView Font",&mTodoViewFont,KGlobalSettings::generalFont()); 167 addItemFont("TodoView Font",&mTodoViewFont,KGlobalSettings::generalFont());
161 addItemFont("ListView Font",&mListViewFont,KGlobalSettings::generalFont()); 168 addItemFont("ListView Font",&mListViewFont,KGlobalSettings::generalFont());
162 addItemFont("DateNavigator Font",&mDateNavigatorFont,KGlobalSettings::generalFont()); 169 addItemFont("DateNavigator Font",&mDateNavigatorFont,KGlobalSettings::generalFont());
163 addItemFont("EditBox Font",&mEditBoxFont,KGlobalSettings::generalFont()); 170 addItemFont("EditBox Font",&mEditBoxFont,KGlobalSettings::generalFont());
164 addItemFont("JournalView Font",&mJornalViewFont,KGlobalSettings::generalFont()); 171 addItemFont("JournalView Font",&mJornalViewFont,KGlobalSettings::generalFont());
165 addItemFont("WhatsNextView Font",&mWhatsNextFont,KGlobalSettings::generalFont()); 172 addItemFont("WhatsNextView Font",&mWhatsNextFont,KGlobalSettings::generalFont());
166 addItemFont("EventView Font",&mEventViewFont,KGlobalSettings::generalFont()); 173 addItemFont("EventView Font",&mEventViewFont,KGlobalSettings::generalFont());
167 174
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 09a0dce..8dfdf69 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -124,133 +124,140 @@ class KOPrefs : public KPimPrefs
124 124
125 QColor mHolidayColor; 125 QColor mHolidayColor;
126 QColor mHighlightColor; 126 QColor mHighlightColor;
127 QColor mEventColor; 127 QColor mEventColor;
128 QColor mTodoDoneColor; 128 QColor mTodoDoneColor;
129 QColor mAgendaBgColor; 129 QColor mAgendaBgColor;
130 QColor mWorkingHoursColor; 130 QColor mWorkingHoursColor;
131 QColor mTodoDueTodayColor; 131 QColor mTodoDueTodayColor;
132 QColor mTodoOverdueColor; 132 QColor mTodoOverdueColor;
133 QColor mMonthViewEvenColor; 133 QColor mMonthViewEvenColor;
134 QColor mMonthViewOddColor; 134 QColor mMonthViewOddColor;
135 QColor mMonthViewHolidayColor; 135 QColor mMonthViewHolidayColor;
136 bool mMonthViewUsesDayColors; 136 bool mMonthViewUsesDayColors;
137 bool mMonthViewSatSunTog; 137 bool mMonthViewSatSunTog;
138 bool mMonthViewWeek; 138 bool mMonthViewWeek;
139 QColor mAppColor1; 139 QColor mAppColor1;
140 QColor mAppColor2; 140 QColor mAppColor2;
141 bool mUseAppColors; 141 bool mUseAppColors;
142 142
143 int mDayBegins; 143 int mDayBegins;
144 int mHourSize; 144 int mHourSize;
145 int mAllDaySize; 145 int mAllDaySize;
146 bool mShowFullMenu; 146 bool mShowFullMenu;
147 bool mDailyRecur; 147 bool mDailyRecur;
148 bool mWeeklyRecur; 148 bool mWeeklyRecur;
149 bool mMonthDailyRecur; 149 bool mMonthDailyRecur;
150 bool mMonthWeeklyRecur; 150 bool mMonthWeeklyRecur;
151 bool mMonthShowIcons; 151 bool mMonthShowIcons;
152 bool mMonthShowShort; 152 bool mMonthShowShort;
153 bool mEnableToolTips; 153 bool mEnableToolTips;
154 bool mEnableMonthScroll; 154 bool mEnableMonthScroll;
155 bool mFullViewMonth; 155 bool mFullViewMonth;
156 bool mMonthViewUsesCategoryColor; 156 bool mMonthViewUsesCategoryColor;
157 bool mFullViewTodo; 157 bool mFullViewTodo;
158 bool mShowCompletedTodo; 158 bool mShowCompletedTodo;
159 bool mMarcusBainsEnabled; 159 bool mMarcusBainsEnabled;
160 int mNextXDays; 160 int mNextXDays;
161 int mWhatsNextDays; 161 int mWhatsNextDays;
162 int mWhatsNextPrios; 162 int mWhatsNextPrios;
163 bool mEnableQuickTodo; 163 bool mEnableQuickTodo;
164 164
165 bool mCompactDialogs; 165 bool mCompactDialogs;
166 bool mVerticalScreen; 166 bool mVerticalScreen;
167 167
168 bool mShowIconNewTodo; 168 bool mShowIconNewTodo;
169 bool mShowIconNewEvent; 169 bool mShowIconNewEvent;
170 bool mShowIconSearch; 170 bool mShowIconSearch;
171 bool mShowIconList; 171 bool mShowIconList;
172 bool mShowIconDay1; 172 bool mShowIconDay1;
173 bool mShowIconDay5; 173 bool mShowIconDay5;
174 bool mShowIconDay6; 174 bool mShowIconDay6;
175 bool mShowIconDay7; 175 bool mShowIconDay7;
176 bool mShowIconMonth; 176 bool mShowIconMonth;
177 bool mShowIconTodoview; 177 bool mShowIconTodoview;
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 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;
199 bool mShowTimeInAgenda; 206 bool mShowTimeInAgenda;
200 bool mHideNonStartedTodos; 207 bool mHideNonStartedTodos;
201 208
202 int mLastSyncTime; 209 int mLastSyncTime;
203 void setCategoryColor(QString cat,const QColor & color); 210 void setCategoryColor(QString cat,const QColor & color);
204 QColor *categoryColor(QString cat); 211 QColor *categoryColor(QString cat);
205 212
206 QString mArchiveFile; 213 QString mArchiveFile;
207 QString mHtmlExportFile; 214 QString mHtmlExportFile;
208 bool mHtmlWithSave; 215 bool mHtmlWithSave;
209 216
210 QStringList mSelectedPlugins; 217 QStringList mSelectedPlugins;
211 218
212 QString mLastImportFile; 219 QString mLastImportFile;
213 QString mLastVcalFile; 220 QString mLastVcalFile;
214 QString mLastSaveFile; 221 QString mLastSaveFile;
215 QString mLastLoadFile; 222 QString mLastLoadFile;
216 223
217 224
218 QString mDefaultAlarmFile; 225 QString mDefaultAlarmFile;
219 int mIMIPScheduler; 226 int mIMIPScheduler;
220 int mIMIPSend; 227 int mIMIPSend;
221 QStringList mAdditionalMails; 228 QStringList mAdditionalMails;
222 int mIMIPAutoRefresh; 229 int mIMIPAutoRefresh;
223 int mIMIPAutoInsertReply; 230 int mIMIPAutoInsertReply;
224 int mIMIPAutoInsertRequest; 231 int mIMIPAutoInsertRequest;
225 int mIMIPAutoFreeBusy; 232 int mIMIPAutoFreeBusy;
226 int mIMIPAutoFreeBusyReply; 233 int mIMIPAutoFreeBusyReply;
227 234
228 QStringList mTodoTemplates; 235 QStringList mTodoTemplates;
229 QStringList mEventTemplates; 236 QStringList mEventTemplates;
230 237
231 int mDestination; 238 int mDestination;
232 239
233 240
234 bool mEditOnDoubleClick; 241 bool mEditOnDoubleClick;
235 bool mViewChangeHoldFullscreen; 242 bool mViewChangeHoldFullscreen;
236 bool mViewChangeHoldNonFullscreen; 243 bool mViewChangeHoldNonFullscreen;
237 bool mCenterOnCurrentTime; 244 bool mCenterOnCurrentTime;
238 bool mSetTimeToDayStartAt; 245 bool mSetTimeToDayStartAt;
239 bool mHighlightCurrentDay; 246 bool mHighlightCurrentDay;
240 bool mUseHighlightLightColor; 247 bool mUseHighlightLightColor;
241 bool mListViewMonthTimespan; 248 bool mListViewMonthTimespan;
242 bool mWNViewShowsParents; 249 bool mWNViewShowsParents;
243 bool mWNViewShowsPast; 250 bool mWNViewShowsPast;
244 bool mWNViewShowLocation; 251 bool mWNViewShowLocation;
245 bool mTodoViewShowsPercentage; 252 bool mTodoViewShowsPercentage;
246 bool mTodoViewUsesCatColors; 253 bool mTodoViewUsesCatColors;
247 bool mMonthViewUsesBigFont; 254 bool mMonthViewUsesBigFont;
248 bool mTodoViewUsesSmallFont; 255 bool mTodoViewUsesSmallFont;
249 bool mTodoViewUsesForegroundColor; 256 bool mTodoViewUsesForegroundColor;
250 bool mMonthViewUsesForegroundColor; 257 bool mMonthViewUsesForegroundColor;
251 258
252 bool mHightlightDateTimeEdit; 259 bool mHightlightDateTimeEdit;
253 bool mShortDateInViewer; 260 bool mShortDateInViewer;
254 261
255 bool mShowDateNavigator; 262 bool mShowDateNavigator;
256 263
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index ca0d542..c6ae868 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1,230 +1,293 @@
1#include <stdlib.h> 1#include <stdlib.h>
2 2
3#include <qaction.h> 3#include <qaction.h>
4#include <qpopupmenu.h> 4#include <qpopupmenu.h>
5#include <qpainter.h> 5#include <qpainter.h>
6#include <qwhatsthis.h> 6#include <qwhatsthis.h>
7#include <qpushbutton.h> 7#include <qpushbutton.h>
8#include <qmessagebox.h> 8#include <qmessagebox.h>
9#include <qlineedit.h> 9#include <qlineedit.h>
10#include <qtextcodec.h> 10#include <qtextcodec.h>
11#include <qfile.h> 11#include <qfile.h>
12#include <qdir.h> 12#include <qdir.h>
13#include <qapp.h> 13#include <qapp.h>
14#include <qfileinfo.h> 14#include <qfileinfo.h>
15#include <qlabel.h> 15#include <qlabel.h>
16#include <qspinbox.h> 16#include <qspinbox.h>
17#include <qcheckbox.h> 17#include <qcheckbox.h>
18#include <qmap.h> 18#include <qmap.h>
19#include <qwmatrix.h> 19#include <qwmatrix.h>
20#include <qtextbrowser.h> 20#include <qtextbrowser.h>
21#include <qtextstream.h> 21#include <qtextstream.h>
22#ifndef DESKTOP_VERSION 22#ifndef DESKTOP_VERSION
23#include <qpe/global.h> 23#include <qpe/global.h>
24#include <qpe/qpemenubar.h> 24#include <qpe/qpemenubar.h>
25#include <qpe/qpetoolbar.h> 25#include <qpe/qpetoolbar.h>
26#include <qpe/resource.h> 26#include <qpe/resource.h>
27#include <qpe/qpeapplication.h> 27#include <qpe/qpeapplication.h>
28#include <qtopia/alarmserver.h> 28#include <qtopia/alarmserver.h>
29#include <qtopia/qcopenvelope_qws.h> 29#include <qtopia/qcopenvelope_qws.h>
30#include <unistd.h> // for sleep 30#include <unistd.h> // for sleep
31#else 31#else
32#include <qmenubar.h> 32#include <qmenubar.h>
33#include <qtoolbar.h> 33#include <qtoolbar.h>
34#include <qapplication.h> 34#include <qapplication.h>
35//#include <resource.h> 35//#include <resource.h>
36 36
37#endif 37#endif
38#include <libkcal/calendarlocal.h> 38#include <libkcal/calendarlocal.h>
39#include <libkcal/todo.h> 39#include <libkcal/todo.h>
40#include <libkcal/phoneformat.h> 40#include <libkcal/phoneformat.h>
41#include <libkdepim/ksyncprofile.h> 41#include <libkdepim/ksyncprofile.h>
42#include <libkdepim/phoneaccess.h> 42#include <libkdepim/phoneaccess.h>
43#include <libkcal/kincidenceformatter.h> 43#include <libkcal/kincidenceformatter.h>
44#include <libkdepim/kpimglobalprefs.h> 44#include <libkdepim/kpimglobalprefs.h>
45 45
46#include "calendarview.h" 46#include "calendarview.h"
47#include "koviewmanager.h" 47#include "koviewmanager.h"
48#include "datenavigator.h" 48#include "datenavigator.h"
49#include "koagendaview.h" 49#include "koagendaview.h"
50#include "koagenda.h" 50#include "koagenda.h"
51#include "kodialogmanager.h" 51#include "kodialogmanager.h"
52#include "kdialogbase.h" 52#include "kdialogbase.h"
53#include "kapplication.h" 53#include "kapplication.h"
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
65using namespace KCal; 66using namespace KCal;
66#ifndef _WIN32_ 67#ifndef _WIN32_
67#include <unistd.h> 68#include <unistd.h>
68#else 69#else
69#ifdef _OL_IMPORT_ 70#ifdef _OL_IMPORT_
70#include "koimportoldialog.h" 71#include "koimportoldialog.h"
71#endif 72#endif
72#endif 73#endif
73#include "mainwindow.h" 74#include "mainwindow.h"
74 75
75 76
76class KOex2phonePrefs : public QDialog 77class KOex2phonePrefs : public QDialog
77{ 78{
78 public: 79 public:
79 KOex2phonePrefs( QWidget *parent=0, const char *name=0 ) : 80 KOex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
80 QDialog( parent, name, true ) 81 QDialog( parent, name, true )
81 { 82 {
82 setCaption( i18n("Export to phone options") ); 83 setCaption( i18n("Export to phone options") );
83 QVBoxLayout* lay = new QVBoxLayout( this ); 84 QVBoxLayout* lay = new QVBoxLayout( this );
84 lay->setSpacing( 3 ); 85 lay->setSpacing( 3 );
85 lay->setMargin( 3 ); 86 lay->setMargin( 3 );
86 QLabel *lab; 87 QLabel *lab;
87 lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) ); 88 lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );
88 lab->setAlignment (AlignHCenter ); 89 lab->setAlignment (AlignHCenter );
89 QHBox* temphb; 90 QHBox* temphb;
90 temphb = new QHBox( this ); 91 temphb = new QHBox( this );
91 new QLabel( i18n("I/O device: "), temphb ); 92 new QLabel( i18n("I/O device: "), temphb );
92 mPhoneDevice = new QLineEdit( temphb); 93 mPhoneDevice = new QLineEdit( temphb);
93 lay->addWidget( temphb ); 94 lay->addWidget( temphb );
94 temphb = new QHBox( this ); 95 temphb = new QHBox( this );
95 new QLabel( i18n("Connection: "), temphb ); 96 new QLabel( i18n("Connection: "), temphb );
96 mPhoneConnection = new QLineEdit( temphb); 97 mPhoneConnection = new QLineEdit( temphb);
97 lay->addWidget( temphb ); 98 lay->addWidget( temphb );
98 temphb = new QHBox( this ); 99 temphb = new QHBox( this );
99 new QLabel( i18n("Model(opt.): "), temphb ); 100 new QLabel( i18n("Model(opt.): "), temphb );
100 mPhoneModel = new QLineEdit( temphb); 101 mPhoneModel = new QLineEdit( temphb);
101 lay->addWidget( temphb ); 102 lay->addWidget( temphb );
102 mWriteBackFuture= new QCheckBox( i18n("Write back events in future only"), this ); 103 mWriteBackFuture= new QCheckBox( i18n("Write back events in future only"), this );
103 mWriteBackFuture->setChecked( true ); 104 mWriteBackFuture->setChecked( true );
104 lay->addWidget( mWriteBackFuture ); 105 lay->addWidget( mWriteBackFuture );
105 temphb = new QHBox( this ); 106 temphb = new QHBox( this );
106 new QLabel( i18n("Max. weeks in future: ") , temphb ); 107 new QLabel( i18n("Max. weeks in future: ") , temphb );
107 mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb); 108 mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb);
108 mWriteBackFutureWeeks->setValue( 8 ); 109 mWriteBackFutureWeeks->setValue( 8 );
109 lay->addWidget( temphb ); 110 lay->addWidget( temphb );
110 lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) ); 111 lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) );
111 lab->setAlignment (AlignHCenter ); 112 lab->setAlignment (AlignHCenter );
112 QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this ); 113 QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
113 lay->addWidget( ok ); 114 lay->addWidget( ok );
114 QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); 115 QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
115 lay->addWidget( cancel ); 116 lay->addWidget( cancel );
116 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); 117 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) );
117 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); 118 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) );
118 resize( 220, 240 ); 119 resize( 220, 240 );
119 qApp->processEvents(); 120 qApp->processEvents();
120 int dw = QApplication::desktop()->width(); 121 int dw = QApplication::desktop()->width();
121 int dh = QApplication::desktop()->height(); 122 int dh = QApplication::desktop()->height();
122 move( (dw-width())/2, (dh - height() )/2 ); 123 move( (dw-width())/2, (dh - height() )/2 );
123 } 124 }
124 125
125public: 126public:
126 QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 127 QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel;
127 QCheckBox* mWriteBackFuture; 128 QCheckBox* mWriteBackFuture;
128 QSpinBox* mWriteBackFutureWeeks; 129 QSpinBox* mWriteBackFutureWeeks;
129}; 130};
130 131
131int globalFlagBlockStartup; 132int globalFlagBlockStartup;
132MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : 133MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
133 QMainWindow( parent, name ) 134 QMainWindow( parent, name )
134{ 135{
135 136
136 mClosed = false; 137 mClosed = false;
137 //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; 138 //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
138 QString confFile = locateLocal("config","korganizerrc"); 139 QString confFile = locateLocal("config","korganizerrc");
139 QFileInfo finf ( confFile ); 140 QFileInfo finf ( confFile );
140 bool showWarning = !finf.exists(); 141 bool showWarning = !finf.exists();
141 setIcon(SmallIcon( "ko24" ) ); 142 setIcon(SmallIcon( "ko24" ) );
142 mBlockAtStartup = true; 143 mBlockAtStartup = true;
143 mFlagKeyPressed = false; 144 mFlagKeyPressed = false;
144 setCaption("KO/Pi"); 145 setCaption("KO/Pi");
145 KOPrefs *p = KOPrefs::instance(); 146 KOPrefs *p = KOPrefs::instance();
146 KPimGlobalPrefs::instance()->setGlobalConfig(); 147 KPimGlobalPrefs::instance()->setGlobalConfig();
147 if ( p->mHourSize > 22 ) 148 if ( p->mHourSize > 22 )
148 p->mHourSize = 22; 149 p->mHourSize = 22;
149 QMainWindow::ToolBarDock tbd; 150 QMainWindow::ToolBarDock tbd;
150 if ( p->mToolBarHor ) { 151 if ( p->mToolBarHor ) {
151 if ( p->mToolBarUp ) 152 if ( p->mToolBarUp )
152 tbd = Bottom; 153 tbd = Bottom;
153 else 154 else
154 tbd = Top; 155 tbd = Top;
155 } 156 }
156 else { 157 else {
157 if ( p->mToolBarUp ) 158 if ( p->mToolBarUp )
158 tbd = Right; 159 tbd = Right;
159 else 160 else
160 tbd = Left; 161 tbd = Left;
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();
173#endif 236#endif
174 237
175 //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); 238 //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ());
176 setDefaultPreferences(); 239 setDefaultPreferences();
177 mCalendar = new CalendarLocal(); 240 mCalendar = new CalendarLocal();
178 mView = new CalendarView( mCalendar, this,"mCalendar " ); 241 mView = new CalendarView( mCalendar, this,"mCalendar " );
179 mView->hide(); 242 mView->hide();
180 //mView->resize(splash->size() ); 243 //mView->resize(splash->size() );
181 initActions(); 244 initActions();
182 mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu); 245 mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu);
183 mSyncManager->setBlockSave(false); 246 mSyncManager->setBlockSave(false);
184 mView->setSyncManager(mSyncManager); 247 mView->setSyncManager(mSyncManager);
185#ifndef DESKTOP_VERSION 248#ifndef DESKTOP_VERSION
186 iconToolBar->show(); 249 iconToolBar->show();
187 qApp->processEvents(); 250 qApp->processEvents();
188#endif 251#endif
189 //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ()); 252 //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ());
190 int vh = height() ; 253 int vh = height() ;
191 int vw = width(); 254 int vw = width();
192 //qDebug("Toolbar hei %d ",iconToolBar->height() ); 255 //qDebug("Toolbar hei %d ",iconToolBar->height() );
193 if ( iconToolBar->orientation () == Qt:: Horizontal ) { 256 if ( iconToolBar->orientation () == Qt:: Horizontal ) {
194 vh -= iconToolBar->height(); 257 vh -= iconToolBar->height();
195 } else { 258 } else {
196 vw -= iconToolBar->height(); 259 vw -= iconToolBar->height();
197 } 260 }
198 //mView->setMaximumSize( splash->size() ); 261 //mView->setMaximumSize( splash->size() );
199 //mView->resize( splash->size() ); 262 //mView->resize( splash->size() );
200 //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); 263 //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ());
201 mView->readSettings(); 264 mView->readSettings();
202 bool newFile = false; 265 bool newFile = false;
203 if( !QFile::exists( defaultFileName() ) ) { 266 if( !QFile::exists( defaultFileName() ) ) {
204 QFileInfo finfo ( defaultFileName() ); 267 QFileInfo finfo ( defaultFileName() );
205 QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); 268 QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics");
206 qDebug("oldfile %s ", oldFile.latin1()); 269 qDebug("oldfile %s ", oldFile.latin1());
207 QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; 270 QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n";
208 finfo.setFile( oldFile ); 271 finfo.setFile( oldFile );
209 if (finfo.exists() ) { 272 if (finfo.exists() ) {
210 KMessageBox::information( this, message); 273 KMessageBox::information( this, message);
211 mView->openCalendar( oldFile ); 274 mView->openCalendar( oldFile );
212 qApp->processEvents(); 275 qApp->processEvents();
213 } else { 276 } else {
214 oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics"); 277 oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics");
215 finfo.setFile( oldFile ); 278 finfo.setFile( oldFile );
216 if (finfo.exists() ) { 279 if (finfo.exists() ) {
217 KMessageBox::information( this, message); 280 KMessageBox::information( this, message);
218 mView->openCalendar( oldFile ); 281 mView->openCalendar( oldFile );
219 qApp->processEvents(); 282 qApp->processEvents();
220 } 283 }
221 } 284 }
222 mView->saveCalendar( defaultFileName() ); 285 mView->saveCalendar( defaultFileName() );
223 newFile = true; 286 newFile = true;
224 } 287 }
225 288
226 QTime neededSaveTime = QDateTime::currentDateTime().time(); 289 QTime neededSaveTime = QDateTime::currentDateTime().time();
227 mView->openCalendar( defaultFileName() ); 290 mView->openCalendar( defaultFileName() );
228 int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); 291 int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
229 qDebug("KO: Calendar loading time: %d ms",msNeeded ); 292 qDebug("KO: Calendar loading time: %d ms",msNeeded );
230 293
@@ -570,128 +633,130 @@ void MainWindow::initActions()
570 menuBar->insertItem( i18n("Help"), helpMenu ); 633 menuBar->insertItem( i18n("Help"), helpMenu );
571 //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); 634 //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
572 menuBar1->setMaximumSize( menuBar1->sizeHint( )); 635 menuBar1->setMaximumSize( menuBar1->sizeHint( ));
573 } 636 }
574 connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); 637 connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) );
575 connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); 638 connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );
576 mWeekBgColor = iconToolBar->backgroundColor(); 639 mWeekBgColor = iconToolBar->backgroundColor();
577 mWeekPixmap.resize( pixWid , pixHei ); 640 mWeekPixmap.resize( pixWid , pixHei );
578 mWeekPixmap.fill( mWeekBgColor ); 641 mWeekPixmap.fill( mWeekBgColor );
579 icon = mWeekPixmap; 642 icon = mWeekPixmap;
580 mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); 643 mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
581 if ( p-> mShowIconWeekNum ) 644 if ( p-> mShowIconWeekNum )
582 mWeekAction->addTo( iconToolBar ); 645 mWeekAction->addTo( iconToolBar );
583 mWeekFont = font(); 646 mWeekFont = font();
584 647
585 int fontPoint = mWeekFont.pointSize(); 648 int fontPoint = mWeekFont.pointSize();
586 QFontMetrics f( mWeekFont ); 649 QFontMetrics f( mWeekFont );
587 int fontWid = f.width( "30" ); 650 int fontWid = f.width( "30" );
588 while ( fontWid > pixWid ) { 651 while ( fontWid > pixWid ) {
589 --fontPoint; 652 --fontPoint;
590 mWeekFont.setPointSize( fontPoint ); 653 mWeekFont.setPointSize( fontPoint );
591 QFontMetrics f( mWeekFont ); 654 QFontMetrics f( mWeekFont );
592 fontWid = f.width( "30" ); 655 fontWid = f.width( "30" );
593 //qDebug("dec-- "); 656 //qDebug("dec-- ");
594 } 657 }
595 658
596 connect( mWeekAction, SIGNAL( activated() ), 659 connect( mWeekAction, SIGNAL( activated() ),
597 this, SLOT( weekAction() ) ); 660 this, SLOT( weekAction() ) );
598 661
599 connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) ); 662 connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) );
600 663
601 //#endif 664 //#endif
602 // ****************** 665 // ******************
603 QAction *action; 666 QAction *action;
604 // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); 667 // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
605 configureToolBarMenu->setCheckable( true ); 668 configureToolBarMenu->setCheckable( true );
606 669
607 670
608 configureAgendaMenu->setCheckable( true ); 671 configureAgendaMenu->setCheckable( true );
609 int iii ; 672 int iii ;
610 for ( iii = 1;iii<= 10 ;++iii ){ 673 for ( iii = 1;iii<= 10 ;++iii ){
611 configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 ); 674 configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 );
612 } 675 }
613 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu ); 676 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu );
614 677
615 connect( configureAgendaMenu, SIGNAL( aboutToShow()), 678 connect( configureAgendaMenu, SIGNAL( aboutToShow()),
616 this, SLOT( showConfigureAgenda( ) ) ); 679 this, SLOT( showConfigureAgenda( ) ) );
617 680
618 icon = loadPixmap( pathString + "configure" ); 681 icon = loadPixmap( pathString + "configure" );
619 action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this ); 682 action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this );
620 action->addTo( actionMenu ); 683 action->addTo( actionMenu );
621 connect( action, SIGNAL( activated() ), 684 connect( action, SIGNAL( activated() ),
622 mView, SLOT( edit_options() ) ); 685 mView, SLOT( edit_options() ) );
623 actionMenu->insertSeparator(); 686 actionMenu->insertSeparator();
624 687
625 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); 688 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
626 action->addTo( actionMenu ); 689 action->addTo( actionMenu );
627 connect( action, SIGNAL( activated() ), 690 connect( action, SIGNAL( activated() ),
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() ) );
640 icon = loadPixmap( pathString + "newtodo" ); 705 icon = loadPixmap( pathString + "newtodo" );
641 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); 706 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
642 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); 707 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
643 nt_action->addTo( actionMenu ); 708 nt_action->addTo( actionMenu );
644 connect( nt_action, SIGNAL( activated() ), 709 connect( nt_action, SIGNAL( activated() ),
645 mView, SLOT( newTodo() ) ); 710 mView, SLOT( newTodo() ) );
646 711
647 icon = loadPixmap( pathString + "today" ); 712 icon = loadPixmap( pathString + "today" );
648 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); 713 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
649 today_action->addTo( viewMenu ); 714 today_action->addTo( viewMenu );
650 connect( today_action, SIGNAL( activated() ), 715 connect( today_action, SIGNAL( activated() ),
651 mView, SLOT( goToday() ) ); 716 mView, SLOT( goToday() ) );
652 viewMenu->insertSeparator(); 717 viewMenu->insertSeparator();
653 718
654 icon = loadPixmap( pathString + "navi" ); 719 icon = loadPixmap( pathString + "navi" );
655 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); 720 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
656 action->addTo( viewMenu ); 721 action->addTo( viewMenu );
657 connect( action, SIGNAL( activated() ), 722 connect( action, SIGNAL( activated() ),
658 mView, SLOT( toggleDateNavigatorWidget() ) ); 723 mView, SLOT( toggleDateNavigatorWidget() ) );
659 mToggleNav = action ; 724 mToggleNav = action ;
660 icon = loadPixmap( pathString + "filter" ); 725 icon = loadPixmap( pathString + "filter" );
661 action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); 726 action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this );
662 action->addTo( viewMenu ); 727 action->addTo( viewMenu );
663 connect( action, SIGNAL( activated() ), 728 connect( action, SIGNAL( activated() ),
664 mView, SLOT( toggleFilter() ) ); 729 mView, SLOT( toggleFilter() ) );
665 mToggleFilter = action; 730 mToggleFilter = action;
666 icon = loadPixmap( pathString + "allday" ); 731 icon = loadPixmap( pathString + "allday" );
667 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); 732 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
668 action->addTo( viewMenu ); 733 action->addTo( viewMenu );
669 connect( action, SIGNAL( activated() ), 734 connect( action, SIGNAL( activated() ),
670 mView, SLOT( toggleAllDaySize() ) ); 735 mView, SLOT( toggleAllDaySize() ) );
671 mToggleAllday = action; 736 mToggleAllday = action;
672 737
673 738
674 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 739 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
675 mToggleNav, SLOT( setEnabled ( bool ) ) ); 740 mToggleNav, SLOT( setEnabled ( bool ) ) );
676 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 741 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
677 mToggleFilter, SLOT( setEnabled ( bool ) ) ); 742 mToggleFilter, SLOT( setEnabled ( bool ) ) );
678 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), 743 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
679 mToggleAllday, SLOT( setEnabled ( bool ) ) ); 744 mToggleAllday, SLOT( setEnabled ( bool ) ) );
680 745
681 viewMenu->insertSeparator(); 746 viewMenu->insertSeparator();
682 icon = loadPixmap( pathString + "picker" ); 747 icon = loadPixmap( pathString + "picker" );
683 action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this ); 748 action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this );
684 action->addTo( viewMenu ); 749 action->addTo( viewMenu );
685 connect( action, SIGNAL( activated() ), 750 connect( action, SIGNAL( activated() ),
686 mView, SLOT( showDatePicker() ) ); 751 mView, SLOT( showDatePicker() ) );
687 action->addTo( iconToolBar ); 752 action->addTo( iconToolBar );
688 viewMenu->insertSeparator(); 753 viewMenu->insertSeparator();
689 754
690 755
691 icon = loadPixmap( pathString + "whatsnext" ); 756 icon = loadPixmap( pathString + "whatsnext" );
692 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); 757 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
693 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); 758 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
694 whatsnext_action->addTo( viewMenu ); 759 whatsnext_action->addTo( viewMenu );
695 connect( whatsnext_action, SIGNAL( activated() ), 760 connect( whatsnext_action, SIGNAL( activated() ),
696 mView->viewManager(), SLOT( showWhatsNextView() ) ); 761 mView->viewManager(), SLOT( showWhatsNextView() ) );
697 762
@@ -938,246 +1003,261 @@ void MainWindow::initActions()
938 connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); 1003 connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
939 action = new QAction( "beam all", i18n("Exit (+save)"), 0, 1004 action = new QAction( "beam all", i18n("Exit (+save)"), 0,
940 this ); 1005 this );
941 action->addTo( importMenu ); 1006 action->addTo( importMenu );
942 connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); 1007 connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
943 1008
944 //menuBar->insertItem( "Configure",configureMenu ); 1009 //menuBar->insertItem( "Configure",configureMenu );
945 //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); 1010 //configureMenu->insertItem( "Toolbar",configureToolBarMenu );
946 icon = loadPixmap( "korganizer/korganizer" ); 1011 icon = loadPixmap( "korganizer/korganizer" );
947 1012
948 action = new QAction( "Whats New", i18n("What's new?"), 0,this ); 1013 action = new QAction( "Whats New", i18n("What's new?"), 0,this );
949 action->addTo( helpMenu ); 1014 action->addTo( helpMenu );
950 connect( action, SIGNAL( activated() ), 1015 connect( action, SIGNAL( activated() ),
951 SLOT( whatsNew() ) ); 1016 SLOT( whatsNew() ) );
952 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); 1017 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this );
953 action->addTo( helpMenu ); 1018 action->addTo( helpMenu );
954 connect( action, SIGNAL( activated() ), 1019 connect( action, SIGNAL( activated() ),
955 SLOT( features() ) ); 1020 SLOT( features() ) );
956 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); 1021 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
957 action->addTo( helpMenu ); 1022 action->addTo( helpMenu );
958 connect( action, SIGNAL( activated() ), 1023 connect( action, SIGNAL( activated() ),
959 SLOT( keyBindings() ) ); 1024 SLOT( keyBindings() ) );
960 action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); 1025 action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this );
961 action->addTo( helpMenu ); 1026 action->addTo( helpMenu );
962 connect( action, SIGNAL( activated() ), 1027 connect( action, SIGNAL( activated() ),
963 SLOT( synchowto() ) ); 1028 SLOT( synchowto() ) );
964 action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); 1029 action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this );
965 action->addTo( helpMenu ); 1030 action->addTo( helpMenu );
966 connect( action, SIGNAL( activated() ), 1031 connect( action, SIGNAL( activated() ),
967 SLOT( kdesynchowto() ) ); 1032 SLOT( kdesynchowto() ) );
968 action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); 1033 action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this );
969 action->addTo( helpMenu ); 1034 action->addTo( helpMenu );
970 connect( action, SIGNAL( activated() ), 1035 connect( action, SIGNAL( activated() ),
971 SLOT( multisynchowto() ) ); 1036 SLOT( multisynchowto() ) );
972 action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); 1037 action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this );
973 action->addTo( helpMenu ); 1038 action->addTo( helpMenu );
974 connect( action, SIGNAL( activated() ), 1039 connect( action, SIGNAL( activated() ),
975 SLOT( aboutAutoSaving() ) ); 1040 SLOT( aboutAutoSaving() ) );
976 action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); 1041 action = new QAction( "Problemd", i18n("Known Problems..."), 0,this );
977 action->addTo( helpMenu ); 1042 action->addTo( helpMenu );
978 connect( action, SIGNAL( activated() ), 1043 connect( action, SIGNAL( activated() ),
979 SLOT( aboutKnownBugs() ) ); 1044 SLOT( aboutKnownBugs() ) );
980 action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); 1045 action = new QAction( "Translate Howto", i18n("User translation..."), 0,this );
981 action->addTo( helpMenu ); 1046 action->addTo( helpMenu );
982 connect( action, SIGNAL( activated() ), 1047 connect( action, SIGNAL( activated() ),
983 SLOT( usertrans() ) ); 1048 SLOT( usertrans() ) );
984 action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); 1049 action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this );
985 action->addTo( helpMenu ); 1050 action->addTo( helpMenu );
986 connect( action, SIGNAL( activated() ), 1051 connect( action, SIGNAL( activated() ),
987 SLOT( faq() ) ); 1052 SLOT( faq() ) );
988 action = new QAction( "licence", i18n("Licence..."), 0, this ); 1053 action = new QAction( "licence", i18n("Licence..."), 0, this );
989 action->addTo( helpMenu ); 1054 action->addTo( helpMenu );
990 connect( action, SIGNAL( activated() ), 1055 connect( action, SIGNAL( activated() ),
991 SLOT( licence() ) ); 1056 SLOT( licence() ) );
992 action = new QAction( "about", i18n("About..."), 0, this ); 1057 action = new QAction( "about", i18n("About..."), 0, this );
993 action->addTo( helpMenu ); 1058 action->addTo( helpMenu );
994 connect( action, SIGNAL( activated() ), 1059 connect( action, SIGNAL( activated() ),
995 SLOT( about() ) ); 1060 SLOT( about() ) );
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)
1075 configureToolBarMenu->setItemChecked( 10, true ); 1140 configureToolBarMenu->setItemChecked( 10, true );
1076 if (p->mShowIconNewTodo ) 1141 if (p->mShowIconNewTodo )
1077 configureToolBarMenu->setItemChecked( 20, true ); 1142 configureToolBarMenu->setItemChecked( 20, true );
1078 if (p-> mShowIconSearch) 1143 if (p-> mShowIconSearch)
1079 configureToolBarMenu->setItemChecked( 120, true ); 1144 configureToolBarMenu->setItemChecked( 120, true );
1080 if (p-> mShowIconList) 1145 if (p-> mShowIconList)
1081 configureToolBarMenu->setItemChecked( 30, true ); 1146 configureToolBarMenu->setItemChecked( 30, true );
1082 if (p-> mShowIconDay1) 1147 if (p-> mShowIconDay1)
1083 configureToolBarMenu->setItemChecked( 40, true ); 1148 configureToolBarMenu->setItemChecked( 40, true );
1084 if (p-> mShowIconDay5) 1149 if (p-> mShowIconDay5)
1085 configureToolBarMenu->setItemChecked( 50, true ); 1150 configureToolBarMenu->setItemChecked( 50, true );
1086 if (p-> mShowIconDay6) 1151 if (p-> mShowIconDay6)
1087 configureToolBarMenu->setItemChecked( 75, true ); 1152 configureToolBarMenu->setItemChecked( 75, true );
1088 if (p-> mShowIconDay7) 1153 if (p-> mShowIconDay7)
1089 configureToolBarMenu->setItemChecked( 60, true ); 1154 configureToolBarMenu->setItemChecked( 60, true );
1090 if (p-> mShowIconMonth) 1155 if (p-> mShowIconMonth)
1091 configureToolBarMenu->setItemChecked( 70, true ); 1156 configureToolBarMenu->setItemChecked( 70, true );
1092 if (p-> mShowIconTodoview) 1157 if (p-> mShowIconTodoview)
1093 configureToolBarMenu->setItemChecked( 80, true ); 1158 configureToolBarMenu->setItemChecked( 80, true );
1094 if (p-> mShowIconBackFast) 1159 if (p-> mShowIconBackFast)
1095 configureToolBarMenu->setItemChecked( 200, true ); 1160 configureToolBarMenu->setItemChecked( 200, true );
1096 if (p-> mShowIconBack) 1161 if (p-> mShowIconBack)
1097 configureToolBarMenu->setItemChecked( 210, true ); 1162 configureToolBarMenu->setItemChecked( 210, true );
1098 if (p-> mShowIconToday) 1163 if (p-> mShowIconToday)
1099 configureToolBarMenu->setItemChecked( 130, true ); 1164 configureToolBarMenu->setItemChecked( 130, true );
1100 if (p-> mShowIconForward) 1165 if (p-> mShowIconForward)
1101 configureToolBarMenu->setItemChecked( 220, true ); 1166 configureToolBarMenu->setItemChecked( 220, true );
1102 if (p-> mShowIconForwardFast) 1167 if (p-> mShowIconForwardFast)
1103 configureToolBarMenu->setItemChecked( 230, true ); 1168 configureToolBarMenu->setItemChecked( 230, true );
1104 if (p-> mShowIconNextDays) 1169 if (p-> mShowIconNextDays)
1105 configureToolBarMenu->setItemChecked( 100, true ); 1170 configureToolBarMenu->setItemChecked( 100, true );
1106 if (p-> mShowIconNext) 1171 if (p-> mShowIconNext)
1107 configureToolBarMenu->setItemChecked( 110, true ); 1172 configureToolBarMenu->setItemChecked( 110, true );
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 );
1114 QLabel* dummy = new QLabel( iconToolBar ); 1179 if (!p-> mShowIconStretch) {
1115 dummy->setBackgroundColor( iconToolBar->backgroundColor() ); 1180 QLabel* dummy = new QLabel( iconToolBar );
1116 if (!p-> mShowIconStretch) 1181 dummy->setBackgroundColor( iconToolBar->backgroundColor() );
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
1125void MainWindow::exportToPhone( int mode ) 1205void MainWindow::exportToPhone( int mode )
1126{ 1206{
1127 1207
1128 //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); 1208 //ex2phone->insertItem(i18n("Complete calendar..."), 1 );
1129 //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); 1209 //ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
1130 KOex2phonePrefs ex2phone; 1210 KOex2phonePrefs ex2phone;
1131 1211
1132 ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); 1212 ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection );
1133 ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); 1213 ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice );
1134 ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); 1214 ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel );
1135 if ( mode == 1 ) 1215 if ( mode == 1 )
1136 ex2phone.setCaption(i18n("Export complete calendar")); 1216 ex2phone.setCaption(i18n("Export complete calendar"));
1137 if ( mode == 2 ) 1217 if ( mode == 2 )
1138 ex2phone.setCaption(i18n("Export filtered calendar")); 1218 ex2phone.setCaption(i18n("Export filtered calendar"));
1139 1219
1140 if ( !ex2phone.exec() ) { 1220 if ( !ex2phone.exec() ) {
1141 return; 1221 return;
1142 } 1222 }
1143 KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); 1223 KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text();
1144 KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); 1224 KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text();
1145 KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); 1225 KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text();
1146 1226
1147 int inFuture = 0; 1227 int inFuture = 0;
1148 if ( ex2phone.mWriteBackFuture->isChecked() ) 1228 if ( ex2phone.mWriteBackFuture->isChecked() )
1149 inFuture = ex2phone.mWriteBackFutureWeeks->value(); 1229 inFuture = ex2phone.mWriteBackFutureWeeks->value();
1150 QPtrList<Incidence> delSel; 1230 QPtrList<Incidence> delSel;
1151 if ( mode == 1 ) 1231 if ( mode == 1 )
1152 delSel = mCalendar->rawIncidences(); 1232 delSel = mCalendar->rawIncidences();
1153 if ( mode == 2 ) 1233 if ( mode == 2 )
1154 delSel = mCalendar->incidences(); 1234 delSel = mCalendar->incidences();
1155 CalendarLocal* cal = new CalendarLocal(); 1235 CalendarLocal* cal = new CalendarLocal();
1156 cal->setLocalTime(); 1236 cal->setLocalTime();
1157 Incidence *incidence = delSel.first(); 1237 Incidence *incidence = delSel.first();
1158 QDateTime cur = QDateTime::currentDateTime().addDays( -7 ); 1238 QDateTime cur = QDateTime::currentDateTime().addDays( -7 );
1159 QDateTime end = cur.addDays( ( inFuture +1 ) *7 ); 1239 QDateTime end = cur.addDays( ( inFuture +1 ) *7 );
1160 while ( incidence ) { 1240 while ( incidence ) {
1161 if ( incidence->type() != "Journal" ) { 1241 if ( incidence->type() != "Journal" ) {
1162 bool add = true; 1242 bool add = true;
1163 if ( inFuture ) { 1243 if ( inFuture ) {
1164 QDateTime dt; 1244 QDateTime dt;
1165 if ( incidence->type() == "Todo" ) { 1245 if ( incidence->type() == "Todo" ) {
1166 Todo * t = (Todo*)incidence; 1246 Todo * t = (Todo*)incidence;
1167 if ( t->hasDueDate() ) 1247 if ( t->hasDueDate() )
1168 dt = t->dtDue(); 1248 dt = t->dtDue();
1169 else 1249 else
1170 dt = cur.addSecs( 62 ); 1250 dt = cur.addSecs( 62 );
1171 } 1251 }
1172 else { 1252 else {
1173 bool ok; 1253 bool ok;
1174 dt = incidence->getNextOccurence( cur, &ok ); 1254 dt = incidence->getNextOccurence( cur, &ok );
1175 if ( !ok ) 1255 if ( !ok )
1176 dt = cur.addSecs( -62 ); 1256 dt = cur.addSecs( -62 );
1177 } 1257 }
1178 if ( dt < cur || dt > end ) { 1258 if ( dt < cur || dt > end ) {
1179 add = false; 1259 add = false;
1180 } 1260 }
1181 } 1261 }
1182 if ( add ) { 1262 if ( add ) {
1183 Incidence *in = incidence->clone(); 1263 Incidence *in = incidence->clone();
@@ -1500,130 +1580,149 @@ void MainWindow::enableIncidenceActions( bool enabled )
1500 1580
1501 mCloneAction->setEnabled( enabled ); 1581 mCloneAction->setEnabled( enabled );
1502 mMoveAction->setEnabled( enabled ); 1582 mMoveAction->setEnabled( enabled );
1503 mBeamAction->setEnabled( enabled ); 1583 mBeamAction->setEnabled( enabled );
1504 mCancelAction->setEnabled( enabled ); 1584 mCancelAction->setEnabled( enabled );
1505} 1585}
1506 1586
1507void MainWindow::importOL() 1587void MainWindow::importOL()
1508{ 1588{
1509#ifdef _OL_IMPORT_ 1589#ifdef _OL_IMPORT_
1510 KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); 1590 KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );
1511 id->exec(); 1591 id->exec();
1512 delete id; 1592 delete id;
1513 mView->updateView(); 1593 mView->updateView();
1514#endif 1594#endif
1515} 1595}
1516void MainWindow::importBday() 1596void MainWindow::importBday()
1517{ 1597{
1518 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), 1598 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
1519 i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"), 1599 i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),
1520 i18n("Import!"), i18n("Cancel"), 0, 1600 i18n("Import!"), i18n("Cancel"), 0,
1521 0, 1 ); 1601 0, 1 );
1522 if ( result == 0 ) { 1602 if ( result == 0 ) {
1523 mView->importBday(); 1603 mView->importBday();
1524 1604
1525 } 1605 }
1526 1606
1527 1607
1528} 1608}
1529void MainWindow::importQtopia() 1609void MainWindow::importQtopia()
1530{ 1610{
1531 //#ifndef DESKTOP_VERSION 1611 //#ifndef DESKTOP_VERSION
1532 QString mess = i18n("When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing"); 1612 QString mess = i18n("When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing");
1533#ifdef DESKTOP_VERSION 1613#ifdef DESKTOP_VERSION
1534 mess += i18n("The content of the following files will be\nimported (located in your home directory (hd)):\n(hd)/Applications/datebook/datebook.xml\n(hd)/Applications/todolist/todolist.xml\nThe following category file will be used:\n(hd)/Settings/Categories.xml"); 1614 mess += i18n("The content of the following files will be\nimported (located in your home directory (hd)):\n(hd)/Applications/datebook/datebook.xml\n(hd)/Applications/todolist/todolist.xml\nThe following category file will be used:\n(hd)/Settings/Categories.xml");
1535#endif 1615#endif
1536 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mess, 1616 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mess,
1537 i18n("Import!"), i18n("Cancel"), 0, 1617 i18n("Import!"), i18n("Cancel"), 0,
1538 0, 1 ); 1618 0, 1 );
1539 if ( result == 0 ) { 1619 if ( result == 0 ) {
1540#ifndef DESKTOP_VERSION 1620#ifndef DESKTOP_VERSION
1541 QString datebook = Global::applicationFileName( "datebook", "datebook.xml"); 1621 QString datebook = Global::applicationFileName( "datebook", "datebook.xml");
1542 QString todolist = Global::applicationFileName( "todolist", "todolist.xml"); 1622 QString todolist = Global::applicationFileName( "todolist", "todolist.xml");
1543 QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml"; 1623 QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml";
1544#else 1624#else
1545 QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml"; 1625 QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml";
1546 QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml"; 1626 QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml";
1547 QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml"; 1627 QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml";
1548#endif 1628#endif
1549 mView->importQtopia( categories, datebook, todolist ); 1629 mView->importQtopia( categories, datebook, todolist );
1550 } 1630 }
1551#if 0 1631#if 0
1552 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), 1632 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
1553 i18n("Not supported \non desktop!\n"), 1633 i18n("Not supported \non desktop!\n"),
1554 i18n("Ok"), i18n("Cancel"), 0, 1634 i18n("Ok"), i18n("Cancel"), 0,
1555 0, 1 ); 1635 0, 1 );
1556 1636
1557#endif 1637#endif
1558} 1638}
1559 1639
1560void MainWindow::saveOnClose() 1640void 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}
1570void MainWindow::slotModifiedChanged( bool changed ) 1669void MainWindow::slotModifiedChanged( bool changed )
1571{ 1670{
1572 if ( mBlockAtStartup ) 1671 if ( mBlockAtStartup )
1573 return; 1672 return;
1574 1673
1575 int msec; 1674 int msec;
1576 // we store the changes after 1 minute, 1675 // we store the changes after 1 minute,
1577 // and for safety reasons after 10 minutes again 1676 // and for safety reasons after 10 minutes again
1578 if ( !mSyncManager->blockSave() ) 1677 if ( !mSyncManager->blockSave() )
1579 msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000; 1678 msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000;
1580 else 1679 else
1581 msec = 1000 * 600; 1680 msec = 1000 * 600;
1582 mSaveTimer.start( msec, true ); // 1 minute 1681 mSaveTimer.start( msec, true ); // 1 minute
1583 qDebug("KO: Saving File in %d secs!", msec/1000); 1682 qDebug("KO: Saving File in %d secs!", msec/1000);
1584 mCalendarModifiedFlag = true; 1683 mCalendarModifiedFlag = true;
1585} 1684}
1586void MainWindow::saveStopTimer() 1685void MainWindow::saveStopTimer()
1587{ 1686{
1588 mSaveTimer.stop(); 1687 mSaveTimer.stop();
1589 if (mSaveTimer.isActive() ) 1688 if (mSaveTimer.isActive() )
1590 qDebug("ti active "); 1689 qDebug("ti active ");
1591 else 1690 else
1592 qDebug("KO: Save timer stopped"); 1691 qDebug("KO: Save timer stopped");
1593} 1692}
1594void MainWindow::save() 1693void MainWindow::save()
1595{ 1694{
1596 if ( !mCalendarModifiedFlag ) { 1695 if ( !mCalendarModifiedFlag ) {
1597 qDebug("KO: Calendar not modified. Nothing saved."); 1696 qDebug("KO: Calendar not modified. Nothing saved.");
1598 return; 1697 return;
1599 } 1698 }
1600 if ( mSyncManager->blockSave() ) 1699 if ( mSyncManager->blockSave() )
1601 return; 1700 return;
1602 mSyncManager->setBlockSave(true); 1701 mSyncManager->setBlockSave(true);
1603 if ( mView->checkFileVersion( defaultFileName()) ) { 1702 if ( mView->checkFileVersion( defaultFileName()) ) {
1604 QTime neededSaveTime = QDateTime::currentDateTime().time(); 1703 QTime neededSaveTime = QDateTime::currentDateTime().time();
1605 setCaption(i18n("KO/Pi:Saving Data to File ..." )); 1704 setCaption(i18n("KO/Pi:Saving Data to File ..." ));
1606 qDebug("KO: Start saving data to file!"); 1705 qDebug("KO: Start saving data to file!");
1607 mView->saveCalendar( defaultFileName() ); 1706 mView->saveCalendar( defaultFileName() );
1608 mCalendarModifiedFlag = false; 1707 mCalendarModifiedFlag = false;
1609 int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); 1708 int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
1610 qDebug("KO: Needed %d ms for saving.",msNeeded ); 1709 qDebug("KO: Needed %d ms for saving.",msNeeded );
1611 QString savemes; 1710 QString savemes;
1612 savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000 ); 1711 savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000 );
1613 setCaption(savemes); 1712 setCaption(savemes);
1614 } else 1713 } else
1615 setCaption(i18n("Saving cancelled!")); 1714 setCaption(i18n("Saving cancelled!"));
1616 mSyncManager->setBlockSave( false ); 1715 mSyncManager->setBlockSave( false );
1617} 1716}
1618 1717
1619void MainWindow::keyReleaseEvent ( QKeyEvent * e) 1718void MainWindow::keyReleaseEvent ( QKeyEvent * e)
1620{ 1719{
1621 if ( !e->isAutoRepeat() ) { 1720 if ( !e->isAutoRepeat() ) {
1622 mFlagKeyPressed = false; 1721 mFlagKeyPressed = false;
1623 } 1722 }
1624} 1723}
1625void MainWindow::keyPressEvent ( QKeyEvent * e ) 1724void MainWindow::keyPressEvent ( QKeyEvent * e )
1626{ 1725{
1627 qApp->processEvents(); 1726 qApp->processEvents();
1628 if ( e->isAutoRepeat() && !mFlagKeyPressed ) { 1727 if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
1629 e->ignore(); 1728 e->ignore();
@@ -1744,169 +1843,208 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
1744 mView->editFilters(); 1843 mView->editFilters();
1745 else 1844 else
1746 mView->toggleFilter(); 1845 mView->toggleFilter();
1747 break; 1846 break;
1748 case Qt::Key_X: 1847 case Qt::Key_X:
1749 mView->toggleDateNavigatorWidget(); 1848 mView->toggleDateNavigatorWidget();
1750 break; 1849 break;
1751 case Qt::Key_Space: 1850 case Qt::Key_Space:
1752 mView->toggleExpand(); 1851 mView->toggleExpand();
1753 break; 1852 break;
1754 case Qt::Key_A: 1853 case Qt::Key_A:
1755 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) 1854 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton )
1756 mView->showNextAlarms(); 1855 mView->showNextAlarms();
1757 else 1856 else
1758 mView->toggleAllDaySize(); 1857 mView->toggleAllDaySize();
1759 break; 1858 break;
1760 case Qt::Key_T: 1859 case Qt::Key_T:
1761 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) 1860 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton )
1762 mView->newTodo(); 1861 mView->newTodo();
1763 else { 1862 else {
1764 mView->goToday(); 1863 mView->goToday();
1765 showSelectedDates = true; 1864 showSelectedDates = true;
1766 } 1865 }
1767 break; 1866 break;
1768 case Qt::Key_J: 1867 case Qt::Key_J:
1769 mView->viewManager()->showJournalView(); 1868 mView->viewManager()->showJournalView();
1770 break; 1869 break;
1771 case Qt::Key_B: 1870 case Qt::Key_B:
1772 mView->editIncidenceDescription();; 1871 mView->editIncidenceDescription();;
1773 break; 1872 break;
1774 // case Qt::Key_Return: 1873 // case Qt::Key_Return:
1775 case Qt::Key_E: 1874 case Qt::Key_E:
1776 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) 1875 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton )
1777 mView->newEvent(); 1876 mView->newEvent();
1778 else 1877 else
1779 mView->editIncidence(); 1878 mView->editIncidence();
1780 break; 1879 break;
1781 case Qt::Key_Plus: 1880 case Qt::Key_Plus:
1782 size = p->mHourSize +2; 1881 size = p->mHourSize +2;
1783 if ( size <= 22 ) 1882 if ( size <= 22 )
1784 configureAgenda( size ); 1883 configureAgenda( size );
1785 break; 1884 break;
1786 case Qt::Key_Minus: 1885 case Qt::Key_Minus:
1787 size = p->mHourSize - 2; 1886 size = p->mHourSize - 2;
1788 if ( size >= 4 ) 1887 if ( size >= 4 )
1789 configureAgenda( size ); 1888 configureAgenda( size );
1790 break; 1889 break;
1791 1890
1792 1891
1793 default: 1892 default:
1794 e->ignore(); 1893 e->ignore();
1795 } 1894 }
1796 if ( pro > 0 ) { 1895 if ( pro > 0 ) {
1797 mView->selectFilter( pro-1 ); 1896 mView->selectFilter( pro-1 );
1798 } 1897 }
1799 if ( showSelectedDates ) { 1898 if ( showSelectedDates ) {
1800 ;// setCaptionToDates(); 1899 ;// setCaptionToDates();
1801 } 1900 }
1802 1901
1803} 1902}
1804 1903
1805void MainWindow::fillFilterMenu() 1904void 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}
1927void 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}
1833void MainWindow::selectFilter( int fil ) 1948void 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 ){
1838 mView->toggleFilerEnabled( ); 1954 if ( mView->filterView()->filtersEnabled() )
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 );
1960 }
1961}
1962void 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 }
1841 } 1973 }
1842} 1974}
1975void MainWindow::selectFilterPopup( int fil )
1976{
1977 selectFilter( fil + 1 );
1978
1979}
1843void MainWindow::configureToolBar( int item ) 1980void 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 );
1855 p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 ); 1993 p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 );
1856 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 ); 1994 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 );
1857 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); 1995 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 );
1858 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); 1996 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 );
1859 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); 1997 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 );
1860 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); 1998 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 );
1861 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); 1999 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 );
1862 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); 2000 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 );
1863 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); 2001 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 );
1864 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); 2002 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 );
1865 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); 2003 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 );
1866 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); 2004 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 );
1867 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); 2005 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 );
1868 p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 ); 2006 p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 );
1869 // initActions(); 2007 // initActions();
1870} 2008}
1871void MainWindow::setCaption ( const QString & c ) 2009void MainWindow::setCaption ( const QString & c )
1872{ 2010{
1873 QString cap = c; 2011 QString cap = c;
1874 cap.replace( QRegExp("\n"), " " ); 2012 cap.replace( QRegExp("\n"), " " );
1875 cap = cap.stripWhiteSpace(); 2013 cap = cap.stripWhiteSpace();
1876 if ( cap.isEmpty() ) 2014 if ( cap.isEmpty() )
1877 cap = "KO/Pi"; 2015 cap = "KO/Pi";
1878 QWidget::setCaption( cap ); 2016 QWidget::setCaption( cap );
1879} 2017}
1880void MainWindow::setCaptionToDates() 2018void MainWindow::setCaptionToDates()
1881{ 2019{
1882 QString selDates; 2020 QString selDates;
1883 QDate date = mView->startDate(); 2021 QDate date = mView->startDate();
1884 if ( ! date.isValid() ) { 2022 if ( ! date.isValid() ) {
1885 setCaption(""); 2023 setCaption("");
1886 return; 2024 return;
1887 } 2025 }
1888 selDates = KGlobal::locale()->formatDate( date, true); 2026 selDates = KGlobal::locale()->formatDate( date, true);
1889 if (mView->startDate() < mView->endDate() ) 2027 if (mView->startDate() < mView->endDate() )
1890 selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); 2028 selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true);
1891 else { 2029 else {
1892 QString addString; 2030 QString addString;
1893 if ( date == QDateTime::currentDateTime().date() ) 2031 if ( date == QDateTime::currentDateTime().date() )
1894 addString = i18n("Today"); 2032 addString = i18n("Today");
1895 else if ( date == QDateTime::currentDateTime().date().addDays(1) ) 2033 else if ( date == QDateTime::currentDateTime().date().addDays(1) )
1896 addString = i18n("Tomorrow"); 2034 addString = i18n("Tomorrow");
1897 if ( !addString.isEmpty() ) 2035 if ( !addString.isEmpty() )
1898 selDates = addString+", "+selDates ; 2036 selDates = addString+", "+selDates ;
1899 } 2037 }
1900 setCaption( i18n("Dates: ") + selDates ); 2038 setCaption( i18n("Dates: ") + selDates );
1901 2039
1902} 2040}
1903void MainWindow::showConfigureAgenda( ) 2041void MainWindow::showConfigureAgenda( )
1904{ 2042{
1905 int iii; 2043 int iii;
1906 for ( iii = 1;iii<= 10 ;++iii ){ 2044 for ( iii = 1;iii<= 10 ;++iii ){
1907 configureAgendaMenu->setItemChecked( (iii+1)*2, false ); 2045 configureAgendaMenu->setItemChecked( (iii+1)*2, false );
1908 } 2046 }
1909 configureAgendaMenu->setItemChecked( (KOPrefs::instance()->mHourSize/2)*2, true ); 2047 configureAgendaMenu->setItemChecked( (KOPrefs::instance()->mHourSize/2)*2, true );
1910} 2048}
1911void MainWindow::configureAgenda( int item ) 2049void MainWindow::configureAgenda( int item )
1912{ 2050{
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index b3041dc..79fb305 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -1,161 +1,170 @@
1#ifndef KORGE_MAINWINDOW_H 1#ifndef KORGE_MAINWINDOW_H
2#define KORGE_MAINWINDOW_H 2#define KORGE_MAINWINDOW_H
3 3
4#include <qmainwindow.h> 4#include <qmainwindow.h>
5#include <qtimer.h> 5#include <qtimer.h>
6#include <qdict.h> 6#include <qdict.h>
7#include <qfile.h> 7#include <qfile.h>
8#include <qmenubar.h> 8#include <qmenubar.h>
9#include <qtextstream.h> 9#include <qtextstream.h>
10#include <qregexp.h> 10#include <qregexp.h>
11 11
12#include <libkcal/incidence.h> 12#include <libkcal/incidence.h>
13#include "simplealarmclient.h" 13#include "simplealarmclient.h"
14#include <ksyncmanager.h> 14#include <ksyncmanager.h>
15#ifndef DESKTOP_VERSION 15#ifndef DESKTOP_VERSION
16#include <qcopchannel_qws.h> 16#include <qcopchannel_qws.h>
17#endif 17#endif
18class QAction; 18class QAction;
19class CalendarView; 19class CalendarView;
20class KSyncProfile; 20class 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
26class QPEToolBar; 26class QPEToolBar;
27class QPEMenuBar;
27 28
28 29
29namespace KCal { 30namespace KCal {
30class CalendarLocal; 31class CalendarLocal;
31} 32}
32 33
33class KOMenuBar : public QMenuBar 34class KOMenuBar : public QMenuBar
34{ 35{
35 public: 36 public:
36 KOMenuBar( QWidget *parent=0 ): QMenuBar (parent ) {;} 37 KOMenuBar( QWidget *parent=0 ): QMenuBar (parent ) {;}
37 QSize sizeHint () const{ qDebug("sizejint ");return QSize ( 40,25 );} 38 QSize sizeHint () const{ qDebug("sizejint ");return QSize ( 40,25 );}
38}; 39};
39 40
40using namespace KCal; 41using namespace KCal;
41 42
42class MainWindow : public QMainWindow 43class MainWindow : public QMainWindow
43{ 44{
44 Q_OBJECT 45 Q_OBJECT
45 public: 46 public:
46 MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); 47 MainWindow( QWidget *parent = 0, const char *name = 0, QString command = "");
47 ~MainWindow(); 48 ~MainWindow();
48 bool beamReceiveEnabled(); 49 bool beamReceiveEnabled();
49 static QString defaultFileName(); 50 static QString defaultFileName();
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();
62 void about(); 64 void about();
63 void licence(); 65 void licence();
64 void faq(); 66 void faq();
65 void usertrans(); 67 void usertrans();
66 void features(); 68 void features();
67 void synchowto(); 69 void synchowto();
68 void kdesynchowto(); 70 void kdesynchowto();
69 void multisynchowto(); 71 void multisynchowto();
70 void whatsNew(); 72 void whatsNew();
71 void keyBindings(); 73 void keyBindings();
72 void aboutAutoSaving();; 74 void aboutAutoSaving();;
73 void aboutKnownBugs(); 75 void aboutKnownBugs();
74 76
75 void processIncidenceSelection( Incidence * ); 77 void processIncidenceSelection( Incidence * );
76 78
77 void importQtopia(); 79 void importQtopia();
78 void importBday(); 80 void importBday();
79 void importOL(); 81 void importOL();
80 void importIcal(); 82 void importIcal();
81 void importFile( QString, bool ); 83 void importFile( QString, bool );
82 void quickImportIcal(); 84 void quickImportIcal();
83 85
84 void slotModifiedChanged( bool ); 86 void slotModifiedChanged( bool );
85 87
86 void save(); 88 void save();
87 void saveStopTimer(); 89 void saveStopTimer();
88 void configureToolBar( int ); 90 void configureToolBar( int );
89 void printSel(); 91 void printSel();
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:
102 void showConfigureAgenda(); 106 void showConfigureAgenda();
103 void getFile( bool ); 107 void getFile( bool );
104 void syncFileRequest(); 108 void syncFileRequest();
105 109
106 protected: 110 protected:
107 void hideEvent ( QHideEvent * ); 111 void hideEvent ( QHideEvent * );
108 QString sentSyncFile(); 112 QString sentSyncFile();
109 void displayText( QString, QString); 113 void displayText( QString, QString);
110 void enableIncidenceActions( bool ); 114 void enableIncidenceActions( bool );
111 115
112 private: 116 private:
113 bool mBRdisabled; 117 bool mBRdisabled;
114#ifndef DESKTOP_VERSION 118#ifndef DESKTOP_VERSION
115 QCopChannel* infrared; 119 QCopChannel* infrared;
116#endif 120#endif
117 QAction* brAction; 121 QAction* brAction;
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;
130 QPopupMenu *configureAgendaMenu, *syncMenu; 139 QPopupMenu *configureAgendaMenu, *syncMenu;
131 CalendarLocal *mCalendar; 140 CalendarLocal *mCalendar;
132 CalendarView *mView; 141 CalendarView *mView;
133 QAction *mNewSubTodoAction; 142 QAction *mNewSubTodoAction;
134 QAction *mWeekAction; 143 QAction *mWeekAction;
135 QFont mWeekFont; 144 QFont mWeekFont;
136 QPixmap mWeekPixmap; 145 QPixmap mWeekPixmap;
137 QColor mWeekBgColor; 146 QColor mWeekBgColor;
138 147
139 QAction *mShowAction; 148 QAction *mShowAction;
140 QAction *mEditAction; 149 QAction *mEditAction;
141 QAction *mDeleteAction; 150 QAction *mDeleteAction;
142 QAction *mCloneAction; 151 QAction *mCloneAction;
143 QAction *mMoveAction; 152 QAction *mMoveAction;
144 QAction *mBeamAction; 153 QAction *mBeamAction;
145 QAction *mCancelAction; 154 QAction *mCancelAction;
146 155
147 QAction *mToggleNav; 156 QAction *mToggleNav;
148 QAction *mToggleFilter; 157 QAction *mToggleFilter;
149 QAction *mToggleAllday; 158 QAction *mToggleAllday;
150 159
151 160
152 void closeEvent( QCloseEvent* ce ); 161 void closeEvent( QCloseEvent* ce );
153 SimpleAlarmClient mAlarmClient; 162 SimpleAlarmClient mAlarmClient;
154 QTimer mSaveTimer; 163 QTimer mSaveTimer;
155 //bool mBlockSaveFlag; 164 //bool mBlockSaveFlag;
156 bool mCalendarModifiedFlag; 165 bool mCalendarModifiedFlag;
157 QPixmap loadPixmap( QString ); 166 QPixmap loadPixmap( QString );
158}; 167};
159 168
160 169
161#endif 170#endif