update to David's suggestion for split view (http://davigno.oxygen-icons.org/?p=43)

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

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 62cb2b0c281ed96f65ed4333dd3ddca9b878861a..66794e3a4ab87aa95b9a5002a1a926284008964a 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -753,20 +753,9 @@ void DolphinMainWindow::toggleSplitView()
         m_view[SecondaryIdx]->show();
     } else {
         // remove secondary view
         m_view[SecondaryIdx]->show();
     } else {
         // remove secondary view

-        if (m_activeView == m_view[PrimaryIdx]) {
-            m_view[SecondaryIdx]->close();
-            m_view[SecondaryIdx]->deleteLater();
-            m_view[SecondaryIdx] = 0;
-        } else {
-            // The secondary view is active, hence from the users point of view
-            // the content of the secondary view should be moved to the primary view.
-            // From an implementation point of view it is more efficient to close
-            // the primary view and exchange the internal pointers afterwards.
-            m_view[PrimaryIdx]->close();
-            delete m_view[PrimaryIdx];
-            m_view[PrimaryIdx] = m_view[SecondaryIdx];
-            m_view[SecondaryIdx] = 0;
-        }
+        m_view[SecondaryIdx]->close();
+        m_view[SecondaryIdx]->deleteLater();
+        m_view[SecondaryIdx] = 0;

     }
     setActiveView(m_view[PrimaryIdx]);
     emit activeViewChanged();
     }
     setActiveView(m_view[PrimaryIdx]);
     emit activeViewChanged();


@@ -999,10 +988,13 @@ void DolphinMainWindow::loadSettings()
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
 
     KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
 
     KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));

-    if (settings->splitView()) {
+    const bool isSplit = settings->splitView();
+    if (isSplit) {

         splitAction->setChecked(true);
         toggleSplitView();
     }
         splitAction->setChecked(true);
         toggleSplitView();
     }

+    const KIcon splitIcon(isSplit ? "fileview-join" : "fileview-split");
+    splitAction->setIcon(splitIcon);

 
     updateViewActions();
 }
 
     updateViewActions();
 }


@@ -1084,7 +1076,7 @@ void DolphinMainWindow::setupActions()
     KToggleAction* detailsView = actionCollection()->add<KToggleAction>("details");
     detailsView->setText(i18n("Details"));
     detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
     KToggleAction* detailsView = actionCollection()->add<KToggleAction>("details");
     detailsView->setText(i18n("Details"));
     detailsView->setShortcut(Qt::CTRL | Qt::Key_2);

-    detailsView->setIcon(KIcon("fileview-text"));
+    detailsView->setIcon(KIcon("fileview-detailed"));

     connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));
 
     KToggleAction* columnView = actionCollection()->add<KToggleAction>("columns");
     connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));
 
     KToggleAction* columnView = actionCollection()->add<KToggleAction>("columns");


@@ -1178,7 +1170,7 @@ void DolphinMainWindow::setupActions()
     KToggleAction* split = actionCollection()->add<KToggleAction>("split_view");
     split->setText(i18n("Split"));
     split->setShortcut(Qt::Key_F10);
     KToggleAction* split = actionCollection()->add<KToggleAction>("split_view");
     split->setText(i18n("Split"));
     split->setShortcut(Qt::Key_F10);

-    split->setIcon(KIcon("view-left-right"));
+    split->setIcon(KIcon("fileview-split"));

     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 
     QAction* reload = actionCollection()->addAction("reload");
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 
     QAction* reload = actionCollection()->addAction("reload");


@@ -1414,7 +1406,10 @@ void DolphinMainWindow::updateViewActions()
     showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());
 
     KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
     showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());
 
     KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));

-    splitAction->setChecked(m_view[SecondaryIdx] != 0);
+    const bool isSplit = (m_view[SecondaryIdx] != 0);
+    splitAction->setChecked(isSplit);
+    const KIcon splitIcon(isSplit ? "fileview-join" : "fileview-split");
+    splitAction->setIcon(splitIcon);

 
     KToggleAction* editableLocactionAction =
         static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
 
     KToggleAction* editableLocactionAction =
         static_cast<KToggleAction*>(actionCollection()->action("editable_location"));

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 0a0c3cac5d6b9093b0e4c136b212fdfab9a373c0..40c1a409d330b880d19d644b086bcee9430fc1a5 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -81,7 +81,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     QLabel* viewModeLabel = new QLabel(i18n("View mode:"), propsBox);
     m_viewMode = new QComboBox(propsBox);
     m_viewMode->addItem(KIcon("fileview-icon"), i18n("Icons"));
     QLabel* viewModeLabel = new QLabel(i18n("View mode:"), propsBox);
     m_viewMode = new QComboBox(propsBox);
     m_viewMode->addItem(KIcon("fileview-icon"), i18n("Icons"));

-    m_viewMode->addItem(KIcon("fileview-text"), i18n("Details"));
+    m_viewMode->addItem(KIcon("fileview-detailed"), i18n("Details"));

     m_viewMode->addItem(KIcon("fileview-column"), i18n("Column"));
     const int index = static_cast<int>(m_viewProps->viewMode());
     m_viewMode->setCurrentIndex(index);
     m_viewMode->addItem(KIcon("fileview-column"), i18n("Column"));
     const int index = static_cast<int>(m_viewProps->viewMode());
     m_viewMode->setCurrentIndex(index);

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index 3dae27a7d10d8b50b82c0a160da6f785736b96ba..c98ba75d61d0f781f0254f81ff2a669c95b9fb9d 100644 (file)
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -58,7 +58,7 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
 
     // initialize 'Details' tab
     m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);
 
     // initialize 'Details' tab
     m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);

-    tabWidget->addTab(m_detailsPage, KIcon("fileview-text"), i18n("Details"));
+    tabWidget->addTab(m_detailsPage, KIcon("fileview-detailed"), i18n("Details"));

 
     // initialize 'Column' tab
     m_columnPage = new ColumnViewSettingsPage(mainWindow, tabWidget);
 
     // initialize 'Column' tab
     m_columnPage = new ColumnViewSettingsPage(mainWindow, tabWidget);