[Gzz-commits] libvob/vob/putil demo.py demokeys.py

[Janne V. Kujala]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Janne V. Kujala <address@hidden>        03/06/10 06:03:33

Modified files:
        vob/putil      : demo.py demokeys.py 

Log message:
        show slider/toggle values in demo.py help text

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/demo.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/demokeys.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: libvob/vob/putil/demo.py
diff -u libvob/vob/putil/demo.py:1.8 libvob/vob/putil/demo.py:1.9
--- libvob/vob/putil/demo.py:1.8        Fri Jun  6 16:04:23 2003
+++ libvob/vob/putil/demo.py    Tue Jun 10 06:03:33 2003
@@ -222,6 +222,8 @@
 
 def addHelp(vs):
     def d(obj): 
+        if hasattr(obj, "getdoc"):
+            return obj.getdoc(currentScene)
        o = getattr(obj, "__doc__", "")
        if not o: return ""
        return o
Index: libvob/vob/putil/demokeys.py
diff -u libvob/vob/putil/demokeys.py:1.1 libvob/vob/putil/demokeys.py:1.2
--- libvob/vob/putil/demokeys.py:1.1    Thu Apr 10 10:00:19 2003
+++ libvob/vob/putil/demokeys.py        Tue Jun 10 06:03:33 2003
@@ -41,7 +41,6 @@
        self.things = args
        self.keymap = {}
        self.res = []
-       self.__doc__ = ""
        print "KEYMAP: things = ",self.things
        for t in self.things:
            for k in t.getKeys():
@@ -49,7 +48,15 @@
                self.keymap[k[0]] = k[1]
            self.res.extend(t.getREs())
            t.prepare(scene)
-           self.__doc__ += "\n" + t.descline
+
+    def getdoc(self, scene):
+        doc = ""
+        for t in self.things:
+            print t
+            doc += "\n" + t.getdoc(scene)
+        return doc
+            
+            
     def __call__(self, key):
        if self.keymap.has_key(key):
            return self.keymap[key](self.scene,key)
@@ -91,6 +98,10 @@
                list.append(k[0])
        return ", ".join(list)
 
+    def getdoc(self, scene):
+        return "XXX an undocumented _Presses object"
+
+
 class Action(_Presses):
     """A key used to fire an action.
     """
@@ -99,7 +110,10 @@
           (key, self.act),
            )
        self.func = func
-       self.descline = self.keyStrings() + ": " + description
+        self.description = description
+
+    def getdoc(self, scene):
+        return self.keyStrings() + ": " + self.description
 
     def prepare(self, scene):
        pass
@@ -117,7 +131,11 @@
            )
        self.attr = attr
        self.default = default
-       self.descline = self.keyStrings() + ": Toggle " + description
+        self.description = description
+
+    def getdoc(self, scene):
+       return "%s: Toggle %s (%s)" % (
+            self.keyStrings(), self.description, getattr(scene, self.attr))
 
     def prepare(self, scene):
        setattr(scene, self.attr, self.default)
@@ -136,7 +154,11 @@
        self.attr = attr
        self.listattr = listattr
        self.default = default
-       self.descline = self.keyStrings() + ": Select " + description
+        self.description = description
+
+    def getdoc(self, scene):
+       return "%s: Select %s (%s)" % (
+            self.keyStrings(), self.description, getattr(scene, self.attr))
 
     def prepare(self, scene):
        setattr(scene, self.attr, self.default)
@@ -159,7 +181,12 @@
            )
        self.attr = attr
        self.default = default
-       self.descline = self.keyStrings()+ ": Adjust " + description
+        self.description = description
+
+    def getdoc(self, scene):
+       return "%s: Adjust %s (%.4G)" % (
+            self.keyStrings(), self.description,
+            getattr(scene, self.attr))
 
     def prepare(self, scene):
        setattr(scene, self.attr, self.default)