X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/bdb91e85ec76da0019044c0f9166be5979df41d6..20641620c8cf9187e44b4aea347cbc8d8c96fc25:/src/dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index acd1282a2..e0386467e 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -273,9 +273,8 @@ void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::Information
 
     const DolphinView* view = m_activeViewContainer->view();
 
-    const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     const bool enable = (view->mode() == DolphinView::DetailsView) ||
-                         ((view->mode() == DolphinView::IconsView) && settings->showAdditionalInfo());
+                        (view->mode() == DolphinView::IconsView);
 
     showSizeInfo->setEnabled(enable);
     showDateInfo->setEnabled(enable);
@@ -1013,8 +1012,8 @@ void DolphinMainWindow::setupActions()
                           SLOT(undo()),
                           actionCollection());
 
-    //Need to remove shift+del from cut action, else the shortcut for deletejob
-    //doesn't work
+    // need to remove shift+del from cut action, else the shortcut for deletejob
+    // doesn't work
     KAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection());
     KShortcut cutShortcut = cut->shortcut();
     cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty);
@@ -1041,7 +1040,6 @@ void DolphinMainWindow::setupActions()
                              SLOT(zoomOut()),
                              actionCollection());
 
-
     KToggleAction* iconsView = DolphinView::iconsModeAction(actionCollection());
     KToggleAction* detailsView = DolphinView::detailsModeAction(actionCollection());
     KToggleAction* columnView = DolphinView::columnsModeAction(actionCollection());
@@ -1151,7 +1149,7 @@ void DolphinMainWindow::setupActions()
 
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
     showPreview->setText(i18nc("@action:intoolbar", "Preview"));
-    showPreview->setIcon(KIcon("fileview-preview"));
+    showPreview->setIcon(KIcon("view-preview"));
     connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
 
     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");
@@ -1160,7 +1158,7 @@ void DolphinMainWindow::setupActions()
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
 
     KAction* split = actionCollection()->addAction("split_view");
-    split->setShortcut(Qt::Key_F10);
+    split->setShortcut(Qt::Key_F3);
     updateSplitAction();
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 
@@ -1274,6 +1272,8 @@ void DolphinMainWindow::setupDockWidgets()
     SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock);
     terminalDock->setWidget(terminalWidget);
 
+    connect(terminalWidget, SIGNAL(hideTerminalSidebarPage()), terminalDock, SLOT(hide()));
+
     terminalDock->toggleViewAction()->setText(i18nc("@title:window", "Terminal"));
     terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4);
     actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
@@ -1455,14 +1455,14 @@ void DolphinMainWindow::updateSplitAction()
     if (m_viewContainer[SecondaryView] != 0) {
         if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
-            splitAction->setIcon(KIcon("fileview-close-right"));
+            splitAction->setIcon(KIcon("view-right-close"));
         } else {
             splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
-            splitAction->setIcon(KIcon("fileview-close-left"));
+            splitAction->setIcon(KIcon("view-left-close"));
         }
     } else {
         splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
-        splitAction->setIcon(KIcon("fileview-split"));
+        splitAction->setIcon(KIcon("view-right-new"));
     }
 }