[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/shells
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-08-26 2:52:17
Message-ID: 1219719137.892496.29555.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 852588 by aseigo:

don't build plasma-mid on win32; some .desktop file clarification


 M  +4 -1      CMakeLists.txt  
 M  +1 -1      desktop/plasma.desktop  
 M  +4 -8      mid/CMakeLists.txt  
 M  +2 -1      mid/plasma-mid.desktop  
 M  +3 -19     mid/plasmaapp.cpp  


--- trunk/KDE/kdebase/workspace/plasma/shells/CMakeLists.txt #852587:852588
@@ -1,5 +1,8 @@
 add_subdirectory(desktop)
-add_subdirectory(mid)
 add_subdirectory(plasmoidviewer)
 add_subdirectory(screensaver)
 
+if(NOT WIN32)
+   add_subdirectory(mid)
+endif(NOT WIN32)
+
--- trunk/KDE/kdebase/workspace/plasma/shells/desktop/plasma.desktop #852587:852588
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Exec=plasma
 X-DBUS-StartupType=wait
-Name=Plasma
+Name=Plasma Desktop Workspace
 Name[ar]=بلازما
 Name[be]=Плазма
 Name[csb]=Plazma
--- trunk/KDE/kdebase/workspace/plasma/shells/mid/CMakeLists.txt #852587:852588
@@ -12,14 +12,10 @@
 
 kde4_add_kdeinit_executable(plasma-mid ${plasma-mid_SRCS})
 
-if(NOT WIN32)
-    target_link_libraries(kdeinit_plasma-mid plasma kworkspace \
                ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
-    if(X11_Xrender_FOUND)
-      target_link_libraries(kdeinit_plasma-mid ${X11_Xrender_LIB})
-    endif(X11_Xrender_FOUND)
-else(NOT WIN32)
-    target_link_libraries(kdeinit_plasma-mid plasma ${KDE4_KNEWSTUFF2_LIBS} \
                ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
-endif(NOT WIN32)
+target_link_libraries(kdeinit_plasma-mid plasma kworkspace ${KDE4_KNEWSTUFF2_LIBS} \
${KDE4_KIO_LIBS} ${X11_LIBRARIES}) +if(X11_Xrender_FOUND)
+   target_link_libraries(kdeinit_plasma-mid ${X11_Xrender_LIB})
+endif(X11_Xrender_FOUND)
 
 install(TARGETS kdeinit_plasma-mid DESTINATION ${LIB_INSTALL_DIR})
 install(TARGETS plasma-mid ${INSTALL_TARGETS_DEFAULT_ARGS})
--- trunk/KDE/kdebase/workspace/plasma/shells/mid/plasma-mid.desktop #852587:852588
@@ -1,7 +1,8 @@
 [Desktop Entry]
 Exec=plasma-mid
 X-DBUS-StartupType=wait
-Name=Plasma MID Shell
+Name=Plasma MID
+Comment=Workspace shell for mobile internet devices
 Type=Service
 X-KDE-StartupNotify=false
 OnlyShowIn=KDE;
--- trunk/KDE/kdebase/workspace/plasma/shells/mid/plasmaapp.cpp #852587:852588
@@ -43,20 +43,17 @@
 #include "midcorona.h"
 #include "midview.h"
 
-#ifdef Q_WS_X11
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrender.h>
 
 Display* dpy = 0;
 Colormap colormap = 0;
 Visual *visual = 0;
-#endif
 
 static const int CONTROL_BAR_HEIGHT = 22;
 
 void checkComposite()
 {
-#ifdef Q_WS_X11
     dpy = XOpenDisplay(0); // open default display
     if (!dpy) {
         kError() << "Cannot connect to the X server" << endl;
@@ -87,30 +84,23 @@
 
     kDebug() << (colormap ? "Plasma has an argb visual" : "Plasma lacks an argb \
                visual") << visual << colormap;
     kDebug() << ((KWindowSystem::compositingActive() && colormap) ? "Plasma can use \
                COMPOSITE for effects"
-                                                                    : "Plasma is \
                COMPOSITE-less") << "on" << dpy;
-#endif
+                                                                  : "Plasma is \
COMPOSITE-less") +             << "on" << dpy;
+
 }
 
 PlasmaApp* PlasmaApp::self()
 {
     if (!kapp) {
         checkComposite();
-#ifdef Q_WS_X11
         return new PlasmaApp(dpy, visual ? Qt::HANDLE(visual) : 0, colormap ? \
                Qt::HANDLE(colormap) : 0);
-#else
-        return new PlasmaApp(0, 0, 0);
-#endif
     }
 
     return qobject_cast<PlasmaApp*>(kapp);
 }
 
 PlasmaApp::PlasmaApp(Display* display, Qt::HANDLE visual, Qt::HANDLE colormap)
-#ifdef Q_WS_X11
     : KUniqueApplication(display, visual, colormap),
-#else
-    : KUniqueApplication(),
-#endif
       m_corona(0),
       m_window(0),
       m_controlBar(0),
@@ -153,7 +143,6 @@
 
     m_window = new QWidget;
 
-#ifdef Q_WS_X11
     //FIXME: if argb visuals enabled Qt will always set WM_CLASS as \
                "qt-subapplication" no matter what
     //the application name is we set the proper XClassHint here, hopefully won't be \
necessary anymore when  //qapplication will manage apps with argb visuals in a better \
way @@ -161,7 +150,6 @@
     classHint.res_name = const_cast<char*>("Plasma");
     classHint.res_class = const_cast<char*>("Plasma");
     XSetClassHint(QX11Info::display(), m_window->winId(), &classHint);
-#endif
 
     QVBoxLayout *layout = new QVBoxLayout(m_window);
     layout->setMargin(0);
@@ -325,11 +313,7 @@
 
 bool PlasmaApp::hasComposite()
 {
-#ifdef Q_WS_X11
     return colormap && KWindowSystem::compositingActive();
-#else
-    return false;
-#endif
 }
 
 void PlasmaApp::notifyStartup(bool completed)


[prev in list] [next in list] [prev in thread] [next in thread]