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
@@ -43,129 +43,130 @@
 #include <kapplication.h>
 KODialogManager::KODialogManager( CalendarView *mainView ) :
  QObject(), mMainView( mainView )
 {
  mOutgoingDialog = 0;
  mIncomingDialog = 0;
  mOptionsDialog = 0;
  mSearchDialog = 0;
  mArchiveDialog = 0;
  mFilterEditDialog = 0;
  mPluginDialog = 0;
  // mCategoryEditDialog = new KPIM::CategoryEditDialog(KOPrefs::instance(),mMainView);
  //KOGlobals::fitDialogToScreen( mCategoryEditDialog );
 }
 KODialogManager::~KODialogManager()
 {
  delete mOutgoingDialog;
  delete mIncomingDialog;
  delete mOptionsDialog;
  delete mSearchDialog;
 #ifndef KORG_NOARCHIVE
  delete mArchiveDialog;
 #endif
  delete mFilterEditDialog;
 #ifndef KORG_NOPLUGINS
  delete mPluginDialog;
 #endif
 }
 OutgoingDialog *KODialogManager::outgoingDialog()
 {
  createOutgoingDialog();
  return mOutgoingDialog;
 }
 void KODialogManager::createOutgoingDialog()
 {
  if (!mOutgoingDialog) {
    mOutgoingDialog = new OutgoingDialog(mMainView->calendar(),mMainView);
    if (mIncomingDialog) mIncomingDialog->setOutgoingDialog(mOutgoingDialog);
    connect(mOutgoingDialog,SIGNAL(numMessagesChanged(int)),
            mMainView,SIGNAL(numOutgoingChanged(int)));
  }
 }
 void KODialogManager::showGlobalOptionsDialog( bool showSync )
 {
    KPimPrefsGlobalDialog gc ( mMainView );
    if ( showSync )
        gc.showTZconfig();
    gc.exec();
 }
 void KODialogManager::showOptionsDialog( bool showSync )
 {
   
  if (!mOptionsDialog) {
    mOptionsDialog = new KOPrefsDialog(mMainView);
    connect(mOptionsDialog,SIGNAL(configChanged()),
            mMainView,SLOT(updateConfig()));
  }
  mOptionsDialog->readConfig();
-#ifndef DESKTOP_VERSION  
+#ifndef DESKTOP_VERSION 
+  mOptionsDialog->hideButtons();
  mOptionsDialog->showMaximized();
 #else
  mOptionsDialog->show();
 #endif
 
  mOptionsDialog->exec();
  delete mOptionsDialog;
  mOptionsDialog = 0;
 }
 void KODialogManager::showSyncOptions()
 {
    showGlobalOptionsDialog( true );
 }
 void KODialogManager::showOutgoingDialog()
 {
  createOutgoingDialog();
  mOutgoingDialog->show();
  mOutgoingDialog->raise();
 }
 IncomingDialog *KODialogManager::incomingDialog()
 {
  createOutgoingDialog();
  if (!mIncomingDialog) {
    mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView);
    connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)),
            mMainView,SIGNAL(numIncomingChanged(int)));
    connect(mIncomingDialog,SIGNAL(calendarUpdated()),
            mMainView,SLOT(updateView()));
  }
  return mIncomingDialog;
 }
 void KODialogManager::createIncomingDialog()
 {
  createOutgoingDialog();
  if (!mIncomingDialog) {
    mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView);
    connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)),
            mMainView,SIGNAL(numIncomingChanged(int)));
    connect(mIncomingDialog,SIGNAL(calendarUpdated()),
            mMainView,SLOT(updateView()));
  }
 }
 void KODialogManager::showIncomingDialog()
 {
  createIncomingDialog();
  mIncomingDialog->show();
  mIncomingDialog->raise();
 }
 /*
 void KODialogManager::showCategoryEditDialog()
 {
  mCategoryEditDialog->show();
 }
 */
 void KODialogManager::hideSearchDialog()
 {
  if (mSearchDialog) 
      mSearchDialog->hide();
 }
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index bdfc637..6ecf978 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -26,129 +26,129 @@
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qbuttongroup.h>
 #include <qvgroupbox.h>
 #include <qwidgetstack.h>
 #include <qdatetime.h>
 #include <qapp.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #ifndef KORG_NOKABC
 #ifdef DESKTOP_VERSION
 #include <kabc/addresseedialog.h>
 #else //DESKTOP_VERSION
 #include <externalapphandler.h>
 #endif //DESKTOP_VERSION
 #endif
 #include <libkcal/incidence.h>
 #include "koprefs.h"
 #include "koeditordetails.h"
 template <>
 CustomListViewItem<class Attendee *>::~CustomListViewItem()
 {
  delete mData;
 }
 template <>
 void CustomListViewItem<class Attendee *>::updateItem()
 {
  setText(0,mData->name());
  setText(1,mData->email());
  setText(2,mData->roleStr());
  setText(3,mData->statusStr());
  if (mData->RSVP() && !mData->email().isEmpty())
    setPixmap(4,SmallIcon("mailappt"));
  else
    setPixmap(4,SmallIcon("nomailappt"));
 }
 KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
  : QWidget( parent, name), mDisableItemUpdate( false )
 {
  QGridLayout *topLayout = new QGridLayout(this);
  topLayout->setSpacing(spacing);
  QString organizer = KOPrefs::instance()->email();
  mOrganizerLabel = new QLabel(i18n("Organizer: %1").arg(organizer),this);
  mListView = new KListView(this,"mListView");
  mListView->addColumn(i18n("Name"),180);
  mListView->addColumn(i18n("Email"),180);
  mListView->addColumn(i18n("Role"),60);
  mListView->addColumn(i18n("Status"),100);
  mListView->addColumn(i18n("RSVP"),35);
-  if ( QApplication::desktop()->width() <= 320 ) {
+  if ( QApplication::desktop()->width() <= 320 ||  QApplication::desktop()->height() <= 240) {
      int hei = 80;
      if ( QApplication::desktop()->height() <= 240  )
          hei = 60;
      mListView->setFixedHeight(hei);
  }
  mListView->setAllColumnsShowFocus (true );
  //mListView->setSingleClick( true );
  connect(mListView,SIGNAL(selectionChanged(QListViewItem *)),
          SLOT(updateAttendeeInput()));
  connect(mListView,SIGNAL(executed(QListViewItem * ,const QPoint&, int )),
          SLOT(itemClicked(QListViewItem * ,const QPoint& , int )));
  mRsvpButton = new QCheckBox(this);
  mRsvpButton->setText(i18n("Request response"));
  mAddressBookButton = new QPushButton(i18n("Address &Book..."),this);
  QLabel *attendeeLabel = new QLabel(this);
  attendeeLabel->setText(i18n("Name:"));
  attendeeLabel->setFixedSize( attendeeLabel->sizeHint()  );
  mNameEdit = new QLineEdit(this);
  connect(mNameEdit,SIGNAL(textChanged(const QString &)),
          SLOT(updateAttendeeItem()));
  mUidEdit = new QLineEdit(0);
  mUidEdit->setText("");
  QLabel *emailLabel = new QLabel(this);
  emailLabel->setText(i18n("Email:"));
  mEmailEdit = new QLineEdit(this);
  connect(mEmailEdit,SIGNAL(textChanged(const QString &)),
          SLOT(updateAttendeeItem()));
  QLabel *attendeeRoleLabel = new QLabel(this);
  attendeeRoleLabel->setText(i18n("Role:"));
  mRoleCombo = new QComboBox(false,this);
  mRoleCombo->insertStringList(Attendee::roleList());
  connect(mRoleCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem()));
  QLabel *statusLabel = new QLabel(this);
  statusLabel->setText( i18n("Status:") );
  mStatusCombo = new QComboBox(false,this);
  mStatusCombo->insertStringList(Attendee::statusList());
  connect(mStatusCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem()));
  connect(mRsvpButton,SIGNAL(clicked()),SLOT(updateAttendeeItem()));
  QWidget *buttonBox = new QWidget(this);
  QVBoxLayout *buttonLayout = new QVBoxLayout(buttonBox);
  QPushButton *newButton = new QPushButton(i18n("&New"),buttonBox);
  buttonLayout->addWidget(newButton);
  connect(newButton,SIGNAL(clicked()),SLOT(addNewAttendee()));
  mRemoveButton = new QPushButton(i18n("&Remove"),buttonBox);
  buttonLayout->addWidget(mRemoveButton);
  connect(mRemoveButton, SIGNAL(clicked()),SLOT(removeAttendee()));
  // buttonLayout->addWidget(mAddressBookButton);
  connect(mAddressBookButton,SIGNAL(clicked()),SLOT(openAddressBook()));
  //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () );
  if ( QApplication::desktop()->height() <= 240 ) {
      mRoleCombo->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::Minimum ,FALSE) );
      mStatusCombo->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::Minimum  ,FALSE) );
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index bfe0aec..915c7ec 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -39,129 +39,129 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kfiledialog.h>
 #include <kstandarddirs.h>
 #include <libkcal/todo.h>
 #include <libkcal/event.h>
 #include <libkdepim/categoryselectdialog.h>
 #include <libkdepim/kdateedit.h>
 #include "koprefs.h"
 #include "koglobals.h"
 #include "koeditorgeneral.h"
 #include "kolocationbox.h"
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 KOEditorGeneral::KOEditorGeneral(QObject* parent, const char* name) :
    QObject( parent, name)
 {
    mNextFocus = 0;
 }
 KOEditorGeneral::~KOEditorGeneral()
 {
 }
 void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
 {
    QGridLayout *headerLayout = new QGridLayout(topLayout);
 #if 0
    mOwnerLabel = new QLabel(i18n("Owner:"),parent);
    headerLayout->addMultiCellWidget(mOwnerLabel,0,0,0,1);
 #endif
    QLabel *summaryLabel = new QLabel(i18n("Summary:"),parent);
    headerLayout->addWidget(summaryLabel,1,0);
    mSummaryEdit = new KOLocationBox(TRUE,parent, 10);
    mSummaryEdit->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::MinimumExpanding  ,FALSE) );
    //mSummaryEdit->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5 ,(QSizePolicy::SizeType)3 ,FALSE) );
    //qDebug("h %d %d ", summaryLabel->sizeHint().height(),mSummaryEdit->sizeHint().height() );
    int hei =  (summaryLabel->sizeHint().height() + mSummaryEdit->sizeHint().height())/2;
    if ( QApplication::desktop()->width() > 320 ) 
        mSummaryEdit->setMaximumHeight( hei +6 );
    //qDebug("%d %d %d %d %d %d ", QSizePolicy::Fixed ,  QSizePolicy::Minimum ,   QSizePolicy:: Maximum ,   QSizePolicy:: Preferred  ,    QSizePolicy::  MinimumExpanding , QSizePolicy::Expanding   );
    // SizeType { Fixed = 0, Minimum = MayGrow, Maximum = MayShrink, Preferred = MayGrow|MayShrink, MinimumExpanding = Minimum|ExpMask, Expanding = MinimumExpanding|MayShrink }
    //   mSummaryEdit = new QLineEdit(parent);
    headerLayout->addWidget(mSummaryEdit,1,1);
    connect ( mSummaryEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) );
  
    QLabel *locationLabel = new QLabel(i18n("Location:"),parent);
    if ( QApplication::desktop()->height() < 320 ) 
        headerLayout->addWidget(locationLabel,1,2);
    else
        headerLayout->addWidget(locationLabel,2,0);
    mLocationEdit = new KOLocationBox(TRUE,parent,10); 
    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);
    //   mLocationEdit = new QLineEdit(parent);
    connect ( mLocationEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) );
    if ( QApplication::desktop()->height() < 320 ) {
        headerLayout->addWidget(mLocationEdit,1,3);
        headerLayout->setColStretch( 1, 10);
        headerLayout->setColStretch( 3, 10);
    }
    else {
        headerLayout->addWidget(mLocationEdit,2,1);
        headerLayout->setColStretch( 1, 10);
    }
 }
 void KOEditorGeneral::setFocusOn( int i )
 {
    mNextFocus = i;
    QTimer::singleShot( 0, this, SLOT ( slotSetFocusOn() ));
 }
 void KOEditorGeneral::slotSetFocusOn()
 {
    mNextFocus;
    if ( mNextFocus == 1 ) {
        mDescriptionEdit->setFocus();
        mDescriptionEdit->setCursorPosition( mDescriptionEdit->numLines (), 333);
    } 
    if ( mNextFocus == 2 ) {
        mSummaryEdit->setFocus();
    }
 }
 void KOEditorGeneral::editCategories()
 {
    // qDebug("KOEditorGeneral::editCategories() ");
    KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 );
    connect(csd,SIGNAL(categoriesSelected(const QString &)), this ,SLOT(setCategories(const QString &)));
    //KOGlobals::fitDialogToScreen( csd );
    csd->setColorEnabled();
    csd->setSelected( QStringList::split (",", mCategoriesLabel->text()) );
    csd->exec();
    delete csd;
 }
 void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout)
 {
    QBoxLayout *categoriesLayout = new QHBoxLayout( topLayout );
    mCategoriesButton = new QPushButton(parent);
    mCategoriesButton->setText(i18n("Categories..."));
    connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() ));
    categoriesLayout->addWidget(mCategoriesButton);
    mCategoriesLabel = new QLabel(parent);
    mCategoriesLabel->setFrameStyle(QFrame::Panel|QFrame::Sunken);
    categoriesLayout->addWidget(mCategoriesLabel,1);
 }
 void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout)
 {
    QBoxLayout *secrecyLayout = new QHBoxLayout( topLayout );
    QLabel *secrecyLabel = new QLabel(i18n("Access:"),parent);
    mCancelBox = new QCheckBox ( i18n("Cancelled"), parent);
    secrecyLayout->addWidget(mCancelBox);
    secrecyLayout->addWidget(secrecyLabel);
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index b782bb1..3ee9a22 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -224,128 +224,135 @@ void  KOPrefsDialog::setupLocaleTab()
   }
  //   KPrefsDialogWidBool *sb;  //#ifndef DESKTOP_VERSION
 #if 0
  ++iii;
  sb =
           addWidBool(i18n("Quick load/save (w/o Unicode)"), 
                      &(KOPrefs::instance()->mUseQuicksave),topFrame);
       topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 #endif
 #endif
 }
 void KOPrefsDialog::setupMainTab()
 {
    QFrame *topFrame = addPage(i18n("General"),0,0);
    // DesktopIcon("identity",KIcon::SizeMedium));
  QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
 //  KPrefsDialogWidBool *emailControlCenter =
 //       addWidBool(i18n("&Use email settings from Control Center"),
 //                  &(KOPrefs::instance()->mEmailControlCenter),topFrame);
 //   topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1);
  // connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)),
  //      SLOT(toggleEmailSettings(bool)));
  mNameEdit = new QLineEdit(topFrame);
  mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
  topLayout->addWidget(mNameLabel,0,0);
  topLayout->addWidget(mNameEdit,0,1);
  mEmailEdit = new QLineEdit(topFrame);
  mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
  topLayout->addWidget(mEmailLabel,1,0);
  topLayout->addWidget(mEmailEdit,1,1);
  KPrefsDialogWidBool *wb;
  
  
  KPrefsDialogWidBool *widbool = addWidBool(i18n("Full menu bar(nr)"),
             &(KOPrefs::instance()->mShowFullMenu),topFrame);
  topLayout->addMultiCellWidget(  widbool->checkBox(), 2,2,0,1); 
  
  
  widbool = addWidBool(i18n("Mini icons in toolbar(nr)"),
             &(KOPrefs::instance()->mToolBarMiniIcons),topFrame);
  topLayout->addMultiCellWidget(  widbool->checkBox(), 3,3,0,1); 
 KPrefsDialogWidBool *verticalScreen =
      addWidBool(i18n("Show vertical screen (Needs restart)"),
                 &(KOPrefs::instance()->mVerticalScreen),topFrame);
  //topLayout->addWidget(verticalScreen->checkBox(),ii++,0);
  topLayout->addMultiCellWidget(verticalScreen->checkBox(),4,4,0,1);
  
  int iii = 5;
  widbool = addWidBool(i18n("Block popup until mouse button release"),
             &(KOPrefs::instance()->mBlockPopupMenu),topFrame);
  topLayout->addMultiCellWidget(  widbool->checkBox(), iii,iii,0,1); 
  ++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);
  new QLabel(i18n("Days in Next-X-Days:"),dummy);
  mNextXDaysSpin = new QSpinBox(2,14,1,dummy);
 
  topLayout->addMultiCellWidget(dummy,iii,iii,0,1);
  ++iii;
 
  // KPrefsDialogWidBool *bcc =
 //       addWidBool(i18n("Send copy to owner when mailing events"),
 //                  &(KOPrefs::instance()->mBcc),topFrame);
 //   topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1);
  // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"),  topFrame);
  //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1);
  // addWidBool(i18n("Enable automatic saving of calendar"),
  //         &(KOPrefs::instance()->mAutoSave),autoSaveGroup);
  QHBox *intervalBox = new QHBox(topFrame);
  // intervalBox->setSpacing(mSpacingHint);
  topLayout->addMultiCellWidget(intervalBox,iii,iii,0,1);
  ++iii;
  QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox);
  mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox);
  autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin); 
  /*
  QHBox * agendasize = new QHBox ( topFrame );
  
  new QLabel (i18n("AllDayAgenda Height:"), agendasize );
  
  mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize);
  topLayout->addMultiCellWidget(agendasize,7,7,0,1);
  */
  
  KPrefsDialogWidBool *ask =
    addWidBool(i18n("Ask for quit when closing KO/Pi"),
               &(KOPrefs::instance()->mAskForQuit),topFrame);
  topLayout->addMultiCellWidget(ask->checkBox(),iii,iii,0,1);
  ++iii;
 
  /*
  KPrefsDialogWidBool *confirmCheck =
      addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm),
                 topFrame);
  topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1);
  mEnableGroupScheduling =
      addWidBool(i18n("Enable group scheduling"),
                 &(KOPrefs::instance()->mEnableGroupScheduling),topFrame);
  topLayout->addWidget(mEnableGroupScheduling->checkBox(),8,0);
  connect(mEnableGroupScheduling->checkBox(),SIGNAL(clicked()),
          SLOT(warningGroupScheduling()));
  mEnableProjectView =
      addWidBool(i18n("Enable project view"),
                 &(KOPrefs::instance()->mEnableProjectView),topFrame);
  topLayout->addWidget(mEnableProjectView->checkBox(),9,0);
@@ -370,134 +377,141 @@ void KOPrefsDialog::setupMainTab()
  defaultFormatGroup->groupBox()->hide();
  KPrefsDialogWidRadios *mailClientGroup =
      addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient),
                   topFrame);
  mailClientGroup->addRadio(i18n("KMail"));
  mailClientGroup->addRadio(i18n("Sendmail"));
  topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1);
  KPrefsDialogWidBool *htmlsave =
      addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave),
                 topFrame);
  topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1);
  KPrefsDialogWidRadios *destinationGroup =
      addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination),
                   topFrame);
  destinationGroup->addRadio(i18n("be added to the standard resource"));
  destinationGroup->addRadio(i18n("be asked which resource to use"));
  topLayout->addMultiCellWidget(destinationGroup->groupBox(),13,13,0,1);
  topLayout->setRowStretch(14,1);
  */
 }
 void KOPrefsDialog::setupTimeTab()
 {
    QFrame *topFrame = addPage(i18n("Time"),0,0);
    // DesktopIcon("clock",KIcon::SizeMedium));
  QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
 
  QHBox *dummy = new QHBox(topFrame);
  KPrefsDialogWidTime *dayBegins =
      addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
               dummy);
  //topLayout->addWidget(dayBegins->label(),2,0);
  
  //topLayout->addWidget(dayBegins->spinBox(),2,1);
  topLayout->addMultiCellWidget(dummy,0,0,0,1);
  topLayout->addWidget(new QLabel(i18n("Default appointment time:"),
                       topFrame),1,0);
  mStartTimeSpin = new QSpinBox(0,23,1,topFrame);
  mStartTimeSpin->setSuffix(":00");
  topLayout->addWidget(mStartTimeSpin,1,1);
  topLayout->addWidget(new QLabel(i18n("Def. duration of new app.:"),
                       topFrame),2,0);
  mDefaultDurationSpin = new QSpinBox(0,23,1,topFrame);
  mDefaultDurationSpin->setSuffix(":00");
  topLayout->addWidget(mDefaultDurationSpin,2,1);
  QStringList alarmList;
  alarmList << i18n("1 minute") << i18n("5 minutes") << i18n("10 minutes")
            << i18n("15 minutes") << i18n("30 minutes")<< i18n("1 hour")<< i18n("3 hours")  << i18n("24 hours") ;
  topLayout->addWidget(new QLabel(i18n("Default alarm time:"),topFrame),
                       3,0);
  mAlarmTimeCombo = new QComboBox(topFrame);
  mAlarmTimeCombo->insertStringList(alarmList);
  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;
