Layout improvements for settings

- Handle 'Context Menu' settings as part of the services
- Handle 'Version Control' settings as part of the services
- Move the confirmations-settings into own tab
- Use combobox for view-property settings
- A lot of minor spacing cleanups

8 files changed, 158 insertions, 201 deletions

diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index 4ed98e5d7..57ff60146 100644
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -22,6 +22,7 @@
 
 #include "dolphin_generalsettings.h"
 
+#include <KComboBox>
 #include <KDialog>
 #include <KLocale>
 
@@ -34,48 +35,27 @@
 
 #include <views/viewproperties.h>
 
-const bool CONFIRM_TRASH = false;
-const bool CONFIRM_DELETE = true;
-
 BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
     SettingsPageBase(parent),
     m_url(url),
-    m_localProps(0),
-    m_globalProps(0),
-    m_confirmMoveToTrash(0),
-    m_confirmDelete(0),
+    m_viewProps(0),
     m_showToolTips(0),
     m_showSelectionToggle(0),
     m_naturalSorting(0)
 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
 
-    // 'View Properties' box
-    QGroupBox* propsBox = new QGroupBox(i18nc("@title:group", "View Properties"), this);
-    propsBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
-
-    m_localProps = new QRadioButton(i18nc("@option:radio", "Remember view properties for each folder"), propsBox);
-
-    m_globalProps = new QRadioButton(i18nc("@option:radio", "Use common view properties for all folders"), propsBox);
+    // View properties
+    QLabel* viewPropsLabel = new QLabel(i18nc("@label", "View properties:"), this);
 
-    QVBoxLayout* propsBoxLayout = new QVBoxLayout(propsBox);
-    propsBoxLayout->addWidget(m_localProps);
-    propsBoxLayout->addWidget(m_globalProps);
+    m_viewProps = new KComboBox(this);
+    const bool useGlobalProps = true;
+    m_viewProps->addItem(i18nc("@option:radio", "Remember view properties for each folder"), !useGlobalProps);
+    m_viewProps->addItem(i18nc("@option:radio", "Use common view properties for all folders"), useGlobalProps);
 
-    // 'Ask Confirmation For' box
-    QGroupBox* confirmBox = new QGroupBox(i18nc("@title:group", "Ask For Confirmation When"), this);
-    confirmBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
-    m_confirmMoveToTrash = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
-                                               "Moving files or folders to trash"), confirmBox);
-    m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
-                                          "Deleting files or folders"), confirmBox);
-    m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
-                                                       "Closing windows with multiple tabs"), confirmBox);
-
-    QVBoxLayout* confirmBoxLayout = new QVBoxLayout(confirmBox);
-    confirmBoxLayout->addWidget(m_confirmMoveToTrash);
-    confirmBoxLayout->addWidget(m_confirmDelete);
-    confirmBoxLayout->addWidget(m_confirmClosingMultipleTabs);
+    QHBoxLayout* viewPropsLayout = new QHBoxLayout(this);
+    viewPropsLayout->addWidget(viewPropsLabel, 0, Qt::AlignRight);
+    viewPropsLayout->addWidget(m_viewProps);
 
     // 'Show tooltips'
     m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"), this);
@@ -86,8 +66,9 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
     // 'Natural sorting of items'
     m_naturalSorting = new QCheckBox(i18nc("option:check", "Natural sorting of items"), this);
 
-    topLayout->addWidget(propsBox);
-    topLayout->addWidget(confirmBox);
+    topLayout->addSpacing(KDialog::spacingHint());
+    topLayout->addLayout(viewPropsLayout);
+    topLayout->addSpacing(KDialog::spacingHint());
     topLayout->addWidget(m_showToolTips);
     topLayout->addWidget(m_showSelectionToggle);
     topLayout->addWidget(m_naturalSorting);
@@ -95,11 +76,7 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
 
     loadSettings();
 
