[mousetrap/ng] Finished the settings handler/interface

[Flavio Percoco <flaper src gnome org>]

commit bbf951a2dbb84040e0f091dbffc1a6fc9233cac4
Author: Flavio Percoco Premoli <flaper87 gmail com>
Date:   Thu May 7 20:20:14 2009 +0200

    Finished the settings handler/interface
---
 src/mousetrap/environment.py.in  |   15 +-----
 src/mousetrap/ui/main.py         |   25 +++++----
 src/mousetrap/ui/settings_gui.py |   99 ++++++++++++++++++++-----------------
 3 files changed, 70 insertions(+), 69 deletions(-)

diff --git a/src/mousetrap/environment.py.in b/src/mousetrap/environment.py.in
index f440d8b..966ac3c 100644
--- a/src/mousetrap/environment.py.in
+++ b/src/mousetrap/environment.py.in
@@ -60,10 +60,10 @@ appPath = os.path.dirname(__file__)
 home = os.path.expanduser("~")
 
 ## Configurations dir
-configPath = home + "/.mouseTrap/"
+configPath = home + "/.mousetrap/"
 
 ## Configurations dir
-configPath = "%s/.mouseTrap/" % home
+configPath = "%s/.mousetrap/" % home
 
 ## Scripts Path
 scriptsPath = "%s/scripts/" % configPath
@@ -75,7 +75,7 @@ profilesPath = "%s/profiles/" % scriptsPath
 configFile = configPath + "userSettings.cfg"
 
 ## The debug file
-debugFile = configPath + "mouseTrap_DEBUG.log"
+debugFile = configPath + "mouseTrap.debug"
 
 ## The language path
 langPath = "%s/locale/" % datadirname
@@ -83,15 +83,6 @@ langPath = "%s/locale/" % datadirname
 ## The haarcascade folder
 haarcascades = appPath + "/haarcascade"
 
-## The debugging parts
-DEBUG = ['widget']
-
-## mouseTrap Modules
-mTModules = { 'lTr' : '_startListener',
-              'cAm' : '_startCam',
-			  'wTp' : '_startWidgetsTrap'}
-
-
 ## Screen Resolution
 screen       = { 'width'  : gtk.gdk.screen_width(),
                  'height' : gtk.gdk.screen_height()}
diff --git a/src/mousetrap/ui/main.py b/src/mousetrap/ui/main.py
index 17a8994..53d9ed2 100644
--- a/src/mousetrap/ui/main.py
+++ b/src/mousetrap/ui/main.py
@@ -109,17 +109,20 @@ class MainGui( gtk.Window ):
         self.vBox.pack_start( self.buttonsBox, False, False )
 
         self.cap_image    = gtk.Image()
-        self.cap_expander = gtk.expander_new_with_mnemonic("_Camera Image")
-        self.cap_expander.add(self.cap_image)
-        self.cap_expander.set_expanded(True)
-        #expander.connect('notify::expanded', self.expanded_cb)
-        self.vBox.pack_start(self.cap_expander)
-
-        self.map_expander = gtk.expander_new_with_mnemonic("_Script Mapper")
-        self.map_expander.add(self.script)
-        self.map_expander.set_expanded(True)
-        #expander.connect('notify::expanded', self.expanded_cb)
-        self.vBox.pack_start(self.map_expander)
+
+        if self.cfg.getboolean("gui", "showCapture"):
+            self.cap_expander = gtk.expander_new_with_mnemonic("_Camera Image")
+            self.cap_expander.add(self.cap_image)
+            self.cap_expander.set_expanded(True)
+            #expander.connect('notify::expanded', self.expanded_cb)
+            self.vBox.pack_start(self.cap_expander)
+
+        if self.cfg.getboolean("gui", "showPointMapper"):
+            self.map_expander = gtk.expander_new_with_mnemonic("_Script Mapper")
+            self.map_expander.add(self.script)
+            self.map_expander.set_expanded(True)
+            #expander.connect('notify::expanded', self.expanded_cb)
+            self.vBox.pack_start(self.map_expander)
 
 #         hBox = gtk.HBox()
 #         showMapper = gtk.CheckButton( _("Start Point Mapper: ") )
diff --git a/src/mousetrap/ui/settings_gui.py b/src/mousetrap/ui/settings_gui.py
index ab16560..da178de 100755
--- a/src/mousetrap/ui/settings_gui.py
+++ b/src/mousetrap/ui/settings_gui.py
@@ -138,17 +138,32 @@ class preffGui( gtk.Window ):
 
         Frame = gtk.Frame()
 
-        mainGuiBox = gtk.VBox( spacing = 6 )
+        general_box = gtk.VBox( spacing = 6 )
 
-        mWindowActive = gtk.CheckButton( _("Show main window") )
-        mWindowActive.set_active( self.cfg.getboolean( "gui", "showMainGui" ) )
-        mWindowActive.connect( "toggled", self._checkToggled, "gui", "showMainGui" )
+#         mWindowActive = gtk.CheckButton( _("Show main window") )
+#         mWindowActive.set_active( self.cfg.getboolean( "gui", "showMainGui" ) )
+#         mWindowActive.connect( "toggled", self._checkToggled, "gui", "showMainGui" )
+#
+#         mainGuiBox.pack_start( mWindowActive, False, False )
+
+        cAmActive = gtk.CheckButton( _("Activate Camera module") )
+        cAmActive.set_active( self.cfg.getboolean( "main", "startCam" ) )
+        cAmActive.connect( "toggled", self._checkToggled, "main", "startCam" )
 