+  }
  QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
                                               i18n("Working Hours"),
                                               topFrame);
-  topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1);
+  topLayout->addMultiCellWidget(workingHoursGroup,iii,iii,0,1);
  workingHoursGroup->layout()->setSpacing( 0 );
  workingHoursGroup->layout()->setMargin( 4 );
  QHBox *workStartBox = new QHBox(workingHoursGroup);
  // workStartBox->setMargin( 0 );
  addWidTime(i18n("Daily starting hour:"),
             &(KOPrefs::instance()->mWorkingHoursStart),workStartBox);
  QHBox *workEndBox = new QHBox(workingHoursGroup);
  //workEndBox->setMargin( 0 );
  addWidTime(i18n("Daily ending hour:"),
             &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox);
  QVBox *excludeBox  = new QVBox(workingHoursGroup);
  //excludeBox->setMargin( 0 );
  addWidBool(i18n("Exclude holidays"),
             &(KOPrefs::instance()->mExcludeHolidays),excludeBox);
  addWidBool(i18n("Exclude Saturdays"),
             &(KOPrefs::instance()->mExcludeSaturdays),excludeBox);
 //   KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"),
        //      &(KOPrefs::instance()->mMarcusBainsShowSeconds),
        //      topFrame);
 //   topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0);
  // topLayout->setRowStretch(6,1);
 }
 void KOPrefsDialog::setupViewsTab()
 {
    QFrame *topFrame = addPage(i18n("Views"),0,0);
    //  DesktopIcon("viewmag",KIcon::SizeMedium));
  QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
 //   QBoxLayout *dayBeginsLayout = new QHBoxLayout;
 //   topLayout->addLayout(dayBeginsLayout,0,0);
 //   KPrefsDialogWidTime *dayBegins =
 //     addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
 //                topFrame);
 //   dayBeginsLayout->addWidget(dayBegins->label());
 //   dayBeginsLayout->addStretch(1);
 //   dayBeginsLayout->addWidget(dayBegins->spinBox());
 //   QBoxLayout *nextDaysLayout = new QHBoxLayout;
 //   topLayout->addLayout(nextDaysLayout,1,0);
 //   nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame));
 //   mNextXDaysSpin = new QSpinBox(2,14,1,topFrame);
 //   nextDaysLayout->addStretch(1);
 //   nextDaysLayout->addWidget(mNextXDaysSpin);
  int ii = 0; 
  KPrefsDialogWidBool *dummy =
    addWidBool(i18n("Edit item on doubleclick (if not, show)"),
               &(KOPrefs::instance()->mEditOnDoubleClick),topFrame);
  topLayout->addWidget(dummy->checkBox(),ii++,0);
  
 
@@ -641,128 +655,140 @@ void KOPrefsDialog::setupViewsTab()
  QHBox *habo = new QHBox( topFrame );
  if ( QApplication::desktop()->width() <= 480 ) {
      lab = new QLabel ( i18n("Show events that recur "), topFrame );
      topLayout->addMultiCellWidget(lab,ii, ii,0,1);
      ii++;
  } else {
      new QLabel ( i18n("Show events that recur "), habo );
  }
  dailyRecur =
    addWidBool(i18n("daily"),
               &(KOPrefs::instance()->mMonthDailyRecur),habo);
  // topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
  weeklyRecur =
    addWidBool(i18n("weekly"),
               &(KOPrefs::instance()->mMonthWeeklyRecur),habo);
  topLayout->addMultiCellWidget(habo,ii, ii,0,1);
  ii++;
  habo = new QHBox( topFrame ); 
  if ( QApplication::desktop()->width() <= 480 ) {
      lab = new QLabel (i18n("Show in every cell ") , topFrame );
      topLayout->addMultiCellWidget(lab,ii, ii,0,1);
      ii++;
      
  } else {
      new QLabel ( i18n("Show in every cell "), habo );
  }
  weeklyRecur = 
    addWidBool(i18n("short month"),
               &(KOPrefs::instance()->mMonthShowShort),habo);
 weeklyRecur =
    addWidBool(i18n("icons"),
               &(KOPrefs::instance()->mMonthShowIcons),habo);
 weeklyRecur =
     addWidBool(i18n("times"),
                &(KOPrefs::instance()->mMonthShowTimes),habo);
  topLayout->addMultiCellWidget(habo,ii, ii,0,1);
  ii++;
 #ifdef DESKTOP_VERSION
 KPrefsDialogWidBool *enableMonthScroll =
      addWidBool(i18n("Enable scrollbars in month view cells"),
                 &(KOPrefs::instance()->mEnableMonthScroll),topFrame);
  topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0);
 #endif
  dummy =
    addWidBool(i18n("Week view mode uses bigger font"),
               &(KOPrefs::instance()->mMonthViewUsesBigFont),topFrame);
  topLayout->addWidget(dummy->checkBox(),ii++,0);
  dummy =
    addWidBool(i18n("Show Sat/Sun together"),
               &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame);
  topLayout->addWidget(dummy->checkBox(),ii++,0);
 KPrefsDialogWidBool *coloredCategoriesInMonthView =
       addWidBool(i18n("Month view uses category colors"),
                  &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame);
  topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 
  dummy =
    addWidBool(i18n("Category colors are applied to text"),
               &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame);
  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 =
       addWidBool(i18n("Month view uses day colors"),
                  &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame);
  topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
 KPrefsDialogWidColor *holidayColor =
      addWidColor(i18n("Day color odd months"),
                  &(KOPrefs::instance()->mMonthViewOddColor),topFrame);
  topLayout->addWidget(holidayColor->label(),ii,0);
  topLayout->addWidget(holidayColor->button(),ii++,1);
 holidayColor =
      addWidColor(i18n("Day color even months"),
                  &(KOPrefs::instance()->mMonthViewEvenColor),topFrame);
  topLayout->addWidget(holidayColor->label(),ii,0);
  topLayout->addWidget(holidayColor->button(),ii++,1);
 
  holidayColor =
      addWidColor(i18n("Color for Sundays + category \"Holiday\""),
                  &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame);
  topLayout->addWidget(holidayColor->label(),ii,0);
  topLayout->addWidget(holidayColor->button(),ii++,1);
  // *********************** What'sNext View
  topFrame = addPage(i18n("What's Next View"),0,0);
  //  DesktopIcon("viewmag",KIcon::SizeMedium));
  
  topLayout = new QGridLayout(topFrame,4,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
  ii = 0;
  QHBox* hdummy = new QHBox(topFrame);
  new QLabel(i18n("Days in What's Next:"),hdummy);
  mWhatsNextSpin = new QSpinBox(1,14,1,hdummy);
  
  topLayout->addWidget(hdummy,ii++,0);
  QHBox *prioBox = new QHBox(topFrame);
  // intervalBox->setSpacing(mSpacingHint);
  topLayout->addWidget(prioBox,ii++,0);
 
  QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox);
  mPrioSpin = new QSpinBox(0,5,1,prioBox);
  if ( QApplication::desktop()->width() <  300 )
      mPrioSpin->setFixedWidth( 40 );
  KPrefsDialogWidBool *passwdk =
      addWidBool(i18n("Show events that are done"),
                 &(KOPrefs::instance()->mWNViewShowsPast),topFrame);
  topLayout->addWidget(passwdk->checkBox(), ii++,0);
  passwdk =
      addWidBool(i18n("Show parent To-Do's"),
                 &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
  topLayout->addWidget(passwdk->checkBox(), ii++,0);
  
  passwdk =
      addWidBool(i18n("Show location"),
                 &(KOPrefs::instance()->mWNViewShowLocation),topFrame);
  topLayout->addWidget(passwdk->checkBox(), ii++,0);
  
@@ -840,131 +866,135 @@ dummy =
                  &(KOPrefs::instance()->mTodoOverdueColor),wid);
  widLayout->addWidget(todoOverdueColor->label());
  widLayout->addWidget(todoOverdueColor->button());
  topLayout->addWidget(wid,ii++,0);
 dummy =
    addWidBool(i18n("Colors are applied to text"),
               &(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame);
  topLayout->addWidget(dummy->checkBox(),ii++,0);
   topFrame = addPage(i18n("View Options"),0,0);
  topLayout = new QGridLayout(topFrame,4,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
  ii = 0;  
   dummy  =
      addWidBool(i18n("Show Sync Events"),
                 &(KOPrefs::instance()->mShowSyncEvents),topFrame);
  topLayout->addWidget(dummy->checkBox(), ii++,0);
  lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame);
  topLayout->addWidget(lab ,ii++,0);
  dummy = addWidBool(i18n("Details"),
               &(KOPrefs::instance()->mEVshowDetails),topFrame);
  topLayout->addWidget(dummy->checkBox(),ii++,0);
  dummy = addWidBool(i18n("Created time"),
               &(KOPrefs::instance()->mEVshowCreated),topFrame);
  topLayout->addWidget(dummy->checkBox(),ii++,0);
  dummy = addWidBool(i18n("Last modified time"),
               &(KOPrefs::instance()->mEVshowChanged),topFrame);
  topLayout->addWidget(dummy->checkBox(),ii++,0);
  lab = new QLabel( i18n("Show in What'sThis quick overview:"), topFrame);
  topLayout->addWidget(lab ,ii++,0);
  dummy = addWidBool(i18n("Details"),
               &(KOPrefs::instance()->mWTshowDetails),topFrame);
  topLayout->addWidget(dummy->checkBox(),ii++,0);
  dummy = addWidBool(i18n("Created time"),
               &(KOPrefs::instance()->mWTshowCreated),topFrame);
  topLayout->addWidget(dummy->checkBox(),ii++,0);
  dummy = addWidBool(i18n("Last modified time"),
               &(KOPrefs::instance()->mWTshowChanged),topFrame);
  topLayout->addWidget(dummy->checkBox(),ii++,0);
   topFrame = addPage(i18n("Alarm"),0,0);
    //  DesktopIcon("viewmag",KIcon::SizeMedium));
  topLayout = new QGridLayout(topFrame,2,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
  int iii = 0;
 dummy =
    addWidBool(i18n("Use internal alarm notification"),
               &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame);
  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
    lab->setAlignment( AlignLeft|WordBreak|AlignTop);
 #else
    lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
    lab->setSizePolicy( QSizePolicy(  QSizePolicy::Ignored , QSizePolicy::Ignored,true) );
 #endif
 
    QHBox* dummyBox = new QHBox(topFrame);
    new QLabel(i18n("Play beeps count:"),dummyBox);
    mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox);
    topLayout->addWidget(dummyBox,iii++,0);
    dummyBox = new QHBox(topFrame);
    new QLabel(i18n("Beeps interval in sec:"),dummyBox);
    mAlarmBeepInterval = new QSpinBox(1,600,1,dummyBox);
    topLayout->addWidget(dummyBox,iii++,0);
    dummyBox = new QHBox(topFrame);
    new QLabel(i18n("Default suspend time in min:"),dummyBox);
    mAlarmSuspendTime = new QSpinBox(1,600,1,dummyBox);
    topLayout->addWidget(dummyBox,iii++,0);
    dummyBox = new QHBox(topFrame);
    new QLabel(i18n("Auto suspend count:"),dummyBox);
    mAlarmSuspendCount = new QSpinBox(0,60,1,dummyBox);
    topLayout->addWidget(dummyBox,iii++,0);
    QHBox* hbo = new QHBox ( topFrame );
    mDefaultAlarmFile = new QLineEdit(hbo);
    QPushButton * loadTemplate = new QPushButton(hbo); 
    QPixmap icon;
    if ( QApplication::desktop()->width() < 321 ) 
        icon = SmallIcon("fileimport16");
    else
        icon = SmallIcon("fileimport");
    loadTemplate->setIconSet (icon ) ; 
    connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( selectSoundFile() ) );
    int size = loadTemplate->sizeHint().height();
    loadTemplate->setFixedSize(  size, size );
  //lab = new QLabel( i18n("This setting is useless for 5500 user!"), topFrame);
  // topLayout->addWidget(lab ,iii++,0);
   lab = new QLabel( i18n("Alarm *.wav file for newly created alarm:"), topFrame);
   topLayout->addWidget(lab ,iii++,0);
   topLayout->addWidget(hbo,iii++,0);
  //  lab = new QLabel( i18n("Note: This does not mean, that for every alarm this file is replayed. This file here is associated with a newly created alarm."), topFrame);
 //    topLayout->addWidget(lab ,iii++,0);
 // #ifndef DESKTOP_VERSION
 //     lab->setAlignment( AlignLeft|WordBreak|AlignTop);
 // #else
 //     lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
 //     lab->setSizePolicy( QSizePolicy(  QSizePolicy::Ignored , QSizePolicy::Ignored,true) );
 // #endif
 
 }
 void KOPrefsDialog::selectSoundFile()
 {
    QString fileName = mDefaultAlarmFile->text();
    fileName = KFileDialog::getSaveFileName(  mDefaultAlarmFile->text() , "Choose default alarm file", this );
     if ( fileName.length() > 0 )
@@ -1103,128 +1133,140 @@ void KOPrefsDialog::setupFontsTab()
  topLayout->setColStretch(1,1);
  topLayout->setRowStretch(4,1);
 }
 void KOPrefsDialog::setupColorsTab()
 {
    QFrame *topFrame = addPage(i18n("Colors"),0,0);
    //  DesktopIcon("colorize",KIcon::SizeMedium));
  QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
  // topLayout->setSpacing(mSpacingHint);
  // topLayout->setMargin(mMarginHint);
  topLayout->setSpacing(2);
  topLayout->setMargin(3);
  int ii = 1;
  QGroupBox *categoryGroup ;
  categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"),
                                           topFrame);
  topLayout->addMultiCellWidget(categoryGroup,0,0,0,1);
  mCategoryCombo = new QComboBox(categoryGroup);
  mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories);
  connect(mCategoryCombo,SIGNAL(activated(int)),SLOT(updateCategoryColor()));
   
  mCategoryButton = new KColorButton(categoryGroup);
  connect(mCategoryButton,SIGNAL(changed(const QColor &)),SLOT(setCategoryColor()));
  updateCategoryColor();
  // Holiday Color
  KPrefsDialogWidColor *holidayColor =
      addWidColor(i18n("Holiday color:"),
                  &(KOPrefs::instance()->mHolidayColor),topFrame);
  topLayout->addWidget(holidayColor->label(),ii,0);
  topLayout->addWidget(holidayColor->button(),ii++,1);
  // Highlight Color
  KPrefsDialogWidColor *highlightColor =
      addWidColor(i18n("Highlight color:"),
                  &(KOPrefs::instance()->mHighlightColor),topFrame);
  topLayout->addWidget(highlightColor->label(),ii,0);
  topLayout->addWidget(highlightColor->button(),ii++,1);
  // Event color
  KPrefsDialogWidColor *eventColor =
      addWidColor(i18n("Default event color:"),
                  &(KOPrefs::instance()->mEventColor),topFrame);
  topLayout->addWidget(eventColor->label(),ii,0);
  topLayout->addWidget(eventColor->button(),ii++,1);
  eventColor =
      addWidColor(i18n("Default todo done color:"),
                  &(KOPrefs::instance()->mTodoDoneColor),topFrame);
  topLayout->addWidget(eventColor->label(),ii,0);
  topLayout->addWidget(eventColor->button(),ii++,1);
