port away from VBox/HBox

diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp
index 7ffb81115aed1c6f712b6ce3e6be482777677248..133e9435021ace6c7855f801038fbd2449b26014 100644 (file)
--- a/src/settings/navigation/navigationsettingspage.cpp
+++ b/src/settings/navigation/navigationsettingspage.cpp
@@ -24,7 +24,6 @@
 #include <KDialog>
 #include <KGlobalSettings>
 #include <KLocalizedString>
 #include <KDialog>
 #include <KGlobalSettings>
 #include <KLocalizedString>

-#include <KVBox>

 
 #include <QCheckBox>
 #include <QGroupBox>
 
 #include <QCheckBox>
 #include <QGroupBox>


@@ -39,11 +38,15 @@ NavigationSettingsPage::NavigationSettingsPage(QWidget* parent) :
     const int spacing = KDialog::spacingHint();
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     const int spacing = KDialog::spacingHint();
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);

-    KVBox* vBox = new KVBox(this);
-    vBox->setSpacing(spacing);
+    QWidget* vBox = new QWidget(this);
+    QVBoxLayout *vBoxLayout = new QVBoxLayout(vBox);
+    vBoxLayout->setMargin(0);
+    vBoxLayout->setSpacing(spacing);
+    vBoxLayout->setAlignment(Qt::AlignTop);

 
     // create 'Mouse' group
     QGroupBox* mouseBox = new QGroupBox(i18nc("@title:group", "Mouse"), vBox);
 
     // create 'Mouse' group
     QGroupBox* mouseBox = new QGroupBox(i18nc("@title:group", "Mouse"), vBox);

+    vBoxLayout->addWidget(mouseBox);

     mouseBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
     m_singleClick = new QRadioButton(i18nc("@option:check Mouse Settings",
                                            "Single-click to open files and folders"), mouseBox);
     mouseBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
     m_singleClick = new QRadioButton(i18nc("@option:check Mouse Settings",
                                            "Single-click to open files and folders"), mouseBox);


@@ -55,8 +58,10 @@ NavigationSettingsPage::NavigationSettingsPage(QWidget* parent) :
     mouseBoxLayout->addWidget(m_doubleClick);
 
     m_openArchivesAsFolder = new QCheckBox(i18nc("@option:check", "Open archives as folder"), vBox);
     mouseBoxLayout->addWidget(m_doubleClick);
 
     m_openArchivesAsFolder = new QCheckBox(i18nc("@option:check", "Open archives as folder"), vBox);

+    vBoxLayout->addWidget(m_openArchivesAsFolder);

 
     m_autoExpandFolders = new QCheckBox(i18nc("option:check", "Open folders during drag operations"), vBox);
 
     m_autoExpandFolders = new QCheckBox(i18nc("option:check", "Open folders during drag operations"), vBox);

+    vBoxLayout->addWidget(m_autoExpandFolders);

 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout

diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index 75ec445df33ecf8960de41f22d63810a78f76b7c..3bf922dfe4deeb8c4aa34716ef3a84760ae6e293 100644 (file)
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -29,13 +29,14 @@
 #include <KLocalizedString>
 #include <QLineEdit>
 #include <KMessageBox>
 #include <KLocalizedString>
 #include <QLineEdit>
 #include <KMessageBox>

-#include <KVBox>

 
 #include <QVBoxLayout>
 #include <QCheckBox>
 #include <QGroupBox>
 #include <QLabel>
 #include <QPushButton>
 
 #include <QVBoxLayout>
 #include <QCheckBox>
 #include <QGroupBox>
 #include <QLabel>
 #include <QPushButton>

+#include <QHBoxLayout>
+#include <QVBoxLayout>

 
 #include "views/dolphinview.h"
 
 
 #include "views/dolphinview.h"
 


@@ -51,20 +52,29 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
     const int spacing = KDialog::spacingHint();
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     const int spacing = KDialog::spacingHint();
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);

-    KVBox* vBox = new KVBox(this);
-    vBox->setSpacing(spacing);
+    QWidget* vBox = new QWidget(this);
+    QVBoxLayout *vBoxLayout = new QVBoxLayout(vBox);
+    vBoxLayout->setMargin(0);
+    vBoxLayout->setSpacing(spacing);
+    vBoxLayout->setAlignment(Qt::AlignTop);

 
     // create 'Home URL' editor
     QGroupBox* homeBox = new QGroupBox(i18nc("@title:group", "Home Folder"), vBox);
 
     // create 'Home URL' editor
     QGroupBox* homeBox = new QGroupBox(i18nc("@title:group", "Home Folder"), vBox);

+    vBoxLayout->addWidget(homeBox);

 
 

