[GRASS-SVN] r57549 - grass/trunk/gui/wxpython

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2013-08-29 14:35:03 -0700 (Thu, 29 Aug 2013)
New Revision: 57549

Modified:
   grass/trunk/gui/wxpython/gis_set.py
Log:
wxGUI/startup: replacing dialog which was showed during initialization by a message in the main window (smoother gui start, less annoying dialogs)

Modified: grass/trunk/gui/wxpython/gis_set.py
===================================================================
--- grass/trunk/gui/wxpython/gis_set.py	2013-08-29 14:57:56 UTC (rev 57548)
+++ grass/trunk/gui/wxpython/gis_set.py	2013-08-29 21:35:03 UTC (rev 57549)
@@ -112,6 +112,17 @@
                                     style = wx.ALIGN_CENTRE)
         self.ldbase = wx.StaticText(parent = self.panel, id = wx.ID_ANY,
                                     label = _("GIS Data Directory:"))
+        # no message at the beginning
+        self.lmessage = wx.StaticText(parent=self.panel, id=wx.ID_ANY,
+                                    label=_(""))
+        # It is not clear if all wx versions supports color, so try-except.
+        # The color itself may not be correct for all platforms/system settings
+        # but in http://xoomer.virgilio.it/infinity77/wxPython/Widgets/wx.SystemSettings.html
+        # there is no 'warning' color.
+        try:
+            self.lmessage.SetForegroundColour(wx.Colour(255, 0, 0))
+        except AttributeError:
+            pass
         self.llocation = wx.StaticText(parent = self.panel, id = wx.ID_ANY,
                                        label = _("Project location\n(projection/coordinate system)"),
                                        style = wx.ALIGN_CENTRE)
@@ -356,6 +367,11 @@
                   flag = wx.ALIGN_CENTER_HORIZONTAL |
                   wx.RIGHT | wx.LEFT | wx.EXPAND,
                   border = 20) # GISDBASE setting
+        # warning/error message
+        sizer.Add(item=self.lmessage,
+                  proportion=0,
+                  flag=wx.ALIGN_CENTER_VERTICAL |
+                  wx.ALIGN_LEFT| wx.LEFT | wx.RIGHT | wx.BOTTOM, border=8)
         sizer.Add(item = location_sizer, proportion = 1,
                   flag = wx.RIGHT | wx.LEFT | wx.EXPAND,
                   border = 1)
@@ -394,6 +410,28 @@
         
         return grassrc
 
+    def _showWarning(self, text):
+        """Displays a warning message to the user.
+
+        There is no cleaning procedure. You should call _hideMessage when
+        you know that there is everything correct now.
+        """
+        self.lmessage.SetLabel(_("Warning: ") + text)
+
+    def _showError(self, text):
+        """Displays a error message to the user.
+
+        There is no cleaning procedure. You should call _hideMessage when
+        you know that there is everything correct now.
+        """
+        self.lmessage.SetLabel(_("Error: ") + text)
+
+    def _hideMessage(self):
+        """Clears/hides the error message."""
+        # we do no hide widget
+        # because we do not want the dialog to change the size
+        self.lmessage.SetLabel("")
+
     def GetRCValue(self, value):
         """!Return GRASS variable (read from GISRC)
         """
@@ -663,12 +701,13 @@
         self.lblocations.InsertItems(self.listOfLocations, 0)
 
         if len(self.listOfLocations) > 0:
+            self._hideMessage()
             self.lblocations.SetSelection(0)
         else:
             self.lblocations.SetSelection(wx.NOT_FOUND)
-            GWarning(_("No GRASS location found in '%s'.") % self.gisdbase,
-                     parent = self)
-        
+            self._showWarning(_("No GRASS location found in '%s'.")
+                              % self.gisdbase)
+
         return self.listOfLocations
 
     def UpdateMapsets(self, location):
@@ -771,9 +810,9 @@
     def OnSetDatabase(self, event):
         """!Database set"""
         gisdbase = self.tgisdbase.GetValue()
+        self._hideMessage()
         if not os.path.exists(gisdbase):
-            GError(_("Path '%s' doesn't exist.") % gisdbase,
-                   parent = self)
+            self._showError(_("Path '%s' doesn't exist.") % gisdbase)
             return
         
         self.gisdbase = self.tgisdbase.GetValue()