+  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);
+  }
+  
  // agenda view background color
  KPrefsDialogWidColor *agendaBgColor =
      addWidColor(i18n("Agenda view background color:"),
                  &(KOPrefs::instance()->mAgendaBgColor),topFrame);
  topLayout->addWidget(agendaBgColor->label(),ii,0);
  topLayout->addWidget(agendaBgColor->button(),ii++,1);
  // working hours color
  KPrefsDialogWidColor *workingHoursColor =
      addWidColor(i18n("Working hours color:"),
                  &(KOPrefs::instance()->mWorkingHoursColor),topFrame);
  topLayout->addWidget(workingHoursColor->label(),ii,0);
  topLayout->addWidget(workingHoursColor->button(),ii++,1);
  KPrefsDialogWidBool *sb =
           addWidBool(i18n("Use colors for application:"),
                      &(KOPrefs::instance()->mUseAppColors),topFrame);
       topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 );
       ii++;
    KPrefsDialogWidColor *   workingHoursColor1 =
           addWidColor(i18n("Buttons, menus, etc.:"),
                       &(KOPrefs::instance()->mAppColor1),topFrame);
       topLayout->addWidget(workingHoursColor1->label(),ii,0);
       topLayout->addWidget(workingHoursColor1->button(),ii++,1);
       
      KPrefsDialogWidColor *   workingHoursColor2 =
           addWidColor(i18n("Frames, labels, etc.:"),
                       &(KOPrefs::instance()->mAppColor2),topFrame);
       topLayout->addWidget(workingHoursColor2->label(),ii,0);
       topLayout->addWidget(workingHoursColor2->button(),ii++,1);
  
 }
 void KOPrefsDialog::setCategoryColor()
 {
  mCategoryDict.replace(mCategoryCombo->currentText(), new QColor(mCategoryButton->color()));
 }
 void KOPrefsDialog::updateCategoryColor()
 {
  QString cat = mCategoryCombo->currentText();
  QColor *color = mCategoryDict.find(cat);
  if (!color) {
    color = KOPrefs::instance()->categoryColor(cat);
  }
  if (color) {
    mCategoryButton->setColor(*color);
  }
 }
 void KOPrefsDialog::setupPrinterTab()
 {
  mPrinterTab = addPage(i18n("Printing"),0,
                        DesktopIcon("fileprint",KIcon::SizeMedium));
  QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
  topLayout->setRowStretch(4,1);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 2c04852..0cb0bce 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -564,129 +564,129 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
            mView->viewManager()->showWeekView();
        }
        else if ( msg == "-showTodo" ) {
            mView->viewManager()->showTodoView();
        }
        else if ( msg == "-showJournal"  ) {
            mView->dateNavigator()->selectDates( 1 );
            mView->dateNavigator()->selectToday();
            mView->viewManager()->showJournalView();
        }
        else if ( msg == "-showKO" ) {
            mView->viewManager()->showNextXView();
        }
        else if ( msg == "-showWNext"  ) {
            mView->viewManager()->showWhatsNextView();
        }
        else if ( msg == "nextView()" ) {
            mView->viewManager()->showNextView();
        }
        else if ( msg == "-showNextXView" ) {
            mView->viewManager()->showNextXView();
        }
    }
    showMaximized();
    raise();
 }
 QPixmap MainWindow::loadPixmap( QString name )
 {
    return SmallIcon( name );
 }
 void MainWindow::setUsesBigPixmaps ( bool b )
 {
    qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b);
    if ( b )
        qDebug("KO: BigPixmaps are not supported ");
 }
 void MainWindow::initActions()
 {
    //KOPrefs::instance()->mShowFullMenu
    iconToolBar->clear();
    KOPrefs *p = KOPrefs::instance();
    //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
    QPopupMenu *viewMenu = new QPopupMenu( this );
    QPopupMenu *actionMenu = new QPopupMenu( this );
    QPopupMenu *importMenu = new QPopupMenu( this );
    QPopupMenu *importMenu_X = new QPopupMenu( this );
    QPopupMenu *exportMenu_X = new QPopupMenu( this );
    QPopupMenu *beamMenu_X = new QPopupMenu( this );
    selectFilterMenu = new QPopupMenu( this );
    selectFilterMenu->setCheckable( true );
    syncMenu = new QPopupMenu( this );
    configureAgendaMenu = new QPopupMenu( this );
    configureToolBarMenu = new QPopupMenu( this );
    QPopupMenu *helpMenu = new QPopupMenu( this );
    QIconSet icon;
    int pixWid = 22, pixHei = 22;
    QString pathString = "";
    if ( !p->mToolBarMiniIcons ) {
-        if ( QApplication::desktop()->width() < 480 ) {
+        if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) {
            pathString += "icons16/";
            pixWid = 18; pixHei = 16;
        }
    } else {
        pathString += "iconsmini/";
        pixWid = 18; pixHei = 16;
    }
    if ( KOPrefs::instance()->mShowFullMenu ) {
        QMenuBar *menuBar1;
        menuBar1 = menuBar();
        menuBar1->insertItem( i18n("File"), importMenu );
        menuBar1->insertItem( i18n("View"), viewMenu );
        menuBar1->insertItem( i18n("Actions"), actionMenu );
 #ifdef DESKTOP_VERSION
        menuBar1->insertItem( i18n("Synchronize"), syncMenu );
        menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
 #else
        menuBar1->insertItem( i18n("Sync"), syncMenu );
        menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu  );
 #endif
        //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
        menuBar1->insertItem( i18n("Filter"),selectFilterMenu  );
        menuBar1->insertItem( i18n("Help"), helpMenu );
    } else {
        QPEMenuBar *menuBar1;
        menuBar1 = new QPEMenuBar( iconToolBar );
        QPopupMenu *menuBar = new QPopupMenu( this );
        icon = loadPixmap( pathString + "z_menu" );
        menuBar1->insertItem( icon.pixmap(), menuBar);
        //menuBar1->insertItem( i18n("ME"), menuBar);
        menuBar->insertItem( i18n("File"), importMenu );
        menuBar->insertItem( i18n("View"), viewMenu );
        menuBar->insertItem( i18n("Actions"), actionMenu );
        menuBar->insertItem( i18n("Synchronize"), syncMenu );
        menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
        menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
        menuBar->insertItem( i18n("Filter"),selectFilterMenu  );
        menuBar->insertItem( i18n("Help"), helpMenu );
        //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
        menuBar1->setMaximumSize( menuBar1->sizeHint( ));
    }
    connect ( selectFilterMenu, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
    connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );
   
    mWeekBgColor = iconToolBar->backgroundColor();
    mWeekPixmap.resize( pixWid , pixHei );
    mWeekPixmap.fill( mWeekBgColor );
    icon = mWeekPixmap;
    mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
    if ( p-> mShowIconWeekNum )
        mWeekAction->addTo( iconToolBar );
    mWeekFont = font();
    int fontPoint = mWeekFont.pointSize();
    QFontMetrics f( mWeekFont );
    int fontWid =  f.width( "30" );
    while ( fontWid > pixWid ) {
        --fontPoint;
        mWeekFont.setPointSize( fontPoint );
        QFontMetrics f( mWeekFont );
        fontWid =  f.width( "30" );
        //qDebug("dec-- ");
    }
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index ef2fc1c..7b3b543 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -9,194 +9,211 @@
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlistview.h>
 #include <qwhatsthis.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <libkdepim/kdateedit.h>
 #include "koglobals.h"
 #include "koprefs.h"
 #include "klineedit.h"
 #include "calendarview.h"
 #include "koviewmanager.h"
 #include "searchdialog.h"
 SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
    : QVBox( 0  )
 {
    mCalendar = calendar;
    QFrame *topFrame = new QFrame( this ) ;//plainPage();
    QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint());
    // Search expression
    QHBoxLayout *subLayout = new QHBoxLayout();
    layout->addLayout(subLayout);
    /*
    searchLabel = new QLabel(topFrame);
    searchLabel->setText(i18n("Search for:"));
    subLayout->addWidget(searchLabel);
    */
    QPushButton *OkButton = new QPushButton(  i18n("Search for:"), topFrame );
    //OkButton->setDefault( true );
    connect(OkButton,SIGNAL(clicked()),SLOT(doSearch()));
    subLayout->addWidget(OkButton);
    searchEdit = new KLineEdit(topFrame);
    subLayout->addWidget(searchEdit);
    mAddItems = new QCheckBox(i18n("Add items"),topFrame);
    subLayout->addWidget(mAddItems);
