[GRASS-SVN] r68273 - grass/trunk/gui/wxpython/mapswipe

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-04-17 10:40:47 -0700 (Sun, 17 Apr 2016)
New Revision: 68273

Modified:
   grass/trunk/gui/wxpython/mapswipe/dialogs.py
   grass/trunk/gui/wxpython/mapswipe/frame.py
   grass/trunk/gui/wxpython/mapswipe/toolbars.py
Log:
g.gui.mapswipe: remove draw/erase from toolbar, layout cosmetics

Modified: grass/trunk/gui/wxpython/mapswipe/dialogs.py
===================================================================
--- grass/trunk/gui/wxpython/mapswipe/dialogs.py	2016-04-17 17:32:35 UTC (rev 68272)
+++ grass/trunk/gui/wxpython/mapswipe/dialogs.py	2016-04-17 17:40:47 UTC (rev 68273)
@@ -101,9 +101,9 @@
         mainSizer.Add(item=self.btnSizer, proportion=0,
                       flag=wx.EXPAND | wx.ALL | wx.ALIGN_CENTER, border=5)
         self.mainSizer = mainSizer
+        self._switchMode(simple=True)
         self.SetSizer(mainSizer)
         mainSizer.Fit(self)
-        self._switchMode(simple=True)
 
     def _createSimplePanel(self):
         panel = wx.Panel(self)

Modified: grass/trunk/gui/wxpython/mapswipe/frame.py
===================================================================
--- grass/trunk/gui/wxpython/mapswipe/frame.py	2016-04-17 17:32:35 UTC (rev 68272)
+++ grass/trunk/gui/wxpython/mapswipe/frame.py	2016-04-17 17:40:47 UTC (rev 68273)
@@ -102,7 +102,7 @@
         self.Bind(wx.EVT_IDLE, self.OnIdle)
         self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
 
-        self.SetSize((825, 600))
+        self.SetSize((800, 600))
         
         self._mgr.Update()
 

Modified: grass/trunk/gui/wxpython/mapswipe/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/mapswipe/toolbars.py	2016-04-17 17:32:35 UTC (rev 68272)
+++ grass/trunk/gui/wxpython/mapswipe/toolbars.py	2016-04-17 17:40:47 UTC (rev 68273)
@@ -56,13 +56,8 @@
         # BaseIcons are a set of often used icons. It is possible
         # to reuse icons in ./trunk/gui/icons/grass or add new ones there.
         icons = BaseIcons
-        return self._getToolbarData((("displaymap", icons["display"],
-                                      self.parent.OnDraw),
-                                     ("rendermap", icons["render"],
+        return self._getToolbarData((("rendermap", icons["render"],
                                       self.parent.OnRender),
-                                     ("erase", icons["erase"],
-                                      self.parent.OnErase),
-                                     (None, ),  # creates separator
                                      ("pointer", icons["pointer"],
                                       self.parent.OnPointer,
                                       wx.ITEM_CHECK),