Преглед изворни кода

wxGUI/iclass: move misc toolbar to the first row
add quit button to the misc toolbar


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

Martin Landa пре 13 година
родитељ
комит
02a1294aca
2 измењених фајлова са 6 додато и 13 уклоњено
  1. 2 2
      gui/wxpython/iclass/frame.py
  2. 4 11
      gui/wxpython/iclass/toolbars.py

+ 2 - 2
gui/wxpython/iclass/frame.py

@@ -68,7 +68,7 @@ class IClassMapFrame(DoubleMapFrame):
     It is wxGUI counterpart of old i.class module.
     It is wxGUI counterpart of old i.class module.
     """
     """
     def __init__(self, parent = None, title = _("Supervised Classification Tool"),
     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):
                  size = (800, 600), name = 'IClassWindow', **kwargs):
         """!
         """!
         @param parent (no parent is expected)
         @param parent (no parent is expected)
@@ -262,7 +262,7 @@ class IClassMapFrame(DoubleMapFrame):
                               ToolbarPane().Top().
                               ToolbarPane().Top().
                               LeftDockable(False).RightDockable(False).
                               LeftDockable(False).RightDockable(False).
                               BottomDockable(False).TopDockable(True).
                               BottomDockable(False).TopDockable(True).
-                              CloseButton(False).Layer(2).Row(2).
+                              CloseButton(False).Layer(2).Row(1).
                               BestSize((self.toolbars[name].GetBestSize())))
                               BestSize((self.toolbars[name].GetBestSize())))
 
 
         if name == "vdigit":
         if name == "vdigit":

+ 4 - 11
gui/wxpython/iclass/toolbars.py

@@ -112,14 +112,6 @@ class IClassMapToolbar(BaseToolbar):
                                       self.parent.OnZoomBack),
                                       self.parent.OnZoomBack),
                                      ("zoomtomap", icons["zoomExtent"],
                                      ("zoomtomap", icons["zoomExtent"],
                                       self.parent.OnZoomToMap),
                                       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):
 class IClassToolbar(BaseToolbar):
     """!IClass toolbar
     """!IClass toolbar
@@ -298,6 +290,7 @@ class IClassMiscToolbar(BaseToolbar):
         icons = BaseIcons
         icons = BaseIcons
         return self._getToolbarData((("help", icons['help'],
         return self._getToolbarData((("help", icons['help'],
                                       self.parent.OnHelp),
                                       self.parent.OnHelp),
-                                     #("quit", icons['quit'],
-                                      #self.parent.OnCloseWindow),
-                                    ))
+                                     ("quit", icons['quit'],
+                                      self.parent.OnCloseWindow),
+                                     ))
+