Changeset 30764

Timestamp:

Mar 27, 2008, 9:33:54 AM (16 years ago)

Author:

martinl

Message:

wxGUI (welcome screen): fix entering GISDBASE manually

File:

• grass/trunk/gui/wxpython/gis_set.py (modified) (7 diffs)

grass/trunk/gui/wxpython/gis_set.py

@@ -132 +132 @@
         # textinputs
         self.tgisdbase = wx.TextCtrl(parent=self.panel, id=wx.ID_ANY, value="", size=(300, -1),
-                                     style=wx.TE_LEFT)
+                                     style=wx.TE_PROCESS_ENTER)
 
         # Locations
@@ -161 +161 @@
         self.lblocations.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnSelectLocation)
         self.lbmapsets.Bind(wx.EVT_LIST_ITEM_SELECTED,   self.OnSelectMapset)
-        self.Bind(wx.EVT_KEY_DOWN,            self.OnKeyPressedInDbase, self.tgisdbase)
+        self.tgisdbase.Bind(wx.EVT_TEXT_ENTER, self.OnSetDatabase)
         self.Bind(wx.EVT_CLOSE,               self.OnCloseWindow)
 
@@ -527 +527 @@
         self.lblocations.InsertItems(self.listOfLocations, 0)
 
+        if len(self.listOfLocations) > 0:
+            self.lblocations.SetSelection(0)
+        else:
+            self.lblocations.SetSelection(wx.NOT_FOUND)
+
         return self.listOfLocations
 
@@ -575 +580 @@
         """Location selected"""
         if event:
-            try:
-                self.lblocations.SetSelection(event.GetIndex())
-            except AttributeError:
-                self.lblocations.SetSelection(0)
+            self.lblocations.SetSelection(event.GetIndex())
             
-        if self.lblocations.GetSelection() > -1:
+        if self.lblocations.GetSelection() != wx.NOT_FOUND:
             self.UpdateMapsets(os.path.join(self.gisdbase,
                                             self.listOfLocations[self.lblocations.GetSelection()]))
@@ -595 +597 @@
         self.lbmapsets.Clear()
         self.lbmapsets.InsertItems(self.listOfMapsets, 0, disabled=disabled)
-        
-        self.lbmapsets.SetSelection(0)
+
+        if len(self.listOfMapsets) > 0:
+            self.lbmapsets.SetSelection(0)
+        else:
+            self.lbmapsets.SetSelection(wx.NOT_FOUND)
 
     def OnSelectMapset(self, event):
@@ -618 +623 @@
         if self.listOfLocations != []:
             self.lblocations.SetSelection(0)
-
-        self.OnSelectLocation(event)
+        else:
+            self.lblocations.SetSelection(wx.NOT_FOUND)
+            
+        self.OnSelectLocation(None)
 
     def OnBrowse(self, event):
@@ -633 +640 @@
 
         self.OnSetDatabase(event)
-
-    def OnKeyPressedInDbase(self,event):
-        """GIS data directory changed"""
-        if wx.WXK_RETURN == event.KeyCode:
-            self.OnSetDatabase(event)
-        else:
-            event.Skip()
 
     def OnCreateMapset(self,event):