author | ulf69 <ulf69> | 2004-09-16 17:23:08 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-09-16 17:23:08 (UTC) |
commit | c32d7e58ca69196426eee3217140227aca634f52 (patch) (unidiff) | |
tree | 3cc420da278d1035bb45c23d7c70562369f96b7b /libkdepim | |
parent | 02e7ae4983679a787834277176a031286a8310c2 (diff) | |
download | kdepimpi-c32d7e58ca69196426eee3217140227aca634f52.zip kdepimpi-c32d7e58ca69196426eee3217140227aca634f52.tar.gz kdepimpi-c32d7e58ca69196426eee3217140227aca634f52.tar.bz2 |
added sip support to external apps
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 44 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.h | 5 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 7 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.h | 10 |
4 files changed, 63 insertions, 3 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 4f4cc6a..703aeb1 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -39,96 +39,97 @@ $Id$ | |||
39 | #include <kdialog.h> | 39 | #include <kdialog.h> |
40 | #include <klocale.h> | 40 | #include <klocale.h> |
41 | 41 | ||
42 | #include <stdlib.h> | 42 | #include <stdlib.h> |
43 | 43 | ||
44 | /*US | 44 | /*US |
45 | #include <qcheckbox.h> | 45 | #include <qcheckbox.h> |
46 | #include <qframe.h> | 46 | #include <qframe.h> |
47 | #include <qpushbutton.h> | 47 | #include <qpushbutton.h> |
48 | #include <qcombobox.h> | 48 | #include <qcombobox.h> |
49 | #include <qlineedit.h> | 49 | #include <qlineedit.h> |
50 | #include <qlabel.h> | 50 | #include <qlabel.h> |
51 | #include <qfile.h> | 51 | #include <qfile.h> |
52 | 52 | ||
53 | #include <kconfig.h> | 53 | #include <kconfig.h> |
54 | #include <kdebug.h> | 54 | #include <kdebug.h> |
55 | #include <kdialog.h> | 55 | #include <kdialog.h> |
56 | #include <klistview.h> | 56 | #include <klistview.h> |
57 | #include <klocale.h> | 57 | #include <klocale.h> |
58 | #include <kglobal.h> | 58 | #include <kglobal.h> |
59 | #include <kmessagebox.h> | 59 | #include <kmessagebox.h> |
60 | #include <kstandarddirs.h> | 60 | #include <kstandarddirs.h> |
61 | 61 | ||
62 | #ifndef KAB_EMBEDDED | 62 | #ifndef KAB_EMBEDDED |
63 | #include <ktrader.h> | 63 | #include <ktrader.h> |
64 | #else // KAB_EMBEDDED | 64 | #else // KAB_EMBEDDED |
65 | #include <mergewidget.h> | 65 | #include <mergewidget.h> |
66 | #include <distributionlistwidget.h> | 66 | #include <distributionlistwidget.h> |
67 | #endif // KAB_EMBEDDED | 67 | #endif // KAB_EMBEDDED |
68 | 68 | ||
69 | #include "addresseewidget.h" | 69 | #include "addresseewidget.h" |
70 | #include "extensionconfigdialog.h" | 70 | #include "extensionconfigdialog.h" |
71 | #include "extensionwidget.h" | 71 | #include "extensionwidget.h" |
72 | */ | 72 | */ |
73 | 73 | ||
74 | #include "kpimglobalprefs.h" | 74 | #include "kpimglobalprefs.h" |
75 | 75 | ||
76 | #include "kdepimconfigwidget.h" | 76 | #include "kdepimconfigwidget.h" |
77 | 77 | ||
78 | 78 | ||
79 | KDEPIMConfigWidget::KDEPIMConfigWidget( QWidget *parent, const char *name ) | 79 | KDEPIMConfigWidget::KDEPIMConfigWidget( QWidget *parent, const char *name ) |
80 | : QWidget( parent, name ) | 80 | : QWidget( parent, name ) |
81 | { | 81 | { |
82 | mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email")); | 82 | mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email")); |
83 | mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone")); | 83 | mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone")); |
84 | mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); | 84 | mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); |
85 | mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); | 85 | mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); |
86 | mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); | 86 | mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); |
87 | mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP")); | ||
87 | 88 | ||
88 | 89 | ||
89 | QVBoxLayout *topLayout = new QVBoxLayout( this, 0, | 90 | QVBoxLayout *topLayout = new QVBoxLayout( this, 0, |
90 | KDialog::spacingHint() ); | 91 | KDialog::spacingHint() ); |
91 | 92 | ||
92 | QTabWidget *tabWidget = new QTabWidget( this ); | 93 | QTabWidget *tabWidget = new QTabWidget( this ); |
93 | topLayout->addWidget( tabWidget ); | 94 | topLayout->addWidget( tabWidget ); |
94 | 95 | ||
95 | 96 | ||
96 | 97 | ||
97 | // mailclient page | 98 | // mailclient page |
98 | QWidget *externalAppsPage = new QWidget( this ); | 99 | QWidget *externalAppsPage = new QWidget( this ); |
99 | QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(), | 100 | QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(), |
100 | KDialog::spacingHintSmall() ); | 101 | KDialog::spacingHintSmall() ); |
101 | 102 | ||
102 | mExternalApps = new QComboBox( externalAppsPage ); | 103 | mExternalApps = new QComboBox( externalAppsPage ); |
103 | 104 | ||
104 | QMap<ExternalAppHandler::Types, QString>::Iterator it; | 105 | QMap<ExternalAppHandler::Types, QString>::Iterator it; |
105 | for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it ) | 106 | for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it ) |
106 | mExternalApps->insertItem( it.data(), it.key() ); | 107 | mExternalApps->insertItem( it.data(), it.key() ); |
107 | 108 | ||
108 | layout->addWidget( mExternalApps ); | 109 | layout->addWidget( mExternalApps ); |
109 | 110 | ||
110 | connect( mExternalApps, SIGNAL( activated( int ) ), | 111 | connect( mExternalApps, SIGNAL( activated( int ) ), |
111 | this, SLOT (externalapp_changed( int ) ) ); | 112 | this, SLOT (externalapp_changed( int ) ) ); |
112 | 113 | ||
113 | 114 | ||
114 | 115 | ||
115 | 116 | ||
116 | mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); | 117 | mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); |
117 | QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" ); | 118 | QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" ); |
118 | 119 | ||
119 | 120 | ||
120 | mClient = new QComboBox( mExternalAppGroupBox ); | 121 | mClient = new QComboBox( mExternalAppGroupBox ); |
121 | boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 ); | 122 | boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 ); |
122 | 123 | ||
123 | connect( mClient, SIGNAL( activated( int ) ), | 124 | connect( mClient, SIGNAL( activated( int ) ), |
124 | this, SLOT (client_changed( int ) ) ); | 125 | this, SLOT (client_changed( int ) ) ); |
125 | 126 | ||
126 | QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox); | 127 | QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox); |
127 | boxLayout->addWidget( lab, 1, 0 ); | 128 | boxLayout->addWidget( lab, 1, 0 ); |
128 | mChannel = new QLineEdit(mExternalAppGroupBox); | 129 | mChannel = new QLineEdit(mExternalAppGroupBox); |
129 | mChannel->setReadOnly(true); | 130 | mChannel->setReadOnly(true); |
130 | boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 ); | 131 | boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 ); |
131 | 132 | ||
132 | lab = new QLabel( i18n("Message:"), mExternalAppGroupBox); | 133 | lab = new QLabel( i18n("Message:"), mExternalAppGroupBox); |
133 | boxLayout->addWidget( lab, 3, 0 ); | 134 | boxLayout->addWidget( lab, 3, 0 ); |
134 | mMessage = new QLineEdit(mExternalAppGroupBox); | 135 | mMessage = new QLineEdit(mExternalAppGroupBox); |
@@ -154,411 +155,450 @@ KDEPIMConfigWidget::KDEPIMConfigWidget( QWidget *parent, const char *name ) | |||
154 | boxLayout->addWidget( lab, 6, 1 ); | 155 | boxLayout->addWidget( lab, 6, 1 ); |
155 | mParameters2 = new QLineEdit(mExternalAppGroupBox); | 156 | mParameters2 = new QLineEdit(mExternalAppGroupBox); |
156 | mParameters2->setReadOnly(true); | 157 | mParameters2->setReadOnly(true); |
157 | boxLayout->addWidget( mParameters2, 7, 1 ); | 158 | boxLayout->addWidget( mParameters2, 7, 1 ); |
158 | 159 | ||
159 | lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox); | 160 | lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox); |
160 | boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 ); | 161 | boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 ); |
161 | 162 | ||
162 | 163 | ||
163 | connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | 164 | connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); |
164 | connect( mMessage, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | 165 | connect( mMessage, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); |
165 | connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | 166 | connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); |
166 | connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | 167 | connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); |
167 | connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); | 168 | connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); |
168 | 169 | ||
169 | 170 | ||
170 | 171 | ||
171 | layout->addWidget( mExternalAppGroupBox ); | 172 | layout->addWidget( mExternalAppGroupBox ); |
172 | tabWidget->addTab( externalAppsPage, i18n( "External Apps." ) ); | 173 | tabWidget->addTab( externalAppsPage, i18n( "External Apps." ) ); |
173 | 174 | ||
174 | } | 175 | } |
175 | 176 | ||
176 | void KDEPIMConfigWidget::externalapp_changed( int newApp ) | 177 | void KDEPIMConfigWidget::externalapp_changed( int newApp ) |
177 | { | 178 | { |
178 | // first store the current data | 179 | // first store the current data |
179 | saveEditFieldSettings(); | 180 | saveEditFieldSettings(); |
180 | 181 | ||
181 | // set mCurrentApp | 182 | // set mCurrentApp |
182 | mCurrentApp = (ExternalAppHandler::Types)newApp; | 183 | mCurrentApp = (ExternalAppHandler::Types)newApp; |
183 | 184 | ||
184 | // set mCurrentClient | 185 | // set mCurrentClient |
185 | switch(mCurrentApp) | 186 | switch(mCurrentApp) |
186 | { | 187 | { |
187 | case(ExternalAppHandler::EMAIL): | 188 | case(ExternalAppHandler::EMAIL): |
188 | mCurrentClient = mEmailClient; | 189 | mCurrentClient = mEmailClient; |
189 | break; | 190 | break; |
190 | case(ExternalAppHandler::PHONE): | 191 | case(ExternalAppHandler::PHONE): |
191 | mCurrentClient = mPhoneClient; | 192 | mCurrentClient = mPhoneClient; |
192 | break; | 193 | break; |
193 | case(ExternalAppHandler::SMS): | 194 | case(ExternalAppHandler::SMS): |
194 | mCurrentClient = mSMSClient; | 195 | mCurrentClient = mSMSClient; |
195 | break; | 196 | break; |
196 | case(ExternalAppHandler::FAX): | 197 | case(ExternalAppHandler::FAX): |
197 | mCurrentClient = mFaxClient; | 198 | mCurrentClient = mFaxClient; |
198 | break; | 199 | break; |
199 | case(ExternalAppHandler::PAGER): | 200 | case(ExternalAppHandler::PAGER): |
200 | mCurrentClient = mPagerClient; | 201 | mCurrentClient = mPagerClient; |
201 | break; | 202 | break; |
203 | case(ExternalAppHandler::SIP): | ||
204 | mCurrentClient = mSipClient; | ||
205 | break; | ||
202 | default: | 206 | default: |
203 | return; | 207 | return; |
204 | } | 208 | } |
205 | 209 | ||
206 | // and at last update the widgets | 210 | // and at last update the widgets |
207 | updateClientWidgets(); | 211 | updateClientWidgets(); |
208 | } | 212 | } |
209 | 213 | ||
210 | 214 | ||
211 | 215 | ||
212 | void KDEPIMConfigWidget::client_changed( int newClient ) | 216 | void KDEPIMConfigWidget::client_changed( int newClient ) |
213 | { | 217 | { |
214 | if (newClient == mCurrentClient) | 218 | if (newClient == mCurrentClient) |
215 | return; | 219 | return; |
216 | 220 | ||
217 | // first store the current data | 221 | // first store the current data |
218 | saveEditFieldSettings(); | 222 | saveEditFieldSettings(); |
219 | 223 | ||
220 | 224 | ||
221 | //then reset the clientvariable | 225 | //then reset the clientvariable |
222 | mCurrentClient = newClient; | 226 | mCurrentClient = newClient; |
223 | 227 | ||
224 | // and at last update the widgets | 228 | // and at last update the widgets |
225 | updateClientWidgets(); | 229 | updateClientWidgets(); |
226 | 230 | ||
227 | modified(); | 231 | modified(); |
228 | } | 232 | } |
229 | 233 | ||
230 | void KDEPIMConfigWidget::saveEditFieldSettings() | 234 | void KDEPIMConfigWidget::saveEditFieldSettings() |
231 | { | 235 | { |
232 | 236 | ||
233 | switch(mCurrentApp) | 237 | switch(mCurrentApp) |
234 | { | 238 | { |
235 | case(ExternalAppHandler::EMAIL): | 239 | case(ExternalAppHandler::EMAIL): |
236 | mEmailClient = mClient->currentItem(); | 240 | mEmailClient = mClient->currentItem(); |
237 | break; | 241 | break; |
238 | case(ExternalAppHandler::PHONE): | 242 | case(ExternalAppHandler::PHONE): |
239 | mPhoneClient= mClient->currentItem(); | 243 | mPhoneClient= mClient->currentItem(); |
240 | break; | 244 | break; |
241 | case(ExternalAppHandler::SMS): | 245 | case(ExternalAppHandler::SMS): |
242 | mSMSClient = mClient->currentItem(); | 246 | mSMSClient = mClient->currentItem(); |
243 | break; | 247 | break; |
244 | case(ExternalAppHandler::FAX): | 248 | case(ExternalAppHandler::FAX): |
245 | mFaxClient = mClient->currentItem(); | 249 | mFaxClient = mClient->currentItem(); |
246 | break; | 250 | break; |
247 | case(ExternalAppHandler::PAGER): | 251 | case(ExternalAppHandler::PAGER): |
248 | mPagerClient = mClient->currentItem(); | 252 | mPagerClient = mClient->currentItem(); |
249 | break; | 253 | break; |
254 | case(ExternalAppHandler::SIP): | ||
255 | mSipClient = mClient->currentItem(); | ||
256 | break; | ||
250 | default: | 257 | default: |
251 | return; | 258 | return; |
252 | } | 259 | } |
253 | 260 | ||
254 | //store the current data back to the apropriate membervariables if we had set it to "other" | 261 | //store the current data back to the apropriate membervariables if we had set it to "other" |
255 | if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC)) | 262 | if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC)) |
256 | { | 263 | { |
257 | mEmailOtherChannel = mChannel->text(); | 264 | mEmailOtherChannel = mChannel->text(); |
258 | mEmailOtherMessage = mMessage->text(); | 265 | mEmailOtherMessage = mMessage->text(); |
259 | mEmailOtherMessageParameters = mParameters->text(); | 266 | mEmailOtherMessageParameters = mParameters->text(); |
260 | mEmailOtherMessage2 = mMessage2->text(); | 267 | mEmailOtherMessage2 = mMessage2->text(); |
261 | mEmailOtherMessageParameters2 = mParameters2->text(); | 268 | mEmailOtherMessageParameters2 = mParameters2->text(); |
262 | } | 269 | } |
263 | else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC)) | 270 | else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC)) |
264 | { | 271 | { |
265 | mPhoneOtherChannel = mChannel->text(); | 272 | mPhoneOtherChannel = mChannel->text(); |
266 | mPhoneOtherMessage = mMessage->text(); | 273 | mPhoneOtherMessage = mMessage->text(); |
267 | mPhoneOtherMessageParameters = mParameters->text(); | 274 | mPhoneOtherMessageParameters = mParameters->text(); |
268 | } | 275 | } |
269 | else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC)) | 276 | else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC)) |
270 | { | 277 | { |
271 | mSMSOtherChannel = mChannel->text(); | 278 | mSMSOtherChannel = mChannel->text(); |
272 | mSMSOtherMessage = mMessage->text(); | 279 | mSMSOtherMessage = mMessage->text(); |
273 | mSMSOtherMessageParameters = mParameters->text(); | 280 | mSMSOtherMessageParameters = mParameters->text(); |
274 | } | 281 | } |
275 | else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC)) | 282 | else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC)) |
276 | { | 283 | { |
277 | mFaxOtherChannel = mChannel->text(); | 284 | mFaxOtherChannel = mChannel->text(); |
278 | mFaxOtherMessage = mMessage->text(); | 285 | mFaxOtherMessage = mMessage->text(); |
279 | mFaxOtherMessageParameters = mParameters->text(); | 286 | mFaxOtherMessageParameters = mParameters->text(); |
280 | } | 287 | } |
281 | else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC)) | 288 | else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC)) |
282 | { | 289 | { |
283 | mPagerOtherChannel = mChannel->text(); | 290 | mPagerOtherChannel = mChannel->text(); |
284 | mPagerOtherMessage = mMessage->text(); | 291 | mPagerOtherMessage = mMessage->text(); |
285 | mPagerOtherMessageParameters = mParameters->text(); | 292 | mPagerOtherMessageParameters = mParameters->text(); |
286 | } | 293 | } |
294 | else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC)) | ||
295 | { | ||
296 | mSipOtherChannel = mChannel->text(); | ||
297 | mSipOtherMessage = mMessage->text(); | ||
298 | mSipOtherMessageParameters = mParameters->text(); | ||
299 | } | ||
287 | 300 | ||
288 | 301 | ||
289 | } | 302 | } |
290 | 303 | ||
291 | void KDEPIMConfigWidget::updateClientWidgets() | 304 | void KDEPIMConfigWidget::updateClientWidgets() |
292 | { | 305 | { |
293 | bool blocked = signalsBlocked(); | 306 | bool blocked = signalsBlocked(); |
294 | blockSignals( true ); | 307 | blockSignals( true ); |
295 | 308 | ||
296 | // at this point we assume, that mCurrentApp and mCurrentClient are set to the values that we want to display | 309 | // at this point we assume, that mCurrentApp and mCurrentClient are set to the values that we want to display |
297 | QMap<ExternalAppHandler::Types, QString>::Iterator it = mExternalAppsMap.find ( mCurrentApp ); | 310 | QMap<ExternalAppHandler::Types, QString>::Iterator it = mExternalAppsMap.find ( mCurrentApp ); |
298 | if (it == mExternalAppsMap.end()) | 311 | if (it == mExternalAppsMap.end()) |
299 | return; | 312 | return; |
300 | 313 | ||
301 | // update group box | 314 | // update group box |
302 | mExternalAppGroupBox->setTitle(i18n( "Used %1 Client" ).arg(it.data())); | 315 | mExternalAppGroupBox->setTitle(i18n( "Used %1 Client" ).arg(it.data())); |
303 | 316 | ||
304 | //update the entries in the client combobox | 317 | //update the entries in the client combobox |
305 | mClient->clear(); | 318 | mClient->clear(); |
306 | 319 | ||
307 | QList<DefaultAppItem> items = ExternalAppHandler::instance()->getAvailableDefaultItems(mCurrentApp); | 320 | QList<DefaultAppItem> items = ExternalAppHandler::instance()->getAvailableDefaultItems(mCurrentApp); |
308 | DefaultAppItem* dai; | 321 | DefaultAppItem* dai; |
309 | for ( dai=items.first(); dai != 0; dai=items.next() ) | 322 | for ( dai=items.first(); dai != 0; dai=items.next() ) |
310 | { | 323 | { |
311 | mClient->insertItem( i18n(dai->_label), dai->_id ); | 324 | mClient->insertItem( i18n(dai->_label), dai->_id ); |
312 | 325 | ||
313 | if (dai->_id == mCurrentClient) | 326 | if (dai->_id == mCurrentClient) |
314 | { | 327 | { |
315 | //restore the edit fields with the data of the local membervariables if we had set it to "other". | 328 | //restore the edit fields with the data of the local membervariables if we had set it to "other". |
316 | //Otherwise take the default data from externalapphandler. | 329 | //Otherwise take the default data from externalapphandler. |
317 | mChannel->setText(dai->_channel); | 330 | mChannel->setText(dai->_channel); |
318 | mMessage->setText(dai->_message); | 331 | mMessage->setText(dai->_message); |
319 | mParameters->setText(dai->_parameters); | 332 | mParameters->setText(dai->_parameters); |
320 | mMessage2->setText(dai->_message2); | 333 | mMessage2->setText(dai->_message2); |
321 | mParameters2->setText(dai->_parameters2); | 334 | mParameters2->setText(dai->_parameters2); |
322 | 335 | ||
323 | 336 | ||
324 | if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC)) | 337 | if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC)) |
325 | { | 338 | { |
326 | mChannel->setText(mEmailOtherChannel); | 339 | mChannel->setText(mEmailOtherChannel); |
327 | mMessage->setText(mEmailOtherMessage); | 340 | mMessage->setText(mEmailOtherMessage); |
328 | mParameters->setText(mEmailOtherMessageParameters); | 341 | mParameters->setText(mEmailOtherMessageParameters); |
329 | mMessage2->setText(mEmailOtherMessage2); | 342 | mMessage2->setText(mEmailOtherMessage2); |
330 | mParameters2->setText(mEmailOtherMessageParameters2); | 343 | mParameters2->setText(mEmailOtherMessageParameters2); |
331 | } | 344 | } |
332 | else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC)) | 345 | else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC)) |
333 | { | 346 | { |
334 | mChannel->setText(mPhoneOtherChannel); | 347 | mChannel->setText(mPhoneOtherChannel); |
335 | mMessage->setText(mPhoneOtherMessage); | 348 | mMessage->setText(mPhoneOtherMessage); |
336 | mParameters->setText(mPhoneOtherMessageParameters); | 349 | mParameters->setText(mPhoneOtherMessageParameters); |
337 | } | 350 | } |
338 | else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC)) | 351 | else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC)) |
339 | { | 352 | { |
340 | mChannel->setText(mSMSOtherChannel); | 353 | mChannel->setText(mSMSOtherChannel); |
341 | mMessage->setText(mSMSOtherMessage); | 354 | mMessage->setText(mSMSOtherMessage); |
342 | mParameters->setText(mSMSOtherMessageParameters); | 355 | mParameters->setText(mSMSOtherMessageParameters); |
343 | } | 356 | } |
344 | else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC)) | 357 | else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC)) |
345 | { | 358 | { |
346 | mChannel->setText(mFaxOtherChannel); | 359 | mChannel->setText(mFaxOtherChannel); |
347 | mMessage->setText(mFaxOtherMessage); | 360 | mMessage->setText(mFaxOtherMessage); |
348 | mParameters->setText(mFaxOtherMessageParameters); | 361 | mParameters->setText(mFaxOtherMessageParameters); |
349 | } | 362 | } |
350 | else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC)) | 363 | else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC)) |
351 | { | 364 | { |
352 | mChannel->setText(mPagerOtherChannel); | 365 | mChannel->setText(mPagerOtherChannel); |
353 | mMessage->setText(mPagerOtherMessage); | 366 | mMessage->setText(mPagerOtherMessage); |
354 | mParameters->setText(mPagerOtherMessageParameters); | 367 | mParameters->setText(mPagerOtherMessageParameters); |
355 | } | 368 | } |
369 | else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC)) | ||
370 | { | ||
371 | mChannel->setText(mSipOtherChannel); | ||
372 | mMessage->setText(mSipOtherMessage); | ||
373 | mParameters->setText(mSipOtherMessageParameters); | ||
374 | } | ||
356 | } | 375 | } |
357 | 376 | ||
358 | } | 377 | } |
359 | 378 | ||
360 | bool readonly; | 379 | bool readonly; |
361 | bool enabled; | 380 | bool enabled; |
362 | if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC)) | 381 | if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC)) |
363 | ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC)) | 382 | ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC)) |
364 | ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC)) | 383 | ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC)) |
365 | ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC)) | 384 | ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC)) |
366 | ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))) | 385 | ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC)) |
386 | ||((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC))) | ||
367 | { | 387 | { |
368 | readonly = false; | 388 | readonly = false; |
369 | } | 389 | } |
370 | else | 390 | else |
371 | { | 391 | { |
372 | readonly = true; | 392 | readonly = true; |
373 | } | 393 | } |
374 | 394 | ||
375 | if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::NONE_EMC)) | 395 | if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::NONE_EMC)) |
376 | ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::NONE_PHC)) | 396 | ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::NONE_PHC)) |
377 | ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::NONE_SMC)) | 397 | ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::NONE_SMC)) |
378 | ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::NONE_FAC)) | 398 | ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::NONE_FAC)) |
379 | ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::NONE_PAC))) | 399 | ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::NONE_PAC)) |
400 | ||((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::NONE_SIC))) | ||
380 | { | 401 | { |
381 | enabled = false; | 402 | enabled = false; |
382 | } | 403 | } |
383 | else | 404 | else |
384 | { | 405 | { |
385 | enabled = true; | 406 | enabled = true; |
386 | } | 407 | } |
387 | 408 | ||
388 | 409 | ||
389 | mChannel->setReadOnly(readonly); | 410 | mChannel->setReadOnly(readonly); |
390 | mMessage->setReadOnly(readonly); | 411 | mMessage->setReadOnly(readonly); |
391 | mParameters->setReadOnly(readonly); | 412 | mParameters->setReadOnly(readonly); |
392 | mMessage2->setReadOnly(readonly); | 413 | mMessage2->setReadOnly(readonly); |
393 | mParameters2->setReadOnly(readonly); | 414 | mParameters2->setReadOnly(readonly); |
394 | 415 | ||
395 | mChannel->setEnabled(enabled); | 416 | mChannel->setEnabled(enabled); |
396 | mMessage->setEnabled(enabled); | 417 | mMessage->setEnabled(enabled); |
397 | mParameters->setEnabled(enabled); | 418 | mParameters->setEnabled(enabled); |
398 | mMessage2->setEnabled(enabled); | 419 | mMessage2->setEnabled(enabled); |
399 | mParameters2->setEnabled(enabled); | 420 | mParameters2->setEnabled(enabled); |
400 | 421 | ||
401 | 422 | ||
402 | 423 | ||
403 | mClient->setCurrentItem(mCurrentClient); | 424 | mClient->setCurrentItem(mCurrentClient); |
404 | 425 | ||
405 | 426 | ||
406 | // enable/disable the extra message/parameter field | 427 | // enable/disable the extra message/parameter field |
407 | if (mCurrentApp == ExternalAppHandler::EMAIL) | 428 | if (mCurrentApp == ExternalAppHandler::EMAIL) |
408 | { | 429 | { |
409 | } | 430 | } |
410 | else | 431 | else |
411 | { | 432 | { |
412 | mMessage2->setText( "" ); | 433 | mMessage2->setText( "" ); |
413 | mParameters2->setText( "" ); | 434 | mParameters2->setText( "" ); |
414 | } | 435 | } |
415 | 436 | ||
416 | if (enabled == true) { | 437 | if (enabled == true) { |
417 | mMessage2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL); | 438 | mMessage2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL); |
418 | mParameters2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL); | 439 | mParameters2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL); |
419 | } | 440 | } |
420 | 441 | ||
421 | 442 | ||
422 | blockSignals( blocked ); | 443 | blockSignals( blocked ); |
423 | 444 | ||
424 | } | 445 | } |
425 | 446 | ||
426 | 447 | ||
427 | 448 | ||
428 | 449 | ||
429 | void KDEPIMConfigWidget::restoreSettings(KPimGlobalPrefs* prefs) | 450 | void KDEPIMConfigWidget::restoreSettings(KPimGlobalPrefs* prefs) |
430 | { | 451 | { |
431 | bool blocked = signalsBlocked(); | 452 | bool blocked = signalsBlocked(); |
432 | blockSignals( true ); | 453 | blockSignals( true ); |
433 | 454 | ||
434 | mEmailClient = prefs->mEmailClient; | 455 | mEmailClient = prefs->mEmailClient; |
435 | mEmailOtherChannel = prefs->mEmailOtherChannel; | 456 | mEmailOtherChannel = prefs->mEmailOtherChannel; |
436 | mEmailOtherMessage = prefs->mEmailOtherMessage; | 457 | mEmailOtherMessage = prefs->mEmailOtherMessage; |
437 | mEmailOtherMessageParameters = prefs->mEmailOtherMessageParameters; | 458 | mEmailOtherMessageParameters = prefs->mEmailOtherMessageParameters; |
438 | mEmailOtherMessage2 = prefs->mEmailOtherMessage2; | 459 | mEmailOtherMessage2 = prefs->mEmailOtherMessage2; |
439 | mEmailOtherMessageParameters2 = prefs->mEmailOtherMessageParameters2; | 460 | mEmailOtherMessageParameters2 = prefs->mEmailOtherMessageParameters2; |
440 | 461 | ||
441 | mPhoneClient = prefs->mPhoneClient; | 462 | mPhoneClient = prefs->mPhoneClient; |
442 | mPhoneOtherChannel = prefs->mPhoneOtherChannel; | 463 | mPhoneOtherChannel = prefs->mPhoneOtherChannel; |
443 | mPhoneOtherMessage = prefs->mPhoneOtherMessage; | 464 | mPhoneOtherMessage = prefs->mPhoneOtherMessage; |
444 | mPhoneOtherMessageParameters = prefs->mPhoneOtherMessageParameters; | 465 | mPhoneOtherMessageParameters = prefs->mPhoneOtherMessageParameters; |
445 | 466 | ||
446 | mFaxClient = prefs->mFaxClient; | 467 | mFaxClient = prefs->mFaxClient; |
447 | mFaxOtherChannel = prefs->mFaxOtherChannel; | 468 | mFaxOtherChannel = prefs->mFaxOtherChannel; |
448 | mFaxOtherMessage = prefs->mFaxOtherMessage; | 469 | mFaxOtherMessage = prefs->mFaxOtherMessage; |
449 | mFaxOtherMessageParameters = prefs->mFaxOtherMessageParameters; | 470 | mFaxOtherMessageParameters = prefs->mFaxOtherMessageParameters; |
450 | 471 | ||
451 | mSMSClient = prefs->mSMSClient; | 472 | mSMSClient = prefs->mSMSClient; |
452 | mSMSOtherChannel = prefs->mSMSOtherChannel; | 473 | mSMSOtherChannel = prefs->mSMSOtherChannel; |
453 | mSMSOtherMessage = prefs->mSMSOtherMessage; | 474 | mSMSOtherMessage = prefs->mSMSOtherMessage; |
454 | mSMSOtherMessageParameters = prefs->mSMSOtherMessageParameters; | 475 | mSMSOtherMessageParameters = prefs->mSMSOtherMessageParameters; |
455 | 476 | ||
456 | mPagerClient = prefs->mPagerClient; | 477 | mPagerClient = prefs->mPagerClient; |
457 | mPagerOtherChannel = prefs->mPagerOtherChannel; | 478 | mPagerOtherChannel = prefs->mPagerOtherChannel; |
458 | mPagerOtherMessage = prefs->mPagerOtherMessage; | 479 | mPagerOtherMessage = prefs->mPagerOtherMessage; |
459 | mPagerOtherMessageParameters = prefs->mPagerOtherMessageParameters; | 480 | mPagerOtherMessageParameters = prefs->mPagerOtherMessageParameters; |
460 | 481 | ||
482 | mSipClient = prefs->mPagerClient; | ||
483 | mSipOtherChannel = prefs->mSipOtherChannel; | ||
484 | mSipOtherMessage = prefs->mSipOtherMessage; | ||
485 | mSipOtherMessageParameters = prefs->mSipOtherMessageParameters; | ||
486 | |||
461 | mCurrentApp = ExternalAppHandler::EMAIL; | 487 | mCurrentApp = ExternalAppHandler::EMAIL; |
462 | mCurrentClient = mEmailClient; | 488 | mCurrentClient = mEmailClient; |
463 | 489 | ||
464 | updateClientWidgets(); | 490 | updateClientWidgets(); |
465 | 491 | ||
466 | blockSignals( blocked ); | 492 | blockSignals( blocked ); |
467 | 493 | ||
468 | emit changed( false ); | 494 | emit changed( false ); |
469 | 495 | ||
470 | } | 496 | } |
471 | 497 | ||
472 | void KDEPIMConfigWidget::saveSettings(KPimGlobalPrefs* prefs) | 498 | void KDEPIMConfigWidget::saveSettings(KPimGlobalPrefs* prefs) |
473 | { | 499 | { |
474 | saveEditFieldSettings(); | 500 | saveEditFieldSettings(); |
475 | 501 | ||
476 | prefs->mEmailClient = mEmailClient; | 502 | prefs->mEmailClient = mEmailClient; |
477 | prefs->mEmailOtherChannel = mEmailOtherChannel; | 503 | prefs->mEmailOtherChannel = mEmailOtherChannel; |
478 | prefs->mEmailOtherMessage = mEmailOtherMessage; | 504 | prefs->mEmailOtherMessage = mEmailOtherMessage; |
479 | prefs->mEmailOtherMessageParameters = mEmailOtherMessageParameters; | 505 | prefs->mEmailOtherMessageParameters = mEmailOtherMessageParameters; |
480 | prefs->mEmailOtherMessage2 = mEmailOtherMessage2; | 506 | prefs->mEmailOtherMessage2 = mEmailOtherMessage2; |
481 | prefs->mEmailOtherMessageParameters2 = mEmailOtherMessageParameters2; | 507 | prefs->mEmailOtherMessageParameters2 = mEmailOtherMessageParameters2; |
482 | 508 | ||
483 | prefs->mPhoneClient = mPhoneClient; | 509 | prefs->mPhoneClient = mPhoneClient; |
484 | prefs->mPhoneOtherChannel = mPhoneOtherChannel; | 510 | prefs->mPhoneOtherChannel = mPhoneOtherChannel; |
485 | prefs->mPhoneOtherMessage = mPhoneOtherMessage; | 511 | prefs->mPhoneOtherMessage = mPhoneOtherMessage; |
486 | prefs->mPhoneOtherMessageParameters = mPhoneOtherMessageParameters; | 512 | prefs->mPhoneOtherMessageParameters = mPhoneOtherMessageParameters; |
487 | 513 | ||
488 | prefs->mFaxClient = mFaxClient; | 514 | prefs->mFaxClient = mFaxClient; |
489 | prefs->mFaxOtherChannel = mFaxOtherChannel; | 515 | prefs->mFaxOtherChannel = mFaxOtherChannel; |
490 | prefs->mFaxOtherMessage = mFaxOtherMessage; | 516 | prefs->mFaxOtherMessage = mFaxOtherMessage; |
491 | prefs->mFaxOtherMessageParameters = mFaxOtherMessageParameters; | 517 | prefs->mFaxOtherMessageParameters = mFaxOtherMessageParameters; |
492 | 518 | ||
493 | prefs->mSMSClient = mSMSClient; | 519 | prefs->mSMSClient = mSMSClient; |
494 | prefs->mSMSOtherChannel = mSMSOtherChannel; | 520 | prefs->mSMSOtherChannel = mSMSOtherChannel; |
495 | prefs->mSMSOtherMessage = mSMSOtherMessage; | 521 | prefs->mSMSOtherMessage = mSMSOtherMessage; |
496 | prefs->mSMSOtherMessageParameters = mSMSOtherMessageParameters; | 522 | prefs->mSMSOtherMessageParameters = mSMSOtherMessageParameters; |
497 | 523 | ||
498 | prefs->mPagerClient = mPagerClient; | 524 | prefs->mPagerClient = mPagerClient; |
499 | prefs->mPagerOtherChannel = mPagerOtherChannel; | 525 | prefs->mPagerOtherChannel = mPagerOtherChannel; |
500 | prefs->mPagerOtherMessage = mPagerOtherMessage; | 526 | prefs->mPagerOtherMessage = mPagerOtherMessage; |
501 | prefs->mPagerOtherMessageParameters = mPagerOtherMessageParameters; | 527 | prefs->mPagerOtherMessageParameters = mPagerOtherMessageParameters; |
502 | 528 | ||
529 | |||
530 | prefs->mSipClient = mSipClient; | ||
531 | prefs->mSipOtherChannel = mSipOtherChannel; | ||
532 | prefs->mSipOtherMessage = mSipOtherMessage; | ||
533 | prefs->mSipOtherMessageParameters = mSipOtherMessageParameters; | ||
534 | |||
503 | prefs->writeConfig(); | 535 | prefs->writeConfig(); |
504 | 536 | ||
505 | //release the cache that other views can access the changed values instantanious | 537 | //release the cache that other views can access the changed values instantanious |
506 | ExternalAppHandler::instance()->loadConfig(); | 538 | ExternalAppHandler::instance()->loadConfig(); |
507 | 539 | ||
508 | emit changed( false ); | 540 | emit changed( false ); |
509 | } | 541 | } |
510 | 542 | ||
511 | void KDEPIMConfigWidget::defaults(KPimGlobalPrefs* prefs) | 543 | void KDEPIMConfigWidget::defaults(KPimGlobalPrefs* prefs) |
512 | { | 544 | { |
513 | 545 | ||
514 | DefaultAppItem* dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::NONE_EMC); | 546 | DefaultAppItem* dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::NONE_EMC); |
515 | 547 | ||
516 | mEmailClient = dai->_id; | 548 | mEmailClient = dai->_id; |
517 | mEmailOtherChannel = dai->_channel; | 549 | mEmailOtherChannel = dai->_channel; |
518 | mEmailOtherMessage = dai->_message; | 550 | mEmailOtherMessage = dai->_message; |
519 | mEmailOtherMessageParameters = dai->_parameters; | 551 | mEmailOtherMessageParameters = dai->_parameters; |
520 | mEmailOtherMessage2 = dai->_message2; | 552 | mEmailOtherMessage2 = dai->_message2; |
521 | mEmailOtherMessageParameters2 = dai->_parameters2; | 553 | mEmailOtherMessageParameters2 = dai->_parameters2; |
522 | 554 | ||
523 | 555 | ||
524 | dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::PHONE, KPimGlobalPrefs::NONE_PHC); | 556 | dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::PHONE, KPimGlobalPrefs::NONE_PHC); |
525 | 557 | ||
526 | mPhoneClient = dai->_id; | 558 | mPhoneClient = dai->_id; |
527 | mPhoneOtherChannel = dai->_channel; | 559 | mPhoneOtherChannel = dai->_channel; |
528 | mPhoneOtherMessage = dai->_message; | 560 | mPhoneOtherMessage = dai->_message; |
529 | mPhoneOtherMessageParameters = dai->_parameters; | 561 | mPhoneOtherMessageParameters = dai->_parameters; |
530 | 562 | ||
531 | dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::FAX, KPimGlobalPrefs::NONE_FAC); | 563 | dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::FAX, KPimGlobalPrefs::NONE_FAC); |
532 | 564 | ||
533 | mFaxClient = dai->_id; | 565 | mFaxClient = dai->_id; |
534 | mFaxOtherChannel = dai->_channel; | 566 | mFaxOtherChannel = dai->_channel; |
535 | mFaxOtherMessage = dai->_message; | 567 | mFaxOtherMessage = dai->_message; |
536 | mFaxOtherMessageParameters = dai->_parameters; | 568 | mFaxOtherMessageParameters = dai->_parameters; |
537 | 569 | ||
538 | dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::SMS, KPimGlobalPrefs::NONE_SMC); | 570 | dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::SMS, KPimGlobalPrefs::NONE_SMC); |
539 | 571 | ||
540 | mSMSClient = dai->_id; | 572 | mSMSClient = dai->_id; |
541 | mSMSOtherChannel = dai->_channel; | 573 | mSMSOtherChannel = dai->_channel; |
542 | mSMSOtherMessage = dai->_message; | 574 | mSMSOtherMessage = dai->_message; |
543 | mSMSOtherMessageParameters = dai->_parameters; | 575 | mSMSOtherMessageParameters = dai->_parameters; |
544 | 576 | ||
545 | dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::NONE_PAC); | 577 | dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::NONE_PAC); |
546 | 578 | ||
547 | mPagerClient = dai->_id; | 579 | mPagerClient = dai->_id; |
548 | mPagerOtherChannel = dai->_channel; | 580 | mPagerOtherChannel = dai->_channel; |
549 | mPagerOtherMessage = dai->_message; | 581 | mPagerOtherMessage = dai->_message; |
550 | mPagerOtherMessageParameters = dai->_parameters; | 582 | mPagerOtherMessageParameters = dai->_parameters; |
551 | 583 | ||
552 | 584 | ||
585 | dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::SIP, KPimGlobalPrefs::NONE_SIC); | ||
586 | |||
587 | mSipClient = dai->_id; | ||
588 | mSipOtherChannel = dai->_channel; | ||
589 | mSipOtherMessage = dai->_message; | ||
590 | mSipOtherMessageParameters = dai->_parameters; | ||
591 | |||
592 | |||
553 | emit changed( true ); | 593 | emit changed( true ); |
554 | } | 594 | } |
555 | 595 | ||
556 | void KDEPIMConfigWidget::modified() | 596 | void KDEPIMConfigWidget::modified() |
557 | { | 597 | { |
558 | emit changed( true ); | 598 | emit changed( true ); |
559 | } | 599 | } |
560 | 600 | ||
561 | void KDEPIMConfigWidget::textChanged( const QString& text ) | 601 | void KDEPIMConfigWidget::textChanged( const QString& text ) |
562 | { | 602 | { |
563 | emit changed( true ); | 603 | emit changed( true ); |
564 | } | 604 | } |
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h index 6e02544..e3cfd81 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.h +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h | |||
@@ -85,56 +85,61 @@ class KDEPIMConfigWidget : public QWidget | |||
85 | 85 | ||
86 | // KListView *mExtensionView; | 86 | // KListView *mExtensionView; |
87 | 87 | ||
88 | // QCheckBox *mNameParsing; | 88 | // QCheckBox *mNameParsing; |
89 | // QCheckBox *mViewsSingleClickBox; | 89 | // QCheckBox *mViewsSingleClickBox; |
90 | // QPushButton *mConfigureButton; | 90 | // QPushButton *mConfigureButton; |
91 | QComboBox* mExternalApps; | 91 | QComboBox* mExternalApps; |
92 | QGroupBox* mExternalAppGroupBox; | 92 | QGroupBox* mExternalAppGroupBox; |
93 | 93 | ||
94 | 94 | ||
95 | QComboBox* mClient; | 95 | QComboBox* mClient; |
96 | QLineEdit* mChannel; | 96 | QLineEdit* mChannel; |
97 | QLineEdit* mMessage; | 97 | QLineEdit* mMessage; |
98 | QLineEdit* mParameters; | 98 | QLineEdit* mParameters; |
99 | QLineEdit* mMessage2; | 99 | QLineEdit* mMessage2; |
100 | QLineEdit* mParameters2; | 100 | QLineEdit* mParameters2; |
101 | 101 | ||
102 | ExternalAppHandler::Types mCurrentApp; | 102 | ExternalAppHandler::Types mCurrentApp; |
103 | int mCurrentClient; | 103 | int mCurrentClient; |
104 | 104 | ||
105 | 105 | ||
106 | int mEmailClient; | 106 | int mEmailClient; |
107 | QString mEmailOtherChannel; | 107 | QString mEmailOtherChannel; |
108 | QString mEmailOtherMessage; | 108 | QString mEmailOtherMessage; |
109 | QString mEmailOtherMessageParameters; | 109 | QString mEmailOtherMessageParameters; |
110 | QString mEmailOtherMessage2; | 110 | QString mEmailOtherMessage2; |
111 | QString mEmailOtherMessageParameters2; | 111 | QString mEmailOtherMessageParameters2; |
112 | 112 | ||
113 | int mPhoneClient; | 113 | int mPhoneClient; |
114 | QString mPhoneOtherChannel; | 114 | QString mPhoneOtherChannel; |
115 | QString mPhoneOtherMessage; | 115 | QString mPhoneOtherMessage; |
116 | QString mPhoneOtherMessageParameters; | 116 | QString mPhoneOtherMessageParameters; |
117 | 117 | ||
118 | int mFaxClient; | 118 | int mFaxClient; |
119 | QString mFaxOtherChannel; | 119 | QString mFaxOtherChannel; |
120 | QString mFaxOtherMessage; | 120 | QString mFaxOtherMessage; |
121 | QString mFaxOtherMessageParameters; | 121 | QString mFaxOtherMessageParameters; |
122 | 122 | ||
123 | int mSMSClient; | 123 | int mSMSClient; |
124 | QString mSMSOtherChannel; | 124 | QString mSMSOtherChannel; |
125 | QString mSMSOtherMessage; | 125 | QString mSMSOtherMessage; |
126 | QString mSMSOtherMessageParameters; | 126 | QString mSMSOtherMessageParameters; |
127 | 127 | ||
128 | int mPagerClient; | 128 | int mPagerClient; |
129 | QString mPagerOtherChannel; | 129 | QString mPagerOtherChannel; |
130 | QString mPagerOtherMessage; | 130 | QString mPagerOtherMessage; |
131 | QString mPagerOtherMessageParameters; | 131 | QString mPagerOtherMessageParameters; |
132 | 132 | ||
133 | int mSipClient; | ||
134 | QString mSipOtherChannel; | ||
135 | QString mSipOtherMessage; | ||
136 | QString mSipOtherMessageParameters; | ||
137 | |||
133 | 138 | ||
134 | 139 | ||
135 | QMap<ExternalAppHandler::Types, QString> mExternalAppsMap; | 140 | QMap<ExternalAppHandler::Types, QString> mExternalAppsMap; |
136 | 141 | ||
137 | // AddresseeWidget *mAddresseeWidget; | 142 | // AddresseeWidget *mAddresseeWidget; |
138 | }; | 143 | }; |
139 | 144 | ||
140 | #endif | 145 | #endif |
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index 7f683a8..eb8f1de 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp | |||
@@ -1,89 +1,94 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkdepim. | 2 | This file is part of libkdepim. |
3 | Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
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 <kglobal.h> | 31 | #include <kglobal.h> |
32 | #include <kconfig.h> | 32 | #include <kconfig.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | #include <kdebug.h> | 34 | #include <kdebug.h> |
35 | #include <kstaticdeleter.h> | 35 | #include <kstaticdeleter.h> |
36 | 36 | ||
37 | #include "kpimglobalprefs.h" | 37 | #include "kpimglobalprefs.h" |
38 | 38 | ||
39 | KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; | 39 | KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; |
40 | static KStaticDeleter<KPimGlobalPrefs> staticDeleter; | 40 | static KStaticDeleter<KPimGlobalPrefs> staticDeleter; |
41 | 41 | ||
42 | 42 | ||
43 | KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) | 43 | KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) |
44 | : KPrefs("kkdepimrc") | 44 | : KPrefs("microkdeglobalrc") |
45 | { | 45 | { |
46 | KPrefs::setCurrentGroup( "ExternalApplications" ); | 46 | KPrefs::setCurrentGroup( "ExternalApplications" ); |
47 | 47 | ||
48 | addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC ); | 48 | addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC ); |
49 | addItemString( "EmailChannel", &mEmailOtherChannel, "" ); | 49 | addItemString( "EmailChannel", &mEmailOtherChannel, "" ); |
50 | addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" ); | 50 | addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" ); |
51 | addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" ); | 51 | addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" ); |
52 | addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" ); | 52 | addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" ); |
53 | addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" ); | 53 | addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" ); |
54 | 54 | ||
55 | addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC ); | 55 | addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC ); |
56 | addItemString( "PhoneChannel", &mPhoneOtherChannel, "" ); | 56 | addItemString( "PhoneChannel", &mPhoneOtherChannel, "" ); |
57 | addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" ); | 57 | addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" ); |
58 | addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" ); | 58 | addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" ); |
59 | 59 | ||
60 | addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC ); | 60 | addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC ); |
61 | addItemString( "FaxChannel", &mFaxOtherChannel, "" ); | 61 | addItemString( "FaxChannel", &mFaxOtherChannel, "" ); |
62 | addItemString( "FaxChannelMessage", &mFaxOtherMessage, "" ); | 62 | addItemString( "FaxChannelMessage", &mFaxOtherMessage, "" ); |
63 | addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" ); | 63 | addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" ); |
64 | 64 | ||
65 | addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC ); | 65 | addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC ); |
66 | addItemString( "SMSChannel", &mSMSOtherChannel, "" ); | 66 | addItemString( "SMSChannel", &mSMSOtherChannel, "" ); |
67 | addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" ); | 67 | addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" ); |
68 | addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" ); | 68 | addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" ); |
69 | 69 | ||
70 | addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC ); | 70 | addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC ); |
71 | addItemString( "PagerChannel", &mPagerOtherChannel, "" ); | 71 | addItemString( "PagerChannel", &mPagerOtherChannel, "" ); |
72 | addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" ); | 72 | addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" ); |
73 | addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" ); | 73 | addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" ); |
74 | 74 | ||
75 | addItemInt( "SIPChannelType", &mSipClient, NONE_SIC ); | ||
76 | addItemString( "SIPChannel", &mSipOtherChannel, "" ); | ||
77 | addItemString( "SIPChannelMessage", &mSipOtherMessage, "" ); | ||
78 | addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" ); | ||
79 | |||
75 | } | 80 | } |
76 | 81 | ||
77 | KPimGlobalPrefs::~KPimGlobalPrefs() | 82 | KPimGlobalPrefs::~KPimGlobalPrefs() |
78 | { | 83 | { |
79 | } | 84 | } |
80 | 85 | ||
81 | KPimGlobalPrefs *KPimGlobalPrefs::instance() | 86 | KPimGlobalPrefs *KPimGlobalPrefs::instance() |
82 | { | 87 | { |
83 | if ( !sInstance ) { | 88 | if ( !sInstance ) { |
84 | sInstance = staticDeleter.setObject( new KPimGlobalPrefs() ); | 89 | sInstance = staticDeleter.setObject( new KPimGlobalPrefs() ); |
85 | sInstance->readConfig(); | 90 | sInstance->readConfig(); |
86 | } | 91 | } |
87 | 92 | ||
88 | return sInstance; | 93 | return sInstance; |
89 | } | 94 | } |
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h index 80b2c4f..8bd543d 100644 --- a/libkdepim/kpimglobalprefs.h +++ b/libkdepim/kpimglobalprefs.h | |||
@@ -27,86 +27,96 @@ Copyright (c) 2004 Ulf Schenk | |||
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #ifndef KPIMGLOBALPREFS_H | 31 | #ifndef KPIMGLOBALPREFS_H |
32 | #define KPIMGLOBALPREFS_H | 32 | #define KPIMGLOBALPREFS_H |
33 | 33 | ||
34 | #include "kprefs.h" | 34 | #include "kprefs.h" |
35 | 35 | ||
36 | class KPimGlobalPrefs : public KPrefs | 36 | class KPimGlobalPrefs : public KPrefs |
37 | { | 37 | { |
38 | public: | 38 | public: |
39 | 39 | ||
40 | static KPimGlobalPrefs *instance(); | 40 | static KPimGlobalPrefs *instance(); |
41 | 41 | ||
42 | 42 | ||
43 | virtual ~KPimGlobalPrefs(); | 43 | virtual ~KPimGlobalPrefs(); |
44 | 44 | ||
45 | 45 | ||
46 | enum EMailClients { | 46 | enum EMailClients { |
47 | NONE_EMC = 0, | 47 | NONE_EMC = 0, |
48 | OTHER_EMC = 1, | 48 | OTHER_EMC = 1, |
49 | OMPI_EMC = 2, | 49 | OMPI_EMC = 2, |
50 | QTOPIA_EMC = 3, | 50 | QTOPIA_EMC = 3, |
51 | OPIE_EMC = 4 | 51 | OPIE_EMC = 4 |
52 | }; | 52 | }; |
53 | 53 | ||
54 | enum PhoneClients { | 54 | enum PhoneClients { |
55 | NONE_PHC = 0, | 55 | NONE_PHC = 0, |
56 | OTHER_PHC = 1, | 56 | OTHER_PHC = 1, |
57 | KPPI_PHC = 2 | 57 | KPPI_PHC = 2 |
58 | }; | 58 | }; |
59 | 59 | ||
60 | enum FaxClients { | 60 | enum FaxClients { |
61 | NONE_FAC = 0, | 61 | NONE_FAC = 0, |
62 | OTHER_FAC = 1 | 62 | OTHER_FAC = 1 |
63 | }; | 63 | }; |
64 | 64 | ||
65 | enum SMSClients { | 65 | enum SMSClients { |
66 | NONE_SMC = 0, | 66 | NONE_SMC = 0, |
67 | OTHER_SMC = 1 | 67 | OTHER_SMC = 1 |
68 | }; | 68 | }; |
69 | 69 | ||
70 | enum PagerClients { | 70 | enum PagerClients { |
71 | NONE_PAC = 0, | 71 | NONE_PAC = 0, |
72 | OTHER_PAC = 1 | 72 | OTHER_PAC = 1 |
73 | }; | 73 | }; |
74 | 74 | ||
75 | enum SIPClients { | ||
76 | NONE_SIC = 0, | ||
77 | OTHER_SIC = 1 | ||
78 | }; | ||
79 | |||
75 | private: | 80 | private: |
76 | KPimGlobalPrefs( const QString &name = QString::null ); | 81 | KPimGlobalPrefs( const QString &name = QString::null ); |
77 | 82 | ||
78 | static KPimGlobalPrefs *sInstance; | 83 | static KPimGlobalPrefs *sInstance; |
79 | 84 | ||
80 | 85 | ||
81 | public: | 86 | public: |
82 | int mEmailClient; | 87 | int mEmailClient; |
83 | QString mEmailOtherChannel; | 88 | QString mEmailOtherChannel; |
84 | QString mEmailOtherMessage; | 89 | QString mEmailOtherMessage; |
85 | QString mEmailOtherMessageParameters; | 90 | QString mEmailOtherMessageParameters; |
86 | QString mEmailOtherMessage2; | 91 | QString mEmailOtherMessage2; |
87 | QString mEmailOtherMessageParameters2; | 92 | QString mEmailOtherMessageParameters2; |
88 | 93 | ||
89 | int mPhoneClient; | 94 | int mPhoneClient; |
90 | QString mPhoneOtherChannel; | 95 | QString mPhoneOtherChannel; |
91 | QString mPhoneOtherMessage; | 96 | QString mPhoneOtherMessage; |
92 | QString mPhoneOtherMessageParameters; | 97 | QString mPhoneOtherMessageParameters; |
93 | 98 | ||
94 | int mFaxClient; | 99 | int mFaxClient; |
95 | QString mFaxOtherChannel; | 100 | QString mFaxOtherChannel; |
96 | QString mFaxOtherMessage; | 101 | QString mFaxOtherMessage; |
97 | QString mFaxOtherMessageParameters; | 102 | QString mFaxOtherMessageParameters; |
98 | 103 | ||
99 | int mSMSClient; | 104 | int mSMSClient; |
100 | QString mSMSOtherChannel; | 105 | QString mSMSOtherChannel; |
101 | QString mSMSOtherMessage; | 106 | QString mSMSOtherMessage; |
102 | QString mSMSOtherMessageParameters; | 107 | QString mSMSOtherMessageParameters; |
103 | 108 | ||
104 | int mPagerClient; | 109 | int mPagerClient; |
105 | QString mPagerOtherChannel; | 110 | QString mPagerOtherChannel; |
106 | QString mPagerOtherMessage; | 111 | QString mPagerOtherMessage; |
107 | QString mPagerOtherMessageParameters; | 112 | QString mPagerOtherMessageParameters; |
108 | 113 | ||
114 | int mSipClient; | ||
115 | QString mSipOtherChannel; | ||
116 | QString mSipOtherMessage; | ||
117 | QString mSipOtherMessageParameters; | ||
118 | |||
109 | 119 | ||
110 | }; | 120 | }; |
111 | 121 | ||
112 | #endif | 122 | #endif |