wxGUI: vdigit icons by Robert Szczepanek

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@35186 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gui_modules/globalvar.py

@@ -88,7 +88,7 @@ DIALOG_GSELECT_SIZE = (400, -1)
 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"),

gui/wxpython/gui_modules/preferences.py

@@ -1714,7 +1714,7 @@ class MapsetAccess(wx.Dialog):
                   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)
@@ -1773,13 +1773,22 @@ class CheckListMapset(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.Check
         # 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,

gui/wxpython/icons/grass2_icons.py

@@ -39,28 +39,28 @@ IconsGrass2 = {
     "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',