+    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
    searchEdit->setFocus();
    connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & )));
    connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch()));
    // Subjects to search
    // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"),
    //                                        topFrame);
-    QHBox *incidenceGroup = new QHBox( topFrame );
+    incidenceGroup = new QHBox( topFrame );
    layout->addWidget(incidenceGroup);
    mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup);
    //mSearchEvent->setChecked(true);
    mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup);
    mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup);
-    QHBox *subjectGroup = new QHBox( topFrame );
+    subjectGroup = new QHBox( topFrame );
    layout->addWidget(subjectGroup);
    mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup);
    mSummaryCheck->setChecked(true);
    mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup);
    mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup);
-    QHBox *attendeeGroup = new QHBox( topFrame );
+    attendeeGroup = new QHBox( topFrame );
    layout->addWidget(attendeeGroup );
    new QLabel( i18n("Attendee:"),attendeeGroup );
    mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup  );
    mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup );
    // Date range
    // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"),
    //                                    topFrame);
    // layout->addWidget(rangeGroup);
    QWidget *rangeWidget = new QWidget(topFrame);
    QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint());
    rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget));
    mStartDate = new KDateEdit(rangeWidget);
    rangeLayout->addWidget(mStartDate);
    rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget));
    mEndDate = new KDateEdit(rangeWidget);
    mEndDate->setDate(QDate::currentDate().addDays(365));
    rangeLayout->addWidget(mEndDate);
    QToolButton *wt = QWhatsThis::whatsThisButton (  rangeWidget );
    rangeLayout->addWidget( (QWidget*)wt );
    layout->addWidget(rangeWidget);
    // Results list view
    listView = new KOListView(mCalendar,topFrame);
    layout->addWidget(listView);
    //layout->setStretchFactor( listView, 333 );
    //listView->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::Expanding) );
    //listView->setMaximumHeight( 50 );
    listView->readSettings(KOGlobals::config(),"SearchListView Layout");
    connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList()));
    setCaption( i18n("KO/Pi Find: "));
 #ifdef DESKTOP_VERSION
    OkButton = new QPushButton(  i18n("Close"), this  );
    connect(OkButton,SIGNAL(clicked()),SLOT(hide()));
 #endif
 }
 SearchDialog::~SearchDialog()
 {
  
 }
