From e8f247159e1fbacfd74dbce6c81f4e4855fad293 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Mon, 10 Mar 2008 17:33:30 +0000 Subject: [PATCH] Don't try to show the terminal in dolphin when in Windows svn path=/trunk/KDE/kdebase/apps/; revision=784126 --- src/CMakeLists.txt | 5 +++-- src/dolphinmainwindow.cpp | 11 +++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3f74958f2..de8b6f2e0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -76,7 +76,6 @@ install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR} ) install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart ) install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) - ########################################## set(dolphin_SRCS @@ -109,7 +108,6 @@ set(dolphin_SRCS startupsettingspage.cpp statusbarspaceinfo.cpp statusbarmessagelabel.cpp - terminalsidebarpage.cpp treeviewcontextmenu.cpp treeviewsidebarpage.cpp sidebartreeview.cpp @@ -117,6 +115,9 @@ set(dolphin_SRCS viewsettingspage.cpp viewpropsprogressinfo.cpp ) +if(NOT WIN32) + set(dolphin_SRCS ${dolphin_SRCS} terminalsidebarpage.cpp) +endif(NOT WIN32) qt4_add_dbus_adaptor(dolphin_SRCS org.kde.dolphin.Application.xml diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index ca392c134..ef3180a01 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -35,11 +35,14 @@ #include "infosidebarpage.h" #include "metadatawidget.h" #include "mainwindowadaptor.h" -#include "terminalsidebarpage.h" #include "treeviewsidebarpage.h" #include "viewpropertiesdialog.h" #include "viewproperties.h" +#ifndef Q_OS_WIN +#include "terminalsidebarpage.h" +#endif + #include "dolphin_generalsettings.h" #include "dolphin_iconsmodesettings.h" @@ -865,6 +868,7 @@ void DolphinMainWindow::setupDockWidgets() this, SLOT(dropUrls(KUrl::List, KUrl))); // setup "Terminal" +#ifndef Q_OS_WIN QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window", "Terminal")); terminalDock->setObjectName("terminalDock"); terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea); @@ -880,12 +884,15 @@ void DolphinMainWindow::setupDockWidgets() addDockWidget(Qt::BottomDockWidgetArea, terminalDock); connect(this, SIGNAL(urlChanged(KUrl)), terminalWidget, SLOT(setUrl(KUrl))); - +#endif + const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun(); if (firstRun) { infoDock->hide(); treeViewDock->hide(); +#ifndef Q_OS_WIN terminalDock->hide(); +#endif } QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places")); -- 2.47.3