-    connect(m_localProps, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_globalProps, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_confirmMoveToTrash, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_confirmDelete, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_confirmClosingMultipleTabs, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    connect(m_viewProps, SIGNAL(currentIndexChanged(int)), this, SIGNAL(changed()));
     connect(m_showToolTips, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
     connect(m_showSelectionToggle, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
     connect(m_naturalSorting, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
@@ -111,13 +88,17 @@ BehaviorSettingsPage::~BehaviorSettingsPage()
 
 void BehaviorSettingsPage::applySettings()
 {
+    GeneralSettings* settings = GeneralSettings::self();
     ViewProperties props(m_url);  // read current view properties
 
-    const bool useGlobalProps = m_globalProps->isChecked();
-
-    GeneralSettings* settings = GeneralSettings::self();
+    const int index = m_viewProps->currentIndex();
+    const bool useGlobalProps = m_viewProps->itemData(index).toBool();
     settings->setGlobalViewProps(useGlobalProps);
 
+    settings->setShowToolTips(m_showToolTips->isChecked());
+    settings->setShowSelectionToggle(m_showSelectionToggle->isChecked());
+    settings->writeConfig();
+
     if (useGlobalProps) {
         // Remember the global view properties by applying the current view properties.
         // It is important that GeneralSettings::globalViewProps() is set before
@@ -127,17 +108,6 @@ void BehaviorSettingsPage::applySettings()
         globalProps.setDirProperties(props);
     }
 
-    KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig("kiorc", KConfig::NoGlobals);
-    KConfigGroup confirmationGroup(kioConfig, "Confirmations");
-    confirmationGroup.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked());
-    confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
-    confirmationGroup.sync();
-
-    settings->setConfirmClosingMultipleTabs(m_confirmClosingMultipleTabs->isChecked());
-    settings->setShowToolTips(m_showToolTips->isChecked());
-    settings->setShowSelectionToggle(m_showSelectionToggle->isChecked());
-    settings->writeConfig();
-
     const bool naturalSorting = m_naturalSorting->isChecked();
     if (KGlobalSettings::naturalSorting() != naturalSorting) {
         KConfigGroup group(KGlobal::config(), "KDE");
@@ -152,24 +122,13 @@ void BehaviorSettingsPage::restoreDefaults()
     settings->useDefaults(true);
     loadSettings();
     settings->useDefaults(false);
-    m_confirmMoveToTrash->setChecked(CONFIRM_TRASH);
-    m_confirmDelete->setChecked(CONFIRM_DELETE);
 }
 
 void BehaviorSettingsPage::loadSettings()
 {
-    if (GeneralSettings::globalViewProps()) {
-        m_globalProps->setChecked(true);
-    } else {
-        m_localProps->setChecked(true);
-    }
-
-    KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig("kiorc", KConfig::IncludeGlobals);
-    const KConfigGroup confirmationGroup(kioConfig, "Confirmations");
-    m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", CONFIRM_TRASH));
-    m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", CONFIRM_DELETE));
+    const int index = (m_viewProps->itemData(0).toBool() == GeneralSettings::globalViewProps()) ? 0 : 1;
+    m_viewProps->setCurrentIndex(index);
 
-    m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs());
     m_showToolTips->setChecked(GeneralSettings::showToolTips());
     m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle());
     m_naturalSorting->setChecked(KGlobalSettings::naturalSorting());
diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h
index 7d48b0c16..f1e49ef68 100644
--- a/src/settings/general/behaviorsettingspage.h
+++ b/src/settings/general/behaviorsettingspage.h
@@ -23,6 +23,7 @@
 #include <settings/settingspagebase.h>
 #include <KUrl>
 
+class KComboBox;
 class QCheckBox;
 class QLabel;
 class QRadioButton;
@@ -50,12 +51,7 @@ private:
 private:
     KUrl m_url;
 
-    QRadioButton* m_localProps;
-    QRadioButton* m_globalProps;
-
-    QCheckBox* m_confirmMoveToTrash;
-    QCheckBox* m_confirmDelete;
-    QCheckBox* m_confirmClosingMultipleTabs;
+    KComboBox* m_viewProps;
 
     QCheckBox* m_showToolTips;
     QLabel* m_configureToolTips;
diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp
new file mode 100644
index 000000000..07ca5237b
--- /dev/null
+++ b/src/settings/general/confirmationssettingspage.cpp
@@ -0,0 +1,106 @@
+/***************************************************************************
+ *   Copyright (C) 2012 by Peter Penz <[email protected]>             *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
+ ***************************************************************************/
+
+#include "confirmationssettingspage.h"
+
+#include <dolphin_generalsettings.h>
+
+#include <KDialog>
+#include <KLocale>
+
+#include <QCheckBox>
+#include <QLabel>
+#include <QVBoxLayout>
+
+namespace {
+    const bool ConfirmTrash = false;
+    const bool ConfirmDelete = true;
+}
+
+ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
+    SettingsPageBase(parent),
+    m_confirmMoveToTrash(0),
+    m_confirmDelete(0),
+    m_confirmClosingMultipleTabs(0)
+{
+    QVBoxLayout* topLayout = new QVBoxLayout(this);
+
+    QLabel* confirmLabel = new QLabel(i18nc("@title:group", "Ask for confirmation when:"), this);
+
+    m_confirmMoveToTrash = new QCheckBox(i18nc("@option:check Ask for confirmation when",
+                                               "Moving files or folders to trash"), this);
+    m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for confirmation when",
+                                          "Deleting files or folders"), this);
+    m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for confirmation when",
+                                                       "Closing windows with multiple tabs"), this);
+
+    topLayout->addSpacing(KDialog::spacingHint());
+    topLayout->addWidget(confirmLabel);
+    topLayout->addSpacing(KDialog::spacingHint());
+    topLayout->addWidget(m_confirmMoveToTrash);
+    topLayout->addWidget(m_confirmDelete);
+    topLayout->addWidget(m_confirmClosingMultipleTabs);
+    topLayout->addStretch();
+
+    loadSettings();
+
+    connect(m_confirmMoveToTrash, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    connect(m_confirmDelete, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    connect(m_confirmClosingMultipleTabs, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+}
+
+ConfirmationsSettingsPage::~ConfirmationsSettingsPage()
+{
+}
+
+void ConfirmationsSettingsPage::applySettings()
+{
+    KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig("kiorc", KConfig::NoGlobals);
+    KConfigGroup confirmationGroup(kioConfig, "Confirmations");
+    confirmationGroup.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked());
+    confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
+    confirmationGroup.sync();
+
+    GeneralSettings* settings = GeneralSettings::self();
+    settings->setConfirmClosingMultipleTabs(m_confirmClosingMultipleTabs->isChecked());
+    settings->writeConfig();
+}
+
+void ConfirmationsSettingsPage::restoreDefaults()
+{
+    GeneralSettings* settings = GeneralSettings::self();
+    settings->useDefaults(true);
+    loadSettings();
+    settings->useDefaults(false);
+
+    m_confirmMoveToTrash->setChecked(ConfirmTrash);
+    m_confirmDelete->setChecked(ConfirmDelete);
+}
+
+void ConfirmationsSettingsPage::loadSettings()
+{
+    KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig("kiorc", KConfig::IncludeGlobals);
+    const KConfigGroup confirmationGroup(kioConfig, "Confirmations");
+    m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", ConfirmTrash));
+    m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", ConfirmDelete));
+
+    m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs());
+}
+
+#include "confirmationssettingspage.moc"
diff --git a/src/settings/general/contextmenusettingspage.h b/src/settings/general/confirmationssettingspage.h
index 77699625b..45f0be1fc 100644
--- a/src/settings/general/contextmenusettingspage.h
+++ b/src/settings/general/confirmationssettingspage.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by Peter Penz <[email protected]>             *
+ *   Copyright (C) 2012 by Peter Penz <[email protected]>             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -16,23 +16,23 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
-#ifndef CONTEXTMENUSETTINGSPAGE_H
-#define CONTEXTMENUSETTINGSPAGE_H
+#ifndef CONFIRMATIONSSETTINGSPAGE_H
+#define CONFIRMATIONSSETTINGSPAGE_H
 
 #include <settings/settingspagebase.h>
 
 class QCheckBox;
 
 /**
- * @brief Page for the 'Context Menu' settings of the Dolphin settings dialog.
+ * @brief Page for the enabling or disabling confirmation dialogs.
  */
