Don't try to show the terminal in dolphin when in Windows

svn path=/trunk/KDE/kdebase/apps/; revision=784126

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3f74958f2d3da21bffae88f5d5d7e4f73d24576c..de8b6f2e01f3ce2c29a180605ad8256e4fb8c325 100644 (file)
--- 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} )
 
 install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart )
 install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 

-

 ##########################################
 
 set(dolphin_SRCS
 ##########################################
 
 set(dolphin_SRCS


@@ -109,7 +108,6 @@ set(dolphin_SRCS
    startupsettingspage.cpp
    statusbarspaceinfo.cpp
    statusbarmessagelabel.cpp
    startupsettingspage.cpp
    statusbarspaceinfo.cpp
    statusbarmessagelabel.cpp

-   terminalsidebarpage.cpp

    treeviewcontextmenu.cpp
    treeviewsidebarpage.cpp
    sidebartreeview.cpp
    treeviewcontextmenu.cpp
    treeviewsidebarpage.cpp
    sidebartreeview.cpp


@@ -117,6 +115,9 @@ set(dolphin_SRCS
    viewsettingspage.cpp
    viewpropsprogressinfo.cpp )
 
    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
 
 qt4_add_dbus_adaptor(dolphin_SRCS
    org.kde.dolphin.Application.xml

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index ca392c134525c1287cb3d65377ad913c6d7197d9..ef3180a0180c0993167b01338f4634663c4090e0 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -35,11 +35,14 @@
 #include "infosidebarpage.h"
 #include "metadatawidget.h"
 #include "mainwindowadaptor.h"
 #include "infosidebarpage.h"
 #include "metadatawidget.h"
 #include "mainwindowadaptor.h"

-#include "terminalsidebarpage.h"

 #include "treeviewsidebarpage.h"
 #include "viewpropertiesdialog.h"
 #include "viewproperties.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"
 
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
 


@@ -865,6 +868,7 @@ void DolphinMainWindow::setupDockWidgets()
             this, SLOT(dropUrls(KUrl::List, KUrl)));
 
     // setup "Terminal"
             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);
     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)));
     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();
     const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
     if (firstRun) {
         infoDock->hide();
         treeViewDock->hide();

+#ifndef Q_OS_WIN

         terminalDock->hide();
         terminalDock->hide();

+#endif         

     }
 
     QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));
     }
 
     QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));