[GRASS-SVN] r49818 - grass/trunk/gui/wxpython/iclass

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-18 12:50:40 -0800 (Sun, 18 Dec 2011)
New Revision: 49818

Modified:
   grass/trunk/gui/wxpython/iclass/frame.py
   grass/trunk/gui/wxpython/iclass/toolbars.py
Log:
wxGUI/iclass: move misc toolbar to the first row
	      add quit button to the misc toolbar


Modified: grass/trunk/gui/wxpython/iclass/frame.py
===================================================================
--- grass/trunk/gui/wxpython/iclass/frame.py	2011-12-18 20:04:55 UTC (rev 49817)
+++ grass/trunk/gui/wxpython/iclass/frame.py	2011-12-18 20:50:40 UTC (rev 49818)
@@ -68,7 +68,7 @@
     It is wxGUI counterpart of old i.class module.
     """
     def __init__(self, parent = None, title = _("Supervised Classification Tool"),
-                 toolbars = ["iClassMap", "iClassMisc", "vdigit", "iClass"],
+                 toolbars = ["iClassMisc", "iClassMap", "vdigit", "iClass"],
                  size = (800, 600), name = 'IClassWindow', **kwargs):
         """!
         @param parent (no parent is expected)
@@ -262,7 +262,7 @@
                               ToolbarPane().Top().
                               LeftDockable(False).RightDockable(False).
                               BottomDockable(False).TopDockable(True).
-                              CloseButton(False).Layer(2).Row(2).
+                              CloseButton(False).Layer(2).Row(1).
                               BestSize((self.toolbars[name].GetBestSize())))
 
         if name == "vdigit":

Modified: grass/trunk/gui/wxpython/iclass/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/iclass/toolbars.py	2011-12-18 20:04:55 UTC (rev 49817)
+++ grass/trunk/gui/wxpython/iclass/toolbars.py	2011-12-18 20:50:40 UTC (rev 49818)
@@ -112,14 +112,6 @@
                                       self.parent.OnZoomBack),
                                      ("zoomtomap", icons["zoomExtent"],
                                       self.parent.OnZoomToMap),
-                                     
-                                     #('settings', Icons["georectify"]["settings"],
-                                      #self.parent.OnSettings),
-                                     #('help', Icons["misc"]["help"],
-                                      #self.parent.OnHelp),
-                                     #(None, ),
-                                     #('quit', Icons["georectify"]["quit"],
-                                      #self.parent.OnQuit))
                                     ))
 class IClassToolbar(BaseToolbar):
     """!IClass toolbar
@@ -298,6 +290,7 @@
         icons = BaseIcons
         return self._getToolbarData((("help", icons['help'],
                                       self.parent.OnHelp),
-                                     #("quit", icons['quit'],
-                                      #self.parent.OnCloseWindow),
-                                    ))
+                                     ("quit", icons['quit'],
+                                      self.parent.OnCloseWindow),
+                                     ))
+