-class ContextMenuSettingsPage : public SettingsPageBase
+class ConfirmationsSettingsPage : public SettingsPageBase
 {
     Q_OBJECT
 
 public:
-    ContextMenuSettingsPage(QWidget* parent);
-    virtual ~ContextMenuSettingsPage();
+    ConfirmationsSettingsPage(QWidget* parent);
+    virtual ~ConfirmationsSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
     virtual void applySettings();
@@ -44,8 +44,9 @@ private:
     void loadSettings();
 
 private:
-    QCheckBox* m_showDeleteCommand;
-    QCheckBox* m_showCopyMoveMenu;
+    QCheckBox* m_confirmMoveToTrash;
+    QCheckBox* m_confirmDelete;
+    QCheckBox* m_confirmClosingMultipleTabs;
 };
 
 #endif
diff --git a/src/settings/general/contextmenusettingspage.cpp b/src/settings/general/contextmenusettingspage.cpp
deleted file mode 100644
index 142a942a3..000000000
--- a/src/settings/general/contextmenusettingspage.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2009 by Peter Penz <[email protected]>             *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
-
-#include "contextmenusettingspage.h"
-
-#include <dolphin_generalsettings.h>
-
-#include <KDialog>
-#include <KLocale>
-#include <KVBox>
-
-#include <QCheckBox>
-#include <QVBoxLayout>
-
-const bool SHOW_DELETE = false;
-
-ContextMenuSettingsPage::ContextMenuSettingsPage(QWidget* parent) :
-    SettingsPageBase(parent),
-    m_showDeleteCommand(0),
-    m_showCopyMoveMenu(0)
-{
-    QVBoxLayout* topLayout = new QVBoxLayout(this);
-    KVBox* vBox = new KVBox(this);
-    vBox->setSpacing(KDialog::spacingHint());
-
-    m_showDeleteCommand = new QCheckBox(i18nc("@option:check", "Show 'Delete' command"), vBox);
-
-    m_showCopyMoveMenu = new QCheckBox(i18nc("@option:check", "Show 'Copy To' and 'Move To' commands"), vBox);
-
-    // Add a dummy widget with no restriction regarding
-    // a vertical resizing. This assures that the dialog layout
-    // is not stretched vertically.
-    new QWidget(vBox);
-
-    topLayout->addWidget(vBox);
-
-    loadSettings();
-
-    connect(m_showDeleteCommand, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_showCopyMoveMenu, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-}
-
-ContextMenuSettingsPage::~ContextMenuSettingsPage()
-{
-}
-
-void ContextMenuSettingsPage::applySettings()
-{
-    KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
-    KConfigGroup configGroup(globalConfig, "KDE");
-    configGroup.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked());
-    configGroup.sync();
-
-    GeneralSettings::setShowCopyMoveMenu(m_showCopyMoveMenu->isChecked());
-    GeneralSettings::self()->writeConfig();
-}
-
-void ContextMenuSettingsPage::restoreDefaults()
-{
-    GeneralSettings* settings = GeneralSettings::self();
-    settings->useDefaults(true);
-    loadSettings();
-    settings->useDefaults(false);
-    m_showDeleteCommand->setChecked(SHOW_DELETE);
-}
-
-void ContextMenuSettingsPage::loadSettings()
-{
-    KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
-    KConfigGroup configGroup(globalConfig, "KDE");
-    m_showDeleteCommand->setChecked(configGroup.readEntry("ShowDeleteCommand", SHOW_DELETE));
-
-    m_showCopyMoveMenu->setChecked(GeneralSettings::showCopyMoveMenu());
-}
-
-#include "contextmenusettingspage.moc"
diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp
index dddefdd5c..18e152880 100644
--- a/src/settings/general/generalsettingspage.cpp
+++ b/src/settings/general/generalsettingspage.cpp
@@ -21,7 +21,7 @@
 #include "generalsettingspage.h"
 
 #include "behaviorsettingspage.h"
