yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix layout

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=959342
This commit is contained in:
Christoph Feck 2009-04-26 03:41:18 +00:00
parent 9c6f4d4d90
commit d06ac8ac27
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kcmkwin/kwindecoration/kwindecoration.cpp
View file

@ -82,7 +82,6 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QVariantList &
QVBoxLayout* layout = new QVBoxLayout(this); QVBoxLayout* layout = new QVBoxLayout(this);
layout->setMargin(0); layout->setMargin(0);
layout->setSpacing(KDialog::spacingHint());
// Save this for later... // Save this for later...
// cbUseMiniWindows = new QCheckBox( i18n( "Render mini &titlebars for all windows"), checkGroup ); // cbUseMiniWindows = new QCheckBox( i18n( "Render mini &titlebars for all windows"), checkGroup );
@ -95,8 +94,6 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QVariantList &
QWidget *pluginPage = new QWidget( tabWidget ); QWidget *pluginPage = new QWidget( tabWidget );
QVBoxLayout* pluginLayout = new QVBoxLayout(pluginPage); QVBoxLayout* pluginLayout = new QVBoxLayout(pluginPage);
pluginLayout->setMargin(KDialog::marginHint());
pluginLayout->setSpacing(KDialog::spacingHint());
// decoration chooser // decoration chooser
decorationList = new KComboBox( pluginPage ); decorationList = new KComboBox( pluginPage );
@ -106,10 +103,9 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QVariantList &
pluginLayout->addWidget(decorationList); pluginLayout->addWidget(decorationList);
pluginSettingsGrp = new QGroupBox( i18n("Decoration Options"), pluginPage ); pluginSettingsGrp = new QGroupBox( i18n("Decoration Options"), pluginPage );
QGridLayout *pluginSettingsLayout = new QGridLayout(); QVBoxLayout *pluginSettingsLayout = new QVBoxLayout();
pluginSettingsGrp->setFlat( true ); pluginSettingsGrp->setFlat( true );
pluginSettingsLayout->setMargin( 0 ); pluginSettingsLayout->setMargin( 0 );
pluginSettingsLayout->setSpacing( KDialog::spacingHint() );
pluginSettingsGrp->setLayout( pluginSettingsLayout ); pluginSettingsGrp->setLayout( pluginSettingsLayout );
pluginLayout->addWidget( pluginSettingsGrp ); pluginLayout->addWidget( pluginSettingsGrp );
@ -123,19 +119,17 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QVariantList &
lBorder->hide(); lBorder->hide();
cBorder->hide(); cBorder->hide();
QHBoxLayout *borderSizeLayout = new QHBoxLayout(); QHBoxLayout *borderSizeLayout = new QHBoxLayout();
pluginSettingsGrp->layout()->addItem( borderSizeLayout ); pluginSettingsLayout->addLayout( borderSizeLayout );
borderSizeLayout->addWidget(lBorder); borderSizeLayout->addWidget(lBorder);
borderSizeLayout->addWidget(cBorder); borderSizeLayout->addWidget(cBorder);
borderSizeLayout->addStretch(); borderSizeLayout->addStretch();
pluginConfigWidget = new KVBox(pluginSettingsGrp); pluginConfigWidget = new KVBox(pluginSettingsGrp);
pluginSettingsGrp->layout()->addWidget( pluginConfigWidget ); pluginSettingsLayout->addWidget( pluginConfigWidget );
// Page 2 (Button Selector) // Page 2 (Button Selector)
QWidget* buttonPage = new QWidget( tabWidget ); QWidget* buttonPage = new QWidget( tabWidget );
QVBoxLayout* buttonLayout = new QVBoxLayout(buttonPage); QVBoxLayout* buttonLayout = new QVBoxLayout(buttonPage);
buttonLayout->setMargin(KDialog::marginHint());
buttonLayout->setSpacing(KDialog::spacingHint());
cbShowToolTips = new QCheckBox( cbShowToolTips = new QCheckBox(
i18n("&Show window button tooltips"), buttonPage ); i18n("&Show window button tooltips"), buttonPage );
@ -163,7 +157,6 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QVariantList &
// preview // preview
QVBoxLayout* previewLayout = new QVBoxLayout(); QVBoxLayout* previewLayout = new QVBoxLayout();
previewLayout->setSpacing( KDialog::spacingHint() );
layout->addLayout( previewLayout ); layout->addLayout( previewLayout );
previewLayout->setMargin( KDialog::marginHint() ); previewLayout->setMargin( KDialog::marginHint() );