[GRASS-SVN] r42351 - in grass/branches/develbranch_6/gui/wxpython:
gui_modules icons
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue May 25 14:13:20 EDT 2010
Author: martinl
Date: 2010-05-25 14:13:20 -0400 (Tue, 25 May 2010)
New Revision: 42351
Modified:
grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py
grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py
grass/branches/develbranch_6/gui/wxpython/icons/icon.py
grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
Log:
wxGUI/modeler: preferences & properties available from toolbar
(merge r42350 from trunk)
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py 2010-05-25 18:10:36 UTC (rev 42350)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py 2010-05-25 18:13:20 UTC (rev 42351)
@@ -1126,7 +1126,7 @@
WriteModelFile(fd = tmpfile,
actions = self.model.GetActions(),
data = self.model.GetData(),
- properties = self.properties)
+ properties = self.model.GetProperties())
except StandardError:
GMessage(parent = self,
message = _("Writing current settings to model file failed."))
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py 2010-05-25 18:10:36 UTC (rev 42350)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py 2010-05-25 18:13:20 UTC (rev 42351)
@@ -1395,6 +1395,8 @@
self.relation = wx.NewId()
self.run = wx.NewId()
self.validate = wx.NewId()
+ self.settings = wx.NewId()
+ self.properties = wx.NewId()
self.quit = wx.NewId()
# tool, label, bitmap, kind, shortHelp, longHelp, handler
@@ -1424,6 +1426,9 @@
(self.relation, 'relation', Icons['modelRelation'].GetBitmap(),
wx.ITEM_NORMAL, Icons['modelRelation'].GetLabel(), Icons['modelRelation'].GetDesc(),
self.parent.OnDefineRelation),
+ (self.properties, "properties", Icons["modelProperties"].GetBitmap(),
+ wx.ITEM_NORMAL, Icons["modelProperties"].GetLabel(), Icons["modelProperties"].GetDesc(),
+ self.parent.OnModelProperties),
('', '', '', '', '', '', ''),
(self.run, 'run', Icons['modelRun'].GetBitmap(),
wx.ITEM_NORMAL, Icons['modelRun'].GetLabel(), Icons['modelRun'].GetDesc(),
@@ -1432,6 +1437,9 @@
wx.ITEM_NORMAL, Icons['modelValidate'].GetLabel(), Icons['modelValidate'].GetDesc(),
self.parent.OnValidateModel),
('', '', '', '', '', '', ''),
+ (self.settings, "settings", Icons["modelSettings"].GetBitmap(),
+ wx.ITEM_NORMAL, Icons["modelSettings"].GetLabel(), Icons["modelSettings"].GetDesc(),
+ self.parent.OnPreferences),
(self.quit, 'quit', Icons['quit'].GetBitmap(),
wx.ITEM_NORMAL, Icons['quit'].GetLabel(), Icons['quit'].GetDesc(),
self.parent.OnCloseWindow),
Modified: grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py 2010-05-25 18:10:36 UTC (rev 42350)
+++ grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py 2010-05-25 18:13:20 UTC (rev 42351)
@@ -111,4 +111,6 @@
"modelValidate" : 'check.png',
"imageSave" : 'image-export.png',
"pythonSave" : 'python-export.png',
+ "modelSettings" : 'settings.png',
+ "modelProperties" : 'options.png',
}
Modified: grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py 2010-05-25 18:10:36 UTC (rev 42350)
+++ grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py 2010-05-25 18:13:20 UTC (rev 42351)
@@ -113,4 +113,6 @@
"modelValidate" : wx.ART_ERROR,
"imageSave" : wx.ART_ERROR,
"pythonSave" : wx.ART_ERROR,
+ "modelSettings" : wx.ART_ERROR,
+ "modelProperties" : wx.ART_ERROR,
}
Modified: grass/branches/develbranch_6/gui/wxpython/icons/icon.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/icon.py 2010-05-25 18:10:36 UTC (rev 42350)
+++ grass/branches/develbranch_6/gui/wxpython/icons/icon.py 2010-05-25 18:13:20 UTC (rev 42351)
@@ -355,6 +355,10 @@
label=_("Run entire model")),
"modelValidate" : MetaIcon (img=Icons["modelValidate"],
label=_("Validate entire model")),
+ "modelSettings" : MetaIcon (img=Icons["modelSettings"],
+ label=_("Show modeler settings")),
+ "modelProperties" : MetaIcon (img=Icons["modelProperties"],
+ label=_("Show model properties")),
}
# testing ...
Modified: grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py 2010-05-25 18:10:36 UTC (rev 42350)
+++ grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py 2010-05-25 18:13:20 UTC (rev 42351)
@@ -114,4 +114,6 @@
"modelValidate" : wx.ART_ERROR,
"imageSave" : wx.ART_ERROR,
"pythonSave" : wx.ART_ERROR,
+ "modelSettings" : wx.ART_ERROR,
+ "modelProperties" : wx.ART_ERROR,
}
Property changes on: grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk/gui/wxpython/icons/silk_icons.py:41584,41586-41587,41590-41592,41594,41596,41598,41600,41806,41884,41888
+ /grass/trunk/gui/wxpython/icons/silk_icons.py:41584,41586-41587,41590-41592,41594,41596,41598,41600,41806,41884,41888,42350
More information about the grass-commit
mailing list