Browse Source

wxGUI: fix menuform error message (missing parameter)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@42424 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 15 years ago
parent
commit
e7b8276196
2 changed files with 3 additions and 2 deletions
  1. 2 1
      gui/wxpython/gui_modules/menuform.py
  2. 1 1
      gui/wxpython/wxgui.py

+ 2 - 1
gui/wxpython/gui_modules/menuform.py

@@ -456,8 +456,9 @@ class grassTask:
         for p in self.params:
         for p in self.params:
             if p.get('value', '') == '' and p.get('required', 'no') != 'no':
             if p.get('value', '') == '' and p.get('required', 'no') != 'no':
                 if p.get('default', '') == '':
                 if p.get('default', '') == '':
+                    desc = p.get('label', p['description'])
                     errorList.append(_("Parameter '%(name)s' (%(desc)s) is missing.") % \
                     errorList.append(_("Parameter '%(name)s' (%(desc)s) is missing.") % \
-                                         {'name' : p['name'], 'desc' : p['description']})
+                                         {'name' : p['name'], 'desc' : desc })
         
         
         return errorList
         return errorList
     
     

+ 1 - 1
gui/wxpython/wxgui.py

@@ -822,7 +822,6 @@ class GMFrame(wx.Frame):
 
 
     def OnWorkspaceSave(self, event=None):
     def OnWorkspaceSave(self, event=None):
         """!Save file with workspace definition"""
         """!Save file with workspace definition"""
-
         if self.workspaceFile:
         if self.workspaceFile:
             dlg = wx.MessageDialog(self, message=_("Workspace file <%s> already exists. "
             dlg = wx.MessageDialog(self, message=_("Workspace file <%s> already exists. "
                                                    "Do you want to overwrite this file?") % \
                                                    "Do you want to overwrite this file?") % \
@@ -833,6 +832,7 @@ class GMFrame(wx.Frame):
             else:
             else:
                 Debug.msg(4, "GMFrame.OnWorkspaceSave(): filename=%s" % self.workspaceFile)
                 Debug.msg(4, "GMFrame.OnWorkspaceSave(): filename=%s" % self.workspaceFile)
                 self.SaveToWorkspaceFile(self.workspaceFile)
                 self.SaveToWorkspaceFile(self.workspaceFile)
+                self.SetTitle(self.baseTitle + " - " + os.path.basename(self.workspaceFile))
         else:
         else:
             self.OnWorkspaceSaveAs()
             self.OnWorkspaceSaveAs()