fixx

2 files changed, 25 insertions, 16 deletions

diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 30efbf6..3468657 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -935,8 +935,8 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
 
         // draw background and topleft frame
         p.fillRect(0,0,width(),height(), mDefaultBackColor);
-        p.setPen(mDefaultTextColor);
-        p.drawRect(0, 0, width(), height());
+        //p.setPen(mDefaultTextColor);
+        //p.drawRect(0, 0, width(), height());
         int mSelStartT = mSelStart;
         int mSelEndT = mSelEnd;
         if ( mSelEndT >=  NUMDAYS )
@@ -1172,6 +1172,8 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
                 p.setFont(myFont);
             }
         }
+        p.setPen(mDefaultTextColor);
+        p.drawRect(0, 0, width(), height());
     } else {
         //qDebug("NO  redraw ");
     }
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index bb88386..ea53043 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -229,45 +229,52 @@ void KOCalEditView::readConfig()
     if ( mw ) delete mw;
     mw = new QWidget ( viewport() );
     addChild(mw);
-
+    int ii = 0;
     mainLayout = new QGridLayout ( mw , 2, 8 );
-    mainLayout->setMargin( 3);
-    mainLayout->setSpacing( 2);
+    mainLayout->setMargin( 2 );
+    mainLayout->setSpacing( 2 );
     QPushButton * addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
     mainLayout->addWidget( addBut,0,0 );
     addBut->setPixmap ( SmallIcon("plus"));
     connect(addBut,SIGNAL(clicked()),SLOT(addCal()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
-
+    int max = addBut->sizeHint().height();
     addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
-    mainLayout->addWidget( addBut,0,1 );
+    mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("eye"));
     connect(addBut,SIGNAL(clicked()),SLOT(enableAll()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     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 );
+    mainLayout->addWidget( lab,0,++ii ); 
+    //lab = new QLabel ( i18n(" "), mw );
+    //mainLayout->addWidget( lab,0,++ii );
+    //lab->setFixedWidth( 1 );
     addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
-    mainLayout->addWidget( addBut,0,4 );
+    mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("bell"));
     connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
-    mainLayout->addWidget( addBut,0,5 );
+    mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("pencil"));
     connect(addBut,SIGNAL(clicked()),SLOT(disableRO()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     lab = new QLabel ( i18n(" Color "), mw );
-    mainLayout->addWidget( lab,0,6 );
+    mainLayout->addWidget( lab,0,++ii );
+    lab = new QLabel ( "", mw );
+    mainLayout->addWidget( lab,0,++ii );
+    lab->setMaximumWidth( max+4 );
+    lab = new QLabel ( "", mw );
+    mainLayout->addWidget( lab,0,++ii );
+
+
 #if 0
     addBut = new QPushButton ( mw );
     mainLayout->addWidget( addBut,0,6 );
@@ -300,8 +307,8 @@ void KOCalEditView::readConfig()
         name->setText(  kkf->mName );
         mainLayout->addWidget( name,row,++iii );
         connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) );
-        lab = new QLabel ( i18n(" "), mw );
-        mainLayout->addWidget( lab,row,++iii );
+        //lab = new QLabel (" ", mw );
+        //mainLayout->addWidget( lab,row,++iii );
         cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,++iii );mAlarmB.append( cb );
         cb->setChecked( kkf->isAlarmEnabled );