Sfoglia il codice sorgente

wxGUI/lmgr: The Data tab is now first and default (#756)

See #748.
Linda Kladivova 4 anni fa
parent
commit
274dcf2f49
1 ha cambiato i file con 15 aggiunte e 14 eliminazioni
  1. 15 14
      gui/wxpython/lmgr/frame.py

+ 15 - 14
gui/wxpython/lmgr/frame.py

@@ -197,7 +197,7 @@ class GMFrame(wx.Frame):
 
 
         self._auimgr.Update()
         self._auimgr.Update()
 
 
-        wx.CallAfter(self.notebook.SetSelectionByName, 'layers')
+        wx.CallAfter(self.notebook.SetSelectionByName, 'catalog')
 
 
         # use default window layout ?
         # use default window layout ?
         if UserSettings.Get(
         if UserSettings.Get(
@@ -311,7 +311,20 @@ class GMFrame(wx.Frame):
                 parent=self, style=globalvar.FNPageDStyle)
                 parent=self, style=globalvar.FNPageDStyle)
         else:
         else:
             self.notebook = FormNotebook(parent=self, style=wx.NB_BOTTOM)
             self.notebook = FormNotebook(parent=self, style=wx.NB_BOTTOM)
-        # create displays notebook widget and add it to main notebook page
+
+        # create 'data catalog' widget and add it to main notebook page
+        self.datacatalog = DataCatalog(
+            parent=self.notebook, giface=self._giface)
+        self.datacatalog.showNotification.connect(
+            lambda message: self.SetStatusText(message))
+        self.datacatalog.changeMapset.connect(lambda mapset: self.ChangeMapset(mapset))
+        self.datacatalog.changeLocation.connect(lambda mapset, location: self.ChangeLocation(location, mapset))
+        self.notebook.AddPage(
+            page=self.datacatalog,
+            text=_("Data"),
+            name='catalog')
+
+        # create displays notebook widget
         cbStyle = globalvar.FNPageStyle
         cbStyle = globalvar.FNPageStyle
         if globalvar.hasAgw:
         if globalvar.hasAgw:
             self.notebookLayers = FN.FlatNotebook(
             self.notebookLayers = FN.FlatNotebook(
@@ -372,18 +385,6 @@ class GMFrame(wx.Frame):
         else:
         else:
             self.search = None
             self.search = None
 
 
-        # create 'data catalog' notebook page
-        self.datacatalog = DataCatalog(
-            parent=self.notebook, giface=self._giface)
-        self.datacatalog.showNotification.connect(
-            lambda message: self.SetStatusText(message))
-        self.datacatalog.changeMapset.connect(lambda mapset: self.ChangeMapset(mapset))
-        self.datacatalog.changeLocation.connect(lambda mapset, location: self.ChangeLocation(location, mapset))
-        self.notebook.AddPage(
-            page=self.datacatalog,
-            text=_("Data"),
-            name='catalog')
-
         # create 'python shell' notebook page
         # create 'python shell' notebook page
         if not UserSettings.Get(
         if not UserSettings.Get(
                 group='manager', key='hideTabs', subkey='pyshell'):
                 group='manager', key='hideTabs', subkey='pyshell'):