Fix for config saving.

[drlaunch] / src / config.py

diff --git a/src/config.py b/src/config.py
index 6250eaf..ad92f14 100755 (executable)
--- a/src/config.py
+++ b/src/config.py
@@ -25,7 +25,7 @@ __version__ = "$Id: 0.py 2265 2010-02-21 19:16:26Z v13 $"
 import os
 import pickle
 
-version = "0.4"
+version = "0.8"
 
 try:
     from glib import get_user_config_dir
@@ -59,13 +59,18 @@ class Config:
        self.id=id
 
        self.size = (2,2)
+       self.themebgsize = 96
        self.iconsize = 64
-       self.iconspace = 42
+#      self.iconspace = 42     # For 4 icons (height)
+       self.iconspace = 36     # For 8 icons (width)
        self.apps=None
-       self.indiv=False
-       self.longpress=True
+       self.indiv=True
+       self.longpress=False
+       self.animate=True
+       self.nobg=False
+       self.themebg=False
 
-       self.maxsz=(4,4)
+       self.maxsz=(8,4)
 
     def setSize(self, sz):
        self.size=sz
@@ -91,6 +96,24 @@ class Config:
     def getLongpress(self):
        return(self.longpress)
 
+    def setAnimate(self, ar):
+       self.animate=ar
+
+    def getAnimate(self):
+       return(self.animate)
+
+    def setNoBg(self, nobg):
+       self.nobg=nobg
+
+    def getNoBg(self):
+       return(self.nobg)
+
+    def setThemeBg(self, themebg):
+       self.themebg=themebg
+
+    def getThemeBg(self):
+       return(self.themebg)
+
     def setApps(self, aps):
        """ apps is a dictionary of (x,y)=>appname """
        self.apps=aps
@@ -114,7 +137,7 @@ class Config:
 
        if dt==None:
            dt={
-               'version':  3,
+               'version':  6,
                'data': {},
                }
 
@@ -123,6 +146,9 @@ class Config:
            'apps':         self.getApps(),
            'indiv':        self.getIndiv(),
            'longpress':    self.getLongpress(),
+           'animate':      self.getAnimate(),
+           'nobg':         self.getNoBg(),
+           'themebg':      self.getThemeBg(),
            }
 
        fn=get_config_fn()
@@ -158,6 +184,30 @@ class Config:
 
        return(dt)
 
+    def parse_v3(self, dt):
+       dt['version']=4
+
+       for i in dt['data']:
+           dt['data'][i]['animate']=True
+
+       return(dt)
+
+    def parse_v4(self, dt):
+       dt['version']=5
+
+       for i in dt['data']:
+           dt['data'][i]['nobg']=False
+
+       return(dt)
+
+    def parse_v5(self, dt):
+       dt['version']=6
+
+       for i in dt['data']:
+           dt['data'][i]['themebg']=False
+
+       return(dt)
+
     def load_all(self):
        fn=get_config_fn()
 
@@ -175,6 +225,15 @@ class Config:
 
                if ret['version']==2:
                    ret=parse_v2(ret)
+
+               if ret['version']==3:
+                   ret=parse_v3(ret)
+
+               if ret['version']==4:
+                   ret=parse_v4(ret)
+
+               if ret['version']==5:
+                   ret=parse_v5(ret)
        except:
            ret=None
 
@@ -196,6 +255,9 @@ class Config:
        self.setApps(dt['apps'])
        self.setIndiv(dt['indiv'])
        self.setLongpress(dt['longpress'])
+       self.setAnimate(dt['animate'])
+       self.setNoBg(dt['nobg'])
+       self.setThemeBg(dt['themebg'])
 
     def check_init(self):
        if self.id==None: