author | zautrix <zautrix> | 2005-04-20 10:43:07 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-20 10:43:07 (UTC) |
commit | f23afbb9c09b4ee0f00af8f04ee4458181792cd0 (patch) (unidiff) | |
tree | 807bcaf329d257ec2a0c5c6e3a6afc7ab53a6078 /libkdepim/kcmconfigs | |
parent | 03f7f26ad34f50dd86f335c7c5a25a292d642793 (diff) | |
download | kdepimpi-f23afbb9c09b4ee0f00af8f04ee4458181792cd0.zip kdepimpi-f23afbb9c09b4ee0f00af8f04ee4458181792cd0.tar.gz kdepimpi-f23afbb9c09b4ee0f00af8f04ee4458181792cd0.tar.bz2 |
fixes
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 41 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.h | 4 |
2 files changed, 43 insertions, 2 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 753d90a..fbfbc45 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -14,56 +14,59 @@ | |||
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
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 | #include <qlayout.h> | 31 | #include <qlayout.h> |
32 | #include <qtabwidget.h> | 32 | #include <qtabwidget.h> |
33 | #include <qcombobox.h> | 33 | #include <qcombobox.h> |
34 | #include <qgroupbox.h> | 34 | #include <qgroupbox.h> |
35 | #include <qlabel.h> | 35 | #include <qlabel.h> |
36 | #include <qlineedit.h> | 36 | #include <qlineedit.h> |
37 | #include <qbuttongroup.h> | 37 | #include <qbuttongroup.h> |
38 | #include <qcheckbox.h> | ||
38 | #include <qfile.h> | 39 | #include <qfile.h> |
39 | #include <qvbox.h> | 40 | #include <qvbox.h> |
40 | #include <qdir.h> | 41 | #include <qdir.h> |
41 | #include <qregexp.h> | 42 | #include <qregexp.h> |
43 | #include <qspinbox.h> | ||
42 | 44 | ||
43 | #include <kdialog.h> | 45 | #include <kdialog.h> |
44 | #include <kprefsdialog.h> | 46 | #include <kprefsdialog.h> |
45 | #include <klocale.h> | 47 | #include <klocale.h> |
48 | #include <kglobalsettings.h> | ||
46 | #include <kdateedit.h> | 49 | #include <kdateedit.h> |
47 | #include <kglobal.h> | 50 | #include <kglobal.h> |
48 | #include <stdlib.h> | 51 | #include <stdlib.h> |
49 | 52 | ||
50 | /*US | 53 | /*US |
51 | #include <qcheckbox.h> | 54 | #include <qcheckbox.h> |
52 | #include <qframe.h> | 55 | #include <qframe.h> |
53 | #include <qpushbutton.h> | 56 | #include <qpushbutton.h> |
54 | #include <qcombobox.h> | 57 | #include <qcombobox.h> |
55 | #include <qlineedit.h> | 58 | #include <qlineedit.h> |
56 | #include <qlabel.h> | 59 | #include <qlabel.h> |
57 | #include <qfile.h> | 60 | #include <qfile.h> |
58 | 61 | ||
59 | #include <kconfig.h> | 62 | #include <kconfig.h> |
60 | #include <kdebug.h> | 63 | #include <kdebug.h> |
61 | #include <kdialog.h> | 64 | #include <kdialog.h> |
62 | #include <klistview.h> | 65 | #include <klistview.h> |
63 | #include <klocale.h> | 66 | #include <klocale.h> |
64 | #include <kglobal.h> | 67 | #include <kglobal.h> |
65 | #include <kmessagebox.h> | 68 | #include <kmessagebox.h> |
66 | #include <kstandarddirs.h> | 69 | #include <kstandarddirs.h> |
67 | 70 | ||
68 | #ifndef KAB_EMBEDDED | 71 | #ifndef KAB_EMBEDDED |
69 | #include <ktrader.h> | 72 | #include <ktrader.h> |
@@ -88,54 +91,90 @@ $Id$ | |||
88 | 91 | ||
89 | KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name ) | 92 | KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name ) |
90 | : KPrefsWidget(prefs, parent, name ) | 93 | : KPrefsWidget(prefs, parent, name ) |
91 | { | 94 | { |
92 | mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email")); | 95 | mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email")); |
93 | mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone")); | 96 | mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone")); |
94 | mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); | 97 | mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); |
95 | mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); | 98 | mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); |
96 | mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); | 99 | mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); |
97 | mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP")); | 100 | mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP")); |
98 | 101 | ||
99 | 102 | ||
100 | QVBoxLayout *topLayout = new QVBoxLayout( this, 0, | 103 | QVBoxLayout *topLayout = new QVBoxLayout( this, 0, |
101 | KDialog::spacingHint() ); | 104 | KDialog::spacingHint() ); |
102 | 105 | ||
103 | tabWidget = new QTabWidget( this ); | 106 | tabWidget = new QTabWidget( this ); |
104 | topLayout->addWidget( tabWidget ); | 107 | topLayout->addWidget( tabWidget ); |
105 | 108 | ||
106 | 109 | ||
107 | setupLocaleTab(); | 110 | setupLocaleTab(); |
108 | setupLocaleDateTab(); | 111 | setupLocaleDateTab(); |
109 | setupTimeZoneTab(); | 112 | setupTimeZoneTab(); |
110 | setupExternalAppTab(); | 113 | setupExternalAppTab(); |
111 | setupStoreTab(); | 114 | setupStoreTab(); |
112 | 115 | setupBackupTab(); | |
113 | } | 116 | } |
114 | void KDEPIMConfigWidget::showTimeZoneTab() | 117 | void KDEPIMConfigWidget::showTimeZoneTab() |
115 | { | 118 | { |
116 | tabWidget->setCurrentPage ( 3 ) ; | 119 | tabWidget->setCurrentPage ( 3 ) ; |
117 | } | 120 | } |
121 | void KDEPIMConfigWidget::setupBackupTab() | ||
122 | { | ||
123 | QVBox *colorPage = new QVBox( this ); | ||
124 | tabWidget->addTab( colorPage, i18n( "Backup" ) ); | ||
125 | QWidget* topFrame = new QWidget( colorPage ); | ||
126 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); | ||
127 | KPrefsWidBool *sb = addWidBool(i18n("Backup enabled"), | ||
128 | &(KPimGlobalPrefs::instance()->mBackupEnabled),topFrame); | ||
129 | topLayout->addWidget((QWidget*)sb->checkBox()); | ||
130 | QWidget* bupFrame = new QWidget( topFrame ); | ||
131 | topLayout->addWidget((bupFrame)); | ||
132 | QObject::connect ( sb->checkBox(), SIGNAL (toggled ( bool ) ), bupFrame, SLOT ( setEnabled( bool ) ) ); | ||
133 | QVBoxLayout *bupLayout = new QVBoxLayout(bupFrame); | ||
134 | sb = addWidBool(i18n("Use standard backup dir"), | ||
135 | &(KPimGlobalPrefs::instance()->mBackupEnabled),bupFrame); | ||
136 | bupLayout->addWidget((QWidget*)sb->checkBox()); | ||
137 | mBackupUrl = new KURLRequester( bupFrame ); | ||
138 | mBackupUrl->setURL( KGlobalSettings::backupDataDir() ); | ||
139 | QObject::connect ( sb->checkBox(), SIGNAL (toggled ( bool ) ), mBackupUrl ,SLOT ( setDisabled( bool ) ) ); | ||
140 | bupLayout->addWidget( mBackupUrl ); | ||
141 | |||
142 | |||
143 | QHBox *dummy = new QHBox(bupFrame); | ||
144 | new QLabel(i18n("Number of Backups:"),dummy); | ||
145 | mBackupNumbersSpin = new QSpinBox(1,21,1,dummy); | ||
146 | new QLabel(i18n(" "),dummy); | ||
147 | bupLayout->addWidget( dummy ); | ||
148 | |||
149 | dummy = new QHBox(bupFrame); | ||
150 | new QLabel(i18n("Make backup every "),dummy); | ||
151 | mBackupDayCountSpin = new QSpinBox(1,28,1,dummy); | ||
152 | new QLabel(i18n(" days"),dummy); | ||
153 | new QLabel(i18n(" "),dummy); | ||
154 | bupLayout->addWidget( dummy ); | ||
155 | |||
156 | } | ||
118 | void KDEPIMConfigWidget::setupStoreTab() | 157 | void KDEPIMConfigWidget::setupStoreTab() |
119 | { | 158 | { |
120 | QVBox *colorPage = new QVBox( this ); | 159 | QVBox *colorPage = new QVBox( this ); |
121 | tabWidget->addTab( colorPage, i18n( "Colors" ) ); | 160 | tabWidget->addTab( colorPage, i18n( "Colors" ) ); |
122 | QWidget* cw = new QWidget( colorPage ); | 161 | QWidget* cw = new QWidget( colorPage ); |
123 | KPrefsWidColor *holidayColor = | 162 | KPrefsWidColor *holidayColor = |
124 | addWidColor(i18n("Alternating background of list views"), | 163 | addWidColor(i18n("Alternating background of list views"), |
125 | &(KPimGlobalPrefs::instance()->mAlternateColor),cw); | 164 | &(KPimGlobalPrefs::instance()->mAlternateColor),cw); |
126 | QHBoxLayout *topLayout = new QHBoxLayout(cw); | 165 | QHBoxLayout *topLayout = new QHBoxLayout(cw); |
127 | topLayout->addWidget(holidayColor->label()); | 166 | topLayout->addWidget(holidayColor->label()); |
128 | topLayout->addWidget( (QWidget* )holidayColor->button()); | 167 | topLayout->addWidget( (QWidget* )holidayColor->button()); |
129 | 168 | ||
130 | 169 | ||
131 | QVBox *storePage = new QVBox( this ); | 170 | QVBox *storePage = new QVBox( this ); |
132 | new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage ); | 171 | new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage ); |
133 | new QLabel( i18n("<b>New data storage dir:</b>"), storePage ); | 172 | new QLabel( i18n("<b>New data storage dir:</b>"), storePage ); |
134 | mStoreUrl = new KURLRequester( storePage ); | 173 | mStoreUrl = new KURLRequester( storePage ); |
135 | mStoreUrl->setURL( KGlobal::dirs()->localkdedir() ); | 174 | mStoreUrl->setURL( KGlobal::dirs()->localkdedir() ); |
136 | #ifdef DESKTOP_VERSION | 175 | #ifdef DESKTOP_VERSION |
137 | QString confFile = qApp->applicationDirPath ()+ "/.microkdehome" ; | 176 | QString confFile = qApp->applicationDirPath ()+ "/.microkdehome" ; |
138 | QFileInfo fi ( confFile ); | 177 | QFileInfo fi ( confFile ); |
139 | if ( fi.exists() ) { | 178 | if ( fi.exists() ) { |
140 | KConfig cfg ( confFile ); | 179 | KConfig cfg ( confFile ); |
141 | cfg.setGroup("Global"); | 180 | cfg.setGroup("Global"); |
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h index 984e4e0..c0b92a9 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.h +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h | |||
@@ -58,48 +58,49 @@ class KDEPIMConfigWidget : public KPrefsWidget | |||
58 | 58 | ||
59 | protected: | 59 | protected: |
60 | /** Implement this to read custom configuration widgets. */ | 60 | /** Implement this to read custom configuration widgets. */ |
61 | virtual void usrReadConfig(); | 61 | virtual void usrReadConfig(); |
62 | /** Implement this to write custom configuration widgets. */ | 62 | /** Implement this to write custom configuration widgets. */ |
63 | virtual void usrWriteConfig(); | 63 | virtual void usrWriteConfig(); |
64 | 64 | ||
65 | 65 | ||
66 | private slots: | 66 | private slots: |
67 | // void configureExtension(); | 67 | // void configureExtension(); |
68 | // void selectionChanged( QListViewItem* ); | 68 | // void selectionChanged( QListViewItem* ); |
69 | // void itemClicked( QListViewItem* ); | 69 | // void itemClicked( QListViewItem* ); |
70 | void client_changed( int newClient ); | 70 | void client_changed( int newClient ); |
71 | void externalapp_changed( int newApp ); | 71 | void externalapp_changed( int newApp ); |
72 | void saveStoreSettings(); | 72 | void saveStoreSettings(); |
73 | void setStandardStore(); | 73 | void setStandardStore(); |
74 | void setLocalStore(); | 74 | void setLocalStore(); |
75 | 75 | ||
76 | private: | 76 | private: |
77 | void setupExternalAppTab(); | 77 | void setupExternalAppTab(); |
78 | void setupLocaleDateTab(); | 78 | void setupLocaleDateTab(); |
79 | void setupLocaleTab(); | 79 | void setupLocaleTab(); |
80 | void setupTimeZoneTab(); | 80 | void setupTimeZoneTab(); |
81 | void setupStoreTab(); | 81 | void setupStoreTab(); |
82 | void setupBackupTab(); | ||
82 | KURLRequester* mStoreUrl; | 83 | KURLRequester* mStoreUrl; |
83 | 84 | ||
84 | void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); | 85 | void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); |
85 | 86 | ||
86 | 87 | ||
87 | void saveEditFieldSettings(); | 88 | void saveEditFieldSettings(); |
88 | void updateClientWidgets(); | 89 | void updateClientWidgets(); |
89 | 90 | ||
90 | QTabWidget *tabWidget; | 91 | QTabWidget *tabWidget; |
91 | 92 | ||
92 | 93 | ||
93 | QLineEdit* mUserDateFormatShort; | 94 | QLineEdit* mUserDateFormatShort; |
94 | QLineEdit* mUserDateFormatLong; | 95 | QLineEdit* mUserDateFormatLong; |
95 | QComboBox* mTimeZoneCombo; | 96 | QComboBox* mTimeZoneCombo; |
96 | KDateEdit* mStartDateSavingEdit; | 97 | KDateEdit* mStartDateSavingEdit; |
97 | KDateEdit* mEndDateSavingEdit; | 98 | KDateEdit* mEndDateSavingEdit; |
98 | 99 | ||
99 | // void restoreExtensionSettings(); | 100 | // void restoreExtensionSettings(); |
100 | // void saveExtensionSettings(); | 101 | // void saveExtensionSettings(); |
101 | 102 | ||
102 | // KListView *mExtensionView; | 103 | // KListView *mExtensionView; |
103 | 104 | ||
104 | // QCheckBox *mNameParsing; | 105 | // QCheckBox *mNameParsing; |
105 | // QCheckBox *mViewsSingleClickBox; | 106 | // QCheckBox *mViewsSingleClickBox; |
@@ -131,31 +132,32 @@ class KDEPIMConfigWidget : public KPrefsWidget | |||
131 | QString mPhoneOtherMessage; | 132 | QString mPhoneOtherMessage; |
132 | QString mPhoneOtherMessageParameters; | 133 | QString mPhoneOtherMessageParameters; |
133 | 134 | ||
134 | int mFaxClient; | 135 | int mFaxClient; |
135 | QString mFaxOtherChannel; | 136 | QString mFaxOtherChannel; |
136 | QString mFaxOtherMessage; | 137 | QString mFaxOtherMessage; |
137 | QString mFaxOtherMessageParameters; | 138 | QString mFaxOtherMessageParameters; |
138 | 139 | ||
139 | int mSMSClient; | 140 | int mSMSClient; |
140 | QString mSMSOtherChannel; | 141 | QString mSMSOtherChannel; |
141 | QString mSMSOtherMessage; | 142 | QString mSMSOtherMessage; |
142 | QString mSMSOtherMessageParameters; | 143 | QString mSMSOtherMessageParameters; |
143 | 144 | ||
144 | int mPagerClient; | 145 | int mPagerClient; |
145 | QString mPagerOtherChannel; | 146 | QString mPagerOtherChannel; |
146 | QString mPagerOtherMessage; | 147 | QString mPagerOtherMessage; |
147 | QString mPagerOtherMessageParameters; | 148 | QString mPagerOtherMessageParameters; |
148 | 149 | ||
149 | int mSipClient; | 150 | int mSipClient; |
150 | QString mSipOtherChannel; | 151 | QString mSipOtherChannel; |
151 | QString mSipOtherMessage; | 152 | QString mSipOtherMessage; |
152 | QString mSipOtherMessageParameters; | 153 | QString mSipOtherMessageParameters; |
153 | 154 | ||
154 | 155 | ||
155 | 156 | KURLRequester* mBackupUrl; | |
157 | QSpinBox* mBackupDayCountSpin, *mBackupNumbersSpin ; | ||
156 | QMap<ExternalAppHandler::Types, QString> mExternalAppsMap; | 158 | QMap<ExternalAppHandler::Types, QString> mExternalAppsMap; |
157 | 159 | ||
158 | // AddresseeWidget *mAddresseeWidget; | 160 | // AddresseeWidget *mAddresseeWidget; |
159 | }; | 161 | }; |
160 | 162 | ||
161 | #endif | 163 | #endif |