summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/kodaymatrix.cpp6
-rw-r--r--korganizer/kofilterview.cpp35
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
@@ -937,4 +937,4 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
937 p.fillRect(0,0,width(),height(), mDefaultBackColor); 937 p.fillRect(0,0,width(),height(), mDefaultBackColor);
938 p.setPen(mDefaultTextColor); 938 //p.setPen(mDefaultTextColor);
939 p.drawRect(0, 0, width(), height()); 939 //p.drawRect(0, 0, width(), height());
940 int mSelStartT = mSelStart; 940 int mSelStartT = mSelStart;
@@ -1174,2 +1174,4 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
1174 } 1174 }
1175 p.setPen(mDefaultTextColor);
1176 p.drawRect(0, 0, width(), height());
1175 } else { 1177 } else {
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index bb88386..ea53043 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -231,6 +231,6 @@ void KOCalEditView::readConfig()
231 addChild(mw); 231 addChild(mw);
232 232 int ii = 0;
233 mainLayout = new QGridLayout ( mw , 2, 8 ); 233 mainLayout = new QGridLayout ( mw , 2, 8 );
234 mainLayout->setMargin( 3); 234 mainLayout->setMargin( 2 );
235 mainLayout->setSpacing( 2); 235 mainLayout->setSpacing( 2 );
236 QPushButton * addBut = new QPushButton ( mw ); 236 QPushButton * addBut = new QPushButton ( mw );
@@ -241,6 +241,6 @@ void KOCalEditView::readConfig()
241 addBut->setMaximumWidth( addBut->sizeHint().height() ); 241 addBut->setMaximumWidth( addBut->sizeHint().height() );
242 242 int max = addBut->sizeHint().height();
243 addBut = new QPushButton ( mw ); 243 addBut = new QPushButton ( mw );
244 addBut->setFocusPolicy(NoFocus); 244 addBut->setFocusPolicy(NoFocus);
245 mainLayout->addWidget( addBut,0,1 ); 245 mainLayout->addWidget( addBut,0,++ii );
246 addBut->setPixmap ( SmallIcon("eye")); 246 addBut->setPixmap ( SmallIcon("eye"));
@@ -250,9 +250,9 @@ void KOCalEditView::readConfig()
250 QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw ); 250 QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw );
251 mainLayout->addWidget( lab,0,2 ); 251 mainLayout->addWidget( lab,0,++ii );
252 lab = new QLabel ( i18n(" "), mw ); 252 //lab = new QLabel ( i18n(" "), mw );
253 mainLayout->addWidget( lab,0,3 ); 253 //mainLayout->addWidget( lab,0,++ii );
254 lab->setFixedWidth( 6 ); 254 //lab->setFixedWidth( 1 );
255 addBut = new QPushButton ( mw ); 255 addBut = new QPushButton ( mw );
256 addBut->setFocusPolicy(NoFocus); 256 addBut->setFocusPolicy(NoFocus);
257 mainLayout->addWidget( addBut,0,4 ); 257 mainLayout->addWidget( addBut,0,++ii );
258 addBut->setPixmap ( SmallIcon("bell")); 258 addBut->setPixmap ( SmallIcon("bell"));
@@ -263,3 +263,3 @@ void KOCalEditView::readConfig()
263 addBut->setFocusPolicy(NoFocus); 263 addBut->setFocusPolicy(NoFocus);
264 mainLayout->addWidget( addBut,0,5 ); 264 mainLayout->addWidget( addBut,0,++ii );
265 addBut->setPixmap ( SmallIcon("pencil")); 265 addBut->setPixmap ( SmallIcon("pencil"));
@@ -269,3 +269,10 @@ void KOCalEditView::readConfig()
269 lab = new QLabel ( i18n(" Color "), mw ); 269 lab = new QLabel ( i18n(" Color "), mw );
270 mainLayout->addWidget( lab,0,6 ); 270 mainLayout->addWidget( lab,0,++ii );
271 lab = new QLabel ( "", mw );
272 mainLayout->addWidget( lab,0,++ii );
273 lab->setMaximumWidth( max+4 );
274 lab = new QLabel ( "", mw );
275 mainLayout->addWidget( lab,0,++ii );
276
277
271#if 0 278#if 0
@@ -302,4 +309,4 @@ void KOCalEditView::readConfig()
302 connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) ); 309 connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) );
303 lab = new QLabel ( i18n(" "), mw ); 310 //lab = new QLabel (" ", mw );
304 mainLayout->addWidget( lab,row,++iii ); 311 //mainLayout->addWidget( lab,row,++iii );
305 cb = new KOCalCheckButton( mw ); 312 cb = new KOCalCheckButton( mw );