-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 764c495..292951b 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -880,97 +880,101 @@ void KDEPIMConfigWidget::usrReadConfig() | |||
880 | mEmailOtherChannel = prefs->mEmailOtherChannel; | 880 | mEmailOtherChannel = prefs->mEmailOtherChannel; |
881 | mEmailOtherMessage = prefs->mEmailOtherMessage; | 881 | mEmailOtherMessage = prefs->mEmailOtherMessage; |
882 | mEmailOtherMessageParameters = prefs->mEmailOtherMessageParameters; | 882 | mEmailOtherMessageParameters = prefs->mEmailOtherMessageParameters; |
883 | mEmailOtherMessage2 = prefs->mEmailOtherMessage2; | 883 | mEmailOtherMessage2 = prefs->mEmailOtherMessage2; |
884 | mEmailOtherMessageParameters2 = prefs->mEmailOtherMessageParameters2; | 884 | mEmailOtherMessageParameters2 = prefs->mEmailOtherMessageParameters2; |
885 | 885 | ||
886 | mPhoneClient = prefs->mPhoneClient; | 886 | mPhoneClient = prefs->mPhoneClient; |
887 | mPhoneOtherChannel = prefs->mPhoneOtherChannel; | 887 | mPhoneOtherChannel = prefs->mPhoneOtherChannel; |
888 | mPhoneOtherMessage = prefs->mPhoneOtherMessage; | 888 | mPhoneOtherMessage = prefs->mPhoneOtherMessage; |
889 | mPhoneOtherMessageParameters = prefs->mPhoneOtherMessageParameters; | 889 | mPhoneOtherMessageParameters = prefs->mPhoneOtherMessageParameters; |
890 | 890 | ||
891 | mFaxClient = prefs->mFaxClient; | 891 | mFaxClient = prefs->mFaxClient; |
892 | mFaxOtherChannel = prefs->mFaxOtherChannel; | 892 | mFaxOtherChannel = prefs->mFaxOtherChannel; |
893 | mFaxOtherMessage = prefs->mFaxOtherMessage; | 893 | mFaxOtherMessage = prefs->mFaxOtherMessage; |
894 | mFaxOtherMessageParameters = prefs->mFaxOtherMessageParameters; | 894 | mFaxOtherMessageParameters = prefs->mFaxOtherMessageParameters; |
895 | 895 | ||
896 | mSMSClient = prefs->mSMSClient; | 896 | mSMSClient = prefs->mSMSClient; |
897 | mSMSOtherChannel = prefs->mSMSOtherChannel; | 897 | mSMSOtherChannel = prefs->mSMSOtherChannel; |
898 | mSMSOtherMessage = prefs->mSMSOtherMessage; | 898 | mSMSOtherMessage = prefs->mSMSOtherMessage; |
899 | mSMSOtherMessageParameters = prefs->mSMSOtherMessageParameters; | 899 | mSMSOtherMessageParameters = prefs->mSMSOtherMessageParameters; |
900 | 900 | ||
901 | mPagerClient = prefs->mPagerClient; | 901 | mPagerClient = prefs->mPagerClient; |
902 | mPagerOtherChannel = prefs->mPagerOtherChannel; | 902 | mPagerOtherChannel = prefs->mPagerOtherChannel; |
903 | mPagerOtherMessage = prefs->mPagerOtherMessage; | 903 | mPagerOtherMessage = prefs->mPagerOtherMessage; |
904 | mPagerOtherMessageParameters = prefs->mPagerOtherMessageParameters; | 904 | mPagerOtherMessageParameters = prefs->mPagerOtherMessageParameters; |
905 | 905 | ||
906 | mSipClient = prefs->mSipClient; | 906 | mSipClient = prefs->mSipClient; |
907 | mSipOtherChannel = prefs->mSipOtherChannel; | 907 | mSipOtherChannel = prefs->mSipOtherChannel; |
908 | mSipOtherMessage = prefs->mSipOtherMessage; | 908 | mSipOtherMessage = prefs->mSipOtherMessage; |
909 | mSipOtherMessageParameters = prefs->mSipOtherMessageParameters; | 909 | mSipOtherMessageParameters = prefs->mSipOtherMessageParameters; |
910 | 910 | ||
911 | mCurrentApp = ExternalAppHandler::EMAIL; | 911 | mCurrentApp = ExternalAppHandler::EMAIL; |
912 | mCurrentClient = mEmailClient; | 912 | mCurrentClient = mEmailClient; |
913 | 913 | ||
914 | updateClientWidgets(); | 914 | updateClientWidgets(); |
915 | 915 | ||
916 | blockSignals( blocked ); | 916 | blockSignals( blocked ); |
917 | 917 | ||
918 | } | 918 | } |
919 | 919 | ||
920 | void KDEPIMConfigWidget::usrWriteConfig() | 920 | void KDEPIMConfigWidget::usrWriteConfig() |
921 | { | 921 | { |
922 | KPimGlobalPrefs* prefs = KPimGlobalPrefs::instance(); | 922 | KPimGlobalPrefs* prefs = KPimGlobalPrefs::instance(); |
923 | 923 | ||
924 | saveEditFieldSettings(); | 924 | saveEditFieldSettings(); |
925 | 925 | ||
926 | prefs->mBackupNumbers = mBackupNumbersSpin->value(); | 926 | prefs->mBackupNumbers = mBackupNumbersSpin->value(); |
927 | prefs->mBackupDayCount = mBackupDayCountSpin->value(); | 927 | prefs->mBackupDayCount = mBackupDayCountSpin->value(); |
928 | prefs->mBackupDatadir = mBackupUrl->url(); | 928 | QString bup_url = mBackupUrl->url(); |
929 | if ( bup_url.right(1) != "/" && bup_url.right(1) != "\\" ) | ||
930 | bup_url += "/"; | ||
931 | |||
932 | prefs->mBackupDatadir = bup_url; | ||
929 | 933 | ||
930 | prefs->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); | 934 | prefs->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); |
931 | prefs->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); | 935 | prefs->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); |
932 | 936 | ||
933 | prefs->mTimeZoneId = mTimeZoneCombo->currentText(); | 937 | prefs->mTimeZoneId = mTimeZoneCombo->currentText(); |
934 | QDate date; | 938 | QDate date; |
935 | date = mStartDateSavingEdit->date(); | 939 | date = mStartDateSavingEdit->date(); |
936 | int sub = 0; | 940 | int sub = 0; |
937 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) | 941 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) |
938 | sub = 1; | 942 | sub = 1; |
939 | prefs->mDaylightsavingStart = date.dayOfYear()-sub; | 943 | prefs->mDaylightsavingStart = date.dayOfYear()-sub; |
940 | date = mEndDateSavingEdit->date(); | 944 | date = mEndDateSavingEdit->date(); |
941 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) | 945 | if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) |
942 | sub = 1; | 946 | sub = 1; |
943 | else | 947 | else |
944 | sub = 0; | 948 | sub = 0; |
945 | prefs->mDaylightsavingEnd = date.dayOfYear()-sub; | 949 | prefs->mDaylightsavingEnd = date.dayOfYear()-sub; |
946 | 950 | ||
947 | 951 | ||
948 | prefs->mEmailClient = mEmailClient; | 952 | prefs->mEmailClient = mEmailClient; |
949 | prefs->mEmailOtherChannel = mEmailOtherChannel; | 953 | prefs->mEmailOtherChannel = mEmailOtherChannel; |
950 | prefs->mEmailOtherMessage = mEmailOtherMessage; | 954 | prefs->mEmailOtherMessage = mEmailOtherMessage; |
951 | prefs->mEmailOtherMessageParameters = mEmailOtherMessageParameters; | 955 | prefs->mEmailOtherMessageParameters = mEmailOtherMessageParameters; |
952 | prefs->mEmailOtherMessage2 = mEmailOtherMessage2; | 956 | prefs->mEmailOtherMessage2 = mEmailOtherMessage2; |
953 | prefs->mEmailOtherMessageParameters2 = mEmailOtherMessageParameters2; | 957 | prefs->mEmailOtherMessageParameters2 = mEmailOtherMessageParameters2; |
954 | 958 | ||
955 | prefs->mPhoneClient = mPhoneClient; | 959 | prefs->mPhoneClient = mPhoneClient; |
956 | prefs->mPhoneOtherChannel = mPhoneOtherChannel; | 960 | prefs->mPhoneOtherChannel = mPhoneOtherChannel; |
957 | prefs->mPhoneOtherMessage = mPhoneOtherMessage; | 961 | prefs->mPhoneOtherMessage = mPhoneOtherMessage; |
958 | prefs->mPhoneOtherMessageParameters = mPhoneOtherMessageParameters; | 962 | prefs->mPhoneOtherMessageParameters = mPhoneOtherMessageParameters; |
959 | 963 | ||
960 | prefs->mFaxClient = mFaxClient; | 964 | prefs->mFaxClient = mFaxClient; |
961 | prefs->mFaxOtherChannel = mFaxOtherChannel; | 965 | prefs->mFaxOtherChannel = mFaxOtherChannel; |
962 | prefs->mFaxOtherMessage = mFaxOtherMessage; | 966 | prefs->mFaxOtherMessage = mFaxOtherMessage; |
963 | prefs->mFaxOtherMessageParameters = mFaxOtherMessageParameters; | 967 | prefs->mFaxOtherMessageParameters = mFaxOtherMessageParameters; |
964 | 968 | ||
965 | prefs->mSMSClient = mSMSClient; | 969 | prefs->mSMSClient = mSMSClient; |
966 | prefs->mSMSOtherChannel = mSMSOtherChannel; | 970 | prefs->mSMSOtherChannel = mSMSOtherChannel; |
967 | prefs->mSMSOtherMessage = mSMSOtherMessage; | 971 | prefs->mSMSOtherMessage = mSMSOtherMessage; |
968 | prefs->mSMSOtherMessageParameters = mSMSOtherMessageParameters; | 972 | prefs->mSMSOtherMessageParameters = mSMSOtherMessageParameters; |
969 | 973 | ||
970 | prefs->mPagerClient = mPagerClient; | 974 | prefs->mPagerClient = mPagerClient; |
971 | prefs->mPagerOtherChannel = mPagerOtherChannel; | 975 | prefs->mPagerOtherChannel = mPagerOtherChannel; |
972 | prefs->mPagerOtherMessage = mPagerOtherMessage; | 976 | prefs->mPagerOtherMessage = mPagerOtherMessage; |
973 | prefs->mPagerOtherMessageParameters = mPagerOtherMessageParameters; | 977 | prefs->mPagerOtherMessageParameters = mPagerOtherMessageParameters; |
974 | 978 | ||
975 | 979 | ||
976 | prefs->mSipClient = mSipClient; | 980 | prefs->mSipClient = mSipClient; |