File 2008-fix-closing-split-view.patch of Package dolphin

Overview Repositories Revisions Requests Users Attributes Meta

File 2008-fix-closing-split-view.patch of Package dolphin

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 0d9d244ae3baf4131ff30d6bc000de19d2f21007..3d7d416b4515cd1690ea6519b57941046146381f 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -212,8 +212,6 @@ DolphinMainWindow::DolphinMainWindow()
     connect(&m_fileItemActions, &KFileItemActions::error, this, [this](const QString &errorMessage) {
         showErrorMessage(errorMessage);
     });
-
-    connect(GeneralSettings::self(), &GeneralSettings::splitViewChanged, this, &DolphinMainWindow::slotSplitViewChanged);
 }
 
 DolphinMainWindow::~DolphinMainWindow()
@@ -462,12 +460,6 @@ void DolphinMainWindow::openNewWindow(const QUrl &url)
     Dolphin::openNewWindow({url}, this);
 }
 
-void DolphinMainWindow::slotSplitViewChanged()
-{
-    m_tabWidget->currentTabPage()->setSplitViewEnabled(GeneralSettings::splitView(), WithAnimation);
-    updateSplitAction();
-}
-
 void DolphinMainWindow::openInNewTab()
 {
     const KFileItemList &list = m_activeViewContainer->view()->selectedItems();
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 551e28192700373103edce3709b39675e2f9ebdc..d2287117ea85ac649fe4afe7d978bae4aed2fb60 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -201,9 +201,6 @@ public Q_SLOTS:
      */
     void openNewWindow(const QUrl &url);
 
-    /** @see GeneralSettings::splitViewChanged() */
-    void slotSplitViewChanged();
-
 Q_SIGNALS:
     /**
      * Is sent if the selection of the currently active view has
diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
index 11a720d20cf069477e13407fc38576aa1f520baf..0cafbecd19aa6ad4637f3d7459275da4c8c1863d 100644
--- a/src/dolphintabwidget.cpp
+++ b/src/dolphintabwidget.cpp
@@ -127,6 +127,7 @@ void DolphinTabWidget::openNewActivatedTab()
     } else {
         oldNavigatorState = m_navigatorsWidget->secondaryUrlNavigator()->visualState();
     }
+    oldNavigatorState->isUrlEditable = GeneralSettings::editableUrl();
 
     const DolphinViewContainer *oldActiveViewContainer = currentTabPage()->activeViewContainer();
     Q_ASSERT(oldActiveViewContainer);
diff --git a/src/dolphinurlnavigator.cpp b/src/dolphinurlnavigator.cpp
index ad45691771be875905e7f1851d1cc4a200459845..a0cfee40841c7d9e7d9bda4aa7548ae5c1780c05 100644
--- a/src/dolphinurlnavigator.cpp
+++ b/src/dolphinurlnavigator.cpp
@@ -91,7 +91,9 @@ void DolphinUrlNavigator::setVisualState(const VisualState &visualState)
     if (!visualState.isUrlEditable) {
         return;
     }
-    editor()->lineEdit()->setText(visualState.text);
+    if (!visualState.text.isEmpty()) {
+        editor()->lineEdit()->setText(visualState.text);
+    }
     if (visualState.hasFocus) {
         editor()->lineEdit()->setFocus();
         editor()->lineEdit()->setCursorPosition(visualState.cursorPosition);
diff --git a/src/dolphinurlnavigatorscontroller.cpp b/src/dolphinurlnavigatorscontroller.cpp
index 9405bb8621292a3b7c0b3b9d46e05e156caed8f6..e26d848188221b5473f575ae9595d60ce14124ca 100644
--- a/src/dolphinurlnavigatorscontroller.cpp
+++ b/src/dolphinurlnavigatorscontroller.cpp
@@ -20,7 +20,6 @@ void DolphinUrlNavigatorsController::slotReadSettings()
     // settings of the URL navigators and split view.
     if (GeneralSettings::modifiedStartupSettings()) {
         for (DolphinUrlNavigator *urlNavigator : s_instances) {
-            urlNavigator->setUrlEditable(GeneralSettings::editableUrl());
             urlNavigator->setShowFullPath(GeneralSettings::showFullPath());
             urlNavigator->setHomeUrl(Dolphin::homeUrl());
         }
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index ba476bb2ac5361ffb12318656abb0951aa82d4a5..539b698671cda1c1d4be8d379411cfe9d5014b2e 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -435,13 +435,6 @@ void DolphinViewContainer::showMessage(const QString &msg, MessageType type)
 
 void DolphinViewContainer::readSettings()
 {
-    // The startup settings should (only) get applied if they have been
-    // modified by the user. Otherwise keep the (possibly) different current
-    // setting of the filterbar.
-    if (GeneralSettings::modifiedStartupSettings()) {
-        setFilterBarVisible(GeneralSettings::filterBar());
-    }
-
     m_view->readSettings();
     m_statusBar->readSettings();
 }

Places

File 2008-fix-closing-split-view.patch of Package dolphin

Places