fixxx

7 files changed, 71 insertions, 8 deletions

diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index 3dfa344..5455098 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -76,64 +76,65 @@ 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  
+  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;
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index bdfc637..6ecf978 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -58,65 +58,65 @@ 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()));
 
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index bfe0aec..915c7ec 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -71,65 +71,65 @@ 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()
 {
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index b782bb1..3ee9a22 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -256,64 +256,71 @@ void KOPrefsDialog::setupMainTab()
   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 );
@@ -402,70 +409,77 @@ void KOPrefsDialog::setupTimeTab()
   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);
@@ -673,64 +687,76 @@ void KOPrefsDialog::setupViewsTab()
  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;
 
@@ -872,67 +898,71 @@ dummy =
   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);
+
+  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); 
@@ -1135,64 +1165,76 @@ void KOPrefsDialog::setupColorsTab()
   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);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 2c04852..0cb0bce 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -596,65 +596,65 @@ 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 );
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index ef2fc1c..7b3b543 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -41,130 +41,147 @@
 #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 );
             }
         }
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index 11ad2f0..b345b98 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -31,66 +31,69 @@
 
 #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