X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/02c94b228a3ad9a5d39e850b9708f1c52c713c57..29778152ad:/src/settings/startup/startupsettingspage.cpp

diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index f8b7daa79..d7d5fba4c 100644
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -43,14 +43,15 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
     m_editableUrl(nullptr),
     m_showFullPath(nullptr),
     m_filterBar(nullptr),
-    m_showFullPathInTitlebar(nullptr)
+    m_showFullPathInTitlebar(nullptr),
+    m_openExternallyCalledFolderInNewTab(nullptr)
 {
     QFormLayout* topLayout = new QFormLayout(this);
 
 
     // create 'Home URL' editor
     QHBoxLayout* homeUrlBoxLayout = new QHBoxLayout();
-    homeUrlBoxLayout->setMargin(0);
+    homeUrlBoxLayout->setContentsMargins(0, 0, 0, 0);
 
     m_homeUrl = new QLineEdit();
     m_homeUrl->setClearButtonEnabled(true);
@@ -67,7 +68,7 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
             this, &StartupSettingsPage::selectHomeUrl);
 
     QHBoxLayout* buttonBoxLayout = new QHBoxLayout();
-    buttonBoxLayout->setMargin(0);
+    buttonBoxLayout->setContentsMargins(0, 0, 0, 0);
 
     QPushButton* useCurrentButton = new QPushButton(i18nc("@action:button", "Use Current Location"));
     buttonBoxLayout->addWidget(useCurrentButton);
@@ -79,7 +80,7 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
             this, &StartupSettingsPage::useDefaultLocation);
 
     QVBoxLayout* homeBoxLayout = new QVBoxLayout();
-    homeBoxLayout->setMargin(0);
+    homeBoxLayout->setContentsMargins(0, 0, 0, 0);
     homeBoxLayout->addLayout(homeUrlBoxLayout);
     homeBoxLayout->addLayout(buttonBoxLayout);
 
@@ -100,6 +101,8 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
     topLayout->addRow(QString(), m_filterBar);
     m_showFullPathInTitlebar = new QCheckBox(i18nc("@option:check Startup Settings", "Show full path in title bar"));
     topLayout->addRow(QString(), m_showFullPathInTitlebar);
+    m_openExternallyCalledFolderInNewTab = new QCheckBox(i18nc("@option:check Startup Settings", "Open new folders in tabs"));
+    topLayout->addRow(QString(), m_openExternallyCalledFolderInNewTab);
 
 
     loadSettings();
@@ -110,6 +113,7 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
     connect(m_showFullPath, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged);
     connect(m_filterBar,    &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged);
     connect(m_showFullPathInTitlebar, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged);
+    connect(m_openExternallyCalledFolderInNewTab, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged);
 }
 
 StartupSettingsPage::~StartupSettingsPage()
@@ -133,7 +137,7 @@ void StartupSettingsPage::applySettings()
     settings->setShowFullPath(m_showFullPath->isChecked());
     settings->setFilterBar(m_filterBar->isChecked());
     settings->setShowFullPathInTitlebar(m_showFullPathInTitlebar->isChecked());
-
+    settings->setOpenExternallyCalledFolderInNewTab(m_openExternallyCalledFolderInNewTab->isChecked());
     settings->save();
 }
 
@@ -183,4 +187,5 @@ void StartupSettingsPage::loadSettings()
     m_showFullPath->setChecked(GeneralSettings::showFullPath());
     m_filterBar->setChecked(GeneralSettings::filterBar());
     m_showFullPathInTitlebar->setChecked(GeneralSettings::showFullPathInTitlebar());
+    m_openExternallyCalledFolderInNewTab->setChecked(GeneralSettings::openExternallyCalledFolderInNewTab());
 }