Browse Source

wxGUI/wms: dialog improvements (see https://trac.osgeo.org/grass/ticket/2859)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@67550 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 9 years ago
parent
commit
c047c0ed23
1 changed files with 18 additions and 1 deletions
  1. 18 1
      gui/wxpython/web_services/dialogs.py

+ 18 - 1
gui/wxpython/web_services/dialogs.py

@@ -123,6 +123,7 @@ class WSDialogBase(wx.Dialog):
         self.layerName = wx.TextCtrl(parent = self.reqDataPanel, id = wx.ID_ANY)
         self.layerName = wx.TextCtrl(parent = self.reqDataPanel, id = wx.ID_ANY)
 
 
         for ws in self.ws_panels.iterkeys():
         for ws in self.ws_panels.iterkeys():
+            # set class WSPanel argument layerNameTxtCtrl
             self.ws_panels[ws]['panel'] =  WSPanel(parent = self.reqDataPanel,
             self.ws_panels[ws]['panel'] =  WSPanel(parent = self.reqDataPanel,
                                                    web_service = ws)
                                                    web_service = ws)
             self.ws_panels[ws]['panel'].capParsed.connect(self.OnPanelCapParsed)
             self.ws_panels[ws]['panel'].capParsed.connect(self.OnPanelCapParsed)
@@ -221,7 +222,12 @@ class WSDialogBase(wx.Dialog):
         dialogSizer.Add(item = self.btnsizer, proportion = 0,
         dialogSizer.Add(item = self.btnsizer, proportion = 0,
                         flag = wx.ALIGN_CENTER)
                         flag = wx.ALIGN_CENTER)
 
 
-        dialogSizer.Add(item = self.statusbar, proportion = 0)
+        # expand wxWidget wx.StatusBar
+        statusbarSizer = wx.BoxSizer(wx.HORIZONTAL)
+        statusbarSizer.Add(item=self.statusbar, proportion=1, flag=wx.EXPAND)
+        dialogSizer.Add(item=statusbarSizer,
+                        proportion=0,
+                        flag=wx.EXPAND)
 
 
         self.SetSizer(dialogSizer)
         self.SetSizer(dialogSizer)
         self.Layout()
         self.Layout()
@@ -303,6 +309,12 @@ class WSDialogBase(wx.Dialog):
         else:
         else:
             self.adv_conn.Collapse(True)
             self.adv_conn.Collapse(True)
 
 
+        # clear content of the wxWidget wx.TextCtrl (Output layer
+        # name:), based on changing default server selection in the
+        # wxWidget wx.Choice
+        if len(self.layerName.GetValue()) > 0:
+            self.layerName.Clear()
+
     def OnClose(self, event):
     def OnClose(self, event):
         """Close the dialog
         """Close the dialog
         """
         """
@@ -327,6 +339,11 @@ class WSDialogBase(wx.Dialog):
         else:
         else:
             self.btn_connect.Enable(False)
             self.btn_connect.Enable(False)
         
         
+        # clear content of the wxWidget wx.TextCtrl (Output Layer
+        # name:), based on changing content of the wxWidget
+        # wx.TextCtrl (Server:)
+        self.layerName.Clear()
+
     def OnOutputLayerName(self, event):
     def OnOutputLayerName(self, event):
         """Update layer name to web service panel
         """Update layer name to web service panel
         """
         """