1 files changed, 19 insertions, 58 deletions

diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index bedc75a..bf81b01 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -84,4 +84,5 @@ RecurDaily::RecurDaily( QWidget *parent, const char *name ) :
   QBoxLayout *topLayout = new QHBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
+  topLayout->setMargin( KDialog::marginHintSmall() );
 
   QLabel *preLabel = new QLabel( i18n("Recur every"), this );
@@ -102,6 +103,7 @@ RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) :
   QBoxLayout *topLayout = new QVBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
+  topLayout->setMargin( KDialog::marginHintSmall() );
 
-  topLayout->addStretch( 1 );
+  //topLayout->addStretch( 1 );
 
   QBoxLayout *weeksLayout = new QHBoxLayout( topLayout );
@@ -120,11 +122,14 @@ RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) :
   for ( int i = 0; i < 7; ++i ) {
     QString weekDayName = KGlobal::locale()->weekDayName( i + 1, true );
-    if ( KOPrefs::instance()->mCompactDialogs ) {
-      weekDayName = weekDayName.left( 1 );
+    int left = 1;
+    if ( QApplication::desktop()->width() > 480 ) {
+        ++left;
+        if ( QApplication::desktop()->width() > 640 )
+            ++left;
     }
-    mDayBoxes[ i ] = new QCheckBox( weekDayName, dayBox );
+    mDayBoxes[ i ] = new QCheckBox( weekDayName.left( left ), dayBox );
   }
 
-  topLayout->addStretch( 1 );
+  topLayout->addStretch( );
 }
 
@@ -154,4 +159,5 @@ RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) :
   QBoxLayout *topLayout = new QVBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
+  topLayout->setMargin( KDialog::marginHintSmall() );
 
 
@@ -173,8 +179,9 @@ RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) :
   QGridLayout *buttonLayout = new QGridLayout( buttonGroup, 3, 2 );
   buttonLayout->setSpacing( KDialog::spacingHint() );
+  buttonLayout->setMargin( KDialog::marginHintSmall() );
 
 
   QString recurOnText;
