Move (broken) editMimeType action from konqueror to dolphinpart (and made it work...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index ea240ba83ce7d1da13e98589440d7839311aac8f..6eb45ac0d1558389586d68800162f86ed656ece5 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -321,7 +321,12 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
     }
 
     QAction* compareFilesAction = actionCollection()->action("compare_files");
-    compareFilesAction->setEnabled(selectedUrlsCount == 2);
+    if (selectedUrlsCount == 2) {
+        const bool kompareInstalled = !KGlobal::dirs()->findExe("kompare").isEmpty();
+        compareFilesAction->setEnabled(selectedUrlsCount == 2 && kompareInstalled);
+    } else {
+        compareFilesAction->setEnabled(false);
+    }
 
     m_activeViewContainer->updateStatusBar();
 
@@ -1269,6 +1274,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());