[GRASS-SVN] r43241 - grass/trunk/gui/wxpython
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Aug 24 12:51:13 EDT 2010
Author: martinl
Date: 2010-08-24 16:51:13 +0000 (Tue, 24 Aug 2010)
New Revision: 43241
Modified:
grass/trunk/gui/wxpython/gis_set.py
Log:
wxGUI/welcome screen: code styling fixed
Modified: grass/trunk/gui/wxpython/gis_set.py
===================================================================
--- grass/trunk/gui/wxpython/gis_set.py 2010-08-24 14:46:31 UTC (rev 43240)
+++ grass/trunk/gui/wxpython/gis_set.py 2010-08-24 16:51:13 UTC (rev 43241)
@@ -8,6 +8,7 @@
Classes:
- GRASSStartup
+ - GListBox
- StartUp
(C) 2006-2010 by the GRASS Development Team
@@ -28,7 +29,7 @@
### i18N
import gettext
-gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode=True)
+gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
from gui_modules import globalvar
if not os.getenv("GRASS_WXBUNDLED"):
@@ -47,7 +48,7 @@
class GRASSStartup(wx.Frame):
"""!GRASS start-up screen"""
- def __init__(self, parent=None, id=wx.ID_ANY, style=wx.DEFAULT_FRAME_STYLE):
+ def __init__(self, parent = None, id = wx.ID_ANY, style = wx.DEFAULT_FRAME_STYLE):
#
# GRASS variables
@@ -63,7 +64,7 @@
self.listOfMapsets = []
self.listOfMapsetsSelectable = []
- wx.Frame.__init__(self, parent=parent, id=id, style=style)
+ wx.Frame.__init__(self, parent = parent, id = id, style = style)
self.locale = wx.Locale(language = wx.LANGUAGE_DEFAULT)
@@ -71,7 +72,7 @@
# i18N
import gettext
- gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode=True)
+ gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
#
# graphical elements
@@ -80,8 +81,8 @@
try:
name = os.path.join(globalvar.ETCDIR, "gui", "images", "startup_banner.png")
self.hbitmap = wx.StaticBitmap(self.panel, wx.ID_ANY,
- wx.Bitmap(name=name,
- type=wx.BITMAP_TYPE_PNG))
+ wx.Bitmap(name = name,
+ type = wx.BITMAP_TYPE_PNG))
except:
self.hbitmap = wx.StaticBitmap(self.panel, wx.ID_ANY, wx.EmptyBitmap(530,150))
@@ -91,73 +92,73 @@
grassVersion = versionFile.readline().split(' ')[0].rstrip('\n')
versionFile.close()
- self.select_box = wx.StaticBox (parent=self.panel, id=wx.ID_ANY,
- label=" %s " % _("Choose project location and mapset"))
+ self.select_box = wx.StaticBox (parent = self.panel, id = wx.ID_ANY,
+ label = " %s " % _("Choose project location and mapset"))
- self.manage_box = wx.StaticBox (parent=self.panel, id=wx.ID_ANY,
- label=" %s " % _("Manage"))
- self.lwelcome = wx.StaticText(parent=self.panel, id=wx.ID_ANY,
- label=_("Welcome to GRASS GIS %s\n"
+ self.manage_box = wx.StaticBox (parent = self.panel, id = wx.ID_ANY,
+ label = " %s " % _("Manage"))
+ self.lwelcome = wx.StaticText(parent = self.panel, id = wx.ID_ANY,
+ label = _("Welcome to GRASS GIS %s\n"
"The world's leading open source GIS") % grassVersion,
- style=wx.ALIGN_CENTRE)
- self.ltitle = wx.StaticText(parent=self.panel, id=wx.ID_ANY,
- label=_("Select an existing project location and mapset\n"
+ style = wx.ALIGN_CENTRE)
+ self.ltitle = wx.StaticText(parent = self.panel, id = wx.ID_ANY,
+ label = _("Select an existing project location and mapset\n"
"or define a new location"),
- style=wx.ALIGN_CENTRE)
- self.ldbase = wx.StaticText(parent=self.panel, id=wx.ID_ANY,
- label=_("GIS Data Directory:"))
- self.llocation = wx.StaticText(parent=self.panel, id=wx.ID_ANY,
- label=_("Project location\n(projection/coordinate system)"),
- style=wx.ALIGN_CENTRE)
- self.lmapset = wx.StaticText(parent=self.panel, id=wx.ID_ANY,
- label=_("Accessible mapsets\n(directories of GIS files)"),
- style=wx.ALIGN_CENTRE)
- self.lcreate = wx.StaticText(parent=self.panel, id=wx.ID_ANY,
- label=_("Create new mapset\nin selected location"),
- style=wx.ALIGN_CENTRE)
- self.ldefine = wx.StaticText(parent=self.panel, id=wx.ID_ANY,
- label=_("Define new location"),
- style=wx.ALIGN_CENTRE)
- self.lmanageloc = wx.StaticText(parent=self.panel, id=wx.ID_ANY,
- label=_("Rename/delete selected\nmapset or location"),
- style=wx.ALIGN_CENTRE)
+ style = wx.ALIGN_CENTRE)
+ self.ldbase = wx.StaticText(parent = self.panel, id = wx.ID_ANY,
+ label = _("GIS Data Directory:"))
+ self.llocation = wx.StaticText(parent = self.panel, id = wx.ID_ANY,
+ label = _("Project location\n(projection/coordinate system)"),
+ style = wx.ALIGN_CENTRE)
+ self.lmapset = wx.StaticText(parent = self.panel, id = wx.ID_ANY,
+ label = _("Accessible mapsets\n(directories of GIS files)"),
+ style = wx.ALIGN_CENTRE)
+ self.lcreate = wx.StaticText(parent = self.panel, id = wx.ID_ANY,
+ label = _("Create new mapset\nin selected location"),
+ style = wx.ALIGN_CENTRE)
+ self.ldefine = wx.StaticText(parent = self.panel, id = wx.ID_ANY,
+ label = _("Define new location"),
+ style = wx.ALIGN_CENTRE)
+ self.lmanageloc = wx.StaticText(parent = self.panel, id = wx.ID_ANY,
+ label = _("Rename/delete selected\nmapset or location"),
+ style = wx.ALIGN_CENTRE)
# buttons
- self.bstart = wx.Button(parent=self.panel, id=wx.ID_ANY,
- label=_("Start &GRASS"))
+ self.bstart = wx.Button(parent = self.panel, id = wx.ID_ANY,
+ label = _("Start &GRASS"))
self.bstart.SetDefault()
- self.bexit = wx.Button(parent=self.panel, id=wx.ID_EXIT)
+ self.bexit = wx.Button(parent = self.panel, id = wx.ID_EXIT)
self.bstart.SetMinSize((180, self.bexit.GetSize()[1]))
- self.bhelp = wx.Button(parent=self.panel, id=wx.ID_HELP)
- self.bbrowse = wx.Button(parent=self.panel, id=wx.ID_ANY,
- label=_("&Browse"))
- self.bmapset = wx.Button(parent=self.panel, id=wx.ID_ANY,
- label=_("&Create mapset"))
- self.bwizard = wx.Button(parent=self.panel, id=wx.ID_ANY,
- label=_("&Location wizard"))
- self.manageloc = wx.Choice(parent=self.panel, id=wx.ID_ANY,
- choices=[_('Rename mapset'), _('Rename location'),
+ self.bhelp = wx.Button(parent = self.panel, id = wx.ID_HELP)
+ self.bbrowse = wx.Button(parent = self.panel, id = wx.ID_ANY,
+ label = _("&Browse"))
+ self.bmapset = wx.Button(parent = self.panel, id = wx.ID_ANY,
+ label = _("&Create mapset"))
+ self.bwizard = wx.Button(parent = self.panel, id = wx.ID_ANY,
+ label = _("&Location wizard"))
+ self.manageloc = wx.Choice(parent = self.panel, id = wx.ID_ANY,
+ choices = [_('Rename mapset'), _('Rename location'),
_('Delete mapset'), _('Delete location')])
self.manageloc.SetSelection(0)
# textinputs
- self.tgisdbase = wx.TextCtrl(parent=self.panel, id=wx.ID_ANY, value="", size=(300, -1),
- style=wx.TE_PROCESS_ENTER)
+ self.tgisdbase = wx.TextCtrl(parent = self.panel, id = wx.ID_ANY, value = "", size = (300, -1),
+ style = wx.TE_PROCESS_ENTER)
# Locations
- self.lpanel = wx.Panel(parent=self.panel, id=wx.ID_ANY)
- self.lblocations = GListBox(parent=self.lpanel,
- id=wx.ID_ANY, size=(180, 200),
- choices=self.listOfLocations)
+ self.lpanel = wx.Panel(parent = self.panel, id = wx.ID_ANY)
+ self.lblocations = GListBox(parent = self.lpanel,
+ id = wx.ID_ANY, size = (180, 200),
+ choices = self.listOfLocations)
self.lblocations.SetColumnWidth(0, 180)
# TODO: sort; but keep PERMANENT on top of list
# Mapsets
- self.mpanel = wx.Panel(parent=self.panel, id=wx.ID_ANY)
- self.lbmapsets = GListBox(parent=self.mpanel,
- id=wx.ID_ANY, size=(180, 200),
- choices=self.listOfMapsets)
+ self.mpanel = wx.Panel(parent = self.panel, id = wx.ID_ANY)
+ self.lbmapsets = GListBox(parent = self.mpanel,
+ id = wx.ID_ANY, size = (180, 200),
+ choices = self.listOfMapsets)
self.lbmapsets.SetColumnWidth(0, 180)
@@ -207,7 +208,7 @@
wx.MessageBox(parent = self, caption = _("Error"),
message = _("Unable to set GRASS database. "
"Check your locale settings."),
- style=wx.OK | wx.ICON_ERROR | wx.CENTRE)
+ style = wx.OK | wx.ICON_ERROR | wx.CENTRE)
self.OnSetDatabase(None)
location = self.GetRCValue("LOCATION_NAME")
@@ -220,7 +221,7 @@
self.UpdateLocations(self.gisdbase)
try:
self.lblocations.SetSelection(self.listOfLocations.index(location),
- force=True)
+ force = True)
self.lblocations.EnsureVisible(self.listOfLocations.index(location))
except ValueError:
print >> sys.stderr, _("ERROR: Location <%s> not found") % \
@@ -232,7 +233,7 @@
if mapset:
try:
self.lbmapsets.SetSelection(self.listOfMapsets.index(mapset),
- force=True)
+ force = True)
self.lbmapsets.EnsureVisible(self.listOfMapsets.index(mapset))
except ValueError:
self.lbmapsets.Clear()
@@ -244,129 +245,129 @@
sizer = wx.BoxSizer(wx.VERTICAL)
dbase_sizer = wx.BoxSizer(wx.HORIZONTAL)
- location_sizer = wx.FlexGridSizer(rows=1, cols=2, vgap=4, hgap=4)
+ location_sizer = wx.FlexGridSizer(rows = 1, cols = 2, vgap = 4, hgap = 4)
select_boxsizer = wx.StaticBoxSizer(self.select_box, wx.VERTICAL)
- select_sizer = wx.FlexGridSizer(rows=2, cols=2, vgap=4, hgap=4)
+ select_sizer = wx.FlexGridSizer(rows = 2, cols = 2, vgap = 4, hgap = 4)
manage_boxsizer = wx.StaticBoxSizer(self.manage_box, wx.VERTICAL)
manage_sizer = wx.BoxSizer(wx.VERTICAL)
btns_sizer = wx.BoxSizer(wx.HORIZONTAL)
# gis data directory
- dbase_sizer.Add(item=self.ldbase, proportion=0,
- flag=wx.ALIGN_CENTER_VERTICAL |
+ dbase_sizer.Add(item = self.ldbase, proportion = 0,
+ flag = wx.ALIGN_CENTER_VERTICAL |
wx.ALIGN_CENTER_HORIZONTAL | wx.ALL,
- border=3)
- dbase_sizer.Add(item=self.tgisdbase, proportion=0,
- flag=wx.ALIGN_CENTER_VERTICAL |
+ border = 3)
+ dbase_sizer.Add(item = self.tgisdbase, proportion = 0,
+ flag = wx.ALIGN_CENTER_VERTICAL |
wx.ALIGN_CENTER_HORIZONTAL | wx.ALL,
- border=3)
- dbase_sizer.Add(item=self.bbrowse, proportion=0,
- flag=wx.ALIGN_CENTER_VERTICAL |
+ border = 3)
+ dbase_sizer.Add(item = self.bbrowse, proportion = 0,
+ flag = wx.ALIGN_CENTER_VERTICAL |
wx.ALIGN_CENTER_HORIZONTAL | wx.ALL,
- border=3)
+ border = 3)
# select sizer
- select_sizer.Add(item=self.llocation, proportion=0,
- flag=label_style | wx.ALL,
- border=3)
- select_sizer.Add(item=self.lmapset, proportion=0,
- flag=label_style | wx.ALL,
- border=3)
- select_sizer.Add(item=self.lpanel, proportion=0,
- flag=wx.ADJUST_MINSIZE |
+ select_sizer.Add(item = self.llocation, proportion = 0,
+ flag = label_style | wx.ALL,
+ border = 3)
+ select_sizer.Add(item = self.lmapset, proportion = 0,
+ flag = label_style | wx.ALL,
+ border = 3)
+ select_sizer.Add(item = self.lpanel, proportion = 0,
+ flag = wx.ADJUST_MINSIZE |
wx.ALIGN_CENTER_VERTICAL |
wx.ALIGN_CENTER_HORIZONTAL)
- select_sizer.Add(item=self.mpanel, proportion=0,
- flag=wx.ADJUST_MINSIZE |
+ select_sizer.Add(item = self.mpanel, proportion = 0,
+ flag = wx.ADJUST_MINSIZE |
wx.ALIGN_CENTER_VERTICAL |
wx.ALIGN_CENTER_HORIZONTAL)
- select_boxsizer.Add(item=select_sizer, proportion=0)
+ select_boxsizer.Add(item = select_sizer, proportion = 0)
# define new location and mapset
- manage_sizer.Add(item=self.ldefine, proportion=0,
- flag=label_style | wx.ALL,
- border=3)
- manage_sizer.Add(item=self.bwizard, proportion=0,
- flag=label_style | wx.BOTTOM,
- border=5)
- manage_sizer.Add(item=self.lcreate, proportion=0,
- flag=label_style | wx.ALL,
- border=3)
- manage_sizer.Add(item=self.bmapset, proportion=0,
- flag=label_style | wx.BOTTOM,
- border=5)
- manage_sizer.Add(item=self.lmanageloc, proportion=0,
- flag=label_style | wx.ALL,
- border=3)
- manage_sizer.Add(item=self.manageloc, proportion=0,
- flag=label_style | wx.BOTTOM,
- border=5)
+ manage_sizer.Add(item = self.ldefine, proportion = 0,
+ flag = label_style | wx.ALL,
+ border = 3)
+ manage_sizer.Add(item = self.bwizard, proportion = 0,
+ flag = label_style | wx.BOTTOM,
+ border = 5)
+ manage_sizer.Add(item = self.lcreate, proportion = 0,
+ flag = label_style | wx.ALL,
+ border = 3)
+ manage_sizer.Add(item = self.bmapset, proportion = 0,
+ flag = label_style | wx.BOTTOM,
+ border = 5)
+ manage_sizer.Add(item = self.lmanageloc, proportion = 0,
+ flag = label_style | wx.ALL,
+ border = 3)
+ manage_sizer.Add(item = self.manageloc, proportion = 0,
+ flag = label_style | wx.BOTTOM,
+ border = 5)
- manage_boxsizer.Add(item=manage_sizer, proportion=0)
+ manage_boxsizer.Add(item = manage_sizer, proportion = 0)
# location sizer
- location_sizer.Add(item=select_boxsizer, proportion=0,
- flag=wx.ADJUST_MINSIZE |
+ location_sizer.Add(item = select_boxsizer, proportion = 0,
+ flag = wx.ADJUST_MINSIZE |
wx.ALIGN_CENTER_VERTICAL |
wx.ALIGN_CENTER_HORIZONTAL |
wx.RIGHT | wx.LEFT | wx.EXPAND,
- border=3) # GISDBASE setting
- location_sizer.Add(item=manage_boxsizer, proportion=0,
- flag=wx.ADJUST_MINSIZE |
+ border = 3) # GISDBASE setting
+ location_sizer.Add(item = manage_boxsizer, proportion = 0,
+ flag = wx.ADJUST_MINSIZE |
wx.ALIGN_TOP |
wx.ALIGN_CENTER_HORIZONTAL |
wx.RIGHT | wx.EXPAND,
- border=3)
+ border = 3)
# buttons
- btns_sizer.Add(item=self.bstart, proportion=0,
- flag=wx.ALIGN_CENTER_HORIZONTAL |
+ btns_sizer.Add(item = self.bstart, proportion = 0,
+ flag = wx.ALIGN_CENTER_HORIZONTAL |
wx.ALIGN_CENTER_VERTICAL |
wx.ALL,
- border=5)
- btns_sizer.Add(item=self.bexit, proportion=0,
- flag=wx.ALIGN_CENTER_HORIZONTAL |
+ border = 5)
+ btns_sizer.Add(item = self.bexit, proportion = 0,
+ flag = wx.ALIGN_CENTER_HORIZONTAL |
wx.ALIGN_CENTER_VERTICAL |
wx.ALL,
- border=5)
- btns_sizer.Add(item=self.bhelp, proportion=0,
- flag=wx.ALIGN_CENTER_HORIZONTAL |
+ border = 5)
+ btns_sizer.Add(item = self.bhelp, proportion = 0,
+ flag = wx.ALIGN_CENTER_HORIZONTAL |
wx.ALIGN_CENTER_VERTICAL |
wx.ALL,
- border=5)
+ border = 5)
# main sizer
- sizer.Add(item=self.hbitmap,
- proportion=0,
- flag=wx.ALIGN_CENTER_VERTICAL |
+ sizer.Add(item = self.hbitmap,
+ proportion = 0,
+ flag = wx.ALIGN_CENTER_VERTICAL |
wx.ALIGN_CENTER_HORIZONTAL |
wx.ALL,
- border=3) # image
- sizer.Add(item=self.lwelcome, # welcome message
- proportion=0,
- flag=wx.ALIGN_CENTER_VERTICAL |
+ border = 3) # image
+ sizer.Add(item = self.lwelcome, # welcome message
+ proportion = 0,
+ flag = wx.ALIGN_CENTER_VERTICAL |
wx.ALIGN_CENTER_HORIZONTAL |
wx.BOTTOM,
- border=5)
- sizer.Add(item=self.ltitle, # title
- proportion=0,
- flag=wx.ALIGN_CENTER_VERTICAL |
+ border = 5)
+ sizer.Add(item = self.ltitle, # title
+ proportion = 0,
+ flag = wx.ALIGN_CENTER_VERTICAL |
wx.ALIGN_CENTER_HORIZONTAL)
- sizer.Add(item=dbase_sizer, proportion=0,
- flag=wx.ALIGN_CENTER_HORIZONTAL |
+ sizer.Add(item = dbase_sizer, proportion = 0,
+ flag = wx.ALIGN_CENTER_HORIZONTAL |
wx.RIGHT | wx.LEFT,
- border=1) # GISDBASE setting
- sizer.Add(item=location_sizer, proportion=1,
- flag=wx.ALIGN_CENTER_VERTICAL |
+ border = 1) # GISDBASE setting
+ sizer.Add(item = location_sizer, proportion = 1,
+ flag = wx.ALIGN_CENTER_VERTICAL |
wx.ALIGN_CENTER_HORIZONTAL |
wx.RIGHT | wx.LEFT,
- border=1)
- sizer.Add(item=btns_sizer, proportion=0,
- flag=wx.ALIGN_CENTER_VERTICAL |
+ border = 1)
+ sizer.Add(item = btns_sizer, proportion = 0,
+ flag = wx.ALIGN_CENTER_VERTICAL |
wx.ALIGN_CENTER_HORIZONTAL |
wx.RIGHT | wx.LEFT,
- border=1)
+ border = 1)
self.panel.SetAutoLayout(True)
self.panel.SetSizer(sizer)
@@ -406,7 +407,7 @@
from gui_modules import location_wizard
gWizard = location_wizard.LocationWizard(parent = self,
grassdatabase = self.tgisdbase.GetValue())
- if gWizard.location != None:
+ if gWizard.location != None:
self.OnSetDatabase(event)
self.UpdateMapsets(os.path.join(self.gisdbase, gWizard.location))
self.lblocations.SetSelection(self.listOfLocations.index(gWizard.location))
@@ -416,13 +417,13 @@
"""!Location management choice control handler
"""
sel = event.GetSelection()
- if sel == 0:
+ if sel == 0:
self.RenameMapset()
- elif sel == 1:
+ elif sel == 1:
self.RenameLocation()
- elif sel == 2:
+ elif sel == 2:
self.DeleteMapset()
- elif sel == 3:
+ elif sel == 3:
self.DeleteLocation()
event.Skip()
@@ -432,29 +433,29 @@
"""
location = utils.UnicodeString(self.listOfLocations[self.lblocations.GetSelection()])
mapset = utils.UnicodeString(self.listOfMapsets[self.lbmapsets.GetSelection()])
- if mapset == 'PERMANENT':
+ if mapset == 'PERMANENT':
GMessage(parent = self,
message = _('Mapset <PERMANENT> is required for valid GRASS location.\n\n'
'This mapset cannot be renamed.'),
msgType = 'info')
return
- dlg = wx.TextEntryDialog(parent=self,
- message=_('Current name: %s\n\nEnter new name:') % mapset,
- caption=_('Rename selected mapset'))
+ dlg = wx.TextEntryDialog(parent = self,
+ message = _('Current name: %s\n\nEnter new name:') % mapset,
+ caption = _('Rename selected mapset'))
- if dlg.ShowModal() == wx.ID_OK:
+ if dlg.ShowModal() == wx.ID_OK:
newmapset = dlg.GetValue()
- if newmapset == mapset:
+ if newmapset == mapset:
dlg.Destroy()
return
if newmapset in self.listOfMapsets:
wx.MessageBox(parent = self,
caption = _('Message'),
- message=_('Unable to rename mapset.\n\n'
+ message = _('Unable to rename mapset.\n\n'
'Mapset <%s> already exists in location.') % newmapset,
- style=wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
+ style = wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
else:
try:
os.rename(os.path.join(self.gisdbase, location, mapset),
@@ -464,8 +465,8 @@
except StandardError, e:
wx.MessageBox(parent = self,
caption = _('Error'),
- message=_('Unable to rename mapset.\n\n%s') % e,
- style=wx.OK | wx.ICON_ERROR | wx.CENTRE)
+ message = _('Unable to rename mapset.\n\n%s') % e,
+ style = wx.OK | wx.ICON_ERROR | wx.CENTRE)
dlg.Destroy()
@@ -474,22 +475,22 @@
"""
location = utils.UnicodeString(self.listOfLocations[self.lblocations.GetSelection()])
- dlg = wx.TextEntryDialog(parent=self,
- message=_('Current name: %s\n\nEnter new name:') % location,
- caption=_('Rename selected location'))
+ dlg = wx.TextEntryDialog(parent = self,
+ message = _('Current name: %s\n\nEnter new name:') % location,
+ caption = _('Rename selected location'))
- if dlg.ShowModal() == wx.ID_OK:
+ if dlg.ShowModal() == wx.ID_OK:
newlocation = dlg.GetValue()
- if newlocation == location:
+ if newlocation == location:
dlg.Destroy()
return
if newlocation in self.listOfLocations:
wx.MessageBox(parent = self,
caption = _('Message'),
- message=_('Unable to rename location.\n\n'
+ message = _('Unable to rename location.\n\n'
'Location <%s> already exists in GRASS database.') % newlocation,
- style=wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
+ style = wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
else:
try:
os.rename(os.path.join(self.gisdbase, location),
@@ -500,8 +501,8 @@
except StandardError, e:
wx.MessageBox(parent = self,
caption = _('Error'),
- message=_('Unable to rename location.\n\n%s') % e,
- style=wx.OK | wx.ICON_ERROR | wx.CENTRE)
+ message = _('Unable to rename location.\n\n%s') % e,
+ style = wx.OK | wx.ICON_ERROR | wx.CENTRE)
dlg.Destroy()
@@ -510,28 +511,28 @@
"""
location = self.listOfLocations[self.lblocations.GetSelection()]
mapset = self.listOfMapsets[self.lbmapsets.GetSelection()]
- if mapset == 'PERMANENT':
+ if mapset == 'PERMANENT':
GMessage(parent = self,
message = _('Mapset <PERMANENT> is required for valid GRASS location.\n\n'
'This mapset cannot be deleted.'),
msgType = 'info')
return
- dlg = wx.MessageDialog(parent=self, message=_("Do you want to continue with deleting mapset <%(mapset)s> "
+ dlg = wx.MessageDialog(parent = self, message = _("Do you want to continue with deleting mapset <%(mapset)s> "
"from location <%(location)s>?\n\n"
"ALL MAPS included in this mapset will be "
"PERMANENTLY DELETED!") % {'mapset' : mapset,
'location' : location},
- caption=_("Delete selected mapset"),
- style=wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION)
+ caption = _("Delete selected mapset"),
+ style = wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION)
- if dlg.ShowModal() == wx.ID_YES:
+ if dlg.ShowModal() == wx.ID_YES:
try:
shutil.rmtree(os.path.join(self.gisdbase, location, mapset))
self.OnSelectLocation(None)
self.lbmapsets.SetSelection(0)
except:
- wx.MessageBox(message=_('Unable to delete mapset'))
+ wx.MessageBox(message = _('Unable to delete mapset'))
dlg.Destroy()
@@ -542,14 +543,14 @@
location = self.listOfLocations[self.lblocations.GetSelection()]
- dlg = wx.MessageDialog(parent=self, message=_("Do you want to continue with deleting "
+ dlg = wx.MessageDialog(parent = self, message = _("Do you want to continue with deleting "
"location <%s>?\n\n"
"ALL MAPS included in this location will be "
"PERMANENTLY DELETED!") % (location),
- caption=_("Delete selected location"),
- style=wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION)
+ caption = _("Delete selected location"),
+ style = wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION)
- if dlg.ShowModal() == wx.ID_YES:
+ if dlg.ShowModal() == wx.ID_YES:
try:
shutil.rmtree(os.path.join(self.gisdbase, location))
self.UpdateLocations(self.gisdbase)
@@ -557,7 +558,7 @@
self.OnSelectLocation(None)
self.lbmapsets.SetSelection(0)
except:
- wx.MessageBox(message=_('Unable to delete location'))
+ wx.MessageBox(message = _('Unable to delete location'))
dlg.Destroy()
@@ -569,7 +570,7 @@
wx.MessageBox(parent = self, caption = _("Error"),
message = _("Unable to set GRASS database. "
"Check your locale settings."),
- style=wx.OK | wx.ICON_ERROR | wx.CENTRE)
+ style = wx.OK | wx.ICON_ERROR | wx.CENTRE)
self.lblocations.Clear()
self.lblocations.InsertItems(self.listOfLocations, 0)
@@ -604,14 +605,14 @@
raise gcmd.CmdError("")
for line in ret.splitlines():
- self.listOfMapsetsSelectable += line.split(' ')
+ self.listOfMapsetsSelectable += line.split(' ')
except:
gcmd.RunCommand("g.gisenv",
- set= "GISDBASE=%s" % self.gisdbase)
+ set = "GISDBASE = %s" % self.gisdbase)
gcmd.RunCommand("g.gisenv",
- set = "LOCATION_NAME=%s" % locationName)
+ set = "LOCATION_NAME = %s" % locationName)
gcmd.RunCommand("g.gisenv",
- set = "MAPSET=PERMANENT")
+ set = "MAPSET = PERMANENT")
# first run only
self.listOfMapsetsSelectable = copy.copy(self.listOfMapsets)
@@ -624,9 +625,9 @@
locationName,
mapset, ".gislock")):
disabled.append(idx)
- idx += 1
+ idx += 1
- self.lbmapsets.InsertItems(self.listOfMapsets, 0, disabled=disabled)
+ self.lbmapsets.InsertItems(self.listOfMapsets, 0, disabled = disabled)
return self.listOfMapsets
@@ -635,7 +636,7 @@
if event:
self.lblocations.SetSelection(event.GetIndex())
- if self.lblocations.GetSelection() != wx.NOT_FOUND:
+ if self.lblocations.GetSelection() != wx.NOT_FOUND:
self.UpdateMapsets(os.path.join(self.gisdbase,
self.listOfLocations[self.lblocations.GetSelection()]))
else:
@@ -654,10 +655,10 @@
locationName,
mapset, ".gislock")):
disabled.append(idx)
- idx += 1
+ idx += 1
self.lbmapsets.Clear()
- self.lbmapsets.InsertItems(self.listOfMapsets, 0, disabled=disabled)
+ self.lbmapsets.InsertItems(self.listOfMapsets, 0, disabled = disabled)
if len(self.listOfMapsets) > 0:
self.lbmapsets.SetSelection(0)
@@ -695,8 +696,8 @@
grassdata = None
dlg = wx.DirDialog(self, _("Choose GIS Data Directory:"),
- style=wx.DD_DEFAULT_STYLE | wx.DD_NEW_DIR_BUTTON)
- if dlg.ShowModal() == wx.ID_OK:
+ style = wx.DD_DEFAULT_STYLE | wx.DD_NEW_DIR_BUTTON)
+ if dlg.ShowModal() == wx.ID_OK:
self.gisdbase = dlg.GetPath()
self.tgisdbase.SetValue(self.gisdbase)
self.OnSetDatabase(event)
@@ -708,11 +709,11 @@
self.gisdbase = self.tgisdbase.GetValue()
location = self.listOfLocations[self.lblocations.GetSelection()]
- dlg = wx.TextEntryDialog(parent=self,
- message=_('Enter name for new mapset:'),
- caption=_('Create new mapset'))
+ dlg = wx.TextEntryDialog(parent = self,
+ message = _('Enter name for new mapset:'),
+ caption = _('Create new mapset'))
- if dlg.ShowModal() == wx.ID_OK:
+ if dlg.ShowModal() == wx.ID_OK:
mapset = dlg.GetValue()
try:
os.mkdir(os.path.join(self.gisdbase, location, mapset))
@@ -723,8 +724,8 @@
self.OnSelectLocation(None)
self.lbmapsets.SetSelection(self.listOfMapsets.index(mapset))
except StandardError, e:
- dlg = wx.MessageDialog(parent=self, message=_("Unable to create new mapset: %s") % e,
- caption=_("Error"), style=wx.OK | wx.ICON_ERROR)
+ dlg = wx.MessageDialog(parent = self, message = _("Unable to create new mapset: %s") % e,
+ caption = _("Error"), style = wx.OK | wx.ICON_ERROR)
dlg.ShowModal()
dlg.Destroy()
return False
@@ -736,13 +737,13 @@
def OnStart(self, event):
"""'Start GRASS' button clicked"""
gcmd.RunCommand("g.gisenv",
- set = "GISDBASE=%s" % \
+ set = "GISDBASE = %s" % \
self.tgisdbase.GetValue())
gcmd.RunCommand("g.gisenv",
- set = "LOCATION_NAME=%s" % \
+ set = "LOCATION_NAME = %s" % \
self.listOfLocations[self.lblocations.GetSelection()])
gcmd.RunCommand("g.gisenv",
- set = "MAPSET=%s" % \
+ set = "MAPSET = %s" % \
self.listOfMapsets[self.lbmapsets.GetSelection()])
self.Destroy()
@@ -756,12 +757,12 @@
def OnHelp(self, event):
"""'Help' button clicked"""
# help text in lib/init/helptext.html
- file=os.path.join(self.gisbase, "docs", "html", "helptext.html")
+ file = os.path.join(self.gisbase, "docs", "html", "helptext.html")
- helpFrame = HelpFrame(parent=self, id=wx.ID_ANY,
- title=_("GRASS Quickstart"),
- size=(640, 480),
- file=file)
+ helpFrame = HelpFrame(parent = self, id = wx.ID_ANY,
+ title = _("GRASS Quickstart"),
+ size = (640, 480),
+ file = file)
helpFrame.Show(True)
event.Skip()
@@ -775,24 +776,22 @@
"""!Use wx.ListCtrl instead of wx.ListBox, different style for
non-selectable items (e.g. mapsets with denied permission)"""
def __init__(self, parent, id, size,
- choices, disabled=[]):
-
- wx.ListCtrl.__init__(self, parent, id, size=size,
- style=wx.LC_REPORT | wx.LC_NO_HEADER | wx.LC_SINGLE_SEL |
+ choices, disabled = []):
+ wx.ListCtrl.__init__(self, parent, id, size = size,
+ style = wx.LC_REPORT | wx.LC_NO_HEADER | wx.LC_SINGLE_SEL |
wx.BORDER_SUNKEN)
-
+
listmix.ListCtrlAutoWidthMixin.__init__(self)
self.InsertColumn(0, '')
-
+
self.selected = wx.NOT_FOUND
- self.__LoadData(choices, disabled)
+ self._LoadData(choices, disabled)
- def __LoadData(self, choices, disabled=[]):
- """
- Load data into list
-
+ def _LoadData(self, choices, disabled = []):
+ """!Load data into list
+
@param choices list of item
@param disabled list of indeces of non-selectable items
"""
@@ -803,22 +802,20 @@
if idx in disabled:
self.SetItemTextColour(idx, wx.Colour(150, 150, 150))
- idx += 1
-
- #self.SetColumnWidth(0, wx.LIST_AUTOSIZE)
-
+ idx += 1
+
def Clear(self):
self.DeleteAllItems()
-
- def InsertItems(self, choices, pos, disabled=[]):
- self.__LoadData(choices, disabled)
-
+
+ def InsertItems(self, choices, pos, disabled = []):
+ self._LoadData(choices, disabled)
+
def SetSelection(self, item, force = False):
- if item != wx.NOT_FOUND and \
- (platform.system() != 'Windows' or force):
+ if item != wx.NOT_FOUND and \
+ (platform.system() != 'Windows' or force):
### Windows -> FIXME
self.SetItemState(item, wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED)
-
+
self.selected = item
def GetSelection(self):
@@ -834,26 +831,26 @@
self.SetTopWindow(StartUp)
StartUp.Show()
- if StartUp.GetRCValue("LOCATION_NAME") == "<UNKNOWN>":
- wx.MessageBox(parent=StartUp,
- caption=_('Starting GRASS for the first time'),
- message=_('GRASS needs a directory in which to store its data. '
+ if StartUp.GetRCValue("LOCATION_NAME") == "<UNKNOWN>":
+ wx.MessageBox(parent = StartUp,
+ caption = _('Starting GRASS for the first time'),
+ message = _('GRASS needs a directory in which to store its data. '
'Create one now if you have not already done so. '
'A popular choice is "grassdata", located in '
'your home directory.'),
- style=wx.OK | wx.ICON_ERROR | wx.CENTRE)
+ style = wx.OK | wx.ICON_ERROR | wx.CENTRE)
StartUp.OnBrowse(None)
return 1
-if __name__ == "__main__":
+if __name__ == "__main__":
if os.getenv("GISBASE") is None:
print >> sys.stderr, "Failed to start GUI, GRASS GIS is not running."
else:
import gettext
- gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode=True)
+ gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
import gui_modules.gcmd as gcmd
import gui_modules.utils as utils
More information about the grass-commit
mailing list