-#include "contextmenusettingspage.h"
+#include "confirmationssettingspage.h"
 #include "previewssettingspage.h"
 #include <settings/settingspagebase.h>
 #include "statusbarsettingspage.h"
@@ -54,9 +54,9 @@ GeneralSettingsPage::GeneralSettingsPage(const KUrl& url, QWidget* parent) :
     connect(previewsPage, SIGNAL(changed()), this, SIGNAL(changed()));
 
     // initialize 'Context Menu' tab
-    ContextMenuSettingsPage* contextMenuPage = new ContextMenuSettingsPage(tabWidget);
-    tabWidget->addTab(contextMenuPage, i18nc("@title:tab Context Menu settings", "Context Menu"));
-    connect(contextMenuPage, SIGNAL(changed()), this, SIGNAL(changed()));
+    ConfirmationsSettingsPage* confirmationsPage = new ConfirmationsSettingsPage(tabWidget);
+    tabWidget->addTab(confirmationsPage, i18nc("@title:tab Confirmations settings", "Confirmations"));
+    connect(confirmationsPage, SIGNAL(changed()), this, SIGNAL(changed()));
 
     // initialize 'Status Bar' tab
     StatusBarSettingsPage* statusBarPage = new StatusBarSettingsPage(tabWidget);
@@ -65,7 +65,7 @@ GeneralSettingsPage::GeneralSettingsPage(const KUrl& url, QWidget* parent) :
 
     m_pages.append(behaviorPage);
     m_pages.append(previewsPage);
