diff options
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/dolphinmainwindow.cpp | 15 | ||||
| -rw-r--r-- | src/dolphinmainwindow.h | 4 |
3 files changed, 2 insertions, 22 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9a8302ff1..89180b780 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -224,6 +224,7 @@ set(dolphinstatic_SRCS panels/folders/foldersitemlistwidget.cpp panels/folders/treeviewcontextmenu.cpp panels/folders/folderspanel.cpp + panels/terminal/terminalpanel.cpp search/dolphinfacetswidget.cpp search/dolphinsearchbox.cpp settings/general/behaviorsettingspage.cpp @@ -266,10 +267,6 @@ kconfig_add_kcfg_files(dolphinstatic_SRCS GENERATE_MOC settings/dolphin_versioncontrolsettings.kcfgc ) -if(NOT WIN32) - set(dolphinstatic_SRCS ${dolphinstatic_SRCS} panels/terminal/terminalpanel.cpp) -endif() - qt5_add_resources(dolphinstatic_SRCS dolphin.qrc) add_library(dolphinstatic STATIC ${dolphinstatic_SRCS}) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index d3e2fd907..da241e20e 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -33,6 +33,7 @@ #include "panels/folders/folderspanel.h" #include "panels/places/placespanel.h" #include "panels/information/informationpanel.h" +#include "panels/terminal/terminalpanel.h" #include "settings/dolphinsettingsdialog.h" #include "statusbar/dolphinstatusbar.h" #include "views/dolphinviewactionhandler.h" @@ -41,10 +42,6 @@ #include "views/viewproperties.h" #include "views/dolphinnewfilemenuobserver.h" -#ifndef Q_OS_WIN -#include "panels/terminal/terminalpanel.h" -#endif - #include "dolphin_generalsettings.h" #include <KActionCollection> @@ -100,9 +97,7 @@ DolphinMainWindow::DolphinMainWindow() : m_controlButton(nullptr), m_updateToolBarTimer(nullptr), m_lastHandleUrlStatJob(nullptr), -#ifndef Q_OS_WIN m_terminalPanel(nullptr), -#endif m_placesPanel(nullptr), m_tearDownFromPlacesRequested(false) { @@ -631,11 +626,9 @@ void DolphinMainWindow::togglePanelLockState() void DolphinMainWindow::slotTerminalPanelVisibilityChanged() { -#ifndef Q_OS_WIN if (m_terminalPanel->isHiddenInVisibleWindow()) { m_activeViewContainer->view()->setFocus(); } -#endif } void DolphinMainWindow::goBack() @@ -1025,7 +1018,6 @@ void DolphinMainWindow::setUrlAsCaption(const QUrl& url) void DolphinMainWindow::slotStorageTearDownFromPlacesRequested(const QString& mountPath) { -#ifndef Q_OS_WIN if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) { m_tearDownFromPlacesRequested = true; m_terminalPanel->goHome(); @@ -1033,17 +1025,14 @@ void DolphinMainWindow::slotStorageTearDownFromPlacesRequested(const QString& mo } else { m_placesPanel->proceedWithTearDown(); } -#endif } void DolphinMainWindow::slotStorageTearDownExternallyRequested(const QString& mountPath) { -#ifndef Q_OS_WIN if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) { m_tearDownFromPlacesRequested = false; m_terminalPanel->goHome(); } -#endif } void DolphinMainWindow::setupActions() @@ -1368,9 +1357,7 @@ void DolphinMainWindow::setupDockWidgets() panelsMenu->addAction(ac->action(QStringLiteral("show_places_panel"))); panelsMenu->addAction(ac->action(QStringLiteral("show_information_panel"))); panelsMenu->addAction(ac->action(QStringLiteral("show_folders_panel"))); -#ifndef Q_OS_WIN panelsMenu->addAction(ac->action(QStringLiteral("show_terminal_panel"))); -#endif panelsMenu->addSeparator(); panelsMenu->addAction(lockLayoutAction); } diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index e81793b0f..5e900e930 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -47,9 +47,7 @@ class KNewFileMenu; class QToolButton; class QIcon; class PlacesPanel; -#ifndef Q_OS_WIN class TerminalPanel; -#endif /** * @short Main window for Dolphin. @@ -517,9 +515,7 @@ private: KIO::Job* m_lastHandleUrlStatJob; -#ifndef Q_OS_WIN TerminalPanel* m_terminalPanel; -#endif PlacesPanel* m_placesPanel; bool m_tearDownFromPlacesRequested; }; |