-rw-r--r-- | korganizer/koprefsdialog.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 1c30faa..7dafcd8 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -58,55 +58,65 @@ | |||
58 | #include <klineedit.h> | 58 | #include <klineedit.h> |
59 | 59 | ||
60 | #if defined(USE_SOLARIS) | 60 | #if defined(USE_SOLARIS) |
61 | #include <sys/param.h> | 61 | #include <sys/param.h> |
62 | 62 | ||
63 | #define ZONEINFODIR "/usr/share/lib/zoneinfo" | 63 | #define ZONEINFODIR "/usr/share/lib/zoneinfo" |
64 | #define INITFILE "/etc/default/init" | 64 | #define INITFILE "/etc/default/init" |
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | #include "koprefs.h" | 67 | #include "koprefs.h" |
68 | 68 | ||
69 | #include "koprefsdialog.h" | 69 | #include "koprefsdialog.h" |
70 | #include "kpimglobalprefs.h" | ||
70 | 71 | ||
71 | 72 | ||
72 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | 73 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : |
73 | KPrefsDialog(KOPrefs::instance(),parent,name,true) | 74 | KPrefsDialog(KOPrefs::instance(),parent,name,true) |
74 | { | 75 | { |
75 | 76 | ||
76 | setCaption( i18n("Preferences - some settings need a restart (nr)")); | 77 | setCaption( i18n("Preferences - some settings need a restart (nr)")); |
77 | mCategoryDict.setAutoDelete(true); | 78 | mCategoryDict.setAutoDelete(true); |
78 | 79 | ||
79 | KGlobal::locale()->insertCatalogue("timezones"); | 80 | KGlobal::locale()->insertCatalogue("timezones"); |
80 | 81 | ||
82 | setupGlobalTab(); | ||
81 | setupMainTab(); | 83 | setupMainTab(); |
82 | setupLocaleTab(); | 84 | setupLocaleTab(); |
83 | setupTimeZoneTab(); | 85 | setupTimeZoneTab(); |
84 | setupTimeTab(); | 86 | setupTimeTab(); |
85 | setupLocaleDateTab(); | 87 | setupLocaleDateTab(); |
86 | setupFontsTab(); | 88 | setupFontsTab(); |
87 | setupColorsTab(); | 89 | setupColorsTab(); |
88 | setupViewsTab(); | 90 | setupViewsTab(); |
89 | //setupSyncTab(); | 91 | //setupSyncTab(); |
90 | //setupSyncAlgTab(); | 92 | //setupSyncAlgTab(); |
91 | //setupPrinterTab(); | 93 | //setupPrinterTab(); |
92 | //setupGroupSchedulingTab(); | 94 | //setupGroupSchedulingTab(); |
93 | //setupGroupAutomationTab(); | 95 | //setupGroupAutomationTab(); |
94 | } | 96 | } |
95 | 97 | ||
96 | 98 | ||
97 | KOPrefsDialog::~KOPrefsDialog() | 99 | KOPrefsDialog::~KOPrefsDialog() |
98 | { | 100 | { |
99 | } | 101 | } |
102 | void KOPrefsDialog::setupGlobalTab() | ||
103 | { | ||
104 | QFrame *topFrame = addPage(i18n("Global"),0,0); | ||
105 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); | ||
106 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); | ||
107 | topLayout->addWidget( kdelibcfg ); | ||
108 | |||
100 | 109 | ||
110 | } | ||
101 | void KOPrefsDialog::setupLocaleDateTab() | 111 | void KOPrefsDialog::setupLocaleDateTab() |
102 | { | 112 | { |
103 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); | 113 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); |
104 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); | 114 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); |
105 | topLayout->setSpacing(spacingHint()); | 115 | topLayout->setSpacing(spacingHint()); |
106 | topLayout->setMargin(marginHint()); | 116 | topLayout->setMargin(marginHint()); |
107 | int iii = 0; | 117 | int iii = 0; |
108 | 118 | ||
109 | 119 | ||
110 | KPrefsDialogWidRadios *syncPrefsGroup = | 120 | KPrefsDialogWidRadios *syncPrefsGroup = |
111 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); | 121 | addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); |
112 | QString format; | 122 | QString format; |
@@ -1312,24 +1322,25 @@ void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text, | |||
1312 | } else { | 1322 | } else { |
1313 | for(int i=0;i<combo->count();++i) { | 1323 | for(int i=0;i<combo->count();++i) { |
1314 | if (combo->text(i) == text) { | 1324 | if (combo->text(i) == text) { |
1315 | combo->setCurrentItem(i); | 1325 | combo->setCurrentItem(i); |
1316 | break; | 1326 | break; |
1317 | } | 1327 | } |
1318 | } | 1328 | } |
1319 | } | 1329 | } |
1320 | } | 1330 | } |
1321 | 1331 | ||
1322 | void KOPrefsDialog::usrReadConfig() | 1332 | void KOPrefsDialog::usrReadConfig() |
1323 | { | 1333 | { |
1334 | kdelibcfg->readConfig(); | ||
1324 | mNameEdit->setText(KOPrefs::instance()->fullName()); | 1335 | mNameEdit->setText(KOPrefs::instance()->fullName()); |
1325 | mEmailEdit->setText(KOPrefs::instance()->email()); | 1336 | mEmailEdit->setText(KOPrefs::instance()->email()); |
1326 | 1337 | ||
1327 | mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval); | 1338 | mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval); |
1328 | QDate current ( 2001, 1,1); | 1339 | QDate current ( 2001, 1,1); |
1329 | mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); | 1340 | mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); |
1330 | mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); | 1341 | mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); |
1331 | setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId)); | 1342 | setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId)); |
1332 | //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); | 1343 | //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); |
1333 | mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime); | 1344 | mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime); |
1334 | mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration); | 1345 | mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration); |
1335 | mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime); | 1346 | mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime); |
@@ -1361,24 +1372,25 @@ void KOPrefsDialog::usrReadConfig() | |||
1361 | mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); | 1372 | mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); |
1362 | updateCategories(); | 1373 | updateCategories(); |
1363 | mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps ); | 1374 | mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps ); |
1364 | mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); | 1375 | mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); |
1365 | mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount ); | 1376 | mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount ); |
1366 | mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); | 1377 | mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); |
1367 | } | 1378 | } |
1368 | 1379 | ||
1369 | 1380 | ||
1370 | void KOPrefsDialog::usrWriteConfig() | 1381 | void KOPrefsDialog::usrWriteConfig() |
1371 | { | 1382 | { |
1372 | 1383 | ||
1384 | kdelibcfg->writeConfig(); | ||
1373 | // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text(); | 1385 | // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text(); |
1374 | //KOPrefs::instance()->mRemoteUser = mRemoteUser->text(); | 1386 | //KOPrefs::instance()->mRemoteUser = mRemoteUser->text(); |
1375 | //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text(); | 1387 | //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text(); |
1376 | //KOPrefs::instance()->mRemoteFile= mRemoteFile->text(); | 1388 | //KOPrefs::instance()->mRemoteFile= mRemoteFile->text(); |
1377 | //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text(); | 1389 | //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text(); |
1378 | KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text(); | 1390 | KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text(); |
1379 | 1391 | ||
1380 | KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); | 1392 | KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); |
1381 | KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); | 1393 | KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); |
1382 | KOPrefs::instance()->setFullName(mNameEdit->text()); | 1394 | KOPrefs::instance()->setFullName(mNameEdit->text()); |
1383 | KOPrefs::instance()->setEmail(mEmailEdit->text()); | 1395 | KOPrefs::instance()->setEmail(mEmailEdit->text()); |
1384 | 1396 | ||