+void SearchDialog::toggleCheckboxes()
+{
+    if ( incidenceGroup->isVisible() ) {
+        incidenceGroup->hide() ;
+        subjectGroup->hide() ;
+        attendeeGroup->hide() ;
+    } else {
+        incidenceGroup->show() ;
+        subjectGroup->show() ;
+        attendeeGroup->show() ;
+    }
+}
 void SearchDialog::raiseAndSelect()
 {
    static int currentState = 0;
    if ( !mSearchJournal->isChecked() && !mSearchTodo->isChecked()  && !mSearchEvent->isChecked() )
        currentState = 0;
    int newState = 0;
    if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
        newState = VIEW_J_VIEW;
    }
    else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
        newState = VIEW_T_VIEW;
    }
    else {
        newState = VIEW_A_VIEW;
    }
    if ( newState != currentState ) {
        if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
            if ( ! mSearchJournal->isChecked() ) {
                mSearchJournal->setChecked( true );
                mSearchTodo->setChecked( false );
                mSearchEvent->setChecked( false );
            }
        }
        else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
            if ( !  mSearchTodo->isChecked()    ) {
                mSearchTodo->setChecked( true );
                mSearchJournal->setChecked( false );
                mSearchEvent->setChecked( false );
            }
        }
        else {
            if ( ! mSearchEvent->isChecked() ) {
                mSearchEvent->setChecked( true );
                mSearchJournal->setChecked( false );
                mSearchTodo->setChecked( false );
            }
        }
    }
    currentState = newState;
    raise();
 }
 void SearchDialog::setFocusToList()
 {
    listView->resetFocus();
 }
 void SearchDialog::accept()
 {
    doSearch();
 }
 void SearchDialog::updateList()
 {
    //listView->updateList();
    if ( isVisible() ) {
        updateView();
        //qDebug("SearchDialog::updated ");
    }
    else {
        listView->clear();
        //qDebug("SearchDialog::cleared ");
    }
 }
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index 11ad2f0..b345b98 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -1,96 +1,99 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 1998 Preston Brown
    Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef SEARCHDIALOG_H
 #define SEARCHDIALOG_H
 #include <qregexp.h>
 #include <kdialogbase.h>
 #include <qvbox.h>
 #include <libkcal/calendar.h>
 #include "kolistview.h"
 class KDateEdit;
 class QCheckBox;
 class QLineEdit;
 class KLineEdit;
 class QLabel;
 class CalendarView;
 using namespace KCal;
 class SearchDialog : public  QVBox 
 {
    Q_OBJECT
  public:
    SearchDialog(Calendar *calendar,CalendarView *parent=0);
    virtual ~SearchDialog();
    KOListView *listview(){ return listView;}
    void updateView();
    void raiseAndSelect();
  public slots:
    void changeEventDisplay(Event *, int) { updateView(); } 
  void updateConfig();
  void updateList();
  protected slots:
  void setFocusToList();
    void  accept();
    void doSearch();
            void searchTextChanged( const QString &_text );
+    void toggleCheckboxes();
  signals:
    void showEventSignal(Event *);
    void editEventSignal(Event *);
    void deleteEventSignal(Event *);
  private:
+    QHBox *incidenceGroup ,*subjectGroup ,*attendeeGroup;
    void search(const QRegExp &);
    Calendar *mCalendar;
    
    QPtrList<Event> mMatchedEvents;
    QPtrList<Todo> mMatchedTodos;
    QPtrList<Journal> mMatchedJournals;
    
    QLabel *searchLabel;
    KLineEdit *searchEdit;
    KOListView *listView;
    
    KDateEdit *mStartDate;
    KDateEdit *mEndDate;
    QCheckBox *mSummaryCheck;
    QCheckBox *mDescriptionCheck;
    QCheckBox *mCategoryCheck;
    QCheckBox *mSearchEvent;
    QCheckBox *mSearchTodo;
    QCheckBox *mSearchJournal;
    QCheckBox *mSearchAName;
    QCheckBox *mSearchAEmail;
    QCheckBox *mAddItems;
    void keyPressEvent ( QKeyEvent *e) ;
 };
 #endif
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
@@ -115,332 +115,339 @@ KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent,
  setupBackupTab();
 }
 void KDEPIMConfigWidget::showTimeZoneTab()
 {
    tabWidget->setCurrentPage ( 3 ) ;
 }
 void KDEPIMConfigWidget::setupBackupTab()
 {
    QVBox *colorPage = new QVBox( this );
    tabWidget->addTab( colorPage, i18n( "Backup" ) );
    QWidget* topFrame = new QWidget( colorPage ); 
    QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
    KPrefsWidBool *sb = addWidBool(i18n("Backup enabled"),
                      &(KPimGlobalPrefs::instance()->mBackupEnabled),topFrame);
    topLayout->addWidget((QWidget*)sb->checkBox());
    QWidget* bupFrame = new QWidget( topFrame ); 
    topLayout->addWidget((bupFrame));
    QObject::connect ( sb->checkBox(), SIGNAL (toggled ( bool ) ), bupFrame, SLOT ( setEnabled( bool ) ) );
    QVBoxLayout *bupLayout = new QVBoxLayout(bupFrame);
    sb = addWidBool(i18n("Use standard backup dir"),
                      &(KPimGlobalPrefs::instance()->mBackupUseDefaultDir),bupFrame);
    bupLayout->addWidget((QWidget*)sb->checkBox());
    mBackupUrl = new KURLRequester( bupFrame );
    mBackupUrl->setURL( KGlobalSettings::backupDataDir() );
    QObject::connect ( sb->checkBox(), SIGNAL (toggled ( bool ) ), mBackupUrl ,SLOT ( setDisabled( bool ) ) );
    bupLayout->addWidget( mBackupUrl );
    mBackupUrl->setEnabled( !KPimGlobalPrefs::instance()->mBackupUseDefaultDir );
    bupFrame->setEnabled( KPimGlobalPrefs::instance()->mBackupEnabled );
    QHBox *dummy = new QHBox(bupFrame);
    new QLabel(i18n("Number of Backups:"),dummy);
    mBackupNumbersSpin = new QSpinBox(1,21,1,dummy);
    new QLabel(i18n(" "),dummy);
    bupLayout->addWidget( dummy );
    dummy = new QHBox(bupFrame);
    new QLabel(i18n("Make backup every "),dummy);
    mBackupDayCountSpin = new QSpinBox(1,28,1,dummy);
    new QLabel(i18n(" days"),dummy);
    new QLabel(i18n(" "),dummy);
    bupLayout->addWidget( dummy ); 
    QString localKdeDir;
    localKdeDir = readEnvPath("LOCALMICROKDEHOME");
    if ( ! localKdeDir.isEmpty() ) {
        sb->checkBox()->setEnabled( false );
        sb->checkBox()->setChecked( true );
        mBackupUrl->setEnabled( false );
        KPimGlobalPrefs::instance()->mBackupUseDefaultDir = true;
    }
 }
 void KDEPIMConfigWidget::setupStoreTab()
 {
    QVBox *colorPage = new QVBox( this );
    tabWidget->addTab( colorPage, i18n( "Colors" ) );
    QWidget* cw = new QWidget( colorPage ); 
    KPrefsWidColor *holidayColor =
      addWidColor(i18n("Alternating background of list views"),
                  &(KPimGlobalPrefs::instance()->mAlternateColor),cw);
    QHBoxLayout *topLayout = new QHBoxLayout(cw);
    topLayout->addWidget(holidayColor->label());
    topLayout->addWidget( (QWidget* )holidayColor->button());
-    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  );
    new QLabel( i18n("<b>New data storage dir:</b>"), storePage );
    mStoreUrl = new KURLRequester( storePage );
    mStoreUrl->setURL( KGlobal::dirs()->localkdedir() );
 #ifdef DESKTOP_VERSION     
    QString confFile = qApp->applicationDirPath ()+ "/.microkdehome" ;
    QFileInfo fi ( confFile );
    if ( fi.exists() ) {
        KConfig cfg (   confFile );
        cfg.setGroup("Global");
        QString localKdeDir = cfg.readEntry( "MICROKDEHOME", "x_x_x" );
        if ( localKdeDir != "x_x_x" ) {
            mStoreUrl->setURL( localKdeDir );
            qDebug("Reading config from %s ", confFile.latin1());
        }
    }
               
 #endif
    new QLabel( i18n("New dirs are created automatically"), storePage  );
    QHBox *bb = new QHBox( storePage );
    QPushButton * pb;
    if ( QApplication::desktop()->width() < 640 )
        pb = new QPushButton ( i18n("Save"), bb  );
    else
        pb = new QPushButton ( i18n("Save settings"), bb  );
    connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) );
    pb = new QPushButton ( i18n("Save standard"), bb  );
    connect(pb, SIGNAL( clicked() ), this, SLOT ( setStandardStore() ) );
 #ifdef DESKTOP_VERSION
    pb = new QPushButton ( i18n("Save using LOCAL storage"), bb  );
    connect(pb, SIGNAL( clicked() ), this, SLOT ( setLocalStore() ) );
 #endif
    new QLabel( i18n("<b>New settings are used\nafter a restart</b>"), storePage );
    new QLabel( i18n("Settings are stored in\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage  );
    tabWidget->addTab( storePage, i18n( "Data storage path" ) );
 }
 void KDEPIMConfigWidget::setLocalStore()
 {
    mStoreUrl->setURL(  "LOCAL:kdepimpi"  );
    saveStoreSettings();
    QString message = i18n("'LOCAL' mode makes is possible to run\nKA/Pi and KO/Pi from a USB memory stick.\nIn LOCAL mode the data is stored\nin a path relative to the executable.\nNote, that in LOCAL mode only addressbook\nresource files in\n <path of the executable>/<dirname after LOCAL:>/apps/kabc/*.vcf\n are supported.\nIf you use the standard addressbook settings\nyou do not have to reconfigure any path,\njust restart the application and import\nyour addressbook and calendar data.");
    KMessageBox::information( this, message);
 }
 void KDEPIMConfigWidget::setStandardStore()
 {
    mStoreUrl->setURL(  QDir::homeDirPath() + "/kdepim"  );
    saveStoreSettings();
 }
 void KDEPIMConfigWidget::saveStoreSettings()
 {
    if ( !mStoreUrl->url().isEmpty() ) {
        QString path = QDir::homeDirPath();
        QString url = mStoreUrl->url();
 #ifdef DESKTOP_VERSION
        if ( url.startsWith( "LOCAL:" ) ) {
            path = qApp->applicationDirPath () ;
        }
 #endif
        KConfig cfg (   path + "/.microkdehome" );
        cfg.setGroup("Global");
        cfg.writeEntry( "MICROKDEHOME", url ); 
        qDebug("cfg.writeEntry( MICROKDEHOME, %s  ", url.latin1());
        cfg.sync();
    } else {
        mStoreUrl->setURL(  QDir::homeDirPath() + "/kdepim"  );
        saveStoreSettings();
    }
 }
 void KDEPIMConfigWidget::setupExternalAppTab()
 {
  QWidget *externalAppsPage = new QWidget( this );
  QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(),
                                            KDialog::spacingHintSmall() );
  mExternalApps = new QComboBox( externalAppsPage );
  QMap<ExternalAppHandler::Types, QString>::Iterator it;
  for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it )
    mExternalApps->insertItem( it.data(), it.key() );
  layout->addWidget( mExternalApps );
  connect( mExternalApps, SIGNAL( activated( int ) ),
           this, SLOT (externalapp_changed( int ) ) );
  mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage );
  QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2,    -1, "gridlayout" );
  mExternalAppGroupBox->layout()->setMargin(4);
  mClient = new QComboBox( mExternalAppGroupBox );
  boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 );
  connect( mClient, SIGNAL( activated( int ) ),
           this, SLOT (client_changed( int ) ) );
  QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox);
  boxLayout->addWidget( lab, 1, 0 );
  mChannel = new QLineEdit(mExternalAppGroupBox);
  mChannel->setReadOnly(true);
  boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 );
  lab = new QLabel( i18n("Message:"), mExternalAppGroupBox);
  boxLayout->addWidget( lab, 3, 0 );
  mMessage = new QLineEdit(mExternalAppGroupBox);
  mMessage->setReadOnly(true);
  boxLayout->addWidget( mMessage , 4, 0);
  lab = new QLabel( i18n("Parameters:"), mExternalAppGroupBox);
  boxLayout->addWidget( lab, 3, 1 );
  mParameters = new QLineEdit(mExternalAppGroupBox);
  mParameters->setReadOnly(true);
  boxLayout->addWidget( mParameters, 4, 1 );
