2 files changed, 30 insertions, 22 deletions

diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 3333ac2..52bc463 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -146,6 +146,9 @@ KOCalEditView::KOCalEditView(QWidget* parent,
                            const char* name )
-  : QWidget(parent,name)
+  : QScrollView(parent,name)
 {
-    mw = 0;
-    ml = new QVBoxLayout ( this );
+    mw = 0; 
+    setResizePolicy( AutoOneFit );
+    setFrameStyle ( QFrame::Panel | QFrame::Plain );
+    setLineWidth ( 1 ); 
+    setMidLineWidth ( 1 ); 
 }
@@ -258,7 +261,8 @@ void KOCalEditView::readConfig()
     if ( mw ) delete mw;
-    mw = new QWidget ( this );
-    ml->addWidget ( mw );
+    mw = new QWidget ( viewport() );
+    addChild(mw);
 
-    mainLayout = new QGridLayout ( mw , 2, 8 ); 
-    //mainLayout->setSpacing( 3 );
+    mainLayout = new QGridLayout ( mw , 2, 8 );
+    mainLayout->setMargin( 3);
+    mainLayout->setSpacing( 2);
     QPushButton * addBut = new QPushButton ( mw );
@@ -275,7 +279,9 @@ void KOCalEditView::readConfig()
 
-    QLabel* lab = new QLabel ( " "+i18n("Calendar")+" ", mw );
-    mainLayout->addWidget( lab,0,2 );
-
+    QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw );
+    mainLayout->addWidget( lab,0,2 ); 
+    lab = new QLabel ( i18n(" "), mw );
+    mainLayout->addWidget( lab,0,3 );
+    lab->setFixedWidth( 6 );
     addBut = new QPushButton ( mw );
-    mainLayout->addWidget( addBut,0,3 );
+    mainLayout->addWidget( addBut,0,4 );
     addBut->setPixmap ( SmallIcon("bell"));
@@ -285,3 +291,3 @@ void KOCalEditView::readConfig()
     addBut = new QPushButton ( mw );
-    mainLayout->addWidget( addBut,0,4 );
+    mainLayout->addWidget( addBut,0,5 );
     addBut->setPixmap ( SmallIcon("pencil"));
@@ -291,3 +297,3 @@ void KOCalEditView::readConfig()
     lab = new QLabel ( i18n(" Color "), mw );
-    mainLayout->addWidget( lab,0,5 );
+    mainLayout->addWidget( lab,0,6 );
 #if 0
@@ -304,3 +310,3 @@ void KOCalEditView::readConfig()
     while ( kkf ) {
-
+        int iii = 0;
         KOCalCheckButton* cb = new KOCalCheckButton( mw );
@@ -313,3 +319,3 @@ void KOCalEditView::readConfig()
         cb = new KOCalCheckButton( mw );
-        mainLayout->addWidget( cb,row,1 );mEnabledB.append( cb );
+        mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb );
         cb->setChecked( kkf->isEnabled );
@@ -322,6 +328,8 @@ void KOCalEditView::readConfig()
         name->setText(  kkf->mName );
-        mainLayout->addWidget( name,row,2 );
+        mainLayout->addWidget( name,row,++iii );
         connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) );
+        lab = new QLabel ( i18n(" "), mw );
+        mainLayout->addWidget( lab,row,++iii );
         cb = new KOCalCheckButton( mw );
-        mainLayout->addWidget( cb,row,3 );mAlarmB.append( cb );
+        mainLayout->addWidget( cb,row,++iii );mAlarmB.append( cb );
         cb->setChecked( kkf->isAlarmEnabled );
@@ -332,3 +340,3 @@ void KOCalEditView::readConfig()
         cb = new KOCalCheckButton( mw );
-        mainLayout->addWidget( cb,row,4 );mROB.append( cb );
+        mainLayout->addWidget( cb,row,++iii );mROB.append( cb );
         cb->setChecked( kkf->isReadOnly );
@@ -339,3 +347,3 @@ void KOCalEditView::readConfig()
         KColorButton *colb = new KColorButton( mw );
-        mainLayout->addWidget( colb,row,5 );
+        mainLayout->addWidget( colb,row,++iii );
         colb->setID( kkf->mCalNumber );
@@ -345,3 +353,3 @@ void KOCalEditView::readConfig()
             KOCalButton* calb = new KOCalButton( mw );
-            mainLayout->addWidget( calb,row,6 );
+            mainLayout->addWidget( calb,row,++iii );
             calb->setNum( kkf->mCalNumber );
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 1849e36..e2ebdd4 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -27,2 +27,3 @@
 #include <qcheckbox.h>
+#include <qscrollview.h>
 #include <qpushbutton.h>
@@ -112,3 +113,3 @@ class KOFilterView : public KOFilterView_base
 
-class KOCalEditView : public QWidget
+class KOCalEditView : public QScrollView
 {
@@ -143,3 +144,2 @@ class KOCalEditView : public QWidget
   private:
-    QVBoxLayout* ml;
     QWidget *mw;