From 5bf63947d92221edc41d78b8e72f99aa18e479dd Mon Sep 17 00:00:00 2001 From: Nadeem Hasan Date: Thu, 23 Oct 2003 14:56:44 +0000 Subject: [PATCH] Layout and whitespace update. svn path=/trunk/kdebase/kwin/; revision=261305 --- kcmkwin/kwindecoration/kwindecoration.cpp | 43 +++++++++++------------ kcmkwin/kwindecoration/kwindecoration.h | 25 +++++++------ 2 files changed, 32 insertions(+), 36 deletions(-) diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp index 9b4f75d68e..76b356183e 100644 --- a/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kcmkwin/kwindecoration/kwindecoration.cpp @@ -97,21 +97,23 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, co // cbUseMiniWindows = new QCheckBox( i18n( "Render mini &titlebars for all windows"), checkGroup ); // QWhatsThis::add( cbUseMiniWindows, i18n( "Note that this option is not available on all styles yet!" ) ); - QFrame* preview_frame = new QFrame( pluginPage ); - preview_frame->setFrameShape( QFrame::NoFrame ); - QVBoxLayout* preview_layout = new QVBoxLayout( preview_frame, 0, KDialog::spacingHint()); - preview = new KDecorationPreview( preview_frame ); - preview_layout->addWidget( preview ); - pluginLayout->addWidget( preview_frame ); - pluginLayout->setStretchFactor( preview_frame, 10 ); + QFrame* preview_frame = new QFrame( pluginPage ); + preview_frame->setFrameShape( QFrame::NoFrame ); + QVBoxLayout* preview_layout = new QVBoxLayout( preview_frame, 0 ); + preview = new KDecorationPreview( preview_frame ); + preview_layout->addWidget( preview ); + pluginLayout->addWidget( preview_frame ); + pluginLayout->setStretchFactor( preview_frame, 10 ); - pluginSettingsLbl = new QLabel( i18n("Decoration Options"), pluginPage ); - pluginSettingsLine = new QFrame( pluginPage ); - pluginSettingsLine ->setFrameStyle( QFrame::HLine | QFrame::Plain ); - pluginConfigWidget = new QVBox(pluginPage); - pluginLayout->addWidget(pluginSettingsLbl ); - pluginLayout->addWidget(pluginSettingsLine); - pluginLayout->addWidget(pluginConfigWidget); + pluginSettingsGrp = new QGroupBox( i18n("Decoration Options"), pluginPage ); + pluginSettingsGrp->setColumnLayout( 0, Vertical ); + pluginSettingsGrp->setFlat( true ); + pluginSettingsGrp->layout()->setMargin( 0 ); + pluginSettingsGrp->layout()->setSpacing( KDialog::spacingHint() ); + pluginLayout->addWidget( pluginSettingsGrp ); + + pluginConfigWidget = new QVBox(pluginSettingsGrp); + pluginSettingsGrp->layout()->add( pluginConfigWidget ); // Page 2 (Button Selector) QVBox* buttonPage = new QVBox( tabWidget ); @@ -130,7 +132,7 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, co lBorder->setBuddy( slBorder ); lBorder->hide(); slBorder->hide(); - + cbUseCustomButtonPositions = new QCheckBox( i18n("Use custom titlebar button &positions"), buttonPage ); QWhatsThis::add( cbUseCustomButtonPositions, @@ -387,20 +389,15 @@ void KWinDecorationModule::resetPlugin( KConfig* conf, const QString& currentDec connect( this, SIGNAL(pluginLoad(KConfig*)), pluginObject, SLOT(load(KConfig*)) ); connect( this, SIGNAL(pluginSave(KConfig*)), pluginObject, SLOT(save(KConfig*)) ); connect( this, SIGNAL(pluginDefaults()), pluginObject, SLOT(defaults()) ); - pluginSettingsLbl->show(); - pluginSettingsLine->show(); - pluginConfigWidget->show(); + pluginSettingsGrp->show(); return; } } - pluginSettingsLbl->hide(); - pluginSettingsLine->hide(); - pluginConfigWidget->hide(); + pluginSettingsGrp->hide(); } - // Reads the kwin config settings, and sets all UI controls to those settings // Updating the config plugin if required void KWinDecorationModule::readConfig( KConfig* conf ) @@ -552,7 +549,7 @@ void KWinDecorationModule::defaults() buttonSource->hideButton('I'); buttonSource->hideButton('A'); buttonSource->hideButton('X'); - + border_size = BorderNormal; checkSupportedBorderSizes(); diff --git a/kcmkwin/kwindecoration/kwindecoration.h b/kcmkwin/kwindecoration/kwindecoration.h index 7d4ce788c0..9c3a2e388a 100644 --- a/kcmkwin/kwindecoration/kwindecoration.h +++ b/kcmkwin/kwindecoration/kwindecoration.h @@ -86,7 +86,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface // Allows us to turn "save" on void slotSelectionChanged(); void slotChangeDecoration( const QString & ); - void slotBorderChanged( int ); + void slotBorderChanged( int ); private: void readConfig( KConfig* conf ); @@ -96,12 +96,12 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface void updateSelection(); QString decorationLibName( const QString& name ); QString decorationName ( QString& libName ); - static QString styleToConfigLib( QString& styleLib ); + static QString styleToConfigLib( QString& styleLib ); void resetPlugin( KConfig* conf, const QString& currentDecoName = QString::null ); void resetKWin(); - void checkSupportedBorderSizes(); - static int borderSizeToIndex( BorderSize size, QValueList< BorderSize > sizes ); - static BorderSize indexToBorderSize( int index, QValueList< BorderSize > sizes ); + void checkSupportedBorderSizes(); + static int borderSizeToIndex( BorderSize size, QValueList< BorderSize > sizes ); + static BorderSize indexToBorderSize( int index, QValueList< BorderSize > sizes ); QTabWidget* tabWidget; @@ -109,20 +109,19 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface KComboBox* decorationList; QValueList decorations; - KDecorationPreview* preview; - KDecorationPlugins* plugins; - KConfig kwinConfig; + KDecorationPreview* preview; + KDecorationPlugins* plugins; + KConfig kwinConfig; QCheckBox* cbUseCustomButtonPositions; // QCheckBox* cbUseMiniWindows; QCheckBox* cbShowToolTips; - QLabel* lBorder; - QSlider* slBorder; - BorderSize border_size; + QLabel* lBorder; + QSlider* slBorder; + BorderSize border_size; QObject* pluginObject; - QLabel* pluginSettingsLbl; - QFrame* pluginSettingsLine; + QGroupBox* pluginSettingsGrp; QWidget* pluginConfigWidget; QString currentLibraryName; QString oldLibraryName;