Fix for config saving.

[drlaunch] / src / widget.py

diff --git a/src/widget.py b/src/widget.py
index 878c063..1918367 100755 (executable)
--- a/src/widget.py
+++ b/src/widget.py
@@ -44,6 +44,8 @@ from math import pi
 import cairo
 import time
 
+from subprocess import Popen,PIPE
+
 from portrait import FremantleRotation
 import launcher
 from xdg.IconTheme import getIconPath
@@ -63,30 +65,55 @@ class DrlaunchPlugin(IconGrid, HomePluginItem, FremantleRotation):
     def __init__(self):
        IconGrid.__init__(self)
        HomePluginItem.__init__(self)
-       FremantleRotation.__init__(self, 'DrlaunchPlugin')
+       FremantleRotation.__init__(self, 'DrlaunchPlugin',
+           mode=FremantleRotation.AUTOMATIC, dontrotate=True)
 
        self.winConfig=None
 
        self.set_settings(True)
-       self.connect('show-settings', self.slot_show_settings)
-       self.connect('long-press', self.signalLongpress)
-       self.connect('click', self.signalClick)
 
-    def get_id(self):
+       self.id=None
+       self.config=None
+
+    def get_id0(self):
        """If this is called from the constructor then the program
        core dumps """
        aid=self.get_applet_id()
 
-       ret="%s" % aid
+       # Get desktop activity if D.A.M. is present
+       
+       act="/usr/bin/activity"
+
+       if os.path.exists(act):
+           r=Popen([act, "current"], stdout=PIPE).communicate()
+           activity=r[0].strip()
+       else:
+           activity=""
+
+       ret="%s-%s" % (aid, activity)
 
        return(ret)
 
-    def do_realize(self):
-       #print "realize"
+    def get_id(self):
+       if self.id==None:
+           self.id=self.get_id0()
+
+       return(self.id)
+
+    def get_config(self):
+       if self.config==None:
+           id=self.get_id()
+           self.config=config.Config(id)
+
+       return(self.config)
 
+    def do_realize(self):
        launcher.init()
-       config.init(self.get_id())
+       config=self.get_config()
        config.load()
+
+       IconGrid.do_realize(self, config)
+
        self.setSize(config.getSize())
        self.reloadIcons()
 
@@ -94,9 +121,15 @@ class DrlaunchPlugin(IconGrid, HomePluginItem, FremantleRotation):
        self.set_colormap(screen.get_rgba_colormap())
        self.set_app_paintable(True)
 
+       self.connect('show-settings', self.slot_show_settings)
+       self.connect('long-press', self.signalLongpress)
+       self.connect('click', self.signalClick)
+       self.connect('notify', self.signalNotify)
+
        HomePluginItem.do_realize(self)
 
     def on_orientation_changed(self, orientation):
+       # Get the first character of the string (l/p)
        o=orientation[0]
        self.setMode(o)
 #      self.queue_draw()
@@ -111,7 +144,7 @@ class DrlaunchPlugin(IconGrid, HomePluginItem, FremantleRotation):
            # self.winConfig.show_all()
            return
 
-       s=WinConfig()
+       s=WinConfig(self.get_config())
        s.show_all()
        s.connect('destroy', self.slotConfigDestroy)
        self.winConfig=s
@@ -120,41 +153,62 @@ class DrlaunchPlugin(IconGrid, HomePluginItem, FremantleRotation):
        self.winConfig=None
 
        dt=sender.getData()
+
+       config=self.get_config()
+
        config.setSize(dt['size'])
        config.setApps(dt['apps'])
        config.setIndiv(dt['indiv'])
        config.setLongpress(dt['longpress'])
+       config.setAnimate(dt['animate'])
+       config.setNoBg(dt['nobg'])
+       config.setThemeBg(dt['themebg'])
        config.save()
        
        # Resize widget
        self.setSize(dt['size'])
        self.reloadIcons()
 
+       # Free memory that is used for animations if animations are disabled
+       if not dt['animate']:
+           self.clearAnimationCache()
+
        self.queue_draw()
 
     def handle_click(self, sender, icon):
        """ common handler for longpress and click """
        if icon.name!=None and icon.name!='':
+           print "name:", icon.name
            launcher.launch(icon.name)
 
     def signalLongpress(self, sender, icon):
-       if config.getLongpress():
-           self.handle_click(sender, icon)
+       self.handle_click(sender, icon)
 
     def signalClick(self, sender, icon):
+       config=self.get_config()
+
        if not config.getLongpress():
            self.handle_click(sender, icon)
 
-    def resize(self):
+    def signalNotify(self, sender, property):
+       if property.name=='is-on-current-desktop':
+           v=self.get_property(property.name)
+           if v and self.draw_pending:
+               self.queue_draw()
+
+    def resize2(self):
+       config=self.get_config()
+
        w=(self.size[0] * config.iconsize) + \
            (self.size[0] * config.iconspace)
        h=(self.size[1] * config.iconsize) + \
            (self.size[1] * config.iconspace)
        self.set_size_request(w, h)
+       self.resize(w, h)
 
     def setSize(self, size):
        IconGrid.setSize(self, size)
-       self.resize()
+       self.resize2()
 
 hd_plugin_type = DrlaunchPlugin