-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 6de60fa..1fae41f 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -645,97 +645,97 @@ void KDEPIMConfigWidget::updateClientWidgets() | |||
645 | 645 | ||
646 | void KDEPIMConfigWidget::usrReadConfig() | 646 | void KDEPIMConfigWidget::usrReadConfig() |
647 | { | 647 | { |
648 | KPimGlobalPrefs* prefs = KPimGlobalPrefs::instance(); | 648 | KPimGlobalPrefs* prefs = KPimGlobalPrefs::instance(); |
649 | 649 | ||
650 | bool blocked = signalsBlocked(); | 650 | bool blocked = signalsBlocked(); |
651 | blockSignals( true ); | 651 | blockSignals( true ); |
652 | 652 | ||
653 | QString dummy = prefs->mUserDateFormatLong; | 653 | QString dummy = prefs->mUserDateFormatLong; |
654 | mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") )); | 654 | mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") )); |
655 | dummy = prefs->mUserDateFormatShort; | 655 | dummy = prefs->mUserDateFormatShort; |
656 | mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); | 656 | mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); |
657 | 657 | ||
658 | QDate current ( 2001, 1,1); | 658 | QDate current ( 2001, 1,1); |
659 | mStartDateSavingEdit->setDate(current.addDays(prefs->mDaylightsavingStart-1)); | 659 | mStartDateSavingEdit->setDate(current.addDays(prefs->mDaylightsavingStart-1)); |
660 | mEndDateSavingEdit->setDate(current.addDays(prefs->mDaylightsavingEnd-1)); | 660 | mEndDateSavingEdit->setDate(current.addDays(prefs->mDaylightsavingEnd-1)); |
661 | setCombo(mTimeZoneCombo,i18n(prefs->mTimeZoneId)); | 661 | setCombo(mTimeZoneCombo,i18n(prefs->mTimeZoneId)); |
662 | 662 | ||
663 | 663 | ||
664 | 664 | ||
665 | 665 | ||
666 | mEmailClient = prefs->mEmailClient; | 666 | mEmailClient = prefs->mEmailClient; |
667 | mEmailOtherChannel = prefs->mEmailOtherChannel; | 667 | mEmailOtherChannel = prefs->mEmailOtherChannel; |
668 | mEmailOtherMessage = prefs->mEmailOtherMessage; | 668 | mEmailOtherMessage = prefs->mEmailOtherMessage; |
669 | mEmailOtherMessageParameters = prefs->mEmailOtherMessageParameters; | 669 | mEmailOtherMessageParameters = prefs->mEmailOtherMessageParameters; |
670 | mEmailOtherMessage2 = prefs->mEmailOtherMessage2; | 670 | mEmailOtherMessage2 = prefs->mEmailOtherMessage2; |
671 | mEmailOtherMessageParameters2 = prefs->mEmailOtherMessageParameters2; | 671 | mEmailOtherMessageParameters2 = prefs->mEmailOtherMessageParameters2; |
672 | 672 | ||
673 | mPhoneClient = prefs->mPhoneClient; | 673 | mPhoneClient = prefs->mPhoneClient; |
674 | mPhoneOtherChannel = prefs->mPhoneOtherChannel; | 674 | mPhoneOtherChannel = prefs->mPhoneOtherChannel; |
675 | mPhoneOtherMessage = prefs->mPhoneOtherMessage; | 675 | mPhoneOtherMessage = prefs->mPhoneOtherMessage; |
676 | mPhoneOtherMessageParameters = prefs->mPhoneOtherMessageParameters; | 676 | mPhoneOtherMessageParameters = prefs->mPhoneOtherMessageParameters; |
677 | 677 | ||
678 | mFaxClient = prefs->mFaxClient; | 678 | mFaxClient = prefs->mFaxClient; |
679 | mFaxOtherChannel = prefs->mFaxOtherChannel; | 679 | mFaxOtherChannel = prefs->mFaxOtherChannel; |
680 | mFaxOtherMessage = prefs->mFaxOtherMessage; | 680 | mFaxOtherMessage = prefs->mFaxOtherMessage; |
681 | mFaxOtherMessageParameters = prefs->mFaxOtherMessageParameters; | 681 | mFaxOtherMessageParameters = prefs->mFaxOtherMessageParameters; |
682 | 682 | ||
683 | mSMSClient = prefs->mSMSClient; | 683 | mSMSClient = prefs->mSMSClient; |
684 | mSMSOtherChannel = prefs->mSMSOtherChannel; | 684 | mSMSOtherChannel = prefs->mSMSOtherChannel; |
685 | mSMSOtherMessage = prefs->mSMSOtherMessage; | 685 | mSMSOtherMessage = prefs->mSMSOtherMessage; |
686 | mSMSOtherMessageParameters = prefs->mSMSOtherMessageParameters; | 686 | mSMSOtherMessageParameters = prefs->mSMSOtherMessageParameters; |
687 | 687 | ||
688 | mPagerClient = prefs->mPagerClient; | 688 | mPagerClient = prefs->mPagerClient; |
689 | mPagerOtherChannel = prefs->mPagerOtherChannel; | 689 | mPagerOtherChannel = prefs->mPagerOtherChannel; |
690 | mPagerOtherMessage = prefs->mPagerOtherMessage; | 690 | mPagerOtherMessage = prefs->mPagerOtherMessage; |
691 | mPagerOtherMessageParameters = prefs->mPagerOtherMessageParameters; | 691 | mPagerOtherMessageParameters = prefs->mPagerOtherMessageParameters; |
692 | 692 | ||
693 | mSipClient = prefs->mPagerClient; | 693 | mSipClient = prefs->mSipClient; |
694 | mSipOtherChannel = prefs->mSipOtherChannel; | 694 | mSipOtherChannel = prefs->mSipOtherChannel; |
695 | mSipOtherMessage = prefs->mSipOtherMessage; | 695 | mSipOtherMessage = prefs->mSipOtherMessage; |
696 | mSipOtherMessageParameters = prefs->mSipOtherMessageParameters; | 696 | mSipOtherMessageParameters = prefs->mSipOtherMessageParameters; |
697 | 697 | ||
698 | mCurrentApp = ExternalAppHandler::EMAIL; | 698 | mCurrentApp = ExternalAppHandler::EMAIL; |
699 | mCurrentClient = mEmailClient; | 699 | mCurrentClient = mEmailClient; |
700 | 700 | ||
701 | updateClientWidgets(); | 701 | updateClientWidgets(); |
702 | 702 | ||
703 | blockSignals( blocked ); | 703 | blockSignals( blocked ); |
704 | 704 | ||
705 | } | 705 | } |
706 | 706 | ||
707 | void KDEPIMConfigWidget::usrWriteConfig() | 707 | void KDEPIMConfigWidget::usrWriteConfig() |
708 | { | 708 | { |
709 | KPimGlobalPrefs* prefs = KPimGlobalPrefs::instance(); | 709 | KPimGlobalPrefs* prefs = KPimGlobalPrefs::instance(); |
710 | 710 | ||
711 | saveEditFieldSettings(); | 711 | saveEditFieldSettings(); |
712 | 712 | ||
713 | 713 | ||
714 | prefs->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); | 714 | prefs->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); |
715 | prefs->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); | 715 | prefs->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); |
716 | 716 | ||
717 | prefs->mTimeZoneId = mTimeZoneCombo->currentText(); | 717 | prefs->mTimeZoneId = mTimeZoneCombo->currentText(); |
718 | QDate date; | 718 | QDate date; |
719 | date = mStartDateSavingEdit->date(); | 719 | date = mStartDateSavingEdit->date(); |
720 | int sub = 0; | 720 | int sub = 0; |
721 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) | 721 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) |
722 | sub = 1; | 722 | sub = 1; |
723 | prefs->mDaylightsavingStart = date.dayOfYear()-sub; | 723 | prefs->mDaylightsavingStart = date.dayOfYear()-sub; |
724 | date = mEndDateSavingEdit->date(); | 724 | date = mEndDateSavingEdit->date(); |
725 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) | 725 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) |
726 | sub = 1; | 726 | sub = 1; |
727 | else | 727 | else |
728 | sub = 0; | 728 | sub = 0; |
729 | prefs->mDaylightsavingEnd = date.dayOfYear()-sub; | 729 | prefs->mDaylightsavingEnd = date.dayOfYear()-sub; |
730 | 730 | ||
731 | 731 | ||
732 | prefs->mEmailClient = mEmailClient; | 732 | prefs->mEmailClient = mEmailClient; |
733 | prefs->mEmailOtherChannel = mEmailOtherChannel; | 733 | prefs->mEmailOtherChannel = mEmailOtherChannel; |
734 | prefs->mEmailOtherMessage = mEmailOtherMessage; | 734 | prefs->mEmailOtherMessage = mEmailOtherMessage; |
735 | prefs->mEmailOtherMessageParameters = mEmailOtherMessageParameters; | 735 | prefs->mEmailOtherMessageParameters = mEmailOtherMessageParameters; |
736 | prefs->mEmailOtherMessage2 = mEmailOtherMessage2; | 736 | prefs->mEmailOtherMessage2 = mEmailOtherMessage2; |
737 | prefs->mEmailOtherMessageParameters2 = mEmailOtherMessageParameters2; | 737 | prefs->mEmailOtherMessageParameters2 = mEmailOtherMessageParameters2; |
738 | 738 | ||
739 | prefs->mPhoneClient = mPhoneClient; | 739 | prefs->mPhoneClient = mPhoneClient; |
740 | prefs->mPhoneOtherChannel = mPhoneOtherChannel; | 740 | prefs->mPhoneOtherChannel = mPhoneOtherChannel; |
741 | prefs->mPhoneOtherMessage = mPhoneOtherMessage; | 741 | prefs->mPhoneOtherMessage = mPhoneOtherMessage; |