author | zautrix <zautrix> | 2005-06-14 12:58:15 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-14 12:58:15 (UTC) |
commit | d38f601cfdb510fc39dd798af44a50c7958d7be8 (patch) (side-by-side diff) | |
tree | d2a118c01faf4b69806de5d6b8b2bf6f6315ecb9 /korganizer/kofilterview.cpp | |
parent | bd2fd522c0ba5c5a7897df0941032a9af9842dfc (diff) | |
download | kdepimpi-d38f601cfdb510fc39dd798af44a50c7958d7be8.zip kdepimpi-d38f601cfdb510fc39dd798af44a50c7958d7be8.tar.gz kdepimpi-d38f601cfdb510fc39dd798af44a50c7958d7be8.tar.bz2 |
fixxx
-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 ) } KOCalEditView::KOCalEditView(QWidget* parent, const char* name ) - : QWidget(parent,name) + : QScrollView(parent,name) { - mw = 0; - ml = new QVBoxLayout ( this ); + mw = 0; + setResizePolicy( AutoOneFit ); + setFrameStyle ( QFrame::Panel | QFrame::Plain ); + setLineWidth ( 1 ); + setMidLineWidth ( 1 ); } KOCalEditView::~KOCalEditView() { // no need to delete child widgets, Qt does it all for us } @@ -253,100 +256,105 @@ void KOCalEditView::readConfig() mStdandardB.clear(); mEnabledB.clear(); mAlarmB.clear(); mROB.clear(); if ( mw ) delete mw; - mw = new QWidget ( this ); - ml->addWidget ( mw ); + mw = new QWidget ( viewport() ); + addChild(mw); - mainLayout = new QGridLayout ( mw , 2, 8 ); - //mainLayout->setSpacing( 3 ); + mainLayout = new QGridLayout ( mw , 2, 8 ); + mainLayout->setMargin( 3); + mainLayout->setSpacing( 2); QPushButton * addBut = new QPushButton ( mw ); mainLayout->addWidget( addBut,0,0 ); addBut->setPixmap ( SmallIcon("plus")); connect(addBut,SIGNAL(clicked()),SLOT(addCal())); addBut->setMaximumWidth( addBut->sizeHint().height() ); addBut = new QPushButton ( mw ); mainLayout->addWidget( addBut,0,1 ); addBut->setPixmap ( SmallIcon("eye")); connect(addBut,SIGNAL(clicked()),SLOT(enableAll())); addBut->setMaximumWidth( addBut->sizeHint().height() ); - QLabel* lab = new QLabel ( " "+i18n("Calendar")+" ", mw ); - mainLayout->addWidget( lab,0,2 ); - + QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw ); + mainLayout->addWidget( lab,0,2 ); + lab = new QLabel ( i18n(" "), mw ); + mainLayout->addWidget( lab,0,3 ); + lab->setFixedWidth( 6 ); addBut = new QPushButton ( mw ); - mainLayout->addWidget( addBut,0,3 ); + mainLayout->addWidget( addBut,0,4 ); addBut->setPixmap ( SmallIcon("bell")); connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm())); addBut->setMaximumWidth( addBut->sizeHint().height() ); addBut = new QPushButton ( mw ); - mainLayout->addWidget( addBut,0,4 ); + mainLayout->addWidget( addBut,0,5 ); addBut->setPixmap ( SmallIcon("pencil")); connect(addBut,SIGNAL(clicked()),SLOT(disableRO())); addBut->setMaximumWidth( addBut->sizeHint().height() ); lab = new QLabel ( i18n(" Color "), mw ); - mainLayout->addWidget( lab,0,5 ); + mainLayout->addWidget( lab,0,6 ); #if 0 addBut = new QPushButton ( mw ); mainLayout->addWidget( addBut,0,6 ); addBut->setPixmap ( SmallIcon("minus")); connect(addBut,SIGNAL(clicked()),SLOT(deleteAll())); addBut->setMaximumWidth( addBut->sizeHint().height() ); #endif KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); int row = 1; while ( kkf ) { - + int iii = 0; KOCalCheckButton* cb = new KOCalCheckButton( mw ); mainLayout->addWidget( cb,row,0 );mStdandardB.append( cb ); cb->setChecked( kkf->isStandard ); cb->setNum( kkf->mCalNumber ); connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); if ( kkf->mErrorOnLoad || kkf->isReadOnly ) cb->setEnabled( false ); cb = new KOCalCheckButton( mw ); - mainLayout->addWidget( cb,row,1 );mEnabledB.append( cb ); + mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb ); cb->setChecked( kkf->isEnabled ); cb->setNum( kkf->mCalNumber ); if ( kkf->mErrorOnLoad ) cb->setEnabled( false ); connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) ); KOCalButton* name = new KOCalButton( mw ); name->setNum( kkf->mCalNumber ); name->setText( kkf->mName ); - mainLayout->addWidget( name,row,2 ); + mainLayout->addWidget( name,row,++iii ); connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) ); + lab = new QLabel ( i18n(" "), mw ); + mainLayout->addWidget( lab,row,++iii ); cb = new KOCalCheckButton( mw ); - mainLayout->addWidget( cb,row,3 );mAlarmB.append( cb ); + mainLayout->addWidget( cb,row,++iii );mAlarmB.append( cb ); cb->setChecked( kkf->isAlarmEnabled ); cb->setNum( kkf->mCalNumber ); connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCalAlarm(int,bool) ) ); if ( kkf->mErrorOnLoad ) cb->setEnabled( false ); cb = new KOCalCheckButton( mw ); - mainLayout->addWidget( cb,row,4 );mROB.append( cb ); + mainLayout->addWidget( cb,row,++iii );mROB.append( cb ); cb->setChecked( kkf->isReadOnly ); cb->setNum( kkf->mCalNumber ); connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectReadOnly(int,bool) ) ); if ( kkf->mErrorOnLoad ) cb->setEnabled( false ); KColorButton *colb = new KColorButton( mw ); - mainLayout->addWidget( colb,row,5 ); + mainLayout->addWidget( colb,row,++iii ); colb->setID( kkf->mCalNumber ); colb->setColor( kkf->mDefaultColor ); connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) ); if ( row > 1) { KOCalButton* calb = new KOCalButton( mw ); - mainLayout->addWidget( calb,row,6 ); + mainLayout->addWidget( calb,row,++iii ); calb->setNum( kkf->mCalNumber ); calb->setPixmap ( SmallIcon("minus")); connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) ); int hei = calb->sizeHint().height(); //calb->setMaximumSize( hei*9/10, hei*9/10 ); } |