-    KHBox* homeUrlBox = new KHBox(homeBox);
-    homeUrlBox->setSpacing(spacing);
+    QWidget* homeUrlBox = new QWidget(homeBox);
+    QHBoxLayout *homeUrlBoxLayout = new QHBoxLayout(homeUrlBox);
+    homeUrlBoxLayout->setMargin(0);
+    homeUrlBoxLayout->setSpacing(spacing);

 
 

-    new QLabel(i18nc("@label:textbox", "Location:"), homeUrlBox);
+    QLabel* homeUrlLabel = new QLabel(i18nc("@label:textbox", "Location:"), homeUrlBox);
+    homeUrlBoxLayout->addWidget(homeUrlLabel);

     m_homeUrl = new QLineEdit(homeUrlBox);
     m_homeUrl = new QLineEdit(homeUrlBox);

+    homeUrlBoxLayout->addWidget(m_homeUrl);

     m_homeUrl->setClearButtonEnabled(true);
 
     QPushButton* selectHomeUrlButton = new QPushButton(QIcon::fromTheme("folder-open"), QString(), homeUrlBox);
     m_homeUrl->setClearButtonEnabled(true);
 
     QPushButton* selectHomeUrlButton = new QPushButton(QIcon::fromTheme("folder-open"), QString(), homeUrlBox);

+    homeUrlBoxLayout->addWidget(selectHomeUrlButton);

 
 #ifndef QT_NO_ACCESSIBILITY
     selectHomeUrlButton->setAccessibleName(i18nc("@action:button", "Select Home Location"));
 
 #ifndef QT_NO_ACCESSIBILITY
     selectHomeUrlButton->setAccessibleName(i18nc("@action:button", "Select Home Location"));


@@ -73,13 +83,17 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
     connect(selectHomeUrlButton, &QPushButton::clicked,
             this, &StartupSettingsPage::selectHomeUrl);
 
     connect(selectHomeUrlButton, &QPushButton::clicked,
             this, &StartupSettingsPage::selectHomeUrl);
 

-    KHBox* buttonBox = new KHBox(homeBox);
-    buttonBox->setSpacing(spacing);
+    QWidget* buttonBox = new QWidget(homeBox);
+    QHBoxLayout *buttonBoxLayout = new QHBoxLayout(buttonBox);
+    buttonBoxLayout->setMargin(0);
+    buttonBoxLayout->setSpacing(spacing);

 
     QPushButton* useCurrentButton = new QPushButton(i18nc("@action:button", "Use Current Location"), buttonBox);
 
     QPushButton* useCurrentButton = new QPushButton(i18nc("@action:button", "Use Current Location"), buttonBox);

+    buttonBoxLayout->addWidget(useCurrentButton);

     connect(useCurrentButton, &QPushButton::clicked,
             this, &StartupSettingsPage::useCurrentLocation);
     QPushButton* useDefaultButton = new QPushButton(i18nc("@action:button", "Use Default Location"), buttonBox);
     connect(useCurrentButton, &QPushButton::clicked,
             this, &StartupSettingsPage::useCurrentLocation);
     QPushButton* useDefaultButton = new QPushButton(i18nc("@action:button", "Use Default Location"), buttonBox);

+    buttonBoxLayout->addWidget(useDefaultButton);

     connect(useDefaultButton, &QPushButton::clicked,
             this, &StartupSettingsPage::useDefaultLocation);
 
     connect(useDefaultButton, &QPushButton::clicked,
             this, &StartupSettingsPage::useDefaultLocation);
 


@@ -89,9 +103,13 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
 
     // create 'Split view', 'Show full path', 'Editable location' and 'Filter bar' checkboxes
     m_splitView = new QCheckBox(i18nc("@option:check Startup Settings", "Split view mode"), vBox);
 
     // create 'Split view', 'Show full path', 'Editable location' and 'Filter bar' checkboxes
     m_splitView = new QCheckBox(i18nc("@option:check Startup Settings", "Split view mode"), vBox);

+    vBoxLayout->addWidget(m_splitView);

     m_editableUrl = new QCheckBox(i18nc("@option:check Startup Settings", "Editable location bar"), vBox);
     m_editableUrl = new QCheckBox(i18nc("@option:check Startup Settings", "Editable location bar"), vBox);

+    vBoxLayout->addWidget(m_editableUrl);

     m_showFullPath = new QCheckBox(i18nc("@option:check Startup Settings", "Show full path inside location bar"), vBox);
     m_showFullPath = new QCheckBox(i18nc("@option:check Startup Settings", "Show full path inside location bar"), vBox);

+    vBoxLayout->addWidget(m_showFullPath);

     m_filterBar = new QCheckBox(i18nc("@option:check Startup Settings", "Show filter bar"), vBox);
     m_filterBar = new QCheckBox(i18nc("@option:check Startup Settings", "Show filter bar"), vBox);

+    vBoxLayout->addWidget(m_filterBar);

 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout