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 /libkdepim/kcmconfigs | |
parent | d63eac7a612a9724705bc58ad98c65c6ac052d07 (diff) | |
download | kdepimpi-a56783aace3496c8b40008d0dec4c42437165e54.zip kdepimpi-a56783aace3496c8b40008d0dec4c42437165e54.tar.gz kdepimpi-a56783aace3496c8b40008d0dec4c42437165e54.tar.bz2 |
Fix for startup question for timezone
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 5 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.h | 1 |
2 files changed, 5 insertions, 1 deletions
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 | |||
@@ -75,65 +75,68 @@ $Id$ | |||
75 | 75 | ||
76 | #include "qapplication.h" | 76 | #include "qapplication.h" |
77 | 77 | ||
78 | #include "kpimglobalprefs.h" | 78 | #include "kpimglobalprefs.h" |
79 | 79 | ||
80 | #include "kdepimconfigwidget.h" | 80 | #include "kdepimconfigwidget.h" |
81 | 81 | ||
82 | 82 | ||
83 | KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name ) | 83 | KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name ) |
84 | : KPrefsWidget(prefs, parent, name ) | 84 | : KPrefsWidget(prefs, parent, name ) |
85 | { | 85 | { |
86 | mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email")); | 86 | mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email")); |
87 | mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone")); | 87 | mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone")); |
88 | mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); | 88 | mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); |
89 | mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); | 89 | mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); |
90 | mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); | 90 | mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); |
91 | mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP")); | 91 | mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP")); |
92 | 92 | ||
93 | 93 | ||
94 | QVBoxLayout *topLayout = new QVBoxLayout( this, 0, | 94 | QVBoxLayout *topLayout = new QVBoxLayout( this, 0, |
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 | ||
120 | layout->addWidget( mExternalApps ); | 123 | layout->addWidget( mExternalApps ); |
121 | 124 | ||
122 | connect( mExternalApps, SIGNAL( activated( int ) ), | 125 | connect( mExternalApps, SIGNAL( activated( int ) ), |
123 | this, SLOT (externalapp_changed( int ) ) ); | 126 | this, SLOT (externalapp_changed( int ) ) ); |
124 | 127 | ||
125 | 128 | ||
126 | mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); | 129 | mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); |
127 | QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" ); | 130 | QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" ); |
128 | 131 | ||
129 | 132 | ||
130 | mClient = new QComboBox( mExternalAppGroupBox ); | 133 | mClient = new QComboBox( mExternalAppGroupBox ); |
131 | boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 ); | 134 | boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 ); |
132 | 135 | ||
133 | connect( mClient, SIGNAL( activated( int ) ), | 136 | connect( mClient, SIGNAL( activated( int ) ), |
134 | this, SLOT (client_changed( int ) ) ); | 137 | this, SLOT (client_changed( int ) ) ); |
135 | 138 | ||
136 | QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox); | 139 | QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox); |
137 | boxLayout->addWidget( lab, 1, 0 ); | 140 | boxLayout->addWidget( lab, 1, 0 ); |
138 | mChannel = new QLineEdit(mExternalAppGroupBox); | 141 | mChannel = new QLineEdit(mExternalAppGroupBox); |
139 | mChannel->setReadOnly(true); | 142 | mChannel->setReadOnly(true); |
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 | |||
@@ -24,64 +24,65 @@ | |||
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 KDEPIMCONFIGWIDGET_H | 31 | #ifndef KDEPIMCONFIGWIDGET_H |
32 | #define KDEPIMCONFIGWIDGET_H | 32 | #define KDEPIMCONFIGWIDGET_H |
33 | 33 | ||
34 | #include <kprefswidget.h> | 34 | #include <kprefswidget.h> |
35 | #include <qmap.h> | 35 | #include <qmap.h> |
36 | 36 | ||
37 | #include "externalapphandler.h" | 37 | #include "externalapphandler.h" |
38 | 38 | ||
39 | 39 | ||
40 | class QComboBox; | 40 | class QComboBox; |
41 | class QLineEdit; | 41 | class QLineEdit; |
42 | class KPimGlobalPrefs; | 42 | class KPimGlobalPrefs; |
43 | class QGroupBox; | 43 | 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* ); |
68 | void client_changed( int newClient ); | 69 | void client_changed( int newClient ); |
69 | void externalapp_changed( int newApp ); | 70 | void externalapp_changed( int newApp ); |
70 | 71 | ||
71 | private: | 72 | private: |
72 | void setupExternalAppTab(); | 73 | void setupExternalAppTab(); |
73 | void setupLocaleDateTab(); | 74 | void setupLocaleDateTab(); |
74 | void setupLocaleTab(); | 75 | void setupLocaleTab(); |
75 | void setupTimeZoneTab(); | 76 | void setupTimeZoneTab(); |
76 | 77 | ||
77 | void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); | 78 | void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); |
78 | 79 | ||
79 | 80 | ||
80 | void saveEditFieldSettings(); | 81 | void saveEditFieldSettings(); |
81 | void updateClientWidgets(); | 82 | void updateClientWidgets(); |
82 | 83 | ||
83 | QTabWidget *tabWidget; | 84 | QTabWidget *tabWidget; |
84 | 85 | ||
85 | 86 | ||
86 | QLineEdit* mUserDateFormatShort; | 87 | QLineEdit* mUserDateFormatShort; |
87 | QLineEdit* mUserDateFormatLong; | 88 | QLineEdit* mUserDateFormatLong; |