-rw-r--r-- | korganizer/kofilterview.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index ea53043..ce2880a 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp | |||
@@ -215,83 +215,85 @@ void KOCalEditView::infoCal( int id ) | |||
215 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | 215 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); |
216 | } | 216 | } |
217 | } | 217 | } |
218 | else | 218 | else |
219 | KMessageBox::information( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b>").arg(name).arg(file) ); | 219 | KMessageBox::information( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b>").arg(name).arg(file) ); |
220 | } | 220 | } |
221 | void KOCalEditView::readConfig() | 221 | void KOCalEditView::readConfig() |
222 | { | 222 | { |
223 | 223 | ||
224 | mStdandardB.clear(); | 224 | mStdandardB.clear(); |
225 | mEnabledB.clear(); | 225 | mEnabledB.clear(); |
226 | mAlarmB.clear(); | 226 | mAlarmB.clear(); |
227 | mROB.clear(); | 227 | mROB.clear(); |
228 | 228 | ||
229 | if ( mw ) delete mw; | 229 | if ( mw ) delete mw; |
230 | mw = new QWidget ( viewport() ); | 230 | mw = new QWidget ( viewport() ); |
231 | addChild(mw); | 231 | addChild(mw); |
232 | int ii = 0; | 232 | int ii = 0; |
233 | mainLayout = new QGridLayout ( mw , 2, 8 ); | 233 | mainLayout = new QGridLayout ( mw , 2, 8 ); |
234 | mainLayout->setMargin( 2 ); | 234 | mainLayout->setMargin( 2 ); |
235 | mainLayout->setSpacing( 2 ); | 235 | mainLayout->setSpacing( 2 ); |
236 | QPushButton * addBut = new QPushButton ( mw ); | 236 | QPushButton * addBut = new QPushButton ( mw ); |
237 | addBut->setFocusPolicy(NoFocus); | 237 | addBut->setFocusPolicy(NoFocus); |
238 | mainLayout->addWidget( addBut,0,0 ); | 238 | mainLayout->addWidget( addBut,0,0 ); |
239 | addBut->setPixmap ( SmallIcon("plus")); | 239 | addBut->setPixmap ( SmallIcon("greenhook16")); |
240 | connect(addBut,SIGNAL(clicked()),SLOT(addCal())); | ||
241 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 240 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
242 | int max = addBut->sizeHint().height(); | 241 | int max = addBut->sizeHint().height(); |
243 | addBut = new QPushButton ( mw ); | 242 | addBut = new QPushButton ( mw ); |
244 | addBut->setFocusPolicy(NoFocus); | 243 | addBut->setFocusPolicy(NoFocus); |
245 | mainLayout->addWidget( addBut,0,++ii ); | 244 | mainLayout->addWidget( addBut,0,++ii ); |
246 | addBut->setPixmap ( SmallIcon("eye")); | 245 | addBut->setPixmap ( SmallIcon("eye")); |
247 | connect(addBut,SIGNAL(clicked()),SLOT(enableAll())); | 246 | connect(addBut,SIGNAL(clicked()),SLOT(enableAll())); |
248 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 247 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
249 | 248 | ||
250 | QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw ); | 249 | QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw ); |
251 | mainLayout->addWidget( lab,0,++ii ); | 250 | mainLayout->addWidget( lab,0,++ii ); |
252 | //lab = new QLabel ( i18n(" "), mw ); | 251 | //lab = new QLabel ( i18n(" "), mw ); |
253 | //mainLayout->addWidget( lab,0,++ii ); | 252 | //mainLayout->addWidget( lab,0,++ii ); |
254 | //lab->setFixedWidth( 1 ); | 253 | //lab->setFixedWidth( 1 ); |
255 | addBut = new QPushButton ( mw ); | 254 | addBut = new QPushButton ( mw ); |
256 | addBut->setFocusPolicy(NoFocus); | 255 | addBut->setFocusPolicy(NoFocus); |
257 | mainLayout->addWidget( addBut,0,++ii ); | 256 | mainLayout->addWidget( addBut,0,++ii ); |
258 | addBut->setPixmap ( SmallIcon("bell")); | 257 | addBut->setPixmap ( SmallIcon("bell")); |
259 | connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm())); | 258 | connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm())); |
260 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 259 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
261 | 260 | ||
262 | addBut = new QPushButton ( mw ); | 261 | addBut = new QPushButton ( mw ); |
263 | addBut->setFocusPolicy(NoFocus); | 262 | addBut->setFocusPolicy(NoFocus); |
264 | mainLayout->addWidget( addBut,0,++ii ); | 263 | mainLayout->addWidget( addBut,0,++ii ); |
265 | addBut->setPixmap ( SmallIcon("pencil")); | 264 | addBut->setPixmap ( SmallIcon("pencil")); |
266 | connect(addBut,SIGNAL(clicked()),SLOT(disableRO())); | 265 | connect(addBut,SIGNAL(clicked()),SLOT(disableRO())); |
267 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 266 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
268 | |||
269 | lab = new QLabel ( i18n(" Color "), mw ); | ||
270 | mainLayout->addWidget( lab,0,++ii ); | ||
271 | lab = new QLabel ( "", mw ); | 267 | lab = new QLabel ( "", mw ); |
272 | mainLayout->addWidget( lab,0,++ii ); | 268 | mainLayout->addWidget( lab,0,++ii ); |
273 | lab->setMaximumWidth( max+4 ); | 269 | |
270 | addBut = new QPushButton ( mw ); | ||
271 | addBut->setFocusPolicy(NoFocus); | ||
272 | mainLayout->addWidget( addBut,0,++ii ); | ||
273 | addBut->setPixmap ( SmallIcon("plus")); | ||
274 | connect(addBut,SIGNAL(clicked()),SLOT(addCal())); | ||
275 | |||
274 | lab = new QLabel ( "", mw ); | 276 | lab = new QLabel ( "", mw ); |
275 | mainLayout->addWidget( lab,0,++ii ); | 277 | mainLayout->addWidget( lab,0,++ii ); |
276 | 278 | ||
277 | 279 | ||
278 | #if 0 | 280 | #if 0 |
279 | addBut = new QPushButton ( mw ); | 281 | addBut = new QPushButton ( mw ); |
280 | mainLayout->addWidget( addBut,0,6 ); | 282 | mainLayout->addWidget( addBut,0,6 ); |
281 | addBut->setPixmap ( SmallIcon("minus")); | 283 | addBut->setPixmap ( SmallIcon("minus")); |
282 | connect(addBut,SIGNAL(clicked()),SLOT(deleteAll())); | 284 | connect(addBut,SIGNAL(clicked()),SLOT(deleteAll())); |
283 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 285 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
284 | #endif | 286 | #endif |
285 | 287 | ||
286 | 288 | ||
287 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | 289 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); |
288 | int row = 1; | 290 | int row = 1; |
289 | while ( kkf ) { | 291 | while ( kkf ) { |
290 | int iii = 0; | 292 | int iii = 0; |
291 | KOCalCheckButton* cb = new KOCalCheckButton( mw ); | 293 | KOCalCheckButton* cb = new KOCalCheckButton( mw ); |
292 | mainLayout->addWidget( cb,row,0 );mStdandardB.append( cb ); | 294 | mainLayout->addWidget( cb,row,0 );mStdandardB.append( cb ); |
293 | cb->setChecked( kkf->isStandard ); | 295 | cb->setChecked( kkf->isStandard ); |
294 | cb->setNum( kkf->mCalNumber ); | 296 | cb->setNum( kkf->mCalNumber ); |
295 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); | 297 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); |
296 | if ( kkf->mErrorOnLoad || kkf->isReadOnly ) | 298 | if ( kkf->mErrorOnLoad || kkf->isReadOnly ) |
297 | cb->setEnabled( false ); | 299 | cb->setEnabled( false ); |