summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-14 12:58:15 (UTC)
committer zautrix <zautrix>2005-06-14 12:58:15 (UTC)
commitd38f601cfdb510fc39dd798af44a50c7958d7be8 (patch) (unidiff)
treed2a118c01faf4b69806de5d6b8b2bf6f6315ecb9
parentbd2fd522c0ba5c5a7897df0941032a9af9842dfc (diff)
downloadkdepimpi-d38f601cfdb510fc39dd798af44a50c7958d7be8.zip
kdepimpi-d38f601cfdb510fc39dd798af44a50c7958d7be8.tar.gz
kdepimpi-d38f601cfdb510fc39dd798af44a50c7958d7be8.tar.bz2
fixxx
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
@@ -146,6 +146,9 @@ 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}
@@ -258,7 +261,8 @@ void KOCalEditView::readConfig()
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 );
@@ -275,7 +279,9 @@ void KOCalEditView::readConfig()
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"));
@@ -285,3 +291,3 @@ void KOCalEditView::readConfig()
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"));
@@ -291,3 +297,3 @@ void KOCalEditView::readConfig()
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
@@ -304,3 +310,3 @@ void KOCalEditView::readConfig()
304 while ( kkf ) { 310 while ( kkf ) {
305 311 int iii = 0;
306 KOCalCheckButton* cb = new KOCalCheckButton( mw ); 312 KOCalCheckButton* cb = new KOCalCheckButton( mw );
@@ -313,3 +319,3 @@ void KOCalEditView::readConfig()
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 );
@@ -322,6 +328,8 @@ void KOCalEditView::readConfig()
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 );
@@ -332,3 +340,3 @@ void KOCalEditView::readConfig()
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 );
@@ -339,3 +347,3 @@ void KOCalEditView::readConfig()
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 );
@@ -345,3 +353,3 @@ void KOCalEditView::readConfig()
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 );
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 1849e36..e2ebdd4 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -27,2 +27,3 @@
27#include <qcheckbox.h> 27#include <qcheckbox.h>
28#include <qscrollview.h>
28#include <qpushbutton.h> 29#include <qpushbutton.h>
@@ -112,3 +113,3 @@ class KOFilterView : public KOFilterView_base
112 113
113class KOCalEditView : public QWidget 114class KOCalEditView : public QScrollView
114{ 115{
@@ -143,3 +144,2 @@ class KOCalEditView : public QWidget
143 private: 144 private:
144 QVBoxLayout* ml;
145 QWidget *mw; 145 QWidget *mw;