瀏覽代碼

wxGUI: don't show extension on windows

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@54568 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 12 年之前
父節點
當前提交
1ce8b8acf4
共有 2 個文件被更改,包括 9 次插入5 次删除
  1. 1 4
      gui/wxpython/gui_core/forms.py
  2. 8 1
      lib/python/task.py

+ 1 - 4
gui/wxpython/gui_core/forms.py

@@ -397,10 +397,7 @@ class TaskFrame(wx.Frame):
             self.modeler = None
             self.modeler = None
         
         
         # module name + keywords
         # module name + keywords
-        if self.task.name.split('.')[-1] in ('py', 'sh'):
-            title = str(self.task.name.rsplit('.',1)[0])
-        else:
-            title = self.task.name
+        title = self.task.get_name()
         try:
         try:
             if self.task.keywords !=  ['']:
             if self.task.keywords !=  ['']:
                 title +=   " [" + ', '.join(self.task.keywords) + "]"
                 title +=   " [" + ', '.join(self.task.keywords) + "]"

+ 8 - 1
lib/python/task.py

@@ -89,6 +89,13 @@ class grassTask:
     def get_name(self):
     def get_name(self):
         """!Get task name
         """!Get task name
         """
         """
+        if sys.platform == 'win32':
+            name, ext = os.path.splitext(self.name)
+            if ext in ('.py', '.sh'):
+                return name
+            else:
+                return self.name
+        
         return self.name
         return self.name
 
 
     def get_description(self, full = True):
     def get_description(self, full = True):
@@ -205,7 +212,7 @@ class grassTask:
         '@<required@>' is shown
         '@<required@>' is shown
         @param ignoreDefault True to ignore parameters with default values
         @param ignoreDefault True to ignore parameters with default values
         """
         """
-        cmd = [self.name]
+        cmd = [self.get_name()]
         
         
         suppress_required = False
         suppress_required = False
         for flag in self.flags:
         for flag in self.flags: