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

List:       kde-commits
Subject:    extragear/plasma/applets/lancelot
From:       Ivan Čukić <ivan.cukic+kde () gmail ! com>
Date:       2008-05-22 16:35:35
Message-ID: 1211474135.617590.14068.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 811219 by ivan:

- Applet rewrite (clean build recommended, or just removing
the .desktop file and the plug-in library file since the name
of the plug-in (applet) has changed
- Added a new widget - HoverIcon
- Configuration switched to the new framework in plasma



 M  +3 -0      TODO  
 M  +14 -10    app/src/CMakeLists.txt  
 D             app/src/applet (directory)  
 A             app/src/launcher (directory)  
 A             app/src/launcher/LancelotApplet.cpp   [License: BSD]
 A             app/src/launcher/LancelotApplet.h   [License: BSD]
 A             app/src/launcher/LancelotAppletConfig.cpp   [License: BSD]
 A             app/src/launcher/LancelotAppletConfig.h   [License: BSD]
 A             app/src/launcher/LancelotAppletConfigBase.ui  
 A             app/src/launcher/plasma-applet-lancelot-launcher.desktop  
 M  +2 -0      libs/lancelot/CMakeLists.txt  
 A             libs/lancelot/widgets/HoverIcon.cpp   [License: BSD]
 A             libs/lancelot/widgets/HoverIcon.h   [License: BSD]
 M  +4 -0      libs/lancelot/widgets/Widget.cpp  


--- trunk/extragear/plasma/applets/lancelot/TODO #811218:811219
@@ -18,6 +18,9 @@
 TODO: (a) switch groups to QMetaObject and properties
 TODO: (m) add margin features to layouts
 TODO: (m) add propper size hints to layouts and widgets
+TODO: (e) move the groups mechanism away from Widget
+          so that ordinary plasma widgets could be extended
+          when needed. Add groups support to HoverIcon
 
 Applet:
 
--- trunk/extragear/plasma/applets/lancelot/app/src/CMakeLists.txt #811218:811219
@@ -125,29 +125,33 @@
 
 # Lancelot Main Applet
 
-set(plasma_applet_lancelot_SRCS
+set(plasma_applet_lancelot_launcher_SRCS
   ${plasma_lancelot_widgets_SRCS}
   ${plasma_lancelot_client_SRCS}
-  applet/LancelotApplet.cpp
-  applet/LancelotAppletConfig.cpp
+  launcher/LancelotApplet.cpp
+  launcher/LancelotAppletConfig.cpp
 )
 
 kde4_add_ui_files(
-  plasma_applet_lancelot_SRCS
-  applet/LancelotAppletConfigBase.ui
+  plasma_applet_lancelot_launcher_SRCS
+  launcher/LancelotAppletConfigBase.ui
 )
 
+kde4_add_plugin(plasma_applet_lancelot_launcher ${plasma_applet_lancelot_launcher_SRCS})
 
-kde4_add_plugin(plasma_applet_lancelot ${plasma_applet_lancelot_SRCS})
+target_link_libraries(
+   plasma_applet_lancelot_launcher
+   ${PLASMA_LIBS}
+   ${LANCELOT_LIBS}
+   ${KDE4_KIO_LIBS}
+)
 
-target_link_libraries(plasma_applet_lancelot ${PLASMA_LIBS} ${LANCELOT_LIBS} ${KDE4_KIO_LIBS})
-
 install(
-  TARGETS plasma_applet_lancelot
+  TARGETS plasma_applet_lancelot_launcher
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 install(
-  FILES applet/plasma-applet-lancelot.desktop
+  FILES launcher/plasma-applet-lancelot-launcher.desktop
   DESTINATION ${SERVICES_INSTALL_DIR}
 )
--- trunk/extragear/plasma/applets/lancelot/libs/lancelot/CMakeLists.txt #811218:811219
@@ -44,6 +44,7 @@
         widgets/ExtenderButton.cpp
         widgets/Panel.cpp
         widgets/ResizeBordersPanel.cpp
+        widgets/HoverIcon.cpp
 
         widgets/ScrollBar.cpp
         widgets/ScrollPane.cpp
@@ -101,6 +102,7 @@
    widgets/ResizeBordersPanel.h
    widgets/Widget.h
    widgets/WidgetPositioner.h
+   widgets/HoverIcon.h
    DESTINATION ${INCLUDE_INSTALL_DIR}/lancelot/widgets)
 
 install(FILES
--- trunk/extragear/plasma/applets/lancelot/libs/lancelot/widgets/Widget.cpp #811218:811219
@@ -211,6 +211,10 @@
             } else {
                 result = QSizeF();
             }
+            break;
+        default:
+            result = QSizeF();
+            break;
     }
     return result.boundedTo(constraint);
 }
[prev in list] [next in list] [prev in thread] [next in thread]