-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 | |||
@@ -936,6 +936,6 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
936 | // draw background and topleft frame | 936 | // draw background and topleft frame |
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; |
941 | int mSelEndT = mSelEnd; | 941 | int mSelEndT = mSelEnd; |
@@ -1173,4 +1173,6 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
1173 | } | 1173 | } |
1174 | } | 1174 | } |
1175 | p.setPen(mDefaultTextColor); | ||
1176 | p.drawRect(0, 0, width(), height()); | ||
1175 | } else { | 1177 | } else { |
1176 | //qDebug("NO redraw "); | 1178 | //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,7 +230,7 @@ void KOCalEditView::readConfig() | |||
230 | mw = new QWidget ( viewport() ); | 230 | mw = new QWidget ( viewport() ); |
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 ); |
@@ -240,8 +240,8 @@ void KOCalEditView::readConfig() | |||
240 | connect(addBut,SIGNAL(clicked()),SLOT(addCal())); | 240 | connect(addBut,SIGNAL(clicked()),SLOT(addCal())); |
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")); |
247 | connect(addBut,SIGNAL(clicked()),SLOT(enableAll())); | 247 | connect(addBut,SIGNAL(clicked()),SLOT(enableAll())); |
@@ -249,11 +249,11 @@ void KOCalEditView::readConfig() | |||
249 | 249 | ||
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")); |
259 | connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm())); | 259 | connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm())); |
@@ -262,5 +262,5 @@ void KOCalEditView::readConfig() | |||
262 | addBut = new QPushButton ( mw ); | 262 | addBut = new QPushButton ( mw ); |
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")); |
266 | connect(addBut,SIGNAL(clicked()),SLOT(disableRO())); | 266 | connect(addBut,SIGNAL(clicked()),SLOT(disableRO())); |
@@ -268,5 +268,12 @@ void KOCalEditView::readConfig() | |||
268 | 268 | ||
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 |
272 | addBut = new QPushButton ( mw ); | 279 | addBut = new QPushButton ( mw ); |
@@ -301,6 +308,6 @@ void KOCalEditView::readConfig() | |||
301 | mainLayout->addWidget( name,row,++iii ); | 308 | mainLayout->addWidget( name,row,++iii ); |
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 ); |
306 | mainLayout->addWidget( cb,row,++iii );mAlarmB.append( cb ); | 313 | mainLayout->addWidget( cb,row,++iii );mAlarmB.append( cb ); |