Layout and whitespace update.

svn path=/trunk/kdebase/kwin/; revision=261305
This commit is contained in:
Nadeem Hasan 2003-10-23 14:56:44 +00:00
parent 26a5b0bfb4
commit 5bf63947d9
2 changed files with 32 additions and 36 deletions

View file

@ -99,19 +99,21 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, co
QFrame* preview_frame = new QFrame( pluginPage ); QFrame* preview_frame = new QFrame( pluginPage );
preview_frame->setFrameShape( QFrame::NoFrame ); preview_frame->setFrameShape( QFrame::NoFrame );
QVBoxLayout* preview_layout = new QVBoxLayout( preview_frame, 0, KDialog::spacingHint()); QVBoxLayout* preview_layout = new QVBoxLayout( preview_frame, 0 );
preview = new KDecorationPreview( preview_frame ); preview = new KDecorationPreview( preview_frame );
preview_layout->addWidget( preview ); preview_layout->addWidget( preview );
pluginLayout->addWidget( preview_frame ); pluginLayout->addWidget( preview_frame );
pluginLayout->setStretchFactor( preview_frame, 10 ); pluginLayout->setStretchFactor( preview_frame, 10 );
pluginSettingsLbl = new QLabel( i18n("Decoration Options"), pluginPage ); pluginSettingsGrp = new QGroupBox( i18n("Decoration Options"), pluginPage );
pluginSettingsLine = new QFrame( pluginPage ); pluginSettingsGrp->setColumnLayout( 0, Vertical );
pluginSettingsLine ->setFrameStyle( QFrame::HLine | QFrame::Plain ); pluginSettingsGrp->setFlat( true );
pluginConfigWidget = new QVBox(pluginPage); pluginSettingsGrp->layout()->setMargin( 0 );
pluginLayout->addWidget(pluginSettingsLbl ); pluginSettingsGrp->layout()->setSpacing( KDialog::spacingHint() );
pluginLayout->addWidget(pluginSettingsLine); pluginLayout->addWidget( pluginSettingsGrp );
pluginLayout->addWidget(pluginConfigWidget);
pluginConfigWidget = new QVBox(pluginSettingsGrp);
pluginSettingsGrp->layout()->add( pluginConfigWidget );
// Page 2 (Button Selector) // Page 2 (Button Selector)
QVBox* buttonPage = new QVBox( tabWidget ); QVBox* buttonPage = new QVBox( tabWidget );
@ -387,20 +389,15 @@ void KWinDecorationModule::resetPlugin( KConfig* conf, const QString& currentDec
connect( this, SIGNAL(pluginLoad(KConfig*)), pluginObject, SLOT(load(KConfig*)) ); connect( this, SIGNAL(pluginLoad(KConfig*)), pluginObject, SLOT(load(KConfig*)) );
connect( this, SIGNAL(pluginSave(KConfig*)), pluginObject, SLOT(save(KConfig*)) ); connect( this, SIGNAL(pluginSave(KConfig*)), pluginObject, SLOT(save(KConfig*)) );
connect( this, SIGNAL(pluginDefaults()), pluginObject, SLOT(defaults()) ); connect( this, SIGNAL(pluginDefaults()), pluginObject, SLOT(defaults()) );
pluginSettingsLbl->show(); pluginSettingsGrp->show();
pluginSettingsLine->show();
pluginConfigWidget->show();
return; return;
} }
} }
pluginSettingsLbl->hide(); pluginSettingsGrp->hide();
pluginSettingsLine->hide();
pluginConfigWidget->hide();
} }
// Reads the kwin config settings, and sets all UI controls to those settings // Reads the kwin config settings, and sets all UI controls to those settings
// Updating the config plugin if required // Updating the config plugin if required
void KWinDecorationModule::readConfig( KConfig* conf ) void KWinDecorationModule::readConfig( KConfig* conf )

View file

@ -121,8 +121,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface
BorderSize border_size; BorderSize border_size;
QObject* pluginObject; QObject* pluginObject;
QLabel* pluginSettingsLbl; QGroupBox* pluginSettingsGrp;
QFrame* pluginSettingsLine;
QWidget* pluginConfigWidget; QWidget* pluginConfigWidget;
QString currentLibraryName; QString currentLibraryName;
QString oldLibraryName; QString oldLibraryName;