author | zautrix <zautrix> | 2004-09-22 04:05:36 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-22 04:05:36 (UTC) |
commit | a56783aace3496c8b40008d0dec4c42437165e54 (patch) (unidiff) | |
tree | 7c3c070c3346d67356508d586327212d97b457cb | |
parent | d63eac7a612a9724705bc58ad98c65c6ac052d07 (diff) | |
download | kdepimpi-a56783aace3496c8b40008d0dec4c42437165e54.zip kdepimpi-a56783aace3496c8b40008d0dec4c42437165e54.tar.gz kdepimpi-a56783aace3496c8b40008d0dec4c42437165e54.tar.bz2 |
Fix for startup question for timezone
-rw-r--r-- | korganizer/koprefsdialog.cpp | 3 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 5 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.h | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index b4b3b27..393e6e6 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -221,25 +221,26 @@ void KOPrefsDialog::setupLocaleTab() | |||
221 | // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION | 221 | // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION |
222 | #if 0 | 222 | #if 0 |
223 | ++iii; | 223 | ++iii; |
224 | sb = | 224 | sb = |
225 | addWidBool(i18n("Quick load/save (w/o Unicode)"), | 225 | addWidBool(i18n("Quick load/save (w/o Unicode)"), |
226 | &(KOPrefs::instance()->mUseQuicksave),topFrame); | 226 | &(KOPrefs::instance()->mUseQuicksave),topFrame); |
227 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | 227 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); |
228 | #endif | 228 | #endif |
229 | #endif | 229 | #endif |
230 | } | 230 | } |
231 | void KOPrefsDialog::showSyncPage() | 231 | void KOPrefsDialog::showSyncPage() |
232 | { | 232 | { |
233 | showPage ( 2 ) ; | 233 | showPage ( 0 ) ; |
234 | kdelibcfg->showTimeZoneTab() ; | ||
234 | 235 | ||
235 | } | 236 | } |
236 | void KOPrefsDialog::setupSyncAlgTab() | 237 | void KOPrefsDialog::setupSyncAlgTab() |
237 | { | 238 | { |
238 | #if 0 | 239 | #if 0 |
239 | QLabel * lab; | 240 | QLabel * lab; |
240 | QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); | 241 | QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); |
241 | mSetupSyncAlgTab = topFrame; | 242 | mSetupSyncAlgTab = topFrame; |
242 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); | 243 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); |
243 | topLayout->setSpacing(spacingHint()); | 244 | topLayout->setSpacing(spacingHint()); |
244 | topLayout->setMargin(marginHint()); | 245 | topLayout->setMargin(marginHint()); |
245 | int iii = 0; | 246 | int iii = 0; |
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 2819ab1..073ab74 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -95,25 +95,28 @@ KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, | |||
95 | KDialog::spacingHint() ); | 95 | KDialog::spacingHint() ); |
96 | 96 | ||
97 | tabWidget = new QTabWidget( this ); | 97 | tabWidget = new QTabWidget( this ); |
98 | topLayout->addWidget( tabWidget ); | 98 | topLayout->addWidget( tabWidget ); |
99 | 99 | ||
100 | 100 | ||
101 | setupLocaleTab(); | 101 | setupLocaleTab(); |
102 | setupLocaleDateTab(); | 102 | setupLocaleDateTab(); |
103 | setupTimeZoneTab(); | 103 | setupTimeZoneTab(); |
104 | setupExternalAppTab(); | 104 | setupExternalAppTab(); |
105 | 105 | ||
106 | } | 106 | } |
107 | 107 | void KDEPIMConfigWidget::showTimeZoneTab() | |
108 | { | ||
109 | tabWidget->setCurrentPage ( 2 ) ; | ||
110 | } | ||
108 | void KDEPIMConfigWidget::setupExternalAppTab() | 111 | void KDEPIMConfigWidget::setupExternalAppTab() |
109 | { | 112 | { |
110 | QWidget *externalAppsPage = new QWidget( this ); | 113 | QWidget *externalAppsPage = new QWidget( this ); |
111 | QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(), | 114 | QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(), |
112 | KDialog::spacingHintSmall() ); | 115 | KDialog::spacingHintSmall() ); |
113 | 116 | ||
114 | mExternalApps = new QComboBox( externalAppsPage ); | 117 | mExternalApps = new QComboBox( externalAppsPage ); |
115 | 118 | ||
116 | QMap<ExternalAppHandler::Types, QString>::Iterator it; | 119 | QMap<ExternalAppHandler::Types, QString>::Iterator it; |
117 | for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it ) | 120 | for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it ) |
118 | mExternalApps->insertItem( it.data(), it.key() ); | 121 | mExternalApps->insertItem( it.data(), it.key() ); |
119 | 122 | ||
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h index 6f26513..619f3d7 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.h +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h | |||
@@ -44,24 +44,25 @@ class QGroupBox; | |||
44 | class QTabWidget; | 44 | class QTabWidget; |
45 | class KDateEdit; | 45 | class KDateEdit; |
46 | 46 | ||
47 | class KDEPIMConfigWidget : public KPrefsWidget | 47 | class KDEPIMConfigWidget : public KPrefsWidget |
48 | { | 48 | { |
49 | Q_OBJECT | 49 | Q_OBJECT |
50 | 50 | ||
51 | public: | 51 | public: |
52 | KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name = 0 ); | 52 | KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name = 0 ); |
53 | 53 | ||
54 | public slots: | 54 | public slots: |
55 | void textChanged( const QString& text ); | 55 | void textChanged( const QString& text ); |
56 | void showTimeZoneTab(); | ||
56 | 57 | ||
57 | protected: | 58 | protected: |
58 | /** Implement this to read custom configuration widgets. */ | 59 | /** Implement this to read custom configuration widgets. */ |
59 | virtual void usrReadConfig(); | 60 | virtual void usrReadConfig(); |
60 | /** Implement this to write custom configuration widgets. */ | 61 | /** Implement this to write custom configuration widgets. */ |
61 | virtual void usrWriteConfig(); | 62 | virtual void usrWriteConfig(); |
62 | 63 | ||
63 | 64 | ||
64 | private slots: | 65 | private slots: |
65 | // void configureExtension(); | 66 | // void configureExtension(); |
66 | // void selectionChanged( QListViewItem* ); | 67 | // void selectionChanged( QListViewItem* ); |
67 | // void itemClicked( QListViewItem* ); | 68 | // void itemClicked( QListViewItem* ); |