also toggle the text between "Split" and "Join" for the split action

svn path=/trunk/KDE/kdebase/apps/; revision=671018

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 66794e3a4ab87aa95b9a5002a1a926284008964a..f00641681807736ffc94cc4fb3de338f32458869 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -986,16 +986,7 @@ void DolphinMainWindow::init()
 void DolphinMainWindow::loadSettings()
 {
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-
-    KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
-    const bool isSplit = settings->splitView();
-    if (isSplit) {
-        splitAction->setChecked(true);
-        toggleSplitView();
-    }
-    const KIcon splitIcon(isSplit ? "fileview-join" : "fileview-split");
-    splitAction->setIcon(splitIcon);
-
+    updateSplitAction(settings->splitView());
     updateViewActions();
 }
 
@@ -1168,9 +1159,8 @@ void DolphinMainWindow::setupActions()
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
 
     KToggleAction* split = actionCollection()->add<KToggleAction>("split_view");
-    split->setText(i18n("Split"));
     split->setShortcut(Qt::Key_F10);
-    split->setIcon(KIcon("fileview-split"));
+    updateSplitAction(false);
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 
     QAction* reload = actionCollection()->addAction("reload");
@@ -1405,11 +1395,7 @@ void DolphinMainWindow::updateViewActions()
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
     showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());
 
-    KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
-    const bool isSplit = (m_view[SecondaryIdx] != 0);
-    splitAction->setChecked(isSplit);
-    const KIcon splitIcon(isSplit ? "fileview-join" : "fileview-split");
-    splitAction->setIcon(splitIcon);
+    updateSplitAction(m_view[SecondaryIdx] != 0);
 
     KToggleAction* editableLocactionAction =
         static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
@@ -1479,6 +1465,18 @@ void DolphinMainWindow::connectViewSignals(int viewIndex)
             this, SLOT(slotHistoryChanged()));
 }
 
+void DolphinMainWindow::updateSplitAction(bool isSplit)
+{
+    KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
+    if (isSplit) {
+        splitAction->setText(i18n("Join"));
+        splitAction->setIcon(KIcon("fileview-join"));
+    } else {
+        splitAction->setText(i18n("Split"));
+        splitAction->setIcon(KIcon("fileview-split"));
+    }
+}
+
 DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) :
     KonqUndoManager::UiInterface(mainWin),
     m_mainWin(mainWin)

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 8d44a10862ae233094410351f8334d976ace3a0c..6838b61b0296a94bb79b28d5bfec852642e8e092 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -431,6 +431,14 @@ private:
      */
     void connectViewSignals(int viewIndex);
 
+    /**
+     * Updates the text of the split action:
+     * If \a isSplit is true, the text is set to "Split",
+     * otherwise the text is set to "Join". The icon
+     * is updated to match with the text.
+     */
+    void updateSplitAction(bool isSplit);
+
 private:
     /**
      * DolphinMainWindowsupports only one or two views, which