Merged with changes to Spanish translations. 5_1_x

Sat, 17 Sep 2011 10:55:22 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 17 Sep 2011 10:55:22 +0200
branch
5_1_x
changeset 1334
e6cbd342862d
parent 1331
5dd594d4466f (diff)
parent 1333
56c1ef020d08 (current diff)
child 1336
d8e473d7e443

Merged with changes to Spanish translations.

--- a/Project/AddDirectoryDialog.py	Fri Sep 16 22:21:42 2011 +0200
+++ b/Project/AddDirectoryDialog.py	Sat Sep 17 10:55:22 2011 +0200
@@ -139,6 +139,7 @@
         """
         filetype = \
             self.filterComboBox.itemData(self.filterComboBox.currentIndex())
-        return (filetype, self.sourceDirEdit.text(), 
-            self.targetDirEdit.text(),
+        return (filetype,
+            Utilities.toNativeSeparators(self.sourceDirEdit.text()),
+            Utilities.toNativeSeparators(self.targetDirEdit.text()),
             self.recursiveCheckBox.isChecked())
--- a/Project/AddFileDialog.py	Fri Sep 16 22:21:42 2011 +0200
+++ b/Project/AddFileDialog.py	Sat Sep 17 10:55:22 2011 +0200
@@ -181,5 +181,7 @@
             source files, the target directory and a flag telling, whether
             the files shall be added as source code
         """
-        return (self.sourceFileEdit.text().split(os.pathsep), 
-            self.targetDirEdit.text(), self.sourcecodeCheckBox.isChecked())
+        return (
+            Utilities.toNativeSeparators(self.sourceFileEdit.text().split(os.pathsep)),
+            Utilities.toNativeSeparators(self.targetDirEdit.text()),
+            self.sourcecodeCheckBox.isChecked())
--- a/Utilities/__init__.py	Fri Sep 16 22:21:42 2011 +0200
+++ b/Utilities/__init__.py	Sat Sep 17 10:55:22 2011 +0200
@@ -612,6 +612,9 @@
     if os.path.isabs(file):
         return os.access(file, os.X_OK)
     
+    if os.path.exists(os.path.join(os.curdir, file)):
+        return os.access(os.path.join(os.curdir, file), os.X_OK)
+    
     path = getEnvironmentEntry('PATH')
     
     # environment variable not defined
@@ -640,6 +643,11 @@
         else:
             return ""
         
+    cur_path = os.path.join(os.curdir, file)
+    if os.path.exists(cur_path):
+        if os.access(cur_path, os.X_OK):
+            return cur_path        
+
     path = os.getenv('PATH')
     
     # environment variable not defined

eric ide

mercurial