+      lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox);
-  lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox);
+      boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 );
-  boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 );
+  if (  QApplication::desktop()->height() > 240 ) {
-  lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
+      lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
-  boxLayout->addWidget( lab, 6, 0 );
+      boxLayout->addWidget( lab, 6, 0 );
-  mMessage2 = new QLineEdit(mExternalAppGroupBox);
+      mMessage2 = new QLineEdit(mExternalAppGroupBox);
-  mMessage2->setReadOnly(true);
+      mMessage2->setReadOnly(true);
-  boxLayout->addWidget( mMessage2 , 7, 0);
+      boxLayout->addWidget( mMessage2 , 7, 0);
-  lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox);
+      lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox);
-  boxLayout->addWidget( lab, 6, 1 );
+      boxLayout->addWidget( lab, 6, 1 );
-  mParameters2 = new QLineEdit(mExternalAppGroupBox);
+      mParameters2 = new QLineEdit(mExternalAppGroupBox);
-  mParameters2->setReadOnly(true);
+      mParameters2->setReadOnly(true);
-  boxLayout->addWidget( mParameters2, 7, 1 );
+      boxLayout->addWidget( mParameters2, 7, 1 );
-  lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox);
+      lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox);
-  boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 );
+      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 & ))  );
  layout->addWidget( mExternalAppGroupBox );
  tabWidget->addTab( externalAppsPage, i18n( "External Apps." ) );
 }
  
 void KDEPIMConfigWidget::setupLocaleDateTab()
 {
  QWidget *topFrame = new QWidget( this );
  QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2);
   topLayout->setSpacing(KDialog::spacingHintSmall());
   topLayout->setMargin(KDialog::marginHintSmall());  
   int iii = 0;
   
   KPrefsWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Date Format:"),&(KPimGlobalPrefs::instance()->mPreferredDate),topFrame);
   QString format;
   if ( QApplication::desktop()->width() < 480 )
       format = "(%d.%m.%Y)";
   else 
       format = "(%d.%m.%Y|%A %d %B %Y)";
   syncPrefsGroup->addRadio(i18n("24.03.2004 "+format));
   if ( QApplication::desktop()->width() < 480 )
       format = "(%m.%d.%Y)";
   else 
       format = "(%m.%d.%Y|%A %B %d %Y)";
   syncPrefsGroup->addRadio(i18n("03.24.2004 "+format));
   if ( QApplication::desktop()->width() < 480 )
       format = "(%Y-%m-%d)";
   else 
       format = "(%Y-%m-%d|%A %Y %B %d)";
   syncPrefsGroup->addRadio(i18n("2004-03-24 "+format));
   syncPrefsGroup->addRadio(i18n("User defined"));
   if ( QApplication::desktop()->width() < 480 ) {
       syncPrefsGroup->groupBox()->layout()->setMargin( 5 );
       syncPrefsGroup->groupBox()->layout()->setSpacing( 0 );
   }  
   topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1);
   ++iii;   
   ++iii;
   QLabel * lab;
   mUserDateFormatLong = new QLineEdit(topFrame);
   lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame);
   topLayout->addWidget(lab ,iii,0);
   topLayout->addWidget(mUserDateFormatLong,iii,1);
   ++iii;
   mUserDateFormatShort = new QLineEdit(topFrame);
   lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame);
   topLayout->addWidget(lab ,iii,0);
   topLayout->addWidget(mUserDateFormatShort,iii,1);
   ++iii;
   lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame);
   topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
   ++iii;
