Exclude m_terminalPanel references when built on Windows

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 067d4a6e1d176d038f1dab966d8e4c14ad546d68..4d0e6b20dd79086f0d0ef4d625631d8db0790e90 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -629,6 +629,15 @@ void DolphinMainWindow::togglePanelLockState()
     GeneralSettings::setLockPanels(newLockState);
 }
 
     GeneralSettings::setLockPanels(newLockState);
 }
 

+void DolphinMainWindow::slotTerminalPanelVisibilityChanged()
+{
+#ifndef Q_OS_WIN
+    if (m_terminalPanel->isHiddenInVisibleWindow()) {
+        m_activeViewContainer->view()->setFocus();
+    }
+#endif
+}
+

 void DolphinMainWindow::goBack()
 {
     KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
 void DolphinMainWindow::goBack()
 {
     KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();


@@ -1003,7 +1012,7 @@ void DolphinMainWindow::setUrlAsCaption(const QUrl& url)
 
     if (m_activeViewContainer->isSearchModeEnabled()) {
         if(m_activeViewContainer->currentSearchText().isEmpty()){
 
     if (m_activeViewContainer->isSearchModeEnabled()) {
         if(m_activeViewContainer->currentSearchText().isEmpty()){

-            setWindowTitle(i18n("Empty Search"));
+            setWindowTitle(i18n("Search"));

         } else {
             const auto searchText = i18n("Search for %1", m_activeViewContainer->currentSearchText());
             setWindowTitle(searchText);
         } else {
             const auto searchText = i18n("Search for %1", m_activeViewContainer->currentSearchText());
             setWindowTitle(searchText);


@@ -1297,6 +1306,8 @@ void DolphinMainWindow::setupDockWidgets()
         connect(m_terminalPanel, &TerminalPanel::changeUrl, this, &DolphinMainWindow::slotTerminalDirectoryChanged);
         connect(terminalDock, &DolphinDockWidget::visibilityChanged,
                 m_terminalPanel, &TerminalPanel::dockVisibilityChanged);
         connect(m_terminalPanel, &TerminalPanel::changeUrl, this, &DolphinMainWindow::slotTerminalDirectoryChanged);
         connect(terminalDock, &DolphinDockWidget::visibilityChanged,
                 m_terminalPanel, &TerminalPanel::dockVisibilityChanged);

+        connect(terminalDock, &DolphinDockWidget::visibilityChanged,
+                this, &DolphinMainWindow::slotTerminalPanelVisibilityChanged);

 
         QAction* terminalAction = terminalDock->toggleViewAction();
         createPanelAction(QIcon::fromTheme(QStringLiteral("utilities-terminal")), Qt::Key_F4, terminalAction, QStringLiteral("show_terminal_panel"));
 
         QAction* terminalAction = terminalDock->toggleViewAction();
         createPanelAction(QIcon::fromTheme(QStringLiteral("utilities-terminal")), Qt::Key_F4, terminalAction, QStringLiteral("show_terminal_panel"));