| -rw-r--r-- | korganizer/kodaymatrix.cpp | 6 | ||||
| -rw-r--r-- | korganizer/kofilterview.cpp | 35 |
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 @@ -936,6 +936,6 @@ 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; @@ -1173,4 +1173,6 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) } } + 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 @@ -230,8 +230,8 @@ void KOCalEditView::readConfig() 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); @@ -240,8 +240,8 @@ void KOCalEditView::readConfig() 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())); @@ -249,11 +249,11 @@ 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")); connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm())); @@ -262,5 +262,5 @@ void KOCalEditView::readConfig() 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())); @@ -268,5 +268,12 @@ 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 addBut = new QPushButton ( mw ); @@ -301,6 +308,6 @@ void KOCalEditView::readConfig() 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 ); |