-   lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
+   //qDebug(" QApplication::desktop()->height()xx %d ",  QApplication::desktop()->height() ); 
-   topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
+   if (  QApplication::desktop()->height() > 240 ) {
-   ++iii;  
+       lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
-   lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
+       topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
-   topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
+       ++iii;  
-   ++iii;
+       lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
+       topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
+       ++iii;
+   }
  connect( mUserDateFormatLong, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
  connect( mUserDateFormatShort, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
   tabWidget->addTab( topFrame, i18n( "Date Format" ) );
 }
 void KDEPIMConfigWidget::setupLocaleTab()
 {
  QWidget *topFrame = new QWidget( this );
   QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
   topLayout->setSpacing(KDialog::spacingHint());
   topLayout->setMargin(KDialog::marginHint());  
   int iii = 0;
 KPrefsWidRadios *syncPrefsGroup =
      addWidRadios(i18n("Language:(needs restart)"),&(KPimGlobalPrefs::instance()->mPreferredLanguage),topFrame);
   syncPrefsGroup->addRadio(i18n("English"));
   syncPrefsGroup->addRadio(i18n("German")); 
   syncPrefsGroup->addRadio(i18n("French")); 
   syncPrefsGroup->addRadio(i18n("Italian")); 
   syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 
   if (  QApplication::desktop()->width() <  300   ) {
       syncPrefsGroup->groupBox()->layout()->setMargin( 5 );
       syncPrefsGroup->groupBox()->layout()->setSpacing( 0 );
   }
   topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1);
   ++iii;   
 
   tabWidget->addTab( topFrame, i18n( "Language" ) );
   topFrame = new QWidget( this );
   topLayout = new QGridLayout(topFrame,4,2);
   
   topLayout->setSpacing(KDialog::spacingHint());
   topLayout->setMargin(KDialog::marginHint());  
   iii = 0;
   syncPrefsGroup =
       addWidRadios(i18n("Time Format(nr):"),&(KPimGlobalPrefs::instance()->mPreferredTime),topFrame);
   if (  QApplication::desktop()->width() >  300   )
       syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical);
   syncPrefsGroup->addRadio(i18n("24:00"));
   syncPrefsGroup->addRadio(i18n("12:00am"));
   syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical);
   topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
   ++iii;   
   KPrefsWidBool *sb = addWidBool(i18n("Week starts on Sunday"),
                      &(KPimGlobalPrefs::instance()->mWeekStartsOnSunday),topFrame);
   topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1);
   ++iii;   
   tabWidget->addTab( topFrame, i18n( "Time Format" ) );
 }
 void KDEPIMConfigWidget::setupTimeZoneTab()
 {
    QWidget *topFrame;
    QGridLayout *topLayout ;
@@ -567,300 +574,314 @@ void KDEPIMConfigWidget::externalapp_changed( int newApp )
    case(ExternalAppHandler::SIP):
      mCurrentClient = mSipClient;
      break;
    default:
      return;
  }
  // and at last update the widgets
  updateClientWidgets();
 }
 void KDEPIMConfigWidget::client_changed( int newClient )
 {
  if (newClient == mCurrentClient)
    return;
  // first store the current data
  saveEditFieldSettings();
  //then reset the clientvariable
  mCurrentClient = newClient;
  // and at last update the widgets
  updateClientWidgets();
  KPrefsWidget::modified();
 }
 void KDEPIMConfigWidget::saveEditFieldSettings()
 {
  switch(mCurrentApp)
  {
    case(ExternalAppHandler::EMAIL):
      mEmailClient = mClient->currentItem();
      break;
    case(ExternalAppHandler::PHONE):
      mPhoneClient= mClient->currentItem();
      break;
    case(ExternalAppHandler::SMS):
      mSMSClient = mClient->currentItem();
      break;
    case(ExternalAppHandler::FAX):
      mFaxClient = mClient->currentItem();
      break;
    case(ExternalAppHandler::PAGER):
      mPagerClient = mClient->currentItem();
      break;
    case(ExternalAppHandler::SIP):
      mSipClient = mClient->currentItem();
      break;
    default:
      return;
  }
  //store the current data back to the apropriate membervariables if we had set it to "other"
  if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC))
  {
    mEmailOtherChannel = mChannel->text();
    mEmailOtherMessage = mMessage->text();
    mEmailOtherMessageParameters = mParameters->text();
-    mEmailOtherMessage2 = mMessage2->text();
+    if ( mMessage2 )
-    mEmailOtherMessageParameters2 = mParameters2->text();
+        mEmailOtherMessage2 = mMessage2->text();   
+    if ( mParameters2 )
+        mEmailOtherMessageParameters2 = mParameters2->text();
  }
  else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
  {
    mPhoneOtherChannel = mChannel->text();
    mPhoneOtherMessage = mMessage->text();
    mPhoneOtherMessageParameters = mParameters->text();
  }
  else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC))
  {
    mSMSOtherChannel = mChannel->text();
    mSMSOtherMessage = mMessage->text();
    mSMSOtherMessageParameters = mParameters->text();
  }
  else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
  {
    mFaxOtherChannel = mChannel->text();
    mFaxOtherMessage = mMessage->text();
    mFaxOtherMessageParameters = mParameters->text();
  }
  else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
  {
    mPagerOtherChannel = mChannel->text();
    mPagerOtherMessage = mMessage->text();
    mPagerOtherMessageParameters = mParameters->text();
  }
  else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC))
  {
    mSipOtherChannel = mChannel->text();
    mSipOtherMessage = mMessage->text();
    mSipOtherMessageParameters = mParameters->text();
  }
 }
 void KDEPIMConfigWidget::updateClientWidgets()
 {
  bool blocked = signalsBlocked();
  blockSignals( true );
  // at this point we assume, that mCurrentApp and mCurrentClient are set to the values that we want to display
  QMap<ExternalAppHandler::Types, QString>::Iterator it = mExternalAppsMap.find ( mCurrentApp );
  if (it == mExternalAppsMap.end())
    return;
  // update group box
  mExternalAppGroupBox->setTitle(i18n( "Used %1 Client" ).arg(it.data()));
  //update the entries in the client combobox
  mClient->clear();
  QList<DefaultAppItem> items = ExternalAppHandler::instance()->getAvailableDefaultItems(mCurrentApp);
  DefaultAppItem* dai;
  for ( dai=items.first(); dai != 0; dai=items.next() )
  {
    mClient->insertItem( i18n(dai->_label), dai->_id );
    if (dai->_id == mCurrentClient)
    {
      //restore the edit fields with the data of the local membervariables if we had set it to "other".
      //Otherwise take the default data from externalapphandler.
      mChannel->setText(dai->_channel);
      mMessage->setText(dai->_message);
-      mParameters->setText(dai->_parameters);
+      mParameters->setText(dai->_parameters);  
-      mMessage2->setText(dai->_message2);
+      if ( mMessage2 )
+          mMessage2->setText(dai->_message2); 
+    if ( mParameters2 )
      mParameters2->setText(dai->_parameters2);
      if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC))
      {
        mChannel->setText(mEmailOtherChannel);
        mMessage->setText(mEmailOtherMessage);
-        mParameters->setText(mEmailOtherMessageParameters);
+        mParameters->setText(mEmailOtherMessageParameters); 
+        if ( mMessage2 )
        mMessage2->setText(mEmailOtherMessage2);
+    if ( mParameters2 )
        mParameters2->setText(mEmailOtherMessageParameters2);
      }
      else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
      {
        mChannel->setText(mPhoneOtherChannel);
        mMessage->setText(mPhoneOtherMessage);
        mParameters->setText(mPhoneOtherMessageParameters);
      }
      else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC))
      {
        mChannel->setText(mSMSOtherChannel);
        mMessage->setText(mSMSOtherMessage);
        mParameters->setText(mSMSOtherMessageParameters);
      }
      else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
      {
        mChannel->setText(mFaxOtherChannel);
        mMessage->setText(mFaxOtherMessage);
        mParameters->setText(mFaxOtherMessageParameters);
      }
      else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
      {
        mChannel->setText(mPagerOtherChannel);
        mMessage->setText(mPagerOtherMessage);
        mParameters->setText(mPagerOtherMessageParameters);
      }
      else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC))
      {
        mChannel->setText(mSipOtherChannel);
        mMessage->setText(mSipOtherMessage);
        mParameters->setText(mSipOtherMessageParameters);
      }
    }
  }
  bool readonly;
  bool enabled;
  if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC))
     ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
     ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC))
     ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
     ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
     ||((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC)))
     {
       readonly = false;
         }
         else
         {
       readonly = true;
         }
  if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::NONE_EMC))
     ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::NONE_PHC))
     ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::NONE_SMC))
     ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::NONE_FAC))
     ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::NONE_PAC))
     ||((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::NONE_SIC)))
     {
       enabled = false;
         }
         else
         {
       enabled = true;
         }
  mChannel->setReadOnly(readonly);
  mMessage->setReadOnly(readonly);
