Multiple instance support.

[drlaunch] / src / win_config.py

diff --git a/src/win_config.py b/src/win_config.py
index 016de49..5e638c3 100755 (executable)
--- a/src/win_config.py
+++ b/src/win_config.py
@@ -31,19 +31,22 @@ from hildon import StackableWindow
 #from portrait import FremantleRotation
 #from xdg.IconTheme import getIconPath
 
-import config
+#import config
 import apps
 from icon import Icon, getIcon
 from icongrid import IconGridWidget
 
 class WinConfig(StackableWindow):
-    def __init__(self, *args):
+    def __init__(self, config, *args):
        StackableWindow.__init__(self)
 
+       self.config=config
+
        self.setupUi()
 
     def setupUi(self):
-       self.igw=IconGridWidget(True)
+       self.igw=IconGridWidget(True, self.config)
+#      self.igw.do_realize()
 #      self.igw.setSize(config.getSize())
 
        hbox=gtk.HBox()
@@ -60,7 +63,7 @@ class WinConfig(StackableWindow):
 #      hbox.add(vbox)
        al.add(vbox)
 
-       maxsz=config.getMaxSize()
+       maxsz=self.config.getMaxSize()
 
        # ----------------------------------------------
        vbox.add(gtk.Label('Width:'))
@@ -114,9 +117,9 @@ class WinConfig(StackableWindow):
 
        self.ignore_toggle=False
 
-       self.setSize(config.getSize())
-       self.setIndiv(config.getIndiv())
-       self.setLongpress(config.getLongpress())
+       self.setSize(self.config.getSize())
+       self.setIndiv(self.config.getIndiv())
+       self.setLongpress(self.config.getLongpress())
 
     def slotLongpress(self, sender, icon):
        self.doConfig(icon)
@@ -149,7 +152,7 @@ class WinConfig(StackableWindow):
 
        self.ignore_toggle=True
 
-       maxsz=config.getMaxSize()
+       maxsz=self.config.getMaxSize()
 
        id=sz[0]-1