author | zautrix <zautrix> | 2004-10-18 22:08:36 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-18 22:08:36 (UTC) |
commit | 9fd09e806dfe3df5abdf70991b6ec170fed51078 (patch) (unidiff) | |
tree | dc708d0baa4ddb5773531750bcca6000fc7297f4 /libkdepim | |
parent | c051fdcc1e7abac87f74430a7fcf3e7099f3b062 (diff) | |
download | kdepimpi-9fd09e806dfe3df5abdf70991b6ec170fed51078.zip kdepimpi-9fd09e806dfe3df5abdf70991b6ec170fed51078.tar.gz kdepimpi-9fd09e806dfe3df5abdf70991b6ec170fed51078.tar.bz2 |
added 30min plus to timezone setting
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 5 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 3 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.h | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 1eef150..332f975 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -198,256 +198,261 @@ void KDEPIMConfigWidget::setupLocaleDateTab() | |||
198 | 198 | ||
199 | 199 | ||
200 | KPrefsWidRadios *syncPrefsGroup = | 200 | KPrefsWidRadios *syncPrefsGroup = |
201 | addWidRadios(i18n("Date Format:"),&(KPimGlobalPrefs::instance()->mPreferredDate),topFrame); | 201 | addWidRadios(i18n("Date Format:"),&(KPimGlobalPrefs::instance()->mPreferredDate),topFrame); |
202 | QString format; | 202 | QString format; |
203 | if ( QApplication::desktop()->width() < 480 ) | 203 | if ( QApplication::desktop()->width() < 480 ) |
204 | format = "(%d.%m.%Y)"; | 204 | format = "(%d.%m.%Y)"; |
205 | else | 205 | else |
206 | format = "(%d.%m.%Y|%A %d %B %Y)"; | 206 | format = "(%d.%m.%Y|%A %d %B %Y)"; |
207 | syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); | 207 | syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); |
208 | if ( QApplication::desktop()->width() < 480 ) | 208 | if ( QApplication::desktop()->width() < 480 ) |
209 | format = "(%m.%d.%Y)"; | 209 | format = "(%m.%d.%Y)"; |
210 | else | 210 | else |
211 | format = "(%m.%d.%Y|%A %B %d %Y)"; | 211 | format = "(%m.%d.%Y|%A %B %d %Y)"; |
212 | syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); | 212 | syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); |
213 | if ( QApplication::desktop()->width() < 480 ) | 213 | if ( QApplication::desktop()->width() < 480 ) |
214 | format = "(%Y-%m-%d)"; | 214 | format = "(%Y-%m-%d)"; |
215 | else | 215 | else |
216 | format = "(%Y-%m-%d|%A %Y %B %d)"; | 216 | format = "(%Y-%m-%d|%A %Y %B %d)"; |
217 | syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); | 217 | syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); |
218 | syncPrefsGroup->addRadio(i18n("User defined")); | 218 | syncPrefsGroup->addRadio(i18n("User defined")); |
219 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); | 219 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); |
220 | ++iii; | 220 | ++iii; |
221 | ++iii; | 221 | ++iii; |
222 | QLabel * lab; | 222 | QLabel * lab; |
223 | mUserDateFormatLong = new QLineEdit(topFrame); | 223 | mUserDateFormatLong = new QLineEdit(topFrame); |
224 | lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); | 224 | lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); |
225 | topLayout->addWidget(lab ,iii,0); | 225 | topLayout->addWidget(lab ,iii,0); |
226 | topLayout->addWidget(mUserDateFormatLong,iii,1); | 226 | topLayout->addWidget(mUserDateFormatLong,iii,1); |
227 | ++iii; | 227 | ++iii; |
228 | mUserDateFormatShort = new QLineEdit(topFrame); | 228 | mUserDateFormatShort = new QLineEdit(topFrame); |
229 | lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame); | 229 | lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame); |
230 | topLayout->addWidget(lab ,iii,0); | 230 | topLayout->addWidget(lab ,iii,0); |
231 | topLayout->addWidget(mUserDateFormatShort,iii,1); | 231 | topLayout->addWidget(mUserDateFormatShort,iii,1); |
232 | ++iii; | 232 | ++iii; |
233 | lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); | 233 | lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); |
234 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | 234 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); |
235 | ++iii; | 235 | ++iii; |
236 | lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame); | 236 | lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame); |
237 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | 237 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); |
238 | ++iii; | 238 | ++iii; |
239 | lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame); | 239 | lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame); |
240 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); | 240 | topLayout->addMultiCellWidget(lab ,iii,iii,0,1); |
241 | ++iii; | 241 | ++iii; |
242 | 242 | ||
243 | connect( mUserDateFormatLong, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | 243 | connect( mUserDateFormatLong, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); |
244 | connect( mUserDateFormatShort, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | 244 | connect( mUserDateFormatShort, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); |
245 | 245 | ||
246 | 246 | ||
247 | tabWidget->addTab( topFrame, i18n( "Date Format" ) ); | 247 | tabWidget->addTab( topFrame, i18n( "Date Format" ) ); |
248 | } | 248 | } |
249 | 249 | ||
250 | void KDEPIMConfigWidget::setupLocaleTab() | 250 | void KDEPIMConfigWidget::setupLocaleTab() |
251 | { | 251 | { |
252 | 252 | ||
253 | QWidget *topFrame = new QWidget( this ); | 253 | QWidget *topFrame = new QWidget( this ); |
254 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); | 254 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); |
255 | 255 | ||
256 | topLayout->setSpacing(KDialog::spacingHint()); | 256 | topLayout->setSpacing(KDialog::spacingHint()); |
257 | topLayout->setMargin(KDialog::marginHint()); | 257 | topLayout->setMargin(KDialog::marginHint()); |
258 | int iii = 0; | 258 | int iii = 0; |
259 | KPrefsWidRadios *syncPrefsGroup = | 259 | KPrefsWidRadios *syncPrefsGroup = |
260 | addWidRadios(i18n("Language:(needs restart)"),&(KPimGlobalPrefs::instance()->mPreferredLanguage),topFrame); | 260 | addWidRadios(i18n("Language:(needs restart)"),&(KPimGlobalPrefs::instance()->mPreferredLanguage),topFrame); |
261 | syncPrefsGroup->addRadio(i18n("English")); | 261 | syncPrefsGroup->addRadio(i18n("English")); |
262 | syncPrefsGroup->addRadio(i18n("German")); | 262 | syncPrefsGroup->addRadio(i18n("German")); |
263 | syncPrefsGroup->addRadio(i18n("French")); | 263 | syncPrefsGroup->addRadio(i18n("French")); |
264 | syncPrefsGroup->addRadio(i18n("Italian")); | 264 | syncPrefsGroup->addRadio(i18n("Italian")); |
265 | syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); | 265 | syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); |
266 | if ( QApplication::desktop()->width() < 300 ) | 266 | if ( QApplication::desktop()->width() < 300 ) |
267 | ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); | 267 | ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); |
268 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); | 268 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); |
269 | ++iii; | 269 | ++iii; |
270 | 270 | ||
271 | syncPrefsGroup = | 271 | syncPrefsGroup = |
272 | addWidRadios(i18n("Time Format(nr):"),&(KPimGlobalPrefs::instance()->mPreferredTime),topFrame); | 272 | addWidRadios(i18n("Time Format(nr):"),&(KPimGlobalPrefs::instance()->mPreferredTime),topFrame); |
273 | if ( QApplication::desktop()->width() > 300 ) | 273 | if ( QApplication::desktop()->width() > 300 ) |
274 | syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical); | 274 | syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical); |
275 | syncPrefsGroup->addRadio(i18n("24:00")); | 275 | syncPrefsGroup->addRadio(i18n("24:00")); |
276 | syncPrefsGroup->addRadio(i18n("12:00am")); | 276 | syncPrefsGroup->addRadio(i18n("12:00am")); |
277 | syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical); | 277 | syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical); |
278 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); | 278 | topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); |
279 | ++iii; | 279 | ++iii; |
280 | 280 | ||
281 | KPrefsWidBool *sb = addWidBool(i18n("Week starts on Sunday"), | 281 | KPrefsWidBool *sb = addWidBool(i18n("Week starts on Sunday"), |
282 | &(KPimGlobalPrefs::instance()->mWeekStartsOnSunday),topFrame); | 282 | &(KPimGlobalPrefs::instance()->mWeekStartsOnSunday),topFrame); |
283 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); | 283 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); |
284 | ++iii; | 284 | ++iii; |
285 | 285 | ||
286 | 286 | ||
287 | tabWidget->addTab( topFrame, i18n( "Locale" ) ); | 287 | tabWidget->addTab( topFrame, i18n( "Locale" ) ); |
288 | 288 | ||
289 | } | 289 | } |
290 | 290 | ||
291 | 291 | ||
292 | void KDEPIMConfigWidget::setupTimeZoneTab() | 292 | void KDEPIMConfigWidget::setupTimeZoneTab() |
293 | { | 293 | { |
294 | QWidget *topFrame = new QWidget( this ); | 294 | QWidget *topFrame = new QWidget( this ); |
295 | QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2); | 295 | QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2); |
296 | topLayout->setSpacing(KDialog::spacingHint()); | 296 | topLayout->setSpacing(KDialog::spacingHint()); |
297 | topLayout->setMargin(KDialog::marginHint()); | 297 | topLayout->setMargin(KDialog::marginHint()); |
298 | 298 | ||
299 | QHBox *timeZoneBox = new QHBox( topFrame ); | 299 | QHBox *timeZoneBox = new QHBox( topFrame ); |
300 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); | 300 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); |
301 | 301 | ||
302 | new QLabel( i18n("Timezone:"), timeZoneBox ); | 302 | new QLabel( i18n("Timezone:"), timeZoneBox ); |
303 | mTimeZoneCombo = new QComboBox( timeZoneBox ); | 303 | mTimeZoneCombo = new QComboBox( timeZoneBox ); |
304 | if ( QApplication::desktop()->width() < 300 ) { | 304 | if ( QApplication::desktop()->width() < 300 ) { |
305 | mTimeZoneCombo->setMaximumWidth(150); | 305 | mTimeZoneCombo->setMaximumWidth(150); |
306 | } | 306 | } |
307 | 307 | ||
308 | QStringList list; | 308 | QStringList list; |
309 | list = KGlobal::locale()->timeZoneList(); | 309 | list = KGlobal::locale()->timeZoneList(); |
310 | mTimeZoneCombo->insertStringList(list); | 310 | mTimeZoneCombo->insertStringList(list); |
311 | 311 | ||
312 | // find the currently set time zone and select it | 312 | // find the currently set time zone and select it |
313 | QString sCurrentlySet = KPimGlobalPrefs::instance()->mTimeZoneId; | 313 | QString sCurrentlySet = KPimGlobalPrefs::instance()->mTimeZoneId; |
314 | int nCurrentlySet = 11; | 314 | int nCurrentlySet = 11; |
315 | for (int i = 0; i < mTimeZoneCombo->count(); i++) | 315 | for (int i = 0; i < mTimeZoneCombo->count(); i++) |
316 | { | 316 | { |
317 | if (mTimeZoneCombo->text(i) == sCurrentlySet) | 317 | if (mTimeZoneCombo->text(i) == sCurrentlySet) |
318 | { | 318 | { |
319 | nCurrentlySet = i; | 319 | nCurrentlySet = i; |
320 | break; | 320 | break; |
321 | } | 321 | } |
322 | } | 322 | } |
323 | mTimeZoneCombo->setCurrentItem(nCurrentlySet); | 323 | mTimeZoneCombo->setCurrentItem(nCurrentlySet); |
324 | int iii = 1; | 324 | int iii = 1; |
325 | KPrefsWidBool *sb = | 325 | KPrefsWidBool *sb = |
326 | addWidBool(i18n("Add 30 min (+00:30) to selected Timezone"), | ||
327 | &(KPimGlobalPrefs::instance()->mTimeZoneAdd30min),topFrame); | ||
328 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); | ||
329 | ++iii; | ||
330 | sb = | ||
326 | addWidBool(i18n("Timezone has daylight saving"), | 331 | addWidBool(i18n("Timezone has daylight saving"), |
327 | &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame); | 332 | &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame); |
328 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); | 333 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); |
329 | ++iii; | 334 | ++iii; |
330 | QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); | 335 | QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); |
331 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | 336 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); |
332 | ++iii; | 337 | ++iii; |
333 | lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); | 338 | lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); |
334 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | 339 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); |
335 | ++iii; | 340 | ++iii; |
336 | lab = new QLabel( i18n("Daylight start:"), topFrame ); | 341 | lab = new QLabel( i18n("Daylight start:"), topFrame ); |
337 | topLayout->addWidget(lab, iii,0); | 342 | topLayout->addWidget(lab, iii,0); |
338 | mStartDateSavingEdit = new KDateEdit(topFrame); | 343 | mStartDateSavingEdit = new KDateEdit(topFrame); |
339 | topLayout->addWidget(mStartDateSavingEdit, iii,1); | 344 | topLayout->addWidget(mStartDateSavingEdit, iii,1); |
340 | ++iii; | 345 | ++iii; |
341 | 346 | ||
342 | lab = new QLabel( i18n("Daylight end:"), topFrame ); | 347 | lab = new QLabel( i18n("Daylight end:"), topFrame ); |
343 | topLayout->addWidget(lab, iii,0); | 348 | topLayout->addWidget(lab, iii,0); |
344 | mEndDateSavingEdit = new KDateEdit(topFrame); | 349 | mEndDateSavingEdit = new KDateEdit(topFrame); |
345 | topLayout->addWidget(mEndDateSavingEdit, iii,1); | 350 | topLayout->addWidget(mEndDateSavingEdit, iii,1); |
346 | ++iii; | 351 | ++iii; |
347 | QDate current ( 2001, 1,1); | 352 | QDate current ( 2001, 1,1); |
348 | mStartDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingStart-1)); | 353 | mStartDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingStart-1)); |
349 | mEndDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingEnd-1)); | 354 | mEndDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingEnd-1)); |
350 | 355 | ||
351 | connect( mStartDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); | 356 | connect( mStartDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); |
352 | connect( mEndDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); | 357 | connect( mEndDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); |
353 | connect( mTimeZoneCombo, SIGNAL( activated( int ) ), this, SLOT (modified() ) ); | 358 | connect( mTimeZoneCombo, SIGNAL( activated( int ) ), this, SLOT (modified() ) ); |
354 | 359 | ||
355 | 360 | ||
356 | 361 | ||
357 | tabWidget->addTab( topFrame, i18n( "Time Zone" ) ); | 362 | tabWidget->addTab( topFrame, i18n( "Time Zone" ) ); |
358 | 363 | ||
359 | } | 364 | } |
360 | 365 | ||
361 | void KDEPIMConfigWidget::externalapp_changed( int newApp ) | 366 | void KDEPIMConfigWidget::externalapp_changed( int newApp ) |
362 | { | 367 | { |
363 | // first store the current data | 368 | // first store the current data |
364 | saveEditFieldSettings(); | 369 | saveEditFieldSettings(); |
365 | 370 | ||
366 | // set mCurrentApp | 371 | // set mCurrentApp |
367 | mCurrentApp = (ExternalAppHandler::Types)newApp; | 372 | mCurrentApp = (ExternalAppHandler::Types)newApp; |
368 | 373 | ||
369 | // set mCurrentClient | 374 | // set mCurrentClient |
370 | switch(mCurrentApp) | 375 | switch(mCurrentApp) |
371 | { | 376 | { |
372 | case(ExternalAppHandler::EMAIL): | 377 | case(ExternalAppHandler::EMAIL): |
373 | mCurrentClient = mEmailClient; | 378 | mCurrentClient = mEmailClient; |
374 | break; | 379 | break; |
375 | case(ExternalAppHandler::PHONE): | 380 | case(ExternalAppHandler::PHONE): |
376 | mCurrentClient = mPhoneClient; | 381 | mCurrentClient = mPhoneClient; |
377 | break; | 382 | break; |
378 | case(ExternalAppHandler::SMS): | 383 | case(ExternalAppHandler::SMS): |
379 | mCurrentClient = mSMSClient; | 384 | mCurrentClient = mSMSClient; |
380 | break; | 385 | break; |
381 | case(ExternalAppHandler::FAX): | 386 | case(ExternalAppHandler::FAX): |
382 | mCurrentClient = mFaxClient; | 387 | mCurrentClient = mFaxClient; |
383 | break; | 388 | break; |
384 | case(ExternalAppHandler::PAGER): | 389 | case(ExternalAppHandler::PAGER): |
385 | mCurrentClient = mPagerClient; | 390 | mCurrentClient = mPagerClient; |
386 | break; | 391 | break; |
387 | case(ExternalAppHandler::SIP): | 392 | case(ExternalAppHandler::SIP): |
388 | mCurrentClient = mSipClient; | 393 | mCurrentClient = mSipClient; |
389 | break; | 394 | break; |
390 | default: | 395 | default: |
391 | return; | 396 | return; |
392 | } | 397 | } |
393 | 398 | ||
394 | // and at last update the widgets | 399 | // and at last update the widgets |
395 | updateClientWidgets(); | 400 | updateClientWidgets(); |
396 | } | 401 | } |
397 | 402 | ||
398 | 403 | ||
399 | 404 | ||
400 | void KDEPIMConfigWidget::client_changed( int newClient ) | 405 | void KDEPIMConfigWidget::client_changed( int newClient ) |
401 | { | 406 | { |
402 | if (newClient == mCurrentClient) | 407 | if (newClient == mCurrentClient) |
403 | return; | 408 | return; |
404 | 409 | ||
405 | // first store the current data | 410 | // first store the current data |
406 | saveEditFieldSettings(); | 411 | saveEditFieldSettings(); |
407 | 412 | ||
408 | 413 | ||
409 | //then reset the clientvariable | 414 | //then reset the clientvariable |
410 | mCurrentClient = newClient; | 415 | mCurrentClient = newClient; |
411 | 416 | ||
412 | // and at last update the widgets | 417 | // and at last update the widgets |
413 | updateClientWidgets(); | 418 | updateClientWidgets(); |
414 | 419 | ||
415 | KPrefsWidget::modified(); | 420 | KPrefsWidget::modified(); |
416 | } | 421 | } |
417 | 422 | ||
418 | void KDEPIMConfigWidget::saveEditFieldSettings() | 423 | void KDEPIMConfigWidget::saveEditFieldSettings() |
419 | { | 424 | { |
420 | 425 | ||
421 | switch(mCurrentApp) | 426 | switch(mCurrentApp) |
422 | { | 427 | { |
423 | case(ExternalAppHandler::EMAIL): | 428 | case(ExternalAppHandler::EMAIL): |
424 | mEmailClient = mClient->currentItem(); | 429 | mEmailClient = mClient->currentItem(); |
425 | break; | 430 | break; |
426 | case(ExternalAppHandler::PHONE): | 431 | case(ExternalAppHandler::PHONE): |
427 | mPhoneClient= mClient->currentItem(); | 432 | mPhoneClient= mClient->currentItem(); |
428 | break; | 433 | break; |
429 | case(ExternalAppHandler::SMS): | 434 | case(ExternalAppHandler::SMS): |
430 | mSMSClient = mClient->currentItem(); | 435 | mSMSClient = mClient->currentItem(); |
431 | break; | 436 | break; |
432 | case(ExternalAppHandler::FAX): | 437 | case(ExternalAppHandler::FAX): |
433 | mFaxClient = mClient->currentItem(); | 438 | mFaxClient = mClient->currentItem(); |
434 | break; | 439 | break; |
435 | case(ExternalAppHandler::PAGER): | 440 | case(ExternalAppHandler::PAGER): |
436 | mPagerClient = mClient->currentItem(); | 441 | mPagerClient = mClient->currentItem(); |
437 | break; | 442 | break; |
438 | case(ExternalAppHandler::SIP): | 443 | case(ExternalAppHandler::SIP): |
439 | mSipClient = mClient->currentItem(); | 444 | mSipClient = mClient->currentItem(); |
440 | break; | 445 | break; |
441 | default: | 446 | default: |
442 | return; | 447 | return; |
443 | } | 448 | } |
444 | 449 | ||
445 | //store the current data back to the apropriate membervariables if we had set it to "other" | 450 | //store the current data back to the apropriate membervariables if we had set it to "other" |
446 | if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC)) | 451 | if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC)) |
447 | { | 452 | { |
448 | mEmailOtherChannel = mChannel->text(); | 453 | mEmailOtherChannel = mChannel->text(); |
449 | mEmailOtherMessage = mMessage->text(); | 454 | mEmailOtherMessage = mMessage->text(); |
450 | mEmailOtherMessageParameters = mParameters->text(); | 455 | mEmailOtherMessageParameters = mParameters->text(); |
451 | mEmailOtherMessage2 = mMessage2->text(); | 456 | mEmailOtherMessage2 = mMessage2->text(); |
452 | mEmailOtherMessageParameters2 = mParameters2->text(); | 457 | mEmailOtherMessageParameters2 = mParameters2->text(); |
453 | } | 458 | } |
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index 5081b26..04e2072 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp | |||
@@ -1,138 +1,139 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkdepim. | 2 | This file is part of libkdepim. |
3 | Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <kglobal.h> | 31 | #include <kglobal.h> |
32 | #include <kconfig.h> | 32 | #include <kconfig.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | #include <kdebug.h> | 34 | #include <kdebug.h> |
35 | #include <kstaticdeleter.h> | 35 | #include <kstaticdeleter.h> |
36 | 36 | ||
37 | #include <qregexp.h> | 37 | #include <qregexp.h> |
38 | #include "kpimglobalprefs.h" | 38 | #include "kpimglobalprefs.h" |
39 | 39 | ||
40 | KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; | 40 | KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; |
41 | static KStaticDeleter<KPimGlobalPrefs> staticDeleter; | 41 | static KStaticDeleter<KPimGlobalPrefs> staticDeleter; |
42 | 42 | ||
43 | 43 | ||
44 | KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) | 44 | KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) |
45 | : KPrefs("microkdeglobalrc") | 45 | : KPrefs("microkdeglobalrc") |
46 | { | 46 | { |
47 | 47 | ||
48 | KPrefs::setCurrentGroup("Locale"); | 48 | KPrefs::setCurrentGroup("Locale"); |
49 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); | 49 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); |
50 | addItemInt("PreferredTime",&mPreferredTime,0); | 50 | addItemInt("PreferredTime",&mPreferredTime,0); |
51 | addItemInt("PreferredDate",&mPreferredDate,0); | 51 | addItemInt("PreferredDate",&mPreferredDate,0); |
52 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); | 52 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); |
53 | //addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); | 53 | //addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); |
54 | // addItemBool("ShortDateInViewer",&mShortDateInViewer,false); | 54 | // addItemBool("ShortDateInViewer",&mShortDateInViewer,false); |
55 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y"); | 55 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y"); |
56 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); | 56 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); |
57 | 57 | ||
58 | KPrefs::setCurrentGroup("Time & Date"); | 58 | KPrefs::setCurrentGroup("Time & Date"); |
59 | 59 | ||
60 | addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") ); | 60 | addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") ); |
61 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); | 61 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); |
62 | addItemBool("TimeZoneAdd30min",&mTimeZoneAdd30min,false); | ||
62 | addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); | 63 | addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); |
63 | addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); | 64 | addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); |
64 | 65 | ||
65 | KPrefs::setCurrentGroup( "ExternalApplications" ); | 66 | KPrefs::setCurrentGroup( "ExternalApplications" ); |
66 | 67 | ||
67 | addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC ); | 68 | addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC ); |
68 | addItemString( "EmailChannel", &mEmailOtherChannel, "" ); | 69 | addItemString( "EmailChannel", &mEmailOtherChannel, "" ); |
69 | addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" ); | 70 | addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" ); |
70 | addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" ); | 71 | addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" ); |
71 | addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" ); | 72 | addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" ); |
72 | addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" ); | 73 | addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" ); |
73 | 74 | ||
74 | addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC ); | 75 | addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC ); |
75 | addItemString( "PhoneChannel", &mPhoneOtherChannel, "" ); | 76 | addItemString( "PhoneChannel", &mPhoneOtherChannel, "" ); |
76 | addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" ); | 77 | addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" ); |
77 | addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" ); | 78 | addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" ); |
78 | 79 | ||
79 | addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC ); | 80 | addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC ); |
80 | addItemString( "FaxChannel", &mFaxOtherChannel, "" ); | 81 | addItemString( "FaxChannel", &mFaxOtherChannel, "" ); |
81 | addItemString( "FaxChannelMessage", &mFaxOtherMessage, "" ); | 82 | addItemString( "FaxChannelMessage", &mFaxOtherMessage, "" ); |
82 | addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" ); | 83 | addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" ); |
83 | 84 | ||
84 | addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC ); | 85 | addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC ); |
85 | addItemString( "SMSChannel", &mSMSOtherChannel, "" ); | 86 | addItemString( "SMSChannel", &mSMSOtherChannel, "" ); |
86 | addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" ); | 87 | addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" ); |
87 | addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" ); | 88 | addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" ); |
88 | 89 | ||
89 | addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC ); | 90 | addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC ); |
90 | addItemString( "PagerChannel", &mPagerOtherChannel, "" ); | 91 | addItemString( "PagerChannel", &mPagerOtherChannel, "" ); |
91 | addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" ); | 92 | addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" ); |
92 | addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" ); | 93 | addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" ); |
93 | 94 | ||
94 | addItemInt( "SIPChannelType", &mSipClient, NONE_SIC ); | 95 | addItemInt( "SIPChannelType", &mSipClient, NONE_SIC ); |
95 | addItemString( "SIPChannel", &mSipOtherChannel, "" ); | 96 | addItemString( "SIPChannel", &mSipOtherChannel, "" ); |
96 | addItemString( "SIPChannelMessage", &mSipOtherMessage, "" ); | 97 | addItemString( "SIPChannelMessage", &mSipOtherMessage, "" ); |
97 | addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" ); | 98 | addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" ); |
98 | 99 | ||
99 | KPrefs::setCurrentGroup( "PhoneAccess" ); | 100 | KPrefs::setCurrentGroup( "PhoneAccess" ); |
100 | addItemString("Ex2PhoneDevice",&mEx2PhoneDevice,"/dev/ircomm"); | 101 | addItemString("Ex2PhoneDevice",&mEx2PhoneDevice,"/dev/ircomm"); |
101 | addItemString("Ex2PhoneConnection",&mEx2PhoneConnection,"irda"); | 102 | addItemString("Ex2PhoneConnection",&mEx2PhoneConnection,"irda"); |
102 | addItemString("Ex2PhoneModel",&mEx2PhoneModel,"6310i"); | 103 | addItemString("Ex2PhoneModel",&mEx2PhoneModel,"6310i"); |
103 | 104 | ||
104 | } | 105 | } |
105 | 106 | ||
106 | 107 | ||
107 | void KPimGlobalPrefs::setGlobalConfig() | 108 | void KPimGlobalPrefs::setGlobalConfig() |
108 | { | 109 | { |
109 | 110 | ||
110 | KGlobal::locale()->setHore24Format( !mPreferredTime ); | 111 | KGlobal::locale()->setHore24Format( !mPreferredTime ); |
111 | KGlobal::locale()->setWeekStartMonday( !mWeekStartsOnSunday ); | 112 | KGlobal::locale()->setWeekStartMonday( !mWeekStartsOnSunday ); |
112 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)mPreferredDate ); | 113 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)mPreferredDate ); |
113 | KGlobal::locale()->setLanguage( mPreferredLanguage ); | 114 | KGlobal::locale()->setLanguage( mPreferredLanguage ); |
114 | QString dummy = mUserDateFormatLong; | 115 | QString dummy = mUserDateFormatLong; |
115 | KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); | 116 | KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); |
116 | dummy = mUserDateFormatShort; | 117 | dummy = mUserDateFormatShort; |
117 | KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); | 118 | KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); |
118 | KGlobal::locale()->setDaylightSaving( mUseDaylightsaving, | 119 | KGlobal::locale()->setDaylightSaving( mUseDaylightsaving, |
119 | mDaylightsavingStart, | 120 | mDaylightsavingStart, |
120 | mDaylightsavingEnd ); | 121 | mDaylightsavingEnd ); |
121 | KGlobal::locale()->setTimezone( mTimeZoneId ); | 122 | KGlobal::locale()->setTimezone( mTimeZoneId, mTimeZoneAdd30min ); |
122 | 123 | ||
123 | } | 124 | } |
124 | KPimGlobalPrefs::~KPimGlobalPrefs() | 125 | KPimGlobalPrefs::~KPimGlobalPrefs() |
125 | { | 126 | { |
126 | //qDebug("KPimGlobalPrefs::~KPimGlobalPrefs() "); | 127 | //qDebug("KPimGlobalPrefs::~KPimGlobalPrefs() "); |
127 | writeConfig(); | 128 | writeConfig(); |
128 | } | 129 | } |
129 | 130 | ||
130 | KPimGlobalPrefs *KPimGlobalPrefs::instance() | 131 | KPimGlobalPrefs *KPimGlobalPrefs::instance() |
131 | { | 132 | { |
132 | if ( !sInstance ) { | 133 | if ( !sInstance ) { |
133 | sInstance = staticDeleter.setObject( new KPimGlobalPrefs() ); | 134 | sInstance = staticDeleter.setObject( new KPimGlobalPrefs() ); |
134 | sInstance->readConfig(); | 135 | sInstance->readConfig(); |
135 | } | 136 | } |
136 | 137 | ||
137 | return sInstance; | 138 | return sInstance; |
138 | } | 139 | } |
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h index f6b6628..7c55099 100644 --- a/libkdepim/kpimglobalprefs.h +++ b/libkdepim/kpimglobalprefs.h | |||
@@ -1,138 +1,139 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkdepim. | 2 | This file is part of libkdepim. |
3 | Copyright (c) 2004 Ulf Schenk | 3 | Copyright (c) 2004 Ulf Schenk |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #ifndef KPIMGLOBALPREFS_H | 31 | #ifndef KPIMGLOBALPREFS_H |
32 | #define KPIMGLOBALPREFS_H | 32 | #define KPIMGLOBALPREFS_H |
33 | 33 | ||
34 | #include "kprefs.h" | 34 | #include "kprefs.h" |
35 | 35 | ||
36 | class KPimGlobalPrefs : public KPrefs | 36 | class KPimGlobalPrefs : public KPrefs |
37 | { | 37 | { |
38 | public: | 38 | public: |
39 | 39 | ||
40 | void setGlobalConfig(); | 40 | void setGlobalConfig(); |
41 | static KPimGlobalPrefs *instance(); | 41 | static KPimGlobalPrefs *instance(); |
42 | 42 | ||
43 | 43 | ||
44 | virtual ~KPimGlobalPrefs(); | 44 | virtual ~KPimGlobalPrefs(); |
45 | 45 | ||
46 | 46 | ||
47 | enum EMailClients { | 47 | enum EMailClients { |
48 | NONE_EMC = 0, | 48 | NONE_EMC = 0, |
49 | OTHER_EMC = 1, | 49 | OTHER_EMC = 1, |
50 | OMPI_EMC = 2, | 50 | OMPI_EMC = 2, |
51 | QTOPIA_EMC = 3, | 51 | QTOPIA_EMC = 3, |
52 | OPIE_EMC = 4 | 52 | OPIE_EMC = 4 |
53 | }; | 53 | }; |
54 | 54 | ||
55 | enum PhoneClients { | 55 | enum PhoneClients { |
56 | NONE_PHC = 0, | 56 | NONE_PHC = 0, |
57 | OTHER_PHC = 1, | 57 | OTHER_PHC = 1, |
58 | KPPI_PHC = 2 | 58 | KPPI_PHC = 2 |
59 | }; | 59 | }; |
60 | 60 | ||
61 | enum FaxClients { | 61 | enum FaxClients { |
62 | NONE_FAC = 0, | 62 | NONE_FAC = 0, |
63 | OTHER_FAC = 1 | 63 | OTHER_FAC = 1 |
64 | }; | 64 | }; |
65 | 65 | ||
66 | enum SMSClients { | 66 | enum SMSClients { |
67 | NONE_SMC = 0, | 67 | NONE_SMC = 0, |
68 | OTHER_SMC = 1 | 68 | OTHER_SMC = 1 |
69 | }; | 69 | }; |
70 | 70 | ||
71 | enum PagerClients { | 71 | enum PagerClients { |
72 | NONE_PAC = 0, | 72 | NONE_PAC = 0, |
73 | OTHER_PAC = 1 | 73 | OTHER_PAC = 1 |
74 | }; | 74 | }; |
75 | 75 | ||
76 | enum SIPClients { | 76 | enum SIPClients { |
77 | NONE_SIC = 0, | 77 | NONE_SIC = 0, |
78 | OTHER_SIC = 1 | 78 | OTHER_SIC = 1 |
79 | }; | 79 | }; |
80 | 80 | ||
81 | private: | 81 | private: |
82 | KPimGlobalPrefs( const QString &name = QString::null ); | 82 | KPimGlobalPrefs( const QString &name = QString::null ); |
83 | 83 | ||
84 | static KPimGlobalPrefs *sInstance; | 84 | static KPimGlobalPrefs *sInstance; |
85 | 85 | ||
86 | 86 | ||
87 | public: | 87 | public: |
88 | //US I copied the following "locale" settings from KOPrefs | 88 | //US I copied the following "locale" settings from KOPrefs |
89 | int mPreferredDate; | 89 | int mPreferredDate; |
90 | QString mUserDateFormatLong; | 90 | QString mUserDateFormatLong; |
91 | QString mUserDateFormatShort; | 91 | QString mUserDateFormatShort; |
92 | int mPreferredLanguage; | 92 | int mPreferredLanguage; |
93 | int mPreferredTime; | 93 | int mPreferredTime; |
94 | bool mWeekStartsOnSunday; | 94 | bool mWeekStartsOnSunday; |
95 | QString mTimeZoneId; | 95 | QString mTimeZoneId; |
96 | bool mUseDaylightsaving; | 96 | bool mUseDaylightsaving; |
97 | int mDaylightsavingStart; | 97 | int mDaylightsavingStart; |
98 | int mDaylightsavingEnd; | 98 | int mDaylightsavingEnd; |
99 | bool mTimeZoneAdd30min; | ||
99 | 100 | ||
100 | int mEmailClient; | 101 | int mEmailClient; |
101 | QString mEmailOtherChannel; | 102 | QString mEmailOtherChannel; |
102 | QString mEmailOtherMessage; | 103 | QString mEmailOtherMessage; |
103 | QString mEmailOtherMessageParameters; | 104 | QString mEmailOtherMessageParameters; |
104 | QString mEmailOtherMessage2; | 105 | QString mEmailOtherMessage2; |
105 | QString mEmailOtherMessageParameters2; | 106 | QString mEmailOtherMessageParameters2; |
106 | 107 | ||
107 | int mPhoneClient; | 108 | int mPhoneClient; |
108 | QString mPhoneOtherChannel; | 109 | QString mPhoneOtherChannel; |
109 | QString mPhoneOtherMessage; | 110 | QString mPhoneOtherMessage; |
110 | QString mPhoneOtherMessageParameters; | 111 | QString mPhoneOtherMessageParameters; |
111 | 112 | ||
112 | int mFaxClient; | 113 | int mFaxClient; |
113 | QString mFaxOtherChannel; | 114 | QString mFaxOtherChannel; |
114 | QString mFaxOtherMessage; | 115 | QString mFaxOtherMessage; |
115 | QString mFaxOtherMessageParameters; | 116 | QString mFaxOtherMessageParameters; |
116 | 117 | ||
117 | int mSMSClient; | 118 | int mSMSClient; |
118 | QString mSMSOtherChannel; | 119 | QString mSMSOtherChannel; |
119 | QString mSMSOtherMessage; | 120 | QString mSMSOtherMessage; |
120 | QString mSMSOtherMessageParameters; | 121 | QString mSMSOtherMessageParameters; |
121 | 122 | ||
122 | int mPagerClient; | 123 | int mPagerClient; |
123 | QString mPagerOtherChannel; | 124 | QString mPagerOtherChannel; |
124 | QString mPagerOtherMessage; | 125 | QString mPagerOtherMessage; |
125 | QString mPagerOtherMessageParameters; | 126 | QString mPagerOtherMessageParameters; |
126 | 127 | ||
127 | int mSipClient; | 128 | int mSipClient; |
128 | QString mSipOtherChannel; | 129 | QString mSipOtherChannel; |
129 | QString mSipOtherMessage; | 130 | QString mSipOtherMessage; |
130 | QString mSipOtherMessageParameters; | 131 | QString mSipOtherMessageParameters; |
131 | 132 | ||
132 | QString mEx2PhoneDevice; | 133 | QString mEx2PhoneDevice; |
133 | QString mEx2PhoneConnection; | 134 | QString mEx2PhoneConnection; |
134 | QString mEx2PhoneModel; | 135 | QString mEx2PhoneModel; |
135 | 136 | ||
136 | }; | 137 | }; |
137 | 138 | ||
138 | #endif | 139 | #endif |