Better choice of phrase: 'Categorized' -> 'Show in Groups'

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index d84775d59dadeb42edcc8fe13ebcd86cefaa7571..5b8b11bc1ff7c07b9545aea628e5ba3556260a86 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -206,38 +206,12 @@ void DolphinMainWindow::rename(const KUrl& oldUrl, const KUrl& newUrl)
 
 void DolphinMainWindow::refreshViews()
 {
-    const bool split = DolphinSettings::instance().generalSettings()->splitView();
-    const bool isPrimaryViewActive = (m_activeView == m_view[PrimaryIdx]);
-    KUrl url;
-    for (int i = PrimaryIdx; i <= SecondaryIdx; ++i) {
-        if (m_view[i] != 0) {
-            url = m_view[i]->url();
-
-            // delete view instance...
-            m_view[i]->close();
-            m_view[i]->deleteLater();
-            m_view[i] = 0;
-        }
+    Q_ASSERT(m_view[PrimaryIdx] != 0);
+    m_view[PrimaryIdx]->refresh();
 
-        if (split || (i == PrimaryIdx)) {
-            // ... and recreate it
-            ViewProperties props(url);
-            m_view[i] = new DolphinView(this,
-                                        m_splitter,
-                                        url,
-                                        props.viewMode(),
-                                        props.showHiddenFiles());
-            connectViewSignals(i);
-            m_view[i]->reload();
-            m_view[i]->show();
-        }
+    if (m_view[SecondaryIdx] != 0) {
+        m_view[SecondaryIdx]->refresh();
     }
-
-    m_activeView = isPrimaryViewActive ? m_view[PrimaryIdx] : m_view[SecondaryIdx];
-    Q_ASSERT(m_activeView != 0);
-
-    updateViewActions();
-    emit activeViewChanged();
 }
 
 void DolphinMainWindow::changeUrl(const KUrl& url)
@@ -1153,7 +1127,7 @@ void DolphinMainWindow::setupActions()
     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
 
     KToggleAction* sortCategorized = actionCollection()->add<KToggleAction>("categorized");
-    sortCategorized->setText(i18n("Categorized"));
+    sortCategorized->setText(i18n("Show in Groups"));
     connect(sortCategorized, SIGNAL(triggered()), this, SLOT(toggleSortCategorization()));
 
     KToggleAction* clearInfo = actionCollection()->add<KToggleAction>("clear_info");