fixxx

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
@@ -178,4 +178,5 @@ 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  );
     new QLabel( i18n("<b>New data storage dir:</b>"), storePage );
@@ -291,9 +292,9 @@ void KDEPIMConfigWidget::setupExternalAppTab()
   mParameters->setReadOnly(true);
   boxLayout->addWidget( mParameters, 4, 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 );
@@ -310,11 +311,14 @@ void KDEPIMConfigWidget::setupExternalAppTab()
   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;
+  }
 
   connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
   connect( mMessage, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
   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 & ))  );
 
 
@@ -375,4 +379,6 @@ void KDEPIMConfigWidget::setupLocaleDateTab()
    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);
@@ -381,4 +387,5 @@ void KDEPIMConfigWidget::setupLocaleDateTab()
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;
+   }
 
   connect( mUserDateFormatLong, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
@@ -629,5 +636,7 @@ void KDEPIMConfigWidget::saveEditFieldSettings()
     mEmailOtherMessage = mMessage->text();
     mEmailOtherMessageParameters = mParameters->text();
+    if ( mMessage2 )
     mEmailOtherMessage2 = mMessage2->text();
+    if ( mParameters2 )
     mEmailOtherMessageParameters2 = mParameters2->text();
   }
@@ -695,5 +704,7 @@ void KDEPIMConfigWidget::updateClientWidgets()
       mMessage->setText(dai->_message);
       mParameters->setText(dai->_parameters);
+      if ( mMessage2 )
       mMessage2->setText(dai->_message2);
+    if ( mParameters2 )
       mParameters2->setText(dai->_parameters2);
 
@@ -704,5 +715,7 @@ void KDEPIMConfigWidget::updateClientWidgets()
         mMessage->setText(mEmailOtherMessage);
         mParameters->setText(mEmailOtherMessageParameters);
+        if ( mMessage2 )
         mMessage2->setText(mEmailOtherMessage2);
+    if ( mParameters2 )
         mParameters2->setText(mEmailOtherMessageParameters2);
       }
@@ -775,5 +788,7 @@ void KDEPIMConfigWidget::updateClientWidgets()
   mMessage->setReadOnly(readonly);
   mParameters->setReadOnly(readonly);
+  if ( mMessage2 )
   mMessage2->setReadOnly(readonly);
+    if ( mParameters2 )
   mParameters2->setReadOnly(readonly);
 
@@ -781,5 +796,7 @@ void KDEPIMConfigWidget::updateClientWidgets()
   mMessage->setEnabled(enabled);
   mParameters->setEnabled(enabled);
+  if ( mMessage2 )
   mMessage2->setEnabled(enabled);
+    if ( mParameters2 )
   mParameters2->setEnabled(enabled);
 
@@ -795,10 +812,14 @@ void KDEPIMConfigWidget::updateClientWidgets()
   else
   {
+  if ( mMessage2 )
     mMessage2->setText( "" );
+    if ( mParameters2 )
     mParameters2->setText( "" );
   }
 
   if (enabled == true) {
+  if ( mMessage2 )
     mMessage2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL);
+    if ( mParameters2 )
     mParameters2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL);
   }