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

1 files changed, 7 insertions, 14 deletions

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();