summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/kofilterview.cpp48
-rw-r--r--korganizer/kofilterview.h4
2 files changed, 30 insertions, 22 deletions
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 3333ac2..52bc463 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -144,10 +144,13 @@ void KOFilterView::setSelectedFilter( int fil )
144 144
145KOCalEditView::KOCalEditView(QWidget* parent, 145KOCalEditView::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
153KOCalEditView::~KOCalEditView() 156KOCalEditView::~KOCalEditView()
@@ -256,11 +259,12 @@ void KOCalEditView::readConfig()
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"));
@@ -273,23 +277,25 @@ void KOCalEditView::readConfig()
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 );
@@ -302,7 +308,7 @@ void KOCalEditView::readConfig()
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 );
@@ -311,7 +317,7 @@ void KOCalEditView::readConfig()
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 )
@@ -320,30 +326,32 @@ void KOCalEditView::readConfig()
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) ) );
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 1849e36..e2ebdd4 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -25,6 +25,7 @@
25 25
26#include <qstring.h> 26#include <qstring.h>
27#include <qcheckbox.h> 27#include <qcheckbox.h>
28#include <qscrollview.h>
28#include <qpushbutton.h> 29#include <qpushbutton.h>
29#include <kconfig.h> 30#include <kconfig.h>
30#include "kofilterview_base.h" 31#include "kofilterview_base.h"
@@ -110,7 +111,7 @@ class KOFilterView : public KOFilterView_base
110 QPtrList<CalFilter> *mFilters; 111 QPtrList<CalFilter> *mFilters;
111}; 112};
112 113
113class KOCalEditView : public QWidget 114class KOCalEditView : public QScrollView
114{ 115{
115 Q_OBJECT 116 Q_OBJECT
116 public: 117 public:
@@ -141,7 +142,6 @@ class KOCalEditView : public QWidget
141 void needsUpdate(); 142 void needsUpdate();
142 143
143 private: 144 private:
144 QVBoxLayout* ml;
145 QWidget *mw; 145 QWidget *mw;
146 void toggleList ( QPtrList<KOCalCheckButton> ); 146 void toggleList ( QPtrList<KOCalCheckButton> );
147 QPtrList<KOCalCheckButton> mStdandardB; 147 QPtrList<KOCalCheckButton> mStdandardB;