[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kwin/kcmkwin/kwindecoration
From:       Nadeem Hasan <nhasan () nadmm ! com>
Date:       2003-10-23 14:56:44
[Download RAW message or body]

CVS commit by nhasan: 

Layout and whitespace update.


  M +22 -25    kwindecoration.cpp   1.49
  M +13 -14    kwindecoration.h   1.19


--- kdebase/kwin/kcmkwin/kwindecoration/kwindecoration.cpp  #1.48:1.49
@@ -100,5 +100,5 @@ KWinDecorationModule::KWinDecorationModu
         QFrame* preview_frame = new QFrame( pluginPage );
         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_layout->addWidget( preview );
@@ -106,11 +106,13 @@ KWinDecorationModule::KWinDecorationModu
         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)
@@ -388,14 +390,10 @@ void KWinDecorationModule::resetPlugin( 
                         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();
 }
 

--- kdebase/kwin/kcmkwin/kwindecoration/kwindecoration.h  #1.18:1.19
@@ -122,6 +122,5 @@ class KWinDecorationModule : public KCMo
 
                 QObject* pluginObject;
-                QLabel*  pluginSettingsLbl;
-                QFrame*  pluginSettingsLine;
+                QGroupBox* pluginSettingsGrp;
                 QWidget* pluginConfigWidget;
                 QString  currentLibraryName;


[prev in list] [next in list] [prev in thread] [next in thread]