summaryrefslogtreecommitdiffabout
path: root/libkdepim/kcmconfigs
Side-by-side diff
Diffstat (limited to 'libkdepim/kcmconfigs') (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.cpp91
1 files changed, 56 insertions, 35 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 93538ec..d3797ae 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -178,3 +178,4 @@ void KDEPIMConfigWidget::setupStoreTab()
- QVBox *storePage = new QVBox( this );
+ QVBox *storePage = new QVBox( this );
+ if ( QApplication::desktop()->height() > 240 )
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 );
@@ -292,22 +293,27 @@ void KDEPIMConfigWidget::setupExternalAppTab()
boxLayout->addWidget( mParameters, 4, 1 );
-
- lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox);
- boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 );
-
-
- lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
- boxLayout->addWidget( lab, 6, 0 );
- mMessage2 = new QLineEdit(mExternalAppGroupBox);
- mMessage2->setReadOnly(true);
- boxLayout->addWidget( mMessage2 , 7, 0);
-
- lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox);
- boxLayout->addWidget( lab, 6, 1 );
- mParameters2 = new QLineEdit(mExternalAppGroupBox);
- mParameters2->setReadOnly(true);
- boxLayout->addWidget( mParameters2, 7, 1 );
-
- lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox);
- boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 );
-
+ lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox);
+ boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 );
+
+
+ if ( QApplication::desktop()->height() > 240 ) {
+ lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
+ boxLayout->addWidget( lab, 6, 0 );
+ mMessage2 = new QLineEdit(mExternalAppGroupBox);
+ mMessage2->setReadOnly(true);
+ boxLayout->addWidget( mMessage2 , 7, 0);
+
+ lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox);
+ boxLayout->addWidget( lab, 6, 1 );
+ mParameters2 = new QLineEdit(mExternalAppGroupBox);
+ mParameters2->setReadOnly(true);
+ boxLayout->addWidget( mParameters2, 7, 1 );
+
+ lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox);
+ boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 );
+ connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
+ connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
+ } else {
+ mMessage2 = 0;
+ mParameters2 = 0;
+ }
@@ -316,4 +322,2 @@ void KDEPIMConfigWidget::setupExternalAppTab()
connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
- connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
- connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
@@ -376,8 +380,11 @@ void KDEPIMConfigWidget::setupLocaleDateTab()
++iii;
- lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
- topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
- ++iii;
- lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
- topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
- ++iii;
+ //qDebug(" QApplication::desktop()->height()xx %d ", QApplication::desktop()->height() );
+ if ( QApplication::desktop()->height() > 240 ) {
+ lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
+ topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
+ ++iii;
+ lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
+ topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
+ ++iii;
+ }
@@ -630,4 +637,6 @@ void KDEPIMConfigWidget::saveEditFieldSettings()
mEmailOtherMessageParameters = mParameters->text();
- mEmailOtherMessage2 = mMessage2->text();
- mEmailOtherMessageParameters2 = mParameters2->text();
+ if ( mMessage2 )
+ mEmailOtherMessage2 = mMessage2->text();
+ if ( mParameters2 )
+ mEmailOtherMessageParameters2 = mParameters2->text();
}
@@ -695,4 +704,6 @@ void KDEPIMConfigWidget::updateClientWidgets()
mMessage->setText(dai->_message);
- mParameters->setText(dai->_parameters);
- mMessage2->setText(dai->_message2);
+ mParameters->setText(dai->_parameters);
+ if ( mMessage2 )
+ mMessage2->setText(dai->_message2);
+ if ( mParameters2 )
mParameters2->setText(dai->_parameters2);
@@ -704,4 +715,6 @@ void KDEPIMConfigWidget::updateClientWidgets()
mMessage->setText(mEmailOtherMessage);
- mParameters->setText(mEmailOtherMessageParameters);
+ mParameters->setText(mEmailOtherMessageParameters);
+ if ( mMessage2 )
mMessage2->setText(mEmailOtherMessage2);
+ if ( mParameters2 )
mParameters2->setText(mEmailOtherMessageParameters2);
@@ -775,4 +788,6 @@ void KDEPIMConfigWidget::updateClientWidgets()
mMessage->setReadOnly(readonly);
- mParameters->setReadOnly(readonly);
+ mParameters->setReadOnly(readonly);
+ if ( mMessage2 )
mMessage2->setReadOnly(readonly);
+ if ( mParameters2 )
mParameters2->setReadOnly(readonly);
@@ -782,3 +797,5 @@ void KDEPIMConfigWidget::updateClientWidgets()
mParameters->setEnabled(enabled);
+ if ( mMessage2 )
mMessage2->setEnabled(enabled);
+ if ( mParameters2 )
mParameters2->setEnabled(enabled);
@@ -796,3 +813,5 @@ void KDEPIMConfigWidget::updateClientWidgets()
{
+ if ( mMessage2 )
mMessage2->setText( "" );
+ if ( mParameters2 )
mParameters2->setText( "" );
@@ -801,3 +820,5 @@ void KDEPIMConfigWidget::updateClientWidgets()
if (enabled == true) {
+ if ( mMessage2 )
mMessage2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL);
+ if ( mParameters2 )
mParameters2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL);