summaryrefslogtreecommitdiffabout
Side-by-side diff
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 )
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()
@@ -256,11 +259,12 @@ void KOCalEditView::readConfig()
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"));
@@ -273,23 +277,25 @@ void KOCalEditView::readConfig()
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 );
@@ -302,7 +308,7 @@ void KOCalEditView::readConfig()
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 );
@@ -311,7 +317,7 @@ void KOCalEditView::readConfig()
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 )
@@ -320,30 +326,32 @@ void KOCalEditView::readConfig()
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) ) );
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 @@
#include <qstring.h>
#include <qcheckbox.h>
+#include <qscrollview.h>
#include <qpushbutton.h>
#include <kconfig.h>
#include "kofilterview_base.h"
@@ -110,7 +111,7 @@ class KOFilterView : public KOFilterView_base
QPtrList<CalFilter> *mFilters;
};
-class KOCalEditView : public QWidget
+class KOCalEditView : public QScrollView
{
Q_OBJECT
public:
@@ -141,7 +142,6 @@ class KOCalEditView : public QWidget
void needsUpdate();
private:
- QVBoxLayout* ml;
QWidget *mw;
void toggleList ( QPtrList<KOCalCheckButton> );
QPtrList<KOCalCheckButton> mStdandardB;