diff --git a/clients/modernsystem/config/config.cpp b/clients/modernsystem/config/config.cpp index 62877632d8..6313f627f9 100644 --- a/clients/modernsystem/config/config.cpp +++ b/clients/modernsystem/config/config.cpp @@ -52,11 +52,15 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, QWidget* parent) : QObject(paren connect(cbShowHandle, SIGNAL(clicked()), this, SLOT(slotSelectionChanged())); sliderBox = new KVBox(handleBox); - handleSizeSlider = new QSlider(0, 4, 1, 0, Qt::Horizontal, sliderBox); + //handleSizeSlider = new QSlider(0, 4, 1, 0, Qt::Horizontal, sliderBox); + handleSizeSlider = new QSlider(Qt::Horizontal, sliderBox); + handleSizeSlider->setMinimum(0); + handleSizeSlider->setMaximum(4); + handleSizeSlider->setPageStep(1); handleSizeSlider->setWhatsThis( i18n("Here you can change the size of the resize handle.")); handleSizeSlider->setTickInterval(1); - handleSizeSlider->setTickmarks(QSlider::TicksBelow); + handleSizeSlider->setTickPosition(QSlider::TicksBelow); connect(handleSizeSlider, SIGNAL(valueChanged(int)), this, SLOT(slotSelectionChanged())); hbox = new KHBox(sliderBox); diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp index e193e82cff..23cc1ddc21 100644 --- a/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kcmkwin/kwindecoration/kwindecoration.cpp @@ -93,8 +93,8 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, co QWidget *pluginPage = new QWidget( tabWidget ); QVBoxLayout* pluginLayout = new QVBoxLayout(pluginPage); - pluginLayout->setMargin(KDialog::marginHint()); - pluginLayout->setSpacing(KDialog::spacingHint()); + pluginLayout->setMargin(KDialog::marginHint()); + pluginLayout->setSpacing(KDialog::spacingHint()); // decoration chooser decorationList = new KComboBox( pluginPage ); @@ -131,8 +131,8 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, co // Page 2 (Button Selector) QWidget* buttonPage = new QWidget( tabWidget ); QVBoxLayout* buttonLayout = new QVBoxLayout(buttonPage); - buttonLayout->setMargin(KDialog::marginHint()); - buttonLayout->setSpacing(KDialog::spacingHint()); + buttonLayout->setMargin(KDialog::marginHint()); + buttonLayout->setSpacing(KDialog::spacingHint()); cbShowToolTips = new QCheckBox( i18n("&Show window button tooltips"), buttonPage ); diff --git a/kcmkwin/kwinoptions/mouse.cpp b/kcmkwin/kwinoptions/mouse.cpp index 5619a56ce2..622086f4e8 100644 --- a/kcmkwin/kwinoptions/mouse.cpp +++ b/kcmkwin/kwinoptions/mouse.cpp @@ -139,9 +139,6 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf : KCModule(inst, parent), config(_config), standAlone(_standAlone) { QString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3; - QVBoxLayout *layout = new QVBoxLayout(this); - layout->setMargin(0); - layout->setSpacing(KDialog::spacingHint()); Q3Grid *grid; Q3GroupBox *box; QLabel *label; @@ -150,6 +147,10 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf QStringList items; bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); + QVBoxLayout *layout = new QVBoxLayout(this); + layout->setMargin(0); + layout->setSpacing(KDialog::spacingHint()); + /** Titlebar doubleclick ************/ QHBoxLayout *hlayout = new QHBoxLayout(); @@ -595,9 +596,6 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, : KCModule(inst, parent), config(_config), standAlone(_standAlone) { QString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3, strAllW; - QVBoxLayout *layout = new QVBoxLayout(this); - layout->setMargin(0); - layout->setSpacing(KDialog::spacingHint()); Q3Grid *grid; Q3GroupBox *box; QLabel *label; @@ -605,6 +603,10 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, QString txtButton1, txtButton3; QStringList items; bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); + + QVBoxLayout *layout = new QVBoxLayout(this); + layout->setMargin(0); + layout->setSpacing(KDialog::spacingHint()); /** Inactive inner window ******************/