-  mParameters->setReadOnly(readonly);
+  mParameters->setReadOnly(readonly); 
+  if ( mMessage2 )
  mMessage2->setReadOnly(readonly);
+    if ( mParameters2 )
  mParameters2->setReadOnly(readonly);
  mChannel->setEnabled(enabled);
  mMessage->setEnabled(enabled);
  mParameters->setEnabled(enabled);
+  if ( mMessage2 )
  mMessage2->setEnabled(enabled);
+    if ( mParameters2 )
  mParameters2->setEnabled(enabled);
  mClient->setCurrentItem(mCurrentClient);
  // enable/disable the extra message/parameter field
  if (mCurrentApp == ExternalAppHandler::EMAIL)
  {
  }
  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);
  }
  blockSignals( blocked );
 }
 void KDEPIMConfigWidget::usrReadConfig()
 {
  KPimGlobalPrefs* prefs = KPimGlobalPrefs::instance();
  bool blocked = signalsBlocked();
  blockSignals( true );
  if (KPimGlobalPrefs::instance()->mBackupUseDefaultDir )
      mBackupUrl->setURL( KGlobalSettings::backupDataDir() );
  else
      mBackupUrl->setURL(prefs->mBackupDatadir);
  mBackupNumbersSpin->setValue( prefs->mBackupNumbers );
  mBackupDayCountSpin->setValue( prefs->mBackupDayCount);
  QString dummy = prefs->mUserDateFormatLong;
  mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") ));
  dummy = prefs->mUserDateFormatShort;
  mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") ));
  QDate current ( 2001, 1,1);
  mStartDateSavingEdit->setDate(current.addDays(prefs->mDaylightsavingStart-1));
  mEndDateSavingEdit->setDate(current.addDays(prefs->mDaylightsavingEnd-1));
  setCombo(mTimeZoneCombo,i18n(prefs->mTimeZoneId));
  mEmailClient = prefs->mEmailClient;
  mEmailOtherChannel = prefs->mEmailOtherChannel;
  mEmailOtherMessage = prefs->mEmailOtherMessage;
  mEmailOtherMessageParameters = prefs->mEmailOtherMessageParameters;
  mEmailOtherMessage2 = prefs->mEmailOtherMessage2;
  mEmailOtherMessageParameters2 = prefs->mEmailOtherMessageParameters2;
  mPhoneClient = prefs->mPhoneClient;
  mPhoneOtherChannel = prefs->mPhoneOtherChannel;
  mPhoneOtherMessage = prefs->mPhoneOtherMessage;
  mPhoneOtherMessageParameters = prefs->mPhoneOtherMessageParameters;
  mFaxClient = prefs->mFaxClient;
  mFaxOtherChannel = prefs->mFaxOtherChannel;
  mFaxOtherMessage = prefs->mFaxOtherMessage;
  mFaxOtherMessageParameters = prefs->mFaxOtherMessageParameters;
  mSMSClient = prefs->mSMSClient;
  mSMSOtherChannel = prefs->mSMSOtherChannel;
  mSMSOtherMessage = prefs->mSMSOtherMessage;
  mSMSOtherMessageParameters = prefs->mSMSOtherMessageParameters;
  mPagerClient = prefs->mPagerClient;
  mPagerOtherChannel = prefs->mPagerOtherChannel;
  mPagerOtherMessage = prefs->mPagerOtherMessage;
  mPagerOtherMessageParameters = prefs->mPagerOtherMessageParameters;
  mSipClient = prefs->mSipClient;
  mSipOtherChannel = prefs->mSipOtherChannel;
  mSipOtherMessage = prefs->mSipOtherMessage;
  mSipOtherMessageParameters = prefs->mSipOtherMessageParameters;
diff --git a/microkde/kcolorbutton.cpp b/microkde/kcolorbutton.cpp
index c7c6088..96dc256 100644
--- a/microkde/kcolorbutton.cpp
+++ b/microkde/kcolorbutton.cpp
@@ -1,47 +1,47 @@
 #include "kcolorbutton.h"
 #include "kcolordialog.h"
 #include "qapplication.h"
 #include "qlayout.h"
 #ifdef DESKTOP_VERSION
 #include <qcolordialog.h>
 #endif
 void KColorButton:: edit()
 {
 #ifdef DESKTOP_VERSION
    QColor col = QColorDialog::getColor ( mColor ); 
    if ( col.isValid () ) {
        mColor = col;
        setColor ( mColor );
        emit changed ( mColor );
    }
 #else
    KColorDialog* k =  new KColorDialog( this );
    k->setColor( mColor );
    int res = k->exec();
    if ( res ) {
        mColor = k->getColor(); 
        setColor ( mColor );
        emit changed ( mColor );
    }
    delete k;
 #endif
 }
 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;
    setFixedSize( size,size );
    connect ( this, SIGNAL( clicked() ), this ,SLOT (edit() ));
    
 }
 void KColorButton::setColor ( const QColor & c) 
 {
 mColor = c; 
 QPixmap pix ( height() - 4, width() - 4 );
 pix.fill( c );
 setPixmap ( pix );
 }