-  if ( !KOPrefs::instance()->mCompactDialogs ) {
+  if ( QApplication::desktop()->width() > 320 ) {
     recurOnText = i18n("Recur on the");
   }
@@ -289,4 +296,5 @@ RecurYearly::RecurYearly( QWidget *parent, const char *name ) :
   QBoxLayout *topLayout = new QVBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
+  topLayout->setMargin( KDialog::marginHintSmall() );
 
 
@@ -506,4 +514,5 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
   QVBoxLayout *rangeLayout = new QVBoxLayout( rangeBox );
   rangeLayout->setSpacing( KDialog::spacingHint() );
+  rangeLayout->setMargin( KDialog::marginHintSmall() );
 
   mStartDateLabel = new QLabel( i18n("Begin on:"), rangeBox );
@@ -539,5 +548,5 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
   endDateLayout->addWidget( mEndDateEdit );
 
-  endDateLayout->addStretch( 1 );
+  //endDateLayout->addStretch( 1 );
 
   connect( mNoEndDateButton, SIGNAL( toggled( bool ) ),
@@ -654,5 +663,4 @@ RecurrenceChooser::RecurrenceChooser( QWidget *parent, const char *name ) :
   QBoxLayout *topLayout = new QVBoxLayout( this );
 
-  if ( KOPrefs::instance()->mCompactDialogs ) {
     mTypeCombo = new QComboBox( this );
     mTypeCombo->insertItem( i18n("Daily") );
@@ -664,25 +672,5 @@ RecurrenceChooser::RecurrenceChooser( QWidget *parent, const char *name ) :
 
     connect( mTypeCombo, SIGNAL( activated( int ) ), SLOT( emitChoice() ) );
-  } else {
-    mTypeCombo = 0;
-
-    QButtonGroup *ruleButtonGroup = new QButtonGroup( 1, Horizontal, this );
-    ruleButtonGroup->setFrameStyle( QFrame::NoFrame );
-    topLayout->addWidget( ruleButtonGroup );
 
-    mDailyButton = new QRadioButton( i18n("Daily"), ruleButtonGroup );
-    mWeeklyButton = new QRadioButton( i18n("Weekly"), ruleButtonGroup );
-    mMonthlyButton = new QRadioButton( i18n("Monthly"), ruleButtonGroup );
-    mYearlyButton = new QRadioButton( i18n("Yearly"), ruleButtonGroup );
-
-    connect( mDailyButton, SIGNAL( toggled( bool ) ),
-             SLOT( emitChoice() ) );
-    connect( mWeeklyButton, SIGNAL( toggled( bool ) ),
-             SLOT( emitChoice() ) );
-    connect( mMonthlyButton, SIGNAL( toggled( bool ) ),
-             SLOT( emitChoice() ) );
-    connect( mYearlyButton, SIGNAL( toggled( bool ) ),
-             SLOT( emitChoice() ) );
-  }
 }
 
@@ -734,4 +722,5 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
   QGridLayout *topLayout = new QGridLayout( this, 2,2 );
   topLayout->setSpacing( KDialog::spacingHint() );
+  topLayout->setMargin( KDialog::marginHintSmall() );
 
   mEnabledCheck = new QCheckBox( i18n("Enable Recurrence"), this );
@@ -745,5 +734,5 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
   topLayout->addMultiCellWidget( mTimeGroupBox, 1, 1 , 0 , 1 );
 
-  if ( KOPrefs::instance()->mCompactDialogs ) {
+  if ( QApplication::desktop()->width() <= 320) {
     mTimeGroupBox->hide();
   }
@@ -757,23 +746,11 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
 //  layoutTimeFrame->addWidget( mDateTimeLabel );
 
-  Qt::Orientation orientation;
-  if ( KOPrefs::instance()->mCompactDialogs ) orientation = Horizontal;
-  else orientation = Vertical;
 
-  mRuleBox = new QGroupBox( 1, orientation, i18n("Recurrence Rule"), this );
-  if ( KOPrefs::instance()->mCompactDialogs ) {
+  mRuleBox = new QGroupBox( 1, Horizontal, i18n("Recurrence Rule"), this );
     topLayout->addMultiCellWidget( mRuleBox, 2, 2, 0, 1 );
-  } else {
-    topLayout->addMultiCellWidget( mRuleBox, 2, 2, 0, 1 );
-  }
-
   mRecurrenceChooser = new RecurrenceChooser( mRuleBox );
   connect( mRecurrenceChooser, SIGNAL( chosen( int ) ),
            SLOT( showCurrentRule( int ) ) );
 
-  if ( !KOPrefs::instance()->mCompactDialogs ) {
-    QFrame *ruleSepFrame = new QFrame( mRuleBox );
-    ruleSepFrame->setFrameStyle( QFrame::VLine | QFrame::Sunken );
-  }
 
   mRuleStack = new QWidgetStack( mRuleBox );
@@ -792,6 +769,4 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
 
   showCurrentRule( mRecurrenceChooser->type() );
-
-  if ( KOPrefs::instance()->mCompactDialogs ) {
     mRecurrenceRangeWidget = 0;
     mRecurrenceRangeDialog = new RecurrenceRangeDialog( this );
@@ -816,18 +791,4 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
     connect( mExceptionsButton, SIGNAL( clicked() ),
              SLOT( showExceptionsDialog() ) );
-
-  } else {
-    mRecurrenceRangeWidget = new RecurrenceRangeWidget( this );
-    mRecurrenceRangeDialog = 0;
-    mRecurrenceRange = mRecurrenceRangeWidget;
-    mRecurrenceRangeButton = 0;
-    topLayout->addWidget( mRecurrenceRangeWidget, 3, 0 );
-
-    mExceptionsWidget = new ExceptionsWidget( this );
-    mExceptionsDialog = 0;
-    mExceptions = mExceptionsWidget;
-    mExceptionsButton = 0;
-    topLayout->addWidget( mExceptionsWidget, 3, 1 );
-  }
 }