summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-07-08 12:15:38 (UTC)
committer zautrix <zautrix>2005-07-08 12:15:38 (UTC)
commit3e94cf2e8a14c7d40aea28a0fe5538abcd211746 (patch) (unidiff)
tree04b5095d96824d5c3d4e01c144e2968dc99e46d8
parente1ed9342934d027f8b72a97eb710a52abe53b719 (diff)
downloadkdepimpi-3e94cf2e8a14c7d40aea28a0fe5538abcd211746.zip
kdepimpi-3e94cf2e8a14c7d40aea28a0fe5538abcd211746.tar.gz
kdepimpi-3e94cf2e8a14c7d40aea28a0fe5538abcd211746.tar.bz2
fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koprefs.cpp2
-rw-r--r--korganizer/mainwindow.cpp26
-rw-r--r--korganizer/mainwindow.h1
3 files changed, 24 insertions, 5 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 9e7f18c..6560877 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -203,129 +203,129 @@ KOPrefs::KOPrefs() :
203 addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" ); 203 addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
204 204
205 205
206 KPrefs::setCurrentGroup("Locale"); 206 KPrefs::setCurrentGroup("Locale");
207 addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 207 addItemBool("ShortDateInViewer",&mShortDateInViewer,false);
208 208
209 209
210 KPrefs::setCurrentGroup("Colors"); 210 KPrefs::setCurrentGroup("Colors");
211 addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor); 211 addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
212 addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor); 212 addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
213 addItemColor("Event Color",&mEventColor,mDefaultCategoryColor); 213 addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
214 addItemColor("Todo done Color",&mTodoDoneColor,QColor(111,255,115) ); 214 addItemColor("Todo done Color",&mTodoDoneColor,QColor(111,255,115) );
215 addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor); 215 addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
216 addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor); 216 addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
217 addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor); 217 addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
218 addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor); 218 addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
219 addItemColor("Todo running Color",&mTodoRunColor,defaultTodoRunColor); 219 addItemColor("Todo running Color",&mTodoRunColor,defaultTodoRunColor);
220 addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 )); 220 addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
221 addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 )); 221 addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
222 addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 )); 222 addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
223 addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 223 addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true);
224 addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true); 224 addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
225 addItemBool("MonthViewWeek",&mMonthViewWeek,false); 225 addItemBool("MonthViewWeek",&mMonthViewWeek,false);
226 addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 226 addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false);
227 addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 )); 227 addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
228 addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 )); 228 addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 ));
229 addItemBool("UseAppColors",&mUseAppColors,false); 229 addItemBool("UseAppColors",&mUseAppColors,false);
230 230
231 231
232 232
233 KPrefs::setCurrentGroup("Views"); 233 KPrefs::setCurrentGroup("Views");
234 addItemBool("Block Popup Menu",&mBlockPopupMenu,false); 234 addItemBool("Block Popup Menu",&mBlockPopupMenu,false);
235 addItemBool("Show Date Navigator",&mShowDateNavigator,true); 235 addItemBool("Show Date Navigator",&mShowDateNavigator,true);
236 addItemInt("Hour Size",&mHourSize,8); 236 addItemInt("Hour Size",&mHourSize,8);
237 addItemBool("Show Daily Recurrences",&mDailyRecur,true); 237 addItemBool("Show Daily Recurrences",&mDailyRecur,true);
238 addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); 238 addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
239 addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true); 239 addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
240 addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true); 240 addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
241 addItemBool("ShowShortMonthName",&mMonthShowShort,false); 241 addItemBool("ShowShortMonthName",&mMonthShowShort,false);
242 addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true); 242 addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
243 addItemBool("ShowTimesInMonthCell",&mMonthShowTimes,true); 243 addItemBool("ShowTimesInMonthCell",&mMonthShowTimes,true);
244#ifdef DESKTOP_VERION 244#ifdef DESKTOP_VERION
245 addItemBool("Enable ToolTips",&mEnableToolTips,true); 245 addItemBool("Enable ToolTips",&mEnableToolTips,true);
246#else 246#else
247 addItemBool("Enable ToolTips",&mEnableToolTips,false); 247 addItemBool("Enable ToolTips",&mEnableToolTips,false);
248#endif 248#endif
249 addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false); 249 addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
250 addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false); 250 addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
251 addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true); 251 addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
252 addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true); 252 addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
253 addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true); 253 addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true);
254 addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false); 254 addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
255 addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false); 255 addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
256 addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true); 256 addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
257 addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true); 257 addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
258 addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);; 258 addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);;
259 addItemBool("WNViewShowsPast",&mWNViewShowsPast,true); 259 addItemBool("WNViewShowsPast",&mWNViewShowsPast,true);
260 addItemBool("WNViewShowLocation",&mWNViewShowLocation,false); 260 addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
261 addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false); 261 addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
262 addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true); 262 addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
263 addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false); 263 addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
264 addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false); 264 addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
265 addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,true); 265 addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,true);
266 addItemBool("MonthViewUsesBigFont",&mMonthViewUsesBigFont,true); 266 addItemBool("MonthViewUsesBigFont",&mMonthViewUsesBigFont,true);
267 addItemBool("MonthViewWeekRowlayout",&mMonthViewWeekRowlayout,true); 267 addItemBool("MonthViewWeekRowlayout",&mMonthViewWeekRowlayout,false);
268 addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false); 268 addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
269 addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false); 269 addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
270#ifdef DESKTOP_VERSION 270#ifdef DESKTOP_VERSION
271 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true); 271 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
272#else 272#else
273 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false); 273 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
274#endif 274#endif
275 addItemInt("Day Begins",&mDayBegins,7); 275 addItemInt("Day Begins",&mDayBegins,7);
276 addItemInt("Working Hours Start",&mWorkingHoursStart,8); 276 addItemInt("Working Hours Start",&mWorkingHoursStart,8);
277 addItemInt("Working Hours End",&mWorkingHoursEnd,17); 277 addItemInt("Working Hours End",&mWorkingHoursEnd,17);
278 addItemBool("Exclude Holidays",&mExcludeHolidays,true); 278 addItemBool("Exclude Holidays",&mExcludeHolidays,true);
279 addItemBool("Exclude Saturdays",&mExcludeSaturdays,true); 279 addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
280 280
281 addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false); 281 addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false);
282 addItemBool("Full View Month",&mFullViewMonth,true); 282 addItemBool("Full View Month",&mFullViewMonth,true);
283 addItemBool("Full View Todo",&mFullViewTodo,true); 283 addItemBool("Full View Todo",&mFullViewTodo,true);
284 addItemBool("Quick Todo",&mEnableQuickTodo,false); 284 addItemBool("Quick Todo",&mEnableQuickTodo,false);
285 285
286 addItemInt("Next X Days",&mNextXDays,3); 286 addItemInt("Next X Days",&mNextXDays,3);
287 287
288 KPrefs::setCurrentGroup("Printer"); 288 KPrefs::setCurrentGroup("Printer");
289 289
290 KPrefs::setCurrentGroup("Layout"); 290 KPrefs::setCurrentGroup("Layout");
291 291
292 addItemBool("CompactDialogs",&mCompactDialogs,false); 292 addItemBool("CompactDialogs",&mCompactDialogs,false);
293 addItemBool("VerticalScreen",&mVerticalScreen,true); 293 addItemBool("VerticalScreen",&mVerticalScreen,true);
294 294
295 KPrefs::setCurrentGroup("KOrganizer Plugins"); 295 KPrefs::setCurrentGroup("KOrganizer Plugins");
296 296
297 addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays"); 297 addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
298 298
299 KPrefs::setCurrentGroup("Group Scheduling"); 299 KPrefs::setCurrentGroup("Group Scheduling");
300 300
301 addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail); 301 addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
302 addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend); 302 addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
303 addItemStringList("AdditionalMails",&mAdditionalMails,""); 303 addItemStringList("AdditionalMails",&mAdditionalMails,"");
304 addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto); 304 addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
305 addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto); 305 addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
306 addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto); 306 addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto);
307 addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto); 307 addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto);
308 addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto); 308 addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto);
309 309
310 KPrefs::setCurrentGroup( "Editors" ); 310 KPrefs::setCurrentGroup( "Editors" );
311 311
312 addItemStringList( "EventTemplates", &mEventTemplates ); 312 addItemStringList( "EventTemplates", &mEventTemplates );
313 addItemStringList( "TodoTemplates", &mTodoTemplates ); 313 addItemStringList( "TodoTemplates", &mTodoTemplates );
314 314
315 addItemInt("DestinationPolicy",&mDestination,standardDestination); 315 addItemInt("DestinationPolicy",&mDestination,standardDestination);
316 316
317 KPrefs::setCurrentGroup( "ViewOptions" ); 317 KPrefs::setCurrentGroup( "ViewOptions" );
318 addItemBool("EVshowDetails",&mEVshowDetails,true); 318 addItemBool("EVshowDetails",&mEVshowDetails,true);
319 addItemBool("EVshowCreated",&mEVshowCreated,true); 319 addItemBool("EVshowCreated",&mEVshowCreated,true);
320 addItemBool("EVshowChanged",&mEVshowChanged,true); 320 addItemBool("EVshowChanged",&mEVshowChanged,true);
321 addItemBool("WTshowDetails",&mWTshowDetails,false); 321 addItemBool("WTshowDetails",&mWTshowDetails,false);
322 addItemBool("WTshowCreated",&mWTshowCreated,false); 322 addItemBool("WTshowCreated",&mWTshowCreated,false);
323 addItemBool("WTshowChanged",&mWTshowChanged,false); 323 addItemBool("WTshowChanged",&mWTshowChanged,false);
324 mCalendars.setAutoDelete( true ); 324 mCalendars.setAutoDelete( true );
325} 325}
326 326
327 327
328KOPrefs::~KOPrefs() 328KOPrefs::~KOPrefs()
329{ 329{
330 if (mInstance == this) 330 if (mInstance == this)
331 mInstance = insd.setObject(0); 331 mInstance = insd.setObject(0);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index bfae1b5..5249300 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1057,176 +1057,179 @@ void MainWindow::initActions()
1057 connect( action, SIGNAL( activated() ), 1057 connect( action, SIGNAL( activated() ),
1058 mView, SLOT( edit_global_options() ) ); 1058 mView, SLOT( edit_global_options() ) );
1059 if ( KOPrefs::instance()->mShowFullMenu ) { 1059 if ( KOPrefs::instance()->mShowFullMenu ) {
1060 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); 1060 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
1061 1061
1062 } 1062 }
1063 // actionMenu->insertSeparator(); 1063 // actionMenu->insertSeparator();
1064 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, 1064 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
1065 this ); 1065 this );
1066 action->addTo( importMenu_X ); 1066 action->addTo( importMenu_X );
1067 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); 1067 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
1068 action = new QAction( "import_quick", i18n("Import last file"), 0, 1068 action = new QAction( "import_quick", i18n("Import last file"), 0,
1069 this ); 1069 this );
1070 action->addTo( importMenu_X ); 1070 action->addTo( importMenu_X );
1071 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); 1071 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
1072 importMenu_X->insertSeparator(); 1072 importMenu_X->insertSeparator();
1073 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, 1073 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
1074 this ); 1074 this );
1075 action->addTo( importMenu_X ); 1075 action->addTo( importMenu_X );
1076 connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); 1076 connect( action, SIGNAL( activated() ), SLOT( importBday() ) );
1077 //#ifndef DESKTOP_VERSION 1077 //#ifndef DESKTOP_VERSION
1078 importMenu_X->insertSeparator(); 1078 importMenu_X->insertSeparator();
1079 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, 1079 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
1080 this ); 1080 this );
1081 action->addTo( importMenu_X ); 1081 action->addTo( importMenu_X );
1082 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); 1082 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
1083 //#else 1083 //#else
1084#ifdef _OL_IMPORT_ 1084#ifdef _OL_IMPORT_
1085 importMenu_X->insertSeparator(); 1085 importMenu_X->insertSeparator();
1086 action = new QAction( "import_ol", i18n("Import from OL"), 0, 1086 action = new QAction( "import_ol", i18n("Import from OL"), 0,
1087 this ); 1087 this );
1088 action->addTo( importMenu_X ); 1088 action->addTo( importMenu_X );
1089 connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); 1089 connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
1090#endif 1090#endif
1091 //#endif 1091 //#endif
1092 1092
1093 //importMenu->insertSeparator(); 1093 //importMenu->insertSeparator();
1094#if 0 1094#if 0
1095 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, 1095 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
1096 this ); 1096 this );
1097 action->addTo( importMenu ); 1097 action->addTo( importMenu );
1098 connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); 1098 connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) );
1099#endif 1099#endif
1100 action = new QAction( "save_cal", i18n("Save Backup..."), 0, 1100 action = new QAction( "save_cal", i18n("Save Backup..."), 0,
1101 this ); 1101 this );
1102 action->addTo( importMenu ); 1102 action->addTo( importMenu );
1103 connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); 1103 connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) );
1104 importMenu->insertSeparator(); 1104 importMenu->insertSeparator();
1105 importMenu->insertItem( i18n("Import"), importMenu_X ); 1105 importMenu->insertItem( i18n("Import"), importMenu_X );
1106 //importMenu->insertSeparator(); 1106 //importMenu->insertSeparator();
1107 action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, 1107 action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
1108 this ); 1108 this );
1109 action->addTo( exportMenu_X ); 1109 action->addTo( exportMenu_X );
1110 connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); 1110 connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
1111 1111
1112 1112
1113 //LR 1113 //LR
1114 QPopupMenu *ex2phone = new QPopupMenu( this ); 1114 QPopupMenu *ex2phone = new QPopupMenu( this );
1115 ex2phone->insertItem(i18n("Complete calendar..."), 1 ); 1115 ex2phone->insertItem(i18n("Complete calendar..."), 1 );
1116 ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); 1116 ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
1117 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); 1117 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) );
1118 exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); 1118 exportMenu_X->insertItem( i18n("Export to phone"), ex2phone );
1119 1119
1120 importMenu->insertItem( i18n("Export"), exportMenu_X ); 1120 importMenu->insertItem( i18n("Export"), exportMenu_X );
1121 mPrintSelAction = 0;
1121#ifndef DESKTOP_VERSION 1122#ifndef DESKTOP_VERSION
1122 //importMenu->insertSeparator(); 1123 //importMenu->insertSeparator();
1123 brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, 1124 brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0,
1124 this ); 1125 this );
1125 brAction->addTo( beamMenu_X ); 1126 brAction->addTo( beamMenu_X );
1126 brAction->setToggleAction (true ) ; 1127 brAction->setToggleAction (true ) ;
1127 connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); 1128 connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) );
1128 1129
1129 action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, 1130 action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
1130 this ); 1131 this );
1131 action->addTo( beamMenu_X ); 1132 action->addTo( beamMenu_X );
1132 connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); 1133 connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) );
1133 1134
1134 action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, 1135 action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0,
1135 this ); 1136 this );
1136 action->addTo( beamMenu_X ); 1137 action->addTo( beamMenu_X );
1137 connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); 1138 connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) );
1138 importMenu->insertItem( i18n("Beam"), beamMenu_X ); 1139 importMenu->insertItem( i18n("Beam"), beamMenu_X );
1139#else 1140#else
1140 //importMenu->insertSeparator(); 1141 //importMenu->insertSeparator();
1141 icon = loadPixmap( pathString + "print" ); 1142 icon = loadPixmap( pathString + "print" );
1142 action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); 1143 action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
1143 action->addTo( beamMenu_X ); 1144 action->addTo( beamMenu_X );
1144 connect( action, SIGNAL( activated() ), 1145 connect( action, SIGNAL( activated() ),
1145 this, SLOT( printCal() ) ); 1146 this, SLOT( printCal() ) );
1146 1147
1147 icon = loadPixmap( pathString + "print" ); 1148 icon = loadPixmap( pathString + "week" );
1148 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); 1149 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
1149 action->addTo( beamMenu_X ); 1150 action->addTo( beamMenu_X );
1150 connect( action, SIGNAL( activated() ), 1151 connect( action, SIGNAL( activated() ),
1151 this, SLOT( printSel() ) ); 1152 this, SLOT( printSel() ) );
1153 icon = loadPixmap( pathString + "whatsnext" );
1152 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); 1154 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
1153 action->addTo( beamMenu_X ); 1155 action->addTo( beamMenu_X );
1154 connect( action, SIGNAL( activated() ), 1156 connect( action, SIGNAL( activated() ),
1155 mView->viewManager(), SLOT( slotprintWNV() ) ); 1157 mView->viewManager(), SLOT( slotprintWNV() ) );
1156 1158
1157 1159
1158 icon = loadPixmap( pathString + "print" ); 1160 icon = loadPixmap( pathString + "list" );
1159 action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this ); 1161 action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this );
1160 action->addTo( beamMenu_X ); 1162 action->addTo( beamMenu_X );
1161 connect( action, SIGNAL( activated() ), 1163 connect( action, SIGNAL( activated() ),
1162 this, SLOT( printListView() ) ); 1164 this, SLOT( printListView() ) );
1163 1165
1166 icon = loadPixmap( pathString + "newevent" );
1164 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); 1167 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
1165 action->addTo( beamMenu_X ); 1168 action->addTo( beamMenu_X );
1166 connect( action, SIGNAL( activated() ), 1169 connect( action, SIGNAL( activated() ),
1167 mView, SLOT( slotprintSelInc() ) ); 1170 mView, SLOT( slotprintSelInc() ) );
1168 1171 mPrintSelAction = action;
1169 importMenu->insertItem( i18n("Print"), beamMenu_X ); 1172 importMenu->insertItem( i18n("Print"), beamMenu_X );
1170#endif 1173#endif
1171 1174
1172 importMenu->insertSeparator(); 1175 importMenu->insertSeparator();
1173 action = new QAction( "beam all", i18n("Save"), 0, 1176 action = new QAction( "beam all", i18n("Save"), 0,
1174 this ); 1177 this );
1175 action->addTo( importMenu ); 1178 action->addTo( importMenu );
1176 connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); 1179 connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
1177 action = new QAction( "beam all", i18n("Exit (+save)"), 0, 1180 action = new QAction( "beam all", i18n("Exit (+save)"), 0,
1178 this ); 1181 this );
1179 action->addTo( importMenu ); 1182 action->addTo( importMenu );
1180 connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); 1183 connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
1181 1184
1182 //menuBar->insertItem( "Configure",configureMenu ); 1185 //menuBar->insertItem( "Configure",configureMenu );
1183 //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); 1186 //configureMenu->insertItem( "Toolbar",configureToolBarMenu );
1184 icon = loadPixmap( "korganizer/korganizer" ); 1187 icon = loadPixmap( "korganizer/korganizer" );
1185 1188
1186 action = new QAction( "Whats New", i18n("What's new?"), 0,this ); 1189 action = new QAction( "Whats New", i18n("What's new?"), 0,this );
1187 action->addTo( helpMenu ); 1190 action->addTo( helpMenu );
1188 connect( action, SIGNAL( activated() ), 1191 connect( action, SIGNAL( activated() ),
1189 SLOT( whatsNew() ) ); 1192 SLOT( whatsNew() ) );
1190 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); 1193 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this );
1191 action->addTo( helpMenu ); 1194 action->addTo( helpMenu );
1192 connect( action, SIGNAL( activated() ), 1195 connect( action, SIGNAL( activated() ),
1193 SLOT( features() ) ); 1196 SLOT( features() ) );
1194 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); 1197 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
1195 action->addTo( helpMenu ); 1198 action->addTo( helpMenu );
1196 connect( action, SIGNAL( activated() ), 1199 connect( action, SIGNAL( activated() ),
1197 SLOT( keyBindings() ) ); 1200 SLOT( keyBindings() ) );
1198 action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this ); 1201 action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this );
1199 action->addTo( helpMenu ); 1202 action->addTo( helpMenu );
1200 connect( action, SIGNAL( activated() ), 1203 connect( action, SIGNAL( activated() ),
1201 SLOT( storagehowto() ) ); 1204 SLOT( storagehowto() ) );
1202 action = new QAction( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this ); 1205 action = new QAction( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this );
1203 action->addTo( helpMenu ); 1206 action->addTo( helpMenu );
1204 connect( action, SIGNAL( activated() ), 1207 connect( action, SIGNAL( activated() ),
1205 SLOT( timetrackinghowto() ) ); 1208 SLOT( timetrackinghowto() ) );
1206 action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); 1209 action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this );
1207 action->addTo( helpMenu ); 1210 action->addTo( helpMenu );
1208 connect( action, SIGNAL( activated() ), 1211 connect( action, SIGNAL( activated() ),
1209 SLOT( synchowto() ) ); 1212 SLOT( synchowto() ) );
1210 action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); 1213 action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this );
1211 action->addTo( helpMenu ); 1214 action->addTo( helpMenu );
1212 connect( action, SIGNAL( activated() ), 1215 connect( action, SIGNAL( activated() ),
1213 SLOT( kdesynchowto() ) ); 1216 SLOT( kdesynchowto() ) );
1214 action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); 1217 action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this );
1215 action->addTo( helpMenu ); 1218 action->addTo( helpMenu );
1216 connect( action, SIGNAL( activated() ), 1219 connect( action, SIGNAL( activated() ),
1217 SLOT( multisynchowto() ) ); 1220 SLOT( multisynchowto() ) );
1218 action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); 1221 action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this );
1219 action->addTo( helpMenu ); 1222 action->addTo( helpMenu );
1220 connect( action, SIGNAL( activated() ), 1223 connect( action, SIGNAL( activated() ),
1221 SLOT( aboutAutoSaving() ) ); 1224 SLOT( aboutAutoSaving() ) );
1222 action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); 1225 action = new QAction( "Problemd", i18n("Known Problems..."), 0,this );
1223 action->addTo( helpMenu ); 1226 action->addTo( helpMenu );
1224 connect( action, SIGNAL( activated() ), 1227 connect( action, SIGNAL( activated() ),
1225 SLOT( aboutKnownBugs() ) ); 1228 SLOT( aboutKnownBugs() ) );
1226 action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); 1229 action = new QAction( "Translate Howto", i18n("User translation..."), 0,this );
1227 action->addTo( helpMenu ); 1230 action->addTo( helpMenu );
1228 connect( action, SIGNAL( activated() ), 1231 connect( action, SIGNAL( activated() ),
1229 SLOT( usertrans() ) ); 1232 SLOT( usertrans() ) );
1230 action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); 1233 action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this );
1231 action->addTo( helpMenu ); 1234 action->addTo( helpMenu );
1232 connect( action, SIGNAL( activated() ), 1235 connect( action, SIGNAL( activated() ),
@@ -1679,141 +1682,156 @@ void MainWindow::updateWeek(QDate seda)
1679 p.end(); 1682 p.end();
1680 QIconSet icon3 ( mWeekPixmap ); 1683 QIconSet icon3 ( mWeekPixmap );
1681 mWeekAction->setIconSet ( icon3 ); 1684 mWeekAction->setIconSet ( icon3 );
1682 1685
1683} 1686}
1684void MainWindow::updateWeekNum(const DateList &selectedDates) 1687void MainWindow::updateWeekNum(const DateList &selectedDates)
1685{ 1688{
1686 updateWeek( selectedDates.first() ); 1689 updateWeek( selectedDates.first() );
1687} 1690}
1688void MainWindow::processIncidenceSelection( Incidence *incidence ) 1691void MainWindow::processIncidenceSelection( Incidence *incidence )
1689{ 1692{
1690 if ( !incidence ) { 1693 if ( !incidence ) {
1691 mShowAction->setMenuText( i18n("Show") ); 1694 mShowAction->setMenuText( i18n("Show") );
1692 enableIncidenceActions( false ); 1695 enableIncidenceActions( false );
1693 mNewSubTodoAction->setEnabled( false ); 1696 mNewSubTodoAction->setEnabled( false );
1694 setCaptionToDates(); 1697 setCaptionToDates();
1695 return; 1698 return;
1696 } 1699 }
1697 QString startString = ""; 1700 QString startString = "";
1698 if ( incidence->typeID() != todoID ) { 1701 if ( incidence->typeID() != todoID ) {
1699 if ( incidence->dtStart().date() < incidence->dtEnd().date() ) { 1702 if ( incidence->dtStart().date() < incidence->dtEnd().date() ) {
1700 if ( incidence->doesFloat() ) { 1703 if ( incidence->doesFloat() ) {
1701 startString += ": "+incidence->dtStartDateStr( true ); 1704 startString += ": "+incidence->dtStartDateStr( true );
1702 startString += " --- "+((Event*)incidence)->dtEndDateStr( true ); 1705 startString += " --- "+((Event*)incidence)->dtEndDateStr( true );
1703 } else { 1706 } else {
1704 startString = ": "+incidence->dtStartStr(true); 1707 startString = ": "+incidence->dtStartStr(true);
1705 startString += " --- "+((Event*)incidence)->dtEndStr(true); 1708 startString += " --- "+((Event*)incidence)->dtEndStr(true);
1706 } 1709 }
1707 } else { 1710 } else {
1708 if ( incidence->dtStart().time() != incidence->dtEnd().time() ) 1711 if ( incidence->dtStart().time() != incidence->dtEnd().time() )
1709 startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+ 1712 startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+
1710 "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time()); 1713 "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time());
1711 if ( incidence->isBirthday() || incidence->isAnniversary() ) { 1714 if ( incidence->isBirthday() || incidence->isAnniversary() ) {
1712 bool ok; 1715 bool ok;
1713 QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok ); 1716 QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok );
1714 if ( ok ) { 1717 if ( ok ) {
1715 int years = noc.date().year() - incidence->dtStart().date().year(); 1718 int years = noc.date().year() - incidence->dtStart().date().year();
1716 startString += i18n(" (%1 y.)"). arg( years ); 1719 startString += i18n(" (%1 y.)"). arg( years );
1717 } 1720 }
1718 } 1721 }
1719 else 1722 else
1720 startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true); 1723 startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true);
1721 } 1724 }
1722 } 1725 }
1723 else { 1726 else {
1724 if ( (( KCal::Todo*)incidence)->percentComplete() == 100 ) 1727 if ( (( KCal::Todo*)incidence)->percentComplete() == 100 )
1725 startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+i18n("completed on %1").arg( (( KCal::Todo*)incidence)->completedStr(true) ); 1728 startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+i18n("completed on %1").arg( (( KCal::Todo*)incidence)->completedStr(true) );
1726 else 1729 else
1727 startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed"); 1730 startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed");
1728 } 1731 }
1729 if ( !incidence->location().isEmpty() ) 1732 if ( !incidence->location().isEmpty() )
1730 startString += " (" +incidence->location()+")"; 1733 startString += " (" +incidence->location()+")";
1731 setCaption( incidence->summary()+startString); 1734 setCaption( incidence->summary()+startString);
1732 enableIncidenceActions( true ); 1735 enableIncidenceActions( true );
1733 if ( incidence->typeID() == eventID ) { 1736 if ( incidence->typeID() == eventID ) {
1734 mShowAction->setMenuText( i18n("Show Event") ); 1737 mShowAction->setMenuText( i18n("Show Event") );
1735 mNewSubTodoAction->setEnabled( false ); 1738 mNewSubTodoAction->setEnabled( false );
1736 } else if ( incidence->typeID() == todoID ) { 1739 } else if ( incidence->typeID() == todoID ) {
1737 mShowAction->setMenuText( i18n("Show Todo") ); 1740 mShowAction->setMenuText( i18n("Show Todo") );
1738 mNewSubTodoAction->setEnabled( true ); 1741 mNewSubTodoAction->setEnabled( true );
1739 } else { 1742 } else {
1740 mShowAction->setMenuText( i18n("Show") ); 1743 mShowAction->setMenuText( i18n("Show") );
1741 mNewSubTodoAction->setEnabled( false ); 1744 mNewSubTodoAction->setEnabled( false );
1742 } 1745 }
1746 static QPixmap jP = SmallIcon( "journal" );
1747 static QPixmap eP = SmallIcon( "newevent" );
1748 static QPixmap tP = SmallIcon( "newtodo" );
1749#ifdef DESKTOP_VERSION
1750 QIconSet icon;
1751 if ( incidence->typeID() == todoID )
1752 icon = QIconSet ( tP );
1753 else if ( incidence->typeID() == eventID )
1754 icon = QIconSet ( eP );
1755 else if ( incidence->typeID() == journalID )
1756 icon = QIconSet ( jP );
1757 mPrintSelAction->setIconSet ( icon );
1758#endif
1743} 1759}
1744 1760
1745void MainWindow::enableIncidenceActions( bool enabled ) 1761void MainWindow::enableIncidenceActions( bool enabled )
1746{ 1762{
1747 mShowAction->setEnabled( enabled ); 1763 mShowAction->setEnabled( enabled );
1748 mEditAction->setEnabled( enabled ); 1764 mEditAction->setEnabled( enabled );
1749 mDeleteAction->setEnabled( enabled ); 1765 mDeleteAction->setEnabled( enabled );
1750 1766
1751 mCloneAction->setEnabled( enabled ); 1767 mCloneAction->setEnabled( enabled );
1752 mMoveAction->setEnabled( enabled ); 1768 mMoveAction->setEnabled( enabled );
1753#ifndef DESKTOP_VERSION 1769#ifndef DESKTOP_VERSION
1754 mBeamAction->setEnabled( enabled ); 1770 mBeamAction->setEnabled( enabled );
1755#endif 1771#else
1772 mPrintSelAction->setEnabled( enabled );
1773#endif
1756 mCancelAction->setEnabled( enabled ); 1774 mCancelAction->setEnabled( enabled );
1757} 1775}
1758 1776
1759void MainWindow::importOL() 1777void MainWindow::importOL()
1760{ 1778{
1761#ifdef _OL_IMPORT_ 1779#ifdef _OL_IMPORT_
1762 mView->clearAllViews(); 1780 mView->clearAllViews();
1763 KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); 1781 KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );
1764 id->exec(); 1782 id->exec();
1765 delete id; 1783 delete id;
1766 mView->calendar()->checkAlarmForIncidence( 0, true ); 1784 mView->calendar()->checkAlarmForIncidence( 0, true );
1767 mView->updateView(); 1785 mView->updateView();
1768#endif 1786#endif
1769} 1787}
1770void MainWindow::importBday() 1788void MainWindow::importBday()
1771{ 1789{
1772 int result = QMessageBox::warning( this, i18n("KO/Pi import information!"), 1790 int result = QMessageBox::warning( this, i18n("KO/Pi import information!"),
1773 i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"), 1791 i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),
1774 i18n("Import!"), i18n("Cancel"), 0, 1792 i18n("Import!"), i18n("Cancel"), 0,
1775 0, 1 ); 1793 0, 1 );
1776 if ( result == 0 ) { 1794 if ( result == 0 ) {
1777 mView->importBday(); 1795 mView->importBday();
1778 1796
1779 } 1797 }
1780 1798
1781 1799
1782} 1800}
1783void MainWindow::importQtopia() 1801void MainWindow::importQtopia()
1784{ 1802{
1785 //#ifndef DESKTOP_VERSION 1803 //#ifndef DESKTOP_VERSION
1786 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"); 1804 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");
1787#ifdef DESKTOP_VERSION 1805#ifdef DESKTOP_VERSION
1788 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"); 1806 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");
1789#endif 1807#endif
1790 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mess, 1808 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mess,
1791 i18n("Import!"), i18n("Cancel"), 0, 1809 i18n("Import!"), i18n("Cancel"), 0,
1792 0, 1 ); 1810 0, 1 );
1793 if ( result == 0 ) { 1811 if ( result == 0 ) {
1794#ifndef DESKTOP_VERSION 1812#ifndef DESKTOP_VERSION
1795 QString datebook = Global::applicationFileName( "datebook", "datebook.xml"); 1813 QString datebook = Global::applicationFileName( "datebook", "datebook.xml");
1796 QString todolist = Global::applicationFileName( "todolist", "todolist.xml"); 1814 QString todolist = Global::applicationFileName( "todolist", "todolist.xml");
1797 QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml"; 1815 QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml";
1798#else 1816#else
1799 QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml"; 1817 QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml";
1800 QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml"; 1818 QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml";
1801 QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml"; 1819 QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml";
1802#endif 1820#endif
1803 mView->importQtopia( categories, datebook, todolist ); 1821 mView->importQtopia( categories, datebook, todolist );
1804 } 1822 }
1805 mView->calendar()->reInitAlarmSettings(); 1823 mView->calendar()->reInitAlarmSettings();
1806#if 0 1824#if 0
1807 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), 1825 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
1808 i18n("Not supported \non desktop!\n"), 1826 i18n("Not supported \non desktop!\n"),
1809 i18n("Ok"), i18n("Cancel"), 0, 1827 i18n("Ok"), i18n("Cancel"), 0,
1810 0, 1 ); 1828 0, 1 );
1811 1829
1812#endif 1830#endif
1813} 1831}
1814 1832
1815void MainWindow::saveOnClose() 1833void MainWindow::saveOnClose()
1816{ 1834{
1817 KOPrefs *p = KOPrefs::instance(); 1835 KOPrefs *p = KOPrefs::instance();
1818 p->mToolBarHor = ( iconToolBar->orientation () == Qt:: Horizontal ); 1836 p->mToolBarHor = ( iconToolBar->orientation () == Qt:: Horizontal );
1819 p->mToolBarHorV = ( viewToolBar->orientation () == Qt:: Horizontal ); 1837 p->mToolBarHorV = ( viewToolBar->orientation () == Qt:: Horizontal );
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 41d5807..d648f14 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -94,80 +94,81 @@ class MainWindow : public QMainWindow
94 void exportVCalendar(); 94 void exportVCalendar();
95 void fillFilterMenu(); 95 void fillFilterMenu();
96 void fillFilterMenuTB(); 96 void fillFilterMenuTB();
97 void selectFilter( int ); 97 void selectFilter( int );
98 void fillFilterMenuPopup(); 98 void fillFilterMenuPopup();
99 void selectFilterPopup( int ); 99 void selectFilterPopup( int );
100 void exportToPhone( int ); 100 void exportToPhone( int );
101 void toggleBeamReceive(); 101 void toggleBeamReceive();
102 void disableBR(bool); 102 void disableBR(bool);
103 signals: 103 signals:
104 void selectWeek ( int ); 104 void selectWeek ( int );
105 private slots: 105 private slots:
106 void showConfigureAgenda(); 106 void showConfigureAgenda();
107 void getFile( bool ); 107 void getFile( bool );
108 void syncFileRequest(); 108 void syncFileRequest();
109 109
110 protected: 110 protected:
111 void hideEvent ( QHideEvent * ); 111 void hideEvent ( QHideEvent * );
112 QString sentSyncFile(); 112 QString sentSyncFile();
113 void displayText( QString, QString); 113 void displayText( QString, QString);
114 void enableIncidenceActions( bool ); 114 void enableIncidenceActions( bool );
115 115
116 private: 116 private:
117 bool mBRdisabled; 117 bool mBRdisabled;
118#ifndef DESKTOP_VERSION 118#ifndef DESKTOP_VERSION
119 QCopChannel* infrared; 119 QCopChannel* infrared;
120#endif 120#endif
121 QAction* brAction; 121 QAction* brAction;
122 KSyncManager* mSyncManager; 122 KSyncManager* mSyncManager;
123 bool mClosed; 123 bool mClosed;
124 void saveOnClose(); 124 void saveOnClose();
125 bool mFlagKeyPressed; 125 bool mFlagKeyPressed;
126 bool mBlockAtStartup; 126 bool mBlockAtStartup;
127 QPEToolBar *iconToolBar; 127 QPEToolBar *iconToolBar;
128 QPEToolBar *viewToolBar; 128 QPEToolBar *viewToolBar;
129 QPEToolBar *navigatorToolBar; 129 QPEToolBar *navigatorToolBar;
130 QPEToolBar *filterToolBar; 130 QPEToolBar *filterToolBar;
131 QMenuBar *filterMenubar; 131 QMenuBar *filterMenubar;
132 QPopupMenu * filterPopupMenu; 132 QPopupMenu * filterPopupMenu;
133 QPopupMenu * mCurrentItemMenu; 133 QPopupMenu * mCurrentItemMenu;
134 void initActions(); 134 void initActions();
135 void setDefaultPreferences(); 135 void setDefaultPreferences();
136 void resizeEvent( QResizeEvent* e); 136 void resizeEvent( QResizeEvent* e);
137 void keyPressEvent ( QKeyEvent * ) ; 137 void keyPressEvent ( QKeyEvent * ) ;
138 void keyReleaseEvent ( QKeyEvent * ) ; 138 void keyReleaseEvent ( QKeyEvent * ) ;
139 QPopupMenu *configureToolBarMenu; 139 QPopupMenu *configureToolBarMenu;
140 QPopupMenu *selectFilterMenu; 140 QPopupMenu *selectFilterMenu;
141 QPopupMenu *selectFilterMenuTB; 141 QPopupMenu *selectFilterMenuTB;
142 QPopupMenu *configureAgendaMenu, *syncMenu; 142 QPopupMenu *configureAgendaMenu, *syncMenu;
143 CalendarLocal *mCalendar; 143 CalendarLocal *mCalendar;
144 CalendarView *mView; 144 CalendarView *mView;
145 QAction *mNewSubTodoAction; 145 QAction *mNewSubTodoAction;
146 QAction *mWeekAction; 146 QAction *mWeekAction;
147 QFont mWeekFont; 147 QFont mWeekFont;
148 QPixmap mWeekPixmap; 148 QPixmap mWeekPixmap;
149 QColor mWeekBgColor; 149 QColor mWeekBgColor;
150 150
151 QAction *mShowAction; 151 QAction *mShowAction;
152 QAction *mEditAction; 152 QAction *mEditAction;
153 QAction *mDeleteAction; 153 QAction *mDeleteAction;
154 QAction *mCloneAction; 154 QAction *mCloneAction;
155 QAction *mMoveAction; 155 QAction *mMoveAction;
156 QAction *mBeamAction; 156 QAction *mBeamAction;
157 QAction *mCancelAction; 157 QAction *mCancelAction;
158 QAction *mPrintSelAction;
158 159
159 QAction *mToggleNav; 160 QAction *mToggleNav;
160 QAction *mToggleFilter; 161 QAction *mToggleFilter;
161 QAction *mToggleAllday; 162 QAction *mToggleAllday;
162 QAction *actionFilterMenuTB; 163 QAction *actionFilterMenuTB;
163 164
164 void closeEvent( QCloseEvent* ce ); 165 void closeEvent( QCloseEvent* ce );
165 QTimer mSaveTimer; 166 QTimer mSaveTimer;
166 //bool mBlockSaveFlag; 167 //bool mBlockSaveFlag;
167 bool mCalendarModifiedFlag; 168 bool mCalendarModifiedFlag;
168 QPixmap loadPixmap( QString ); 169 QPixmap loadPixmap( QString );
169 QPixmap listviewPix, listviewPix0, listviewPix20, listviewPix40, listviewPix60, listviewPix80, journalPix; 170 QPixmap listviewPix, listviewPix0, listviewPix20, listviewPix40, listviewPix60, listviewPix80, journalPix;
170}; 171};
171 172
172 173
173#endif 174#endif