[Freevo-cvslog] r10826 - in trunk/WIP/gui: . gui gui/widgets

[Dirk M. <di...@fr...>]

Author: dmeyer
Date: Fri Jun 27 15:19:38 2008
New Revision: 10826

Log:
move image widget from freevo.WIP to kaa.candy

Removed:
   trunk/WIP/gui/gui/widgets/image.py
Modified:
   trunk/WIP/gui/gui/__init__.py
   trunk/WIP/gui/test.py

Modified: trunk/WIP/gui/gui/__init__.py
==============================================================================
--- trunk/WIP/gui/gui/__init__.py	(original)
+++ trunk/WIP/gui/gui/__init__.py	Fri Jun 27 15:19:38 2008
@@ -37,17 +37,12 @@
 # decorator
 threaded = kaa.candy.threaded
 
-def init(name, geometry, imagedir):
+def init(geometry):
     @threaded()
     def load_modules():
         import stage
         import widgets
         import application
-
-        # FIXME
-        import widgets.image
-        widgets.image.imagedir = imagedir
-
         global window
         window = stage.Stage(geometry)
     kaa.candy.init()

Modified: trunk/WIP/gui/test.py
==============================================================================
--- trunk/WIP/gui/test.py	(original)
+++ trunk/WIP/gui/test.py	Fri Jun 27 15:19:38 2008
@@ -2,15 +2,12 @@
 import kaa
 import gui
 
-images = '../../ui/share/images'
-theme  = 'theme.xml'
-geometry = 800, 600
-
-gui.init('clutter', geometry, images)
-gui.window.theme = theme
-
 import kaa.candy
 
+gui.init((800, 600))
+gui.window.theme = 'theme.xml'
+kaa.candy.config.imagepath.append('../../ui/share/images')
+
 bar = gui.window.render_application('splash').get_element('plugins')
 bar.set_max(30)