-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 332f975..6de60fa 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -124,17 +124,17 @@ void KDEPIMConfigWidget::setupExternalAppTab() | |||
124 | layout->addWidget( mExternalApps ); | 124 | layout->addWidget( mExternalApps ); |
125 | 125 | ||
126 | connect( mExternalApps, SIGNAL( activated( int ) ), | 126 | connect( mExternalApps, SIGNAL( activated( int ) ), |
127 | this, SLOT (externalapp_changed( int ) ) ); | 127 | this, SLOT (externalapp_changed( int ) ) ); |
128 | 128 | ||
129 | 129 | ||
130 | mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); | 130 | mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); |
131 | QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" ); | 131 | QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" ); |
132 | 132 | mExternalAppGroupBox->layout()->setMargin(5); | |
133 | 133 | ||
134 | mClient = new QComboBox( mExternalAppGroupBox ); | 134 | mClient = new QComboBox( mExternalAppGroupBox ); |
135 | boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 ); | 135 | boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 ); |
136 | 136 | ||
137 | connect( mClient, SIGNAL( activated( int ) ), | 137 | connect( mClient, SIGNAL( activated( int ) ), |
138 | this, SLOT (client_changed( int ) ) ); | 138 | this, SLOT (client_changed( int ) ) ); |
139 | 139 | ||
140 | QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox); | 140 | QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox); |
@@ -153,16 +153,17 @@ void KDEPIMConfigWidget::setupExternalAppTab() | |||
153 | boxLayout->addWidget( lab, 3, 1 ); | 153 | boxLayout->addWidget( lab, 3, 1 ); |
154 | mParameters = new QLineEdit(mExternalAppGroupBox); | 154 | mParameters = new QLineEdit(mExternalAppGroupBox); |
155 | mParameters->setReadOnly(true); | 155 | mParameters->setReadOnly(true); |
156 | boxLayout->addWidget( mParameters, 4, 1 ); | 156 | boxLayout->addWidget( mParameters, 4, 1 ); |
157 | 157 | ||
158 | lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox); | 158 | lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox); |
159 | boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 ); | 159 | boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 ); |
160 | 160 | ||
161 | |||
161 | lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox); | 162 | lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox); |
162 | boxLayout->addWidget( lab, 6, 0 ); | 163 | boxLayout->addWidget( lab, 6, 0 ); |
163 | mMessage2 = new QLineEdit(mExternalAppGroupBox); | 164 | mMessage2 = new QLineEdit(mExternalAppGroupBox); |
164 | mMessage2->setReadOnly(true); | 165 | mMessage2->setReadOnly(true); |
165 | boxLayout->addWidget( mMessage2 , 7, 0); | 166 | boxLayout->addWidget( mMessage2 , 7, 0); |
166 | 167 | ||
167 | lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox); | 168 | lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox); |
168 | boxLayout->addWidget( lab, 6, 1 ); | 169 | boxLayout->addWidget( lab, 6, 1 ); |
@@ -187,18 +188,18 @@ void KDEPIMConfigWidget::setupExternalAppTab() | |||
187 | } | 188 | } |
188 | 189 | ||
189 | 190 | ||
190 | void KDEPIMConfigWidget::setupLocaleDateTab() | 191 | void KDEPIMConfigWidget::setupLocaleDateTab() |
191 | { | 192 | { |
192 | QWidget *topFrame = new QWidget( this ); | 193 | QWidget *topFrame = new QWidget( this ); |
193 | QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2); | 194 | QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2); |
194 | 195 | ||
195 | topLayout->setSpacing(KDialog::spacingHint()); | 196 | topLayout->setSpacing(KDialog::spacingHintSmall()); |
196 | topLayout->setMargin(KDialog::marginHint()); | 197 | topLayout->setMargin(KDialog::marginHintSmall()); |
197 | int iii = 0; | 198 | int iii = 0; |
198 | 199 | ||
199 | 200 | ||
200 | KPrefsWidRadios *syncPrefsGroup = | 201 | KPrefsWidRadios *syncPrefsGroup = |
201 | addWidRadios(i18n("Date Format:"),&(KPimGlobalPrefs::instance()->mPreferredDate),topFrame); | 202 | addWidRadios(i18n("Date Format:"),&(KPimGlobalPrefs::instance()->mPreferredDate),topFrame); |
202 | QString format; | 203 | QString format; |
203 | if ( QApplication::desktop()->width() < 480 ) | 204 | if ( QApplication::desktop()->width() < 480 ) |
204 | format = "(%d.%m.%Y)"; | 205 | format = "(%d.%m.%Y)"; |
@@ -211,16 +212,20 @@ void KDEPIMConfigWidget::setupLocaleDateTab() | |||
211 | format = "(%m.%d.%Y|%A %B %d %Y)"; | 212 | format = "(%m.%d.%Y|%A %B %d %Y)"; |
212 | syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); | 213 | syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); |
213 | if ( QApplication::desktop()->width() < 480 ) | 214 | if ( QApplication::desktop()->width() < 480 ) |
214 | format = "(%Y-%m-%d)"; | 215 | format = "(%Y-%m-%d)"; |
215 | else | 216 | else |
216 | format = "(%Y-%m-%d|%A %Y %B %d)"; | 217 | format = "(%Y-%m-%d|%A %Y %B %d)"; |
217 | syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); | 218 | syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); |
218 | syncPrefsGroup->addRadio(i18n("User defined")); | 219 | syncPrefsGroup->addRadio(i18n("User defined")); |
220 | if ( QApplication::desktop()->width() < 480 ) { | ||
221 | syncPrefsGroup->groupBox()->layout()->setMargin( 5 ); | ||
222 | syncPrefsGroup->groupBox()->layout()->setSpacing( 0 ); | ||
223 | } | ||
219 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); | 224 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); |
220 | ++iii; | 225 | ++iii; |
221 | ++iii; | 226 | ++iii; |
222 | QLabel * lab; | 227 | QLabel * lab; |
223 | mUserDateFormatLong = new QLineEdit(topFrame); | 228 | mUserDateFormatLong = new QLineEdit(topFrame); |
224 | lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); | 229 | lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); |
225 | topLayout->addWidget(lab ,iii,0); | 230 | topLayout->addWidget(lab ,iii,0); |
226 | topLayout->addWidget(mUserDateFormatLong,iii,1); | 231 | topLayout->addWidget(mUserDateFormatLong,iii,1); |
@@ -258,18 +263,20 @@ void KDEPIMConfigWidget::setupLocaleTab() | |||
258 | int iii = 0; | 263 | int iii = 0; |
259 | KPrefsWidRadios *syncPrefsGroup = | 264 | KPrefsWidRadios *syncPrefsGroup = |
260 | addWidRadios(i18n("Language:(needs restart)"),&(KPimGlobalPrefs::instance()->mPreferredLanguage),topFrame); | 265 | addWidRadios(i18n("Language:(needs restart)"),&(KPimGlobalPrefs::instance()->mPreferredLanguage),topFrame); |
261 | syncPrefsGroup->addRadio(i18n("English")); | 266 | syncPrefsGroup->addRadio(i18n("English")); |
262 | syncPrefsGroup->addRadio(i18n("German")); | 267 | syncPrefsGroup->addRadio(i18n("German")); |
263 | syncPrefsGroup->addRadio(i18n("French")); | 268 | syncPrefsGroup->addRadio(i18n("French")); |
264 | syncPrefsGroup->addRadio(i18n("Italian")); | 269 | syncPrefsGroup->addRadio(i18n("Italian")); |
265 | syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); | 270 | syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); |
266 | if ( QApplication::desktop()->width() < 300 ) | 271 | if ( QApplication::desktop()->width() < 300 ) { |
267 | ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); | 272 | syncPrefsGroup->groupBox()->layout()->setMargin( 5 ); |
273 | syncPrefsGroup->groupBox()->layout()->setSpacing( 0 ); | ||
274 | } | ||
268 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); | 275 | topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); |
269 | ++iii; | 276 | ++iii; |
270 | 277 | ||
271 | syncPrefsGroup = | 278 | syncPrefsGroup = |
272 | addWidRadios(i18n("Time Format(nr):"),&(KPimGlobalPrefs::instance()->mPreferredTime),topFrame); | 279 | addWidRadios(i18n("Time Format(nr):"),&(KPimGlobalPrefs::instance()->mPreferredTime),topFrame); |
273 | if ( QApplication::desktop()->width() > 300 ) | 280 | if ( QApplication::desktop()->width() > 300 ) |
274 | syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical); | 281 | syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical); |
275 | syncPrefsGroup->addRadio(i18n("24:00")); | 282 | syncPrefsGroup->addRadio(i18n("24:00")); |
@@ -288,18 +295,18 @@ void KDEPIMConfigWidget::setupLocaleTab() | |||
288 | 295 | ||
289 | } | 296 | } |
290 | 297 | ||
291 | 298 | ||
292 | void KDEPIMConfigWidget::setupTimeZoneTab() | 299 | void KDEPIMConfigWidget::setupTimeZoneTab() |
293 | { | 300 | { |
294 | QWidget *topFrame = new QWidget( this ); | 301 | QWidget *topFrame = new QWidget( this ); |
295 | QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2); | 302 | QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2); |
296 | topLayout->setSpacing(KDialog::spacingHint()); | 303 | topLayout->setSpacing(KDialog::spacingHintSmall()); |
297 | topLayout->setMargin(KDialog::marginHint()); | 304 | topLayout->setMargin(KDialog::marginHintSmall()); |
298 | 305 | ||
299 | QHBox *timeZoneBox = new QHBox( topFrame ); | 306 | QHBox *timeZoneBox = new QHBox( topFrame ); |
300 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); | 307 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); |
301 | 308 | ||
302 | new QLabel( i18n("Timezone:"), timeZoneBox ); | 309 | new QLabel( i18n("Timezone:"), timeZoneBox ); |
303 | mTimeZoneCombo = new QComboBox( timeZoneBox ); | 310 | mTimeZoneCombo = new QComboBox( timeZoneBox ); |
304 | if ( QApplication::desktop()->width() < 300 ) { | 311 | if ( QApplication::desktop()->width() < 300 ) { |
305 | mTimeZoneCombo->setMaximumWidth(150); | 312 | mTimeZoneCombo->setMaximumWidth(150); |
@@ -326,20 +333,23 @@ void KDEPIMConfigWidget::setupTimeZoneTab() | |||
326 | addWidBool(i18n("Add 30 min (+00:30) to selected Timezone"), | 333 | addWidBool(i18n("Add 30 min (+00:30) to selected Timezone"), |
327 | &(KPimGlobalPrefs::instance()->mTimeZoneAdd30min),topFrame); | 334 | &(KPimGlobalPrefs::instance()->mTimeZoneAdd30min),topFrame); |
328 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); | 335 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); |
329 | ++iii; | 336 | ++iii; |
330 | sb = | 337 | sb = |
331 | addWidBool(i18n("Timezone has daylight saving"), | 338 | addWidBool(i18n("Timezone has daylight saving"), |
332 | &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame); | 339 | &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame); |
333 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); | 340 | topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); |
334 | ++iii; | 341 | ++iii; |
335 | QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); | 342 | QLabel* lab; |
343 | |||
344 | lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); | ||
336 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | 345 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); |
337 | ++iii; | 346 | ++iii; |
347 | |||
338 | lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); | 348 | lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); |
339 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); | 349 | topLayout->addMultiCellWidget(lab, iii,iii,0,1); |
340 | ++iii; | 350 | ++iii; |
341 | lab = new QLabel( i18n("Daylight start:"), topFrame ); | 351 | lab = new QLabel( i18n("Daylight start:"), topFrame ); |
342 | topLayout->addWidget(lab, iii,0); | 352 | topLayout->addWidget(lab, iii,0); |
343 | mStartDateSavingEdit = new KDateEdit(topFrame); | 353 | mStartDateSavingEdit = new KDateEdit(topFrame); |
344 | topLayout->addWidget(mStartDateSavingEdit, iii,1); | 354 | topLayout->addWidget(mStartDateSavingEdit, iii,1); |
345 | ++iii; | 355 | ++iii; |