| -rw-r--r-- | korganizer/kodaymatrix.cpp | 6 | ||||
| -rw-r--r-- | korganizer/kofilterview.cpp | 33 |
2 files changed, 24 insertions, 15 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 30efbf6..3468657 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -937,4 +937,4 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) 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; @@ -1174,2 +1174,4 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) } + p.setPen(mDefaultTextColor); + p.drawRect(0, 0, width(), height()); } else { diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index bb88386..ea53043 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp @@ -231,5 +231,5 @@ void KOCalEditView::readConfig() addChild(mw); - + int ii = 0; mainLayout = new QGridLayout ( mw , 2, 8 ); - mainLayout->setMargin( 3); + mainLayout->setMargin( 2 ); mainLayout->setSpacing( 2); @@ -241,6 +241,6 @@ void KOCalEditView::readConfig() 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")); @@ -250,9 +250,9 @@ void KOCalEditView::readConfig() 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")); @@ -263,3 +263,3 @@ void KOCalEditView::readConfig() addBut->setFocusPolicy(NoFocus); - mainLayout->addWidget( addBut,0,5 ); + mainLayout->addWidget( addBut,0,++ii ); addBut->setPixmap ( SmallIcon("pencil")); @@ -269,3 +269,10 @@ void KOCalEditView::readConfig() 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 @@ -302,4 +309,4 @@ void KOCalEditView::readConfig() 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 ); |