-rw-r--r-- | korganizer/kofilterview.cpp | 48 |
1 files changed, 28 insertions, 20 deletions
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index 3333ac2..52bc463 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp | |||
@@ -141,16 +141,19 @@ void KOFilterView::setSelectedFilter( int fil ) | |||
141 | } | 141 | } |
142 | 142 | ||
143 | 143 | ||
144 | 144 | ||
145 | KOCalEditView::KOCalEditView(QWidget* parent, | 145 | KOCalEditView::KOCalEditView(QWidget* parent, |
146 | const char* name ) | 146 | const char* name ) |
147 | : QWidget(parent,name) | 147 | : QScrollView(parent,name) |
148 | { | 148 | { |
149 | mw = 0; | 149 | mw = 0; |
150 | ml = new QVBoxLayout ( this ); | 150 | setResizePolicy( AutoOneFit ); |
151 | setFrameStyle ( QFrame::Panel | QFrame::Plain ); | ||
152 | setLineWidth ( 1 ); | ||
153 | setMidLineWidth ( 1 ); | ||
151 | } | 154 | } |
152 | 155 | ||
153 | KOCalEditView::~KOCalEditView() | 156 | KOCalEditView::~KOCalEditView() |
154 | { | 157 | { |
155 | // no need to delete child widgets, Qt does it all for us | 158 | // no need to delete child widgets, Qt does it all for us |
156 | } | 159 | } |
@@ -253,100 +256,105 @@ void KOCalEditView::readConfig() | |||
253 | mStdandardB.clear(); | 256 | mStdandardB.clear(); |
254 | mEnabledB.clear(); | 257 | mEnabledB.clear(); |
255 | mAlarmB.clear(); | 258 | mAlarmB.clear(); |
256 | mROB.clear(); | 259 | mROB.clear(); |
257 | 260 | ||
258 | if ( mw ) delete mw; | 261 | if ( mw ) delete mw; |
259 | mw = new QWidget ( this ); | 262 | mw = new QWidget ( viewport() ); |
260 | ml->addWidget ( mw ); | 263 | addChild(mw); |
261 | 264 | ||
262 | mainLayout = new QGridLayout ( mw , 2, 8 ); | 265 | mainLayout = new QGridLayout ( mw , 2, 8 ); |
263 | //mainLayout->setSpacing( 3 ); | 266 | mainLayout->setMargin( 3); |
267 | mainLayout->setSpacing( 2); | ||
264 | QPushButton * addBut = new QPushButton ( mw ); | 268 | QPushButton * addBut = new QPushButton ( mw ); |
265 | mainLayout->addWidget( addBut,0,0 ); | 269 | mainLayout->addWidget( addBut,0,0 ); |
266 | addBut->setPixmap ( SmallIcon("plus")); | 270 | addBut->setPixmap ( SmallIcon("plus")); |
267 | connect(addBut,SIGNAL(clicked()),SLOT(addCal())); | 271 | connect(addBut,SIGNAL(clicked()),SLOT(addCal())); |
268 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 272 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
269 | 273 | ||
270 | addBut = new QPushButton ( mw ); | 274 | addBut = new QPushButton ( mw ); |
271 | mainLayout->addWidget( addBut,0,1 ); | 275 | mainLayout->addWidget( addBut,0,1 ); |
272 | addBut->setPixmap ( SmallIcon("eye")); | 276 | addBut->setPixmap ( SmallIcon("eye")); |
273 | connect(addBut,SIGNAL(clicked()),SLOT(enableAll())); | 277 | connect(addBut,SIGNAL(clicked()),SLOT(enableAll())); |
274 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 278 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
275 | 279 | ||
276 | QLabel* lab = new QLabel ( " "+i18n("Calendar")+" ", mw ); | 280 | QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw ); |
277 | mainLayout->addWidget( lab,0,2 ); | 281 | mainLayout->addWidget( lab,0,2 ); |
278 | 282 | lab = new QLabel ( i18n(" "), mw ); | |
283 | mainLayout->addWidget( lab,0,3 ); | ||
284 | lab->setFixedWidth( 6 ); | ||
279 | addBut = new QPushButton ( mw ); | 285 | addBut = new QPushButton ( mw ); |
280 | mainLayout->addWidget( addBut,0,3 ); | 286 | mainLayout->addWidget( addBut,0,4 ); |
281 | addBut->setPixmap ( SmallIcon("bell")); | 287 | addBut->setPixmap ( SmallIcon("bell")); |
282 | connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm())); | 288 | connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm())); |
283 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 289 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
284 | 290 | ||
285 | addBut = new QPushButton ( mw ); | 291 | addBut = new QPushButton ( mw ); |
286 | mainLayout->addWidget( addBut,0,4 ); | 292 | mainLayout->addWidget( addBut,0,5 ); |
287 | addBut->setPixmap ( SmallIcon("pencil")); | 293 | addBut->setPixmap ( SmallIcon("pencil")); |
288 | connect(addBut,SIGNAL(clicked()),SLOT(disableRO())); | 294 | connect(addBut,SIGNAL(clicked()),SLOT(disableRO())); |
289 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 295 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
290 | 296 | ||
291 | lab = new QLabel ( i18n(" Color "), mw ); | 297 | lab = new QLabel ( i18n(" Color "), mw ); |
292 | mainLayout->addWidget( lab,0,5 ); | 298 | mainLayout->addWidget( lab,0,6 ); |
293 | #if 0 | 299 | #if 0 |
294 | addBut = new QPushButton ( mw ); | 300 | addBut = new QPushButton ( mw ); |
295 | mainLayout->addWidget( addBut,0,6 ); | 301 | mainLayout->addWidget( addBut,0,6 ); |
296 | addBut->setPixmap ( SmallIcon("minus")); | 302 | addBut->setPixmap ( SmallIcon("minus")); |
297 | connect(addBut,SIGNAL(clicked()),SLOT(deleteAll())); | 303 | connect(addBut,SIGNAL(clicked()),SLOT(deleteAll())); |
298 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 304 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
299 | #endif | 305 | #endif |
300 | 306 | ||
301 | 307 | ||
302 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | 308 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); |
303 | int row = 1; | 309 | int row = 1; |
304 | while ( kkf ) { | 310 | while ( kkf ) { |
305 | 311 | int iii = 0; | |
306 | KOCalCheckButton* cb = new KOCalCheckButton( mw ); | 312 | KOCalCheckButton* cb = new KOCalCheckButton( mw ); |
307 | mainLayout->addWidget( cb,row,0 );mStdandardB.append( cb ); | 313 | mainLayout->addWidget( cb,row,0 );mStdandardB.append( cb ); |
308 | cb->setChecked( kkf->isStandard ); | 314 | cb->setChecked( kkf->isStandard ); |
309 | cb->setNum( kkf->mCalNumber ); | 315 | cb->setNum( kkf->mCalNumber ); |
310 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); | 316 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); |
311 | if ( kkf->mErrorOnLoad || kkf->isReadOnly ) | 317 | if ( kkf->mErrorOnLoad || kkf->isReadOnly ) |
312 | cb->setEnabled( false ); | 318 | cb->setEnabled( false ); |
313 | cb = new KOCalCheckButton( mw ); | 319 | cb = new KOCalCheckButton( mw ); |
314 | mainLayout->addWidget( cb,row,1 );mEnabledB.append( cb ); | 320 | mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb ); |
315 | cb->setChecked( kkf->isEnabled ); | 321 | cb->setChecked( kkf->isEnabled ); |
316 | cb->setNum( kkf->mCalNumber ); | 322 | cb->setNum( kkf->mCalNumber ); |
317 | if ( kkf->mErrorOnLoad ) | 323 | if ( kkf->mErrorOnLoad ) |
318 | cb->setEnabled( false ); | 324 | cb->setEnabled( false ); |
319 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) ); | 325 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) ); |
320 | KOCalButton* name = new KOCalButton( mw ); | 326 | KOCalButton* name = new KOCalButton( mw ); |
321 | name->setNum( kkf->mCalNumber ); | 327 | name->setNum( kkf->mCalNumber ); |
322 | name->setText( kkf->mName ); | 328 | name->setText( kkf->mName ); |
323 | mainLayout->addWidget( name,row,2 ); | 329 | mainLayout->addWidget( name,row,++iii ); |
324 | connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) ); | 330 | connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) ); |
331 | lab = new QLabel ( i18n(" "), mw ); | ||
332 | mainLayout->addWidget( lab,row,++iii ); | ||
325 | cb = new KOCalCheckButton( mw ); | 333 | cb = new KOCalCheckButton( mw ); |
326 | mainLayout->addWidget( cb,row,3 );mAlarmB.append( cb ); | 334 | mainLayout->addWidget( cb,row,++iii );mAlarmB.append( cb ); |
327 | cb->setChecked( kkf->isAlarmEnabled ); | 335 | cb->setChecked( kkf->isAlarmEnabled ); |
328 | cb->setNum( kkf->mCalNumber ); | 336 | cb->setNum( kkf->mCalNumber ); |
329 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCalAlarm(int,bool) ) ); | 337 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCalAlarm(int,bool) ) ); |
330 | if ( kkf->mErrorOnLoad ) | 338 | if ( kkf->mErrorOnLoad ) |
331 | cb->setEnabled( false ); | 339 | cb->setEnabled( false ); |
332 | cb = new KOCalCheckButton( mw ); | 340 | cb = new KOCalCheckButton( mw ); |
333 | mainLayout->addWidget( cb,row,4 );mROB.append( cb ); | 341 | mainLayout->addWidget( cb,row,++iii );mROB.append( cb ); |
334 | cb->setChecked( kkf->isReadOnly ); | 342 | cb->setChecked( kkf->isReadOnly ); |
335 | cb->setNum( kkf->mCalNumber ); | 343 | cb->setNum( kkf->mCalNumber ); |
336 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectReadOnly(int,bool) ) ); | 344 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectReadOnly(int,bool) ) ); |
337 | if ( kkf->mErrorOnLoad ) | 345 | if ( kkf->mErrorOnLoad ) |
338 | cb->setEnabled( false ); | 346 | cb->setEnabled( false ); |
339 | KColorButton *colb = new KColorButton( mw ); | 347 | KColorButton *colb = new KColorButton( mw ); |
340 | mainLayout->addWidget( colb,row,5 ); | 348 | mainLayout->addWidget( colb,row,++iii ); |
341 | colb->setID( kkf->mCalNumber ); | 349 | colb->setID( kkf->mCalNumber ); |
342 | colb->setColor( kkf->mDefaultColor ); | 350 | colb->setColor( kkf->mDefaultColor ); |
343 | connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) ); | 351 | connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) ); |
344 | if ( row > 1) { | 352 | if ( row > 1) { |
345 | KOCalButton* calb = new KOCalButton( mw ); | 353 | KOCalButton* calb = new KOCalButton( mw ); |
346 | mainLayout->addWidget( calb,row,6 ); | 354 | mainLayout->addWidget( calb,row,++iii ); |
347 | calb->setNum( kkf->mCalNumber ); | 355 | calb->setNum( kkf->mCalNumber ); |
348 | calb->setPixmap ( SmallIcon("minus")); | 356 | calb->setPixmap ( SmallIcon("minus")); |
349 | connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) ); | 357 | connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) ); |
350 | int hei = calb->sizeHint().height(); | 358 | int hei = calb->sizeHint().height(); |
351 | //calb->setMaximumSize( hei*9/10, hei*9/10 ); | 359 | //calb->setMaximumSize( hei*9/10, hei*9/10 ); |
352 | } | 360 | } |