[GRASS-SVN] r41908 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-04-17 05:32:36 -0400 (Sat, 17 Apr 2010)
New Revision: 41908

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py
Log:
wxGUI/modeler: color for running actions
(merge r41907 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py	2010-04-17 09:31:13 UTC (rev 41907)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py	2010-04-17 09:32:36 UTC (rev 41908)
@@ -1875,7 +1875,7 @@
                       wx.ALIGN_CENTER_VERTICAL,
                       pos = (row, 1))
 
-        row = 1
+        row += 1
         gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
                                          label = _("Invalid:")),
                       flag = wx.ALIGN_LEFT |
@@ -1892,6 +1892,23 @@
                       wx.ALIGN_CENTER_VERTICAL,
                       pos = (row, 1))
 
+        row += 1
+        gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
+                                         label = _("Running:")),
+                      flag = wx.ALIGN_LEFT |
+                      wx.ALIGN_CENTER_VERTICAL,
+                      pos = (row, 0))
+        rColor = csel.ColourSelect(parent = panel, id = wx.ID_ANY,
+                                   colour = self.settings.Get(group='modeler', key='action', subkey=('color', 'running')),
+                                   size = globalvar.DIALOG_COLOR_SIZE)
+        rColor.SetName('GetColour')
+        self.winId['modeler:action:color:running'] = rColor.GetId()
+        
+        gridSizer.Add(item = rColor,
+                      flag = wx.ALIGN_RIGHT |
+                      wx.ALIGN_CENTER_VERTICAL,
+                      pos = (row, 1))
+
         sizer.Add(item = gridSizer, proportion = 1, flag = wx.ALL | wx.EXPAND, border = 5)
         border.Add(item = sizer, proportion = 0, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, border = 3)
         

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py	2010-04-17 09:31:13 UTC (rev 41907)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py	2010-04-17 09:32:36 UTC (rev 41908)
@@ -523,8 +523,9 @@
             'modeler' : {
                 'action' : {
                     'color' : {
-                        'valid' : (211, 211, 211, 255), # light grey
+                        'valid' :   (211, 211, 211, 255), # light grey
                         'invalid' : (255, 255, 255, 255), # white
+                        'running' : (255, 0, 0),          # running
                         },
                     'size' : {
                         'width' : 100,