-rw-r--r-- | kaddressbook/kabcore.cpp | 4 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index ae0a068..e34a7d3 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -386,50 +386,50 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
386 | mAddressBookService = new KAddressBookService( this ); | 386 | mAddressBookService = new KAddressBookService( this ); |
387 | 387 | ||
388 | #endif //KAB_EMBEDDED | 388 | #endif //KAB_EMBEDDED |
389 | 389 | ||
390 | mMessageTimer = new QTimer( this ); | 390 | mMessageTimer = new QTimer( this ); |
391 | connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); | 391 | connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); |
392 | mEditorDialog = 0; | 392 | mEditorDialog = 0; |
393 | createAddresseeEditorDialog( this ); | 393 | createAddresseeEditorDialog( this ); |
394 | setModified( false ); | 394 | setModified( false ); |
395 | mBRdisabled = false; | 395 | mBRdisabled = false; |
396 | #ifndef DESKTOP_VERSION | 396 | #ifndef DESKTOP_VERSION |
397 | infrared = 0; | 397 | infrared = 0; |
398 | #endif | 398 | #endif |
399 | //toggleBeamReceive( ); | 399 | //toggleBeamReceive( ); |
400 | //mMainWindow->toolBar()->show(); | 400 | //mMainWindow->toolBar()->show(); |
401 | // we have a toolbar repainting error on the Zaurus when starting KA/Pi | 401 | // we have a toolbar repainting error on the Zaurus when starting KA/Pi |
402 | QTimer::singleShot( 10, this , SLOT ( updateToolBar())); | 402 | QTimer::singleShot( 10, this , SLOT ( updateToolBar())); |
403 | } | 403 | } |
404 | 404 | ||
405 | void KABCore::updateToolBar() | 405 | void KABCore::updateToolBar() |
406 | { | 406 | { |
407 | static int iii = 0; | 407 | static int iii = 0; |
408 | ++iii; | 408 | ++iii; |
409 | mMainWindow->toolBar()->repaintMe(); | 409 | mMainWindow->toolBar()->repaintMe(); |
410 | if ( iii < 3 ) | 410 | if ( iii < 4 ) |
411 | QTimer::singleShot( 10, this , SLOT ( updateToolBar())); | 411 | QTimer::singleShot( 100*iii, this , SLOT ( updateToolBar())); |
412 | } | 412 | } |
413 | KABCore::~KABCore() | 413 | KABCore::~KABCore() |
414 | { | 414 | { |
415 | // save(); | 415 | // save(); |
416 | //saveSettings(); | 416 | //saveSettings(); |
417 | //KABPrefs::instance()->writeConfig(); | 417 | //KABPrefs::instance()->writeConfig(); |
418 | delete AddresseeConfig::instance(); | 418 | delete AddresseeConfig::instance(); |
419 | mAddressBook = 0; | 419 | mAddressBook = 0; |
420 | KABC::StdAddressBook::close(); | 420 | KABC::StdAddressBook::close(); |
421 | 421 | ||
422 | delete syncManager; | 422 | delete syncManager; |
423 | #ifndef DESKTOP_VERSION | 423 | #ifndef DESKTOP_VERSION |
424 | if ( infrared ) | 424 | if ( infrared ) |
425 | delete infrared; | 425 | delete infrared; |
426 | #endif | 426 | #endif |
427 | } | 427 | } |
428 | void KABCore::receive( const QCString& cmsg, const QByteArray& data ) | 428 | void KABCore::receive( const QCString& cmsg, const QByteArray& data ) |
429 | { | 429 | { |
430 | //qDebug("KA: QCOP message received: %s ", cmsg.data() ); | 430 | //qDebug("KA: QCOP message received: %s ", cmsg.data() ); |
431 | if ( cmsg == "setDocument(QString)" ) { | 431 | if ( cmsg == "setDocument(QString)" ) { |
432 | QDataStream stream( data, IO_ReadOnly ); | 432 | QDataStream stream( data, IO_ReadOnly ); |
433 | QString fileName; | 433 | QString fileName; |
434 | stream >> fileName; | 434 | stream >> fileName; |
435 | recieve( fileName ); | 435 | recieve( fileName ); |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 4b26058..dbbe832 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -206,50 +206,50 @@ KOPrefs::KOPrefs() : | |||
206 | addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 )); | 206 | addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 )); |
207 | addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); | 207 | addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); |
208 | addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true); | 208 | addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true); |
209 | addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); | 209 | addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); |
210 | addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 )); | 210 | addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 )); |
211 | addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 )); | 211 | addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 )); |
212 | addItemBool("UseAppColors",&mUseAppColors,false); | 212 | addItemBool("UseAppColors",&mUseAppColors,false); |
213 | 213 | ||
214 | 214 | ||
215 | 215 | ||
216 | KPrefs::setCurrentGroup("Views"); | 216 | KPrefs::setCurrentGroup("Views"); |
217 | addItemBool("Show Date Navigator",&mShowDateNavigator,true); | 217 | addItemBool("Show Date Navigator",&mShowDateNavigator,true); |
218 | addItemInt("Hour Size",&mHourSize,8); | 218 | addItemInt("Hour Size",&mHourSize,8); |
219 | addItemBool("Show Daily Recurrences",&mDailyRecur,true); | 219 | addItemBool("Show Daily Recurrences",&mDailyRecur,true); |
220 | addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); | 220 | addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); |
221 | addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true); | 221 | addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true); |
222 | addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true); | 222 | addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true); |
223 | addItemBool("ShowShortMonthName",&mMonthShowShort,false); | 223 | addItemBool("ShowShortMonthName",&mMonthShowShort,false); |
224 | addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true); | 224 | addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true); |
225 | addItemBool("Enable ToolTips",&mEnableToolTips,false); | 225 | addItemBool("Enable ToolTips",&mEnableToolTips,false); |
226 | addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false); | 226 | addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false); |
227 | addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false); | 227 | addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false); |
228 | addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true); | 228 | addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true); |
229 | addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true); | 229 | addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true); |
230 | addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,false); | 230 | addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true); |
231 | addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false); | 231 | addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,true); |
232 | addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false); | 232 | addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false); |
233 | addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true); | 233 | addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true); |
234 | addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true); | 234 | addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true); |
235 | addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);; | 235 | addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);; |
236 | addItemBool("WNViewShowsPast",&mWNViewShowsPast,true); | 236 | addItemBool("WNViewShowsPast",&mWNViewShowsPast,true); |
237 | addItemBool("WNViewShowLocation",&mWNViewShowLocation,false); | 237 | addItemBool("WNViewShowLocation",&mWNViewShowLocation,false); |
238 | addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false); | 238 | addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false); |
239 | addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true); | 239 | addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true); |
240 | addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false); | 240 | addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false); |
241 | addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false); | 241 | addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false); |
242 | addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false); | 242 | addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false); |
243 | addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false); | 243 | addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false); |
244 | addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false); | 244 | addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false); |
245 | #ifdef DESKTOP_VERSION | 245 | #ifdef DESKTOP_VERSION |
246 | addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true); | 246 | addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true); |
247 | #else | 247 | #else |
248 | addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false); | 248 | addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false); |
249 | #endif | 249 | #endif |
250 | addItemInt("Day Begins",&mDayBegins,7); | 250 | addItemInt("Day Begins",&mDayBegins,7); |
251 | addItemInt("Working Hours Start",&mWorkingHoursStart,8); | 251 | addItemInt("Working Hours Start",&mWorkingHoursStart,8); |
252 | addItemInt("Working Hours End",&mWorkingHoursEnd,17); | 252 | addItemInt("Working Hours End",&mWorkingHoursEnd,17); |
253 | addItemBool("Exclude Holidays",&mExcludeHolidays,true); | 253 | addItemBool("Exclude Holidays",&mExcludeHolidays,true); |
254 | addItemBool("Exclude Saturdays",&mExcludeSaturdays,true); | 254 | addItemBool("Exclude Saturdays",&mExcludeSaturdays,true); |
255 | 255 | ||