Keeps the selection after showing/hiding hidden files.

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 9324cdb21a9e393d2702803bdf6753683a0665d3..4c584cdf9fb2572c94e2fc1eddc8b12dce870846 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -824,6 +824,7 @@ void DolphinMainWindow::find()
 
 void DolphinMainWindow::slotSearchLocationChanged()
 {
+#ifdef HAVE_NEPOMUK
     QDockWidget* searchDock = findChild<QDockWidget*>("searchDock");
     if (!searchDock) {
         return;
@@ -835,6 +836,7 @@ void DolphinMainWindow::slotSearchLocationChanged()
                                        ? SearchPanel::FromCurrentDir
                                        : SearchPanel::Everywhere);
     }
+#endif
 }
 
 void DolphinMainWindow::updatePasteAction()
@@ -1799,7 +1801,7 @@ void DolphinMainWindow::setupDockWidgets()
 
     connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide()));
     connect(terminalDock, SIGNAL(visibilityChanged(bool)),
-            terminalPanel, SLOT(visibilityChanged(bool)));
+            terminalPanel, SLOT(dockVisibilityChanged()));
 
     QAction* terminalAction = terminalDock->toggleViewAction();
     terminalAction->setShortcut(Qt::Key_F4);
@@ -2277,6 +2279,8 @@ void ToolBarMenu::showEvent(QShowEvent* event)
         pos.ry() = button->mapToGlobal(QPoint(0, 0)).y() - height();
     }
 
+    pos += screen.topLeft();
+
     move(pos);
 }