[GRASS-SVN] r59381 - grass/branches/releasebranch_6_4/gui/wxpython/location_wizard
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Mar 26 12:53:58 PDT 2014
Author: annakrat
Date: 2014-03-26 12:53:57 -0700 (Wed, 26 Mar 2014)
New Revision: 59381
Modified:
grass/branches/releasebranch_6_4/gui/wxpython/location_wizard/wizard.py
Log:
wxGUI/location wizard: fixes for wxPython 3
Modified: grass/branches/releasebranch_6_4/gui/wxpython/location_wizard/wizard.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/location_wizard/wizard.py 2014-03-26 17:07:45 UTC (rev 59380)
+++ grass/branches/releasebranch_6_4/gui/wxpython/location_wizard/wizard.py 2014-03-26 19:53:57 UTC (rev 59381)
@@ -351,7 +351,6 @@
self.projlist.resizeLastColumn(30)
# layout
- self.sizer.AddGrowableCol(3)
self.sizer.Add(item = self.MakeLabel(_("Projection code:")),
flag = wx.ALIGN_LEFT |
wx.ALIGN_CENTER_VERTICAL |
@@ -367,11 +366,12 @@
flag = wx.ALIGN_RIGHT | wx.EXPAND | wx.ALL,
border = 5, pos = (2, 2))
- self.sizer.AddGrowableRow(3)
self.sizer.Add(item = self.projlist,
flag = wx.EXPAND |
wx.ALIGN_LEFT |
wx.ALL, border = 5, pos = (3, 1), span = (1, 3))
+ self.sizer.AddGrowableCol(3)
+ self.sizer.AddGrowableRow(3)
# events
self.tproj.Bind(wx.EVT_TEXT, self.OnText)
@@ -649,14 +649,13 @@
self.p4projparams = ''
self.projdesc = ''
- self.sizer.AddGrowableCol(1)
- self.sizer.AddGrowableRow(1)
radioSBox = wx.StaticBox(parent = self, id = wx.ID_ANY,
label = " %s " % _("Select datum or ellipsoid (next page)"))
radioSBSizer = wx.StaticBoxSizer(radioSBox)
self.sizer.Add(item = radioSBSizer, pos = (0, 1),
flag = wx.EXPAND | wx.ALIGN_TOP | wx.TOP, border = 10)
+ self.sizer.AddGrowableCol(1)
self.radio1 = wx.RadioButton(parent = self, id = wx.ID_ANY,
label = _("Datum with associated ellipsoid"),
@@ -800,7 +799,7 @@
wx.ALIGN_CENTER_VERTICAL |
wx.LEFT, border = 5)
row += 1
-
+ self.sizer.AddGrowableRow(1)
self.panel.SetSize(self.panel.GetBestSize())
self.panel.Layout()
self.Layout()
@@ -852,7 +851,6 @@
self.datumlist.resizeLastColumn(10)
# layout
- self.sizer.AddGrowableCol(4)
self.sizer.Add(item = self.MakeLabel(_("Datum code:")),
flag = wx.ALIGN_LEFT |
wx.ALIGN_CENTER_VERTICAL |
@@ -871,11 +869,12 @@
wx.ALIGN_CENTER_VERTICAL |
wx.ALL, border = 5, pos = (2, 2))
- self.sizer.AddGrowableRow(3)
self.sizer.Add(item = self.datumlist,
flag = wx.EXPAND |
wx.ALIGN_LEFT |
wx.ALL, border = 5, pos = (3, 1), span = (1, 4))
+ self.sizer.AddGrowableCol(4)
+ self.sizer.AddGrowableRow(3)
# events
self.datumlist.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnDatumSelected)
@@ -1018,7 +1017,6 @@
self.ellipselist.resizeLastColumn(30)
# layout
- self.sizer.AddGrowableCol(4)
self.sizer.Add(item = self.MakeLabel(_("Ellipsoid code:")),
flag = wx.ALIGN_RIGHT |
wx.ALIGN_CENTER_VERTICAL |
@@ -1036,11 +1034,12 @@
wx.ALIGN_CENTER_VERTICAL |
wx.ALL, border = 5, pos = (2, 2))
- self.sizer.AddGrowableRow(3)
self.sizer.Add(item = self.ellipselist,
flag = wx.EXPAND |
wx.ALIGN_LEFT |
wx.ALL, border = 5, pos = (3, 1), span = (1, 4))
+ self.sizer.AddGrowableCol(4)
+ self.sizer.AddGrowableRow(3)
# events
self.ellipselist.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected)
@@ -1118,7 +1117,6 @@
self.bbrowse = self.MakeButton(_("Browse"))
# do layout
- self.sizer.AddGrowableCol(3)
self.sizer.Add(item = self.lfile, flag = wx.ALIGN_LEFT |
wx.ALIGN_CENTRE_VERTICAL |
wx.ALL, border = 5, pos = (1, 1))
@@ -1127,6 +1125,7 @@
wx.ALL, border = 5, pos = (1, 2))
self.sizer.Add(item = self.bbrowse, flag = wx.ALIGN_LEFT |
wx.ALL, border = 5, pos = (1, 3))
+ self.sizer.AddGrowableCol(3)
self.bbrowse.Bind(wx.EVT_BUTTON, self.OnBrowse)
self.tfile.Bind(wx.EVT_TEXT, self.OnText)
@@ -1192,7 +1191,6 @@
self.bbrowse = self.MakeButton(_("Browse"))
# do layout
- self.sizer.AddGrowableCol(3)
self.sizer.Add(item = self.lfile, flag = wx.ALIGN_LEFT |
wx.ALIGN_CENTRE_VERTICAL |
wx.ALL, border = 5, pos = (1, 1))
@@ -1201,6 +1199,7 @@
wx.ALL, border = 5, pos = (1, 2))
self.sizer.Add(item = self.bbrowse, flag = wx.ALIGN_LEFT |
wx.ALL, border = 5, pos = (1, 3))
+ self.sizer.AddGrowableCol(3)
self.bbrowse.Bind(wx.EVT_BUTTON, self.OnBrowse)
self.tfile.Bind(wx.EVT_TEXT, self.OnText)
@@ -1285,7 +1284,6 @@
columns = [_('Code'), _('Description'), _('Parameters')])
# layout
- self.sizer.AddGrowableCol(3)
self.sizer.Add(item = self.lfile,
flag = wx.ALIGN_LEFT |
wx.ALIGN_CENTER_VERTICAL |
@@ -1311,10 +1309,11 @@
wx.ALIGN_CENTER_VERTICAL |
wx.ALL, border = 5, pos = (3, 3))
- self.sizer.AddGrowableRow(4)
self.sizer.Add(item = self.epsglist,
flag = wx.ALIGN_LEFT | wx.EXPAND, pos = (4, 1),
span = (1, 4))
+ self.sizer.AddGrowableCol(3)
+ self.sizer.AddGrowableRow(4)
# events
self.bbrowse.Bind(wx.EVT_BUTTON, self.OnBrowse)
@@ -1477,14 +1476,14 @@
self.label_proj4string = self.MakeLabel(_("Enter PROJ.4 parameters string:"))
# layout
- self.sizer.AddGrowableCol(2)
self.sizer.Add(self.label_proj4string,
flag = wx.ALIGN_LEFT | wx.ALL,
border = 5, pos = (1, 1))
- self.sizer.AddGrowableRow(2)
self.sizer.Add(self.text_proj4string,
flag = wx.ALIGN_LEFT | wx.ALL | wx.EXPAND,
border = 5, pos = (2, 1), span = (1, 2))
+ self.sizer.AddGrowableRow(2)
+ self.sizer.AddGrowableCol(2)
self.text_proj4string.Bind(wx.EVT_TEXT, self.GetProjstring)
self.Bind(wiz.EVT_WIZARD_PAGE_CHANGING, self.OnPageChanging)
@@ -1589,10 +1588,6 @@
def _doLayout(self):
"""!Do page layout"""
- self.sizer.AddGrowableCol(1)
- self.sizer.AddGrowableRow(3, 1)
- self.sizer.AddGrowableRow(4, 1)
- self.sizer.AddGrowableRow(5, 5)
titleSizer = wx.BoxSizer(wx.VERTICAL)
titleSizer.Add(item = self.llocTitle, proportion = 1,
@@ -1643,6 +1638,10 @@
self.sizer.Add(item = self.panelProj4string,
flag = wx.ALIGN_LEFT | wx.ALL | wx.EXPAND,
border = 0, pos = (5, 1))
+ self.sizer.AddGrowableCol(1)
+ self.sizer.AddGrowableRow(3, 1)
+ self.sizer.AddGrowableRow(4, 1)
+ self.sizer.AddGrowableRow(5, 5)
def OnEnterPage(self, event):
"""!Insert values into text controls for summary of location
More information about the grass-commit
mailing list