-        mainGuiBox.pack_start( mWindowActive, False, False )
+        general_box.pack_start( cAmActive, False, False )
 
-        mainGuiBox.show_all()
+        flipImage = gtk.CheckButton( _("Flip Image") )
+        flipImage.set_active( self.cfg.getboolean( "cam",  "flipImage" ) )
+        flipImage.connect( "toggled", self._checkToggled, "cam", "flipImage" )
 
-        Frame.add( mainGuiBox )
+        general_box.pack_start( flipImage, False, False )
+
+        inputDevIndex = self.addSpin( _("Input Video Device Index: "), "inputDevIndex", self.cfg.getint( "cam", "inputDevIndex" ), "cam", "inputDevIndex", 0)
+        general_box.pack_start( inputDevIndex, False, False )
+
+        general_box.show_all()
+
+        Frame.add( general_box )
         Frame.show()
 
         self.NoteBook.insert_page(Frame, gtk.Label( _("General") ) )
@@ -165,18 +180,6 @@ class preffGui( gtk.Window ):
 
         camBox = gtk.VBox( spacing = 6 )
 
-        cAmActive = gtk.CheckButton( _("Activate Camera module") )
-        cAmActive.set_active( self.cfg.getboolean( "main", "startCam" ) )
-        cAmActive.connect( "toggled", self._checkToggled, "main", "startCam" )
-
-        camBox.pack_start( cAmActive, False, False )
-
-        flipImage = gtk.CheckButton( _("Flip Image") )
-        flipImage.set_active( self.cfg.getboolean( "cam",  "flipImage" ) )
-        flipImage.connect( "toggled", self._checkToggled, "cam", "flipImage" )
-
-        camBox.pack_start( flipImage, False, False )
-
         mapperActive = gtk.CheckButton( _("Show Point Mapper") )
         mapperActive.set_active( self.cfg.getboolean( "gui", "showPointMapper" ) )
         mapperActive.connect( "toggled", self._checkToggled, "gui", "showPointMapper" )
@@ -189,9 +192,6 @@ class preffGui( gtk.Window ):
 
         camBox.pack_start( showCapture, False, False )
 
-        inputDevIndex = self.addSpin( _("Input Video Device Index: "), "inputDevIndex", self.cfg.getint( "cam", "inputDevIndex" ), "cam", "inputDevIndex", 0)
-        camBox.pack_start( inputDevIndex, False, False )
-
         camBox.show_all()
 
         Frame.add( camBox )
@@ -281,31 +281,38 @@ class preffGui( gtk.Window ):
         reqMov = self.addSpin( _("Step Speed: "), "stepSpeed", self.cfg.getint( "mouse", "stepSpeed" ), "mouse", "stepSpeed" )
         camBox.pack_start( reqMov, False, False )
 
-        defClickF = gtk.Frame( _( "Default Click:" ) )
-
-        defClicks = {  "b1c"   :  _("Left Click"),
-                       "b1d"   :  _("Double Click"),
-                       "b1p"   :  _("Drag/Drop Click"),
-                       "b3c"   :  _("Right Click")}
-
-        defClicksInv = dict((v,k) for k,v in defClicks.iteritems())
-
-        defClick = gtk.combo_box_new_text()
-        defClick.append_text(defClicks[self.cfg.get( "mouse", "defClick" )])
-
-        defClicklBl = gtk.Label(self.cfg.get( "mouse", "defClick" ))
-        self.preffWidgets['defClick'] = defClicklBl
+        ###############################################
+        #                                             #
+        #    THE WHEEL HAS ALREADY BEEN DISCOVERED    #
+        #     SO, LETS USE MOUSETWEAK INSTEAD OF      #
+        #      ADD THIS SUPPORT TO MOUSETRAP.         #
+        ###############################################
 
-        for mode in defClicks:
-            if mode == self.cfg.get( "mouse", "defClick" ):
-                continue
-            defClick.append_text( defClicks[mode] )
-
-        defClick.connect('changed', self._comboChanged, "mouse", "defClick", defClicksInv)
-        defClick.set_active(0)
-
-        defClickF.add( defClick)
-        camBox.pack_start( defClickF, False, False )
+#         defClickF = gtk.Frame( _( "Default Click:" ) )
+#
+#         defClicks = {  "b1c"   :  _("Left Click"),
+#                        "b1d"   :  _("Double Click"),
+#                        "b1p"   :  _("Drag/Drop Click"),
+#                        "b3c"   :  _("Right Click")}
+#
+#         defClicksInv = dict((v,k) for k,v in defClicks.iteritems())
+#
+#         defClick = gtk.combo_box_new_text()
+#         defClick.append_text(defClicks[self.cfg.get( "mouse", "defClick" )])
+#
+#         defClicklBl = gtk.Label(self.cfg.get( "mouse", "defClick" ))
+#         self.preffWidgets['defClick'] = defClicklBl
+#
+#         for mode in defClicks:
+#             if mode == self.cfg.get( "mouse", "defClick" ):
+#                 continue
+#             defClick.append_text( defClicks[mode] )
+#
+#         defClick.connect('changed', self._comboChanged, "mouse", "defClick", defClicksInv)
+#         defClick.set_active(0)
+#
+#         defClickF.add( defClick)
+#         camBox.pack_start( defClickF, False, False )
 
         camBox.show_all()