| -rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 29 |
1 files changed, 25 insertions, 4 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 @@ -179,2 +179,3 @@ void KDEPIMConfigWidget::setupStoreTab() 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,3 +293,2 @@ void KDEPIMConfigWidget::setupExternalAppTab() boxLayout->addWidget( mParameters, 4, 1 ); - lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox); @@ -297,2 +297,3 @@ void KDEPIMConfigWidget::setupExternalAppTab() + if ( QApplication::desktop()->height() > 240 ) { lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox); @@ -311,3 +312,8 @@ void KDEPIMConfigWidget::setupExternalAppTab() 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,2 +380,4 @@ void KDEPIMConfigWidget::setupLocaleDateTab() ++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); @@ -382,2 +388,3 @@ void KDEPIMConfigWidget::setupLocaleDateTab() ++iii; + } @@ -630,3 +637,5 @@ void KDEPIMConfigWidget::saveEditFieldSettings() mEmailOtherMessageParameters = mParameters->text(); + if ( mMessage2 ) mEmailOtherMessage2 = mMessage2->text(); + if ( mParameters2 ) mEmailOtherMessageParameters2 = mParameters2->text(); @@ -696,3 +705,5 @@ void KDEPIMConfigWidget::updateClientWidgets() mParameters->setText(dai->_parameters); + if ( mMessage2 ) mMessage2->setText(dai->_message2); + if ( mParameters2 ) mParameters2->setText(dai->_parameters2); @@ -705,3 +716,5 @@ void KDEPIMConfigWidget::updateClientWidgets() mParameters->setText(mEmailOtherMessageParameters); + if ( mMessage2 ) mMessage2->setText(mEmailOtherMessage2); + if ( mParameters2 ) mParameters2->setText(mEmailOtherMessageParameters2); @@ -776,3 +789,5 @@ void KDEPIMConfigWidget::updateClientWidgets() 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); |