[GRASS-SVN] r35188 - in grass/branches/develbranch_6/gui:
icons/grass2 wxpython/gui_modules wxpython/icons
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Jan 4 08:53:56 EST 2009
Author: martinl
Date: 2009-01-04 08:53:56 -0500 (Sun, 04 Jan 2009)
New Revision: 35188
Added:
grass/branches/develbranch_6/gui/icons/grass2/attributes-display.png
grass/branches/develbranch_6/gui/icons/grass2/cats-copy.png
grass/branches/develbranch_6/gui/icons/grass2/cats-display.png
grass/branches/develbranch_6/gui/icons/grass2/centroid-create.png
grass/branches/develbranch_6/gui/icons/grass2/line-create.png
grass/branches/develbranch_6/gui/icons/grass2/line-delete.png
grass/branches/develbranch_6/gui/icons/grass2/line-edit.png
grass/branches/develbranch_6/gui/icons/grass2/line-move.png
grass/branches/develbranch_6/gui/icons/grass2/line-split.png
grass/branches/develbranch_6/gui/icons/grass2/point-create.png
grass/branches/develbranch_6/gui/icons/grass2/polygon-create.png
grass/branches/develbranch_6/gui/icons/grass2/settings.png
grass/branches/develbranch_6/gui/icons/grass2/tools.png
grass/branches/develbranch_6/gui/icons/grass2/undo.png
grass/branches/develbranch_6/gui/icons/grass2/vertex-create.png
grass/branches/develbranch_6/gui/icons/grass2/vertex-delete.png
grass/branches/develbranch_6/gui/icons/grass2/vertex-move.png
Modified:
grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py
grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py
Log:
wxGUI: vdigit icons by Robert Szczepanek
(merge from trunk, r35186 & r35187)
Copied: grass/branches/develbranch_6/gui/icons/grass2/attributes-display.png (from rev 35186, grass/trunk/gui/icons/grass2/attributes-display.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/cats-copy.png (from rev 35186, grass/trunk/gui/icons/grass2/cats-copy.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/cats-display.png (from rev 35186, grass/trunk/gui/icons/grass2/cats-display.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/centroid-create.png (from rev 35186, grass/trunk/gui/icons/grass2/centroid-create.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/line-create.png (from rev 35186, grass/trunk/gui/icons/grass2/line-create.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/line-delete.png (from rev 35186, grass/trunk/gui/icons/grass2/line-delete.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/line-edit.png (from rev 35186, grass/trunk/gui/icons/grass2/line-edit.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/line-move.png (from rev 35186, grass/trunk/gui/icons/grass2/line-move.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/line-split.png (from rev 35186, grass/trunk/gui/icons/grass2/line-split.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/point-create.png (from rev 35186, grass/trunk/gui/icons/grass2/point-create.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/polygon-create.png (from rev 35186, grass/trunk/gui/icons/grass2/polygon-create.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/settings.png (from rev 35186, grass/trunk/gui/icons/grass2/settings.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/tools.png (from rev 35186, grass/trunk/gui/icons/grass2/tools.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/undo.png (from rev 35186, grass/trunk/gui/icons/grass2/undo.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/vertex-create.png (from rev 35186, grass/trunk/gui/icons/grass2/vertex-create.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/vertex-delete.png (from rev 35186, grass/trunk/gui/icons/grass2/vertex-delete.png)
===================================================================
(Binary files differ)
Copied: grass/branches/develbranch_6/gui/icons/grass2/vertex-move.png (from rev 35186, grass/trunk/gui/icons/grass2/vertex-move.png)
===================================================================
(Binary files differ)
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py 2009-01-04 13:50:20 UTC (rev 35187)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py 2009-01-04 13:53:56 UTC (rev 35188)
@@ -88,7 +88,7 @@
DIALOG_TEXTCTRL_SIZE = (400, -1)
DIALOG_LAYER_SIZE = (100, -1)
-MAP_WINDOW_SIZE = (680, 520)
+MAP_WINDOW_SIZE = (760, 570)
HIST_WINDOW_SIZE = (500, 350)
MAP_DISPLAY_STATUSBAR_MODE = [_("Coordinates"),
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py 2009-01-04 13:50:20 UTC (rev 35187)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py 2009-01-04 13:53:56 UTC (rev 35188)
@@ -1721,7 +1721,7 @@
flag=wx.ALL, border=5)
self.mapsetlb = CheckListMapset(parent=self)
- self.mapsetlb.LoadData(self.all_mapsets)
+ self.mapsetlb.LoadData()
sizer.Add(item=self.mapsetlb, proportion=1,
flag=wx.ALL | wx.EXPAND, border=5)
@@ -1780,13 +1780,22 @@
# setup mixins
listmix.ListCtrlAutoWidthMixin.__init__(self)
- def LoadData(self, mapsets):
+ def LoadData(self):
"""Load data into list"""
self.InsertColumn(0, _('Mapset'))
self.InsertColumn(1, _('Owner'))
self.InsertColumn(2, _('Group'))
gisenv = grass.gisenv()
locationPath = os.path.join(gisenv['GISDBASE'], gisenv['LOCATION_NAME'])
+
+ ret = grass.read_command('g.mapsets',
+ flags = 'l')
+ print ret
+
+ mapsets = []
+ if ret:
+ mapsets = ret.split('\n')
+
for mapset in mapsets:
index = self.InsertStringItem(sys.maxint, mapset)
mapsetPath = os.path.join(locationPath,
Modified: grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py 2009-01-04 13:50:20 UTC (rev 35187)
+++ grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py 2009-01-04 13:53:56 UTC (rev 35188)
@@ -39,28 +39,28 @@
"quit" : 'quit.png',
# digit
## add feature
- "digAddPoint": None,
- "digAddLine" : None,
- "digAddBoundary": None,
- "digAddCentroid": None,
+ "digAddPoint": 'point-create.png',
+ "digAddLine" : 'line-create.png',
+ "digAddBoundary": 'polygon-create.png',
+ "digAddCentroid": 'centroid-create.png',
## vertex
- "digAddVertex" : None,
- "digMoveVertex" : None,
- "digRemoveVertex" : None,
- "digSplitLine" : None,
+ "digAddVertex" : 'vertex-create.png',
+ "digMoveVertex" : 'vertex-move.png',
+ "digRemoveVertex" : 'vertex-delete.png',
+ "digSplitLine" : 'line-split.png',
## edit feature
- "digEditLine" : None,
- "digMoveLine" : None,
- "digDeleteLine" : None,
+ "digEditLine" : 'line-edit.png',
+ "digMoveLine" : 'line-move.png',
+ "digDeleteLine" : 'line-delete.png',
## cats
- "digDispCats" : None,
- "digCopyCats" : None,
+ "digDispCats" : 'cats-display.png',
+ "digCopyCats" : 'cats-copy.png',
## attributes
- "digDispAttr" : None,
+ "digDispAttr" : 'attributes-display.png',
## general
- "digUndo" : None,
- "digSettings" : None,
- "digAdditionalTools" : None,
+ "digUndo" : 'undo.png',
+ "digSettings" : 'settings.png',
+ "digAdditionalTools" : 'tools.png',
# layer manager
"newdisplay" : 'monitor-create.png',
"workspaceNew" : 'create.png',
@@ -99,7 +99,7 @@
"grGcpAdd" : None,
"grGcpDelete" : None,
"grGcpReload" : None,
- "grSettings" : None,
+ "grSettings" : 'settings.png',
# nviz
- "nvizSettings" : None,
+ "nvizSettings" : 'settings.png',
}
More information about the grass-commit
mailing list