9 files changed, 131 insertions, 47 deletions

diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index 3dfa344..5455098 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -106,3 +106,4 @@ void KODialogManager::showOptionsDialog( bool showSync )
   mOptionsDialog->readConfig();
-#ifndef DESKTOP_VERSION  
+#ifndef DESKTOP_VERSION 
+  mOptionsDialog->hideButtons();
   mOptionsDialog->showMaximized();
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index bdfc637..6ecf978 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -89,3 +89,3 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
   mListView->addColumn(i18n("RSVP"),35);
-  if ( QApplication::desktop()->width() <= 320 ) {
+  if ( QApplication::desktop()->width() <= 320 ||  QApplication::desktop()->height() <= 240) {
       int hei = 80;
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index bfe0aec..915c7ec 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -102,3 +102,3 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
     mLocationEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred  ,QSizePolicy::MinimumExpanding  ,FALSE) );
-    if ( QApplication::desktop()->width() > 320 ) 
+    if ( QApplication::desktop()->width() > 320 && QApplication::desktop()->height() > 240 ) 
         mLocationEdit->setMaximumHeight( hei + 6);
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index b782bb1..3ee9a22 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -287,2 +287,9 @@ void KOPrefsDialog::setupMainTab()
   ++iii;
+  if (  QApplication::desktop()->height() <= 240 ) {
+      topFrame = addPage(i18n("General") +" 2",0,0);
+      topLayout = new QGridLayout(topFrame,4,2);
+      topLayout->setSpacing(2);
+      topLayout->setMargin(3);
+      iii = 0;
+  }
   QHBox *dummy = new QHBox(topFrame);
@@ -433,3 +440,10 @@ void KOPrefsDialog::setupTimeTab()
   topLayout->addWidget(mAlarmTimeCombo,3,1);
-
+  int iii = 4;
+  if (  QApplication::desktop()->height() <= 240 ) {
+      topFrame = addPage(i18n("Time") +" 2",0,0);
+      topLayout = new QGridLayout(topFrame,1,2);
+      topLayout->setSpacing(2);
+      topLayout->setMargin(3);
+      iii = 0;
+  }
 
@@ -438,3 +452,3 @@ void KOPrefsDialog::setupTimeTab()
                                                topFrame);
-  topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1);
+  topLayout->addMultiCellWidget(workingHoursGroup,iii,iii,0,1);
   workingHoursGroup->layout()->setSpacing( 0 );
@@ -704,2 +718,14 @@ void KOPrefsDialog::setupViewsTab()
   topLayout->addWidget(dummy->checkBox(),ii++,0);
+
+
+
+  if (  QApplication::desktop()->height() <= 240 ) {
+      topFrame = addPage(i18n("Month View") +" 2",0,0);
+      topLayout = new QGridLayout(topFrame,4,1);
+      topLayout->setSpacing(2);
+      topLayout->setMargin(1);
+      ii = 0;
+  }
+
+
  coloredCategoriesInMonthView =
@@ -903,5 +929,9 @@ dummy =
   topLayout->addWidget(dummy->checkBox(),iii++,0);
-  lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame);
 
-   topLayout->addWidget(lab ,iii++,0);
+  if (  QApplication::desktop()->height() > 240 ) {
+      
+      lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame);
+      
+      topLayout->addWidget(lab ,iii++,0);
+  }
 #ifndef DESKTOP_VERSION
@@ -1166,2 +1196,14 @@ void KOPrefsDialog::setupColorsTab()
 
+  if (  QApplication::desktop()->height() <= 240 ) {
+      topFrame = addPage(i18n("Colors") +" 2",0,0);
+      //  DesktopIcon("colorize",KIcon::SizeMedium));
+      
+      topLayout = new QGridLayout(topFrame,5,2);
+      // topLayout->setSpacing(mSpacingHint);
+      // topLayout->setMargin(mMarginHint);
+      
+      topLayout->setSpacing(2);
+      topLayout->setMargin(3);
+  }
+  
 
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 2c04852..0cb0bce 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -627,3 +627,3 @@ void MainWindow::initActions()
     if ( !p->mToolBarMiniIcons ) {
-        if ( QApplication::desktop()->width() < 480 ) {
+        if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) {
             pathString += "icons16/";
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index ef2fc1c..7b3b543 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -72,2 +72,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
 
+    QPushButton *togButton = new QPushButton( "", topFrame );
+    subLayout->addWidget(togButton);
+    connect(togButton,SIGNAL(clicked()),SLOT(toggleCheckboxes()));
+    togButton->setPixmap(SmallIcon("1updownarrow"));
+    togButton->setMinimumWidth( togButton->sizeHint().height() );
     searchEdit->setText("*"); // Find all events by default
@@ -80,3 +85,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
 
-    QHBox *incidenceGroup = new QHBox( topFrame );
+    incidenceGroup = new QHBox( topFrame );
     layout->addWidget(incidenceGroup);
@@ -88,3 +93,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
 
-    QHBox *subjectGroup = new QHBox( topFrame );
+    subjectGroup = new QHBox( topFrame );
     layout->addWidget(subjectGroup);
@@ -96,3 +101,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
 
-    QHBox *attendeeGroup = new QHBox( topFrame );
+    attendeeGroup = new QHBox( topFrame );
     layout->addWidget(attendeeGroup );
@@ -138,2 +143,14 @@ SearchDialog::~SearchDialog()
 }
+void SearchDialog::toggleCheckboxes()
+{
+    if ( incidenceGroup->isVisible() ) {
+        incidenceGroup->hide() ;
+        subjectGroup->hide() ;
+        attendeeGroup->hide() ;
+    } else {
+        incidenceGroup->show() ;
+        subjectGroup->show() ;
+        attendeeGroup->show() ;
+    }
+}
 void SearchDialog::raiseAndSelect()
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index 11ad2f0..b345b98 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -62,2 +62,3 @@ class SearchDialog : public  QVBox
             void searchTextChanged( const QString &_text );
+    void toggleCheckboxes();
 
@@ -69,2 +70,4 @@ class SearchDialog : public  QVBox
   private:
+
+    QHBox *incidenceGroup ,*subjectGroup ,*attendeeGroup;
     void search(const QRegExp &);
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);
diff --git a/microkde/kcolorbutton.cpp b/microkde/kcolorbutton.cpp
index c7c6088..96dc256 100644
--- a/microkde/kcolorbutton.cpp
+++ b/microkde/kcolorbutton.cpp
@@ -34,3 +34,3 @@ KColorButton::KColorButton( QWidget *p ):QPushButton( p )
     int size = 24;
-    if(  QApplication::desktop()->width() < 480 )
+    if(  QApplication::desktop()->width() < 480 || QApplication::desktop()->height() <= 320 )
         size = 18;