-    m_pages.append(contextMenuPage);
+    m_pages.append(confirmationsPage);
     m_pages.append(statusBarPage);
 
     topLayout->addWidget(tabWidget, 0, 0);
diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index 4df3fc378..c76f4ca24 100644
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -59,11 +59,8 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     m_remoteFileSizeBox(0)
 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
-    topLayout->setSpacing(KDialog::spacingHint());
-    topLayout->setMargin(KDialog::marginHint());
 
-    // Create group box "Show previews for:"
-    QGroupBox* listBox = new QGroupBox(i18nc("@title:group", "Show previews for"), this);
+    QLabel* showPreviewsLabel = new QLabel(i18nc("@title:group", "Show previews for:"), this);
 
     m_listView = new QListView(this);
 
@@ -80,11 +77,6 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     m_listView->setItemDelegate(delegate);
     m_listView->setVerticalScrollMode(QListView::ScrollPerPixel);
 
-    QVBoxLayout* listBoxLayout = new QVBoxLayout(listBox);
-    listBoxLayout->setSpacing(KDialog::spacingHint());
-    listBoxLayout->setMargin(KDialog::marginHint());
-    listBoxLayout->addWidget(m_listView);
-
     QLabel* remoteFileSizeLabel = new QLabel(i18nc("@label", "Skip previews for remote files above:"), this);
 
     m_remoteFileSizeBox = new KIntSpinBox(this);
@@ -96,7 +88,9 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     fileSizeBoxLayout->addWidget(remoteFileSizeLabel, 0, Qt::AlignRight);
     fileSizeBoxLayout->addWidget(m_remoteFileSizeBox);
 
-    topLayout->addWidget(listBox);
+    topLayout->addSpacing(KDialog::spacingHint());
+    topLayout->addWidget(showPreviewsLabel);
+    topLayout->addWidget(m_listView);
     topLayout->addLayout(fileSizeBoxLayout);
 
     loadSettings();
diff --git a/src/settings/general/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp
index 8ba0d7337..48622ac4c 100644
--- a/src/settings/general/statusbarsettingspage.cpp
+++ b/src/settings/general/statusbarsettingspage.cpp
@@ -23,7 +23,6 @@
 
 #include <KDialog>
 #include <KLocale>
-#include <KVBox>
 
 #include <QCheckBox>
 #include <QVBoxLayout>
@@ -33,20 +32,14 @@ StatusBarSettingsPage::StatusBarSettingsPage(QWidget* parent) :
     m_showZoomSlider(0),
     m_showSpaceInfo(0)
 {
-    QVBoxLayout* topLayout = new QVBoxLayout(this);
-    KVBox* vBox = new KVBox(this);
-    vBox->setSpacing(KDialog::spacingHint());
-
-    m_showZoomSlider = new QCheckBox(i18nc("@option:check", "Show zoom slider"), vBox);
-
-    m_showSpaceInfo = new QCheckBox(i18nc("@option:check", "Show space information"), vBox);
+    m_showZoomSlider = new QCheckBox(i18nc("@option:check", "Show zoom slider"), this);
+    m_showSpaceInfo = new QCheckBox(i18nc("@option:check", "Show space information"), this);
 
-    // Add a dummy widget with no restriction regarding
-    // a vertical resizing. This assures that the dialog layout
-    // is not stretched vertically.
-    new QWidget(vBox);
-
-    topLayout->addWidget(vBox);
+    QVBoxLayout* topLayout = new QVBoxLayout(this);
+    topLayout->addSpacing(KDialog::spacingHint());
+    topLayout->addWidget(m_showZoomSlider);
+    topLayout->addWidget(m_showSpaceInfo);
+    topLayout->addStretch();
 
     loadSettings();