Mercurial Repositories > eric / file diff

--- a/Project/AddFileDialog.py	Thu Mar 09 19:28:59 2017 +0100
+++ b/Project/AddFileDialog.py	Fri Mar 10 17:32:19 2017 +0100
@@ -23,14 +23,14 @@
     """
     Class implementing a dialog to add a file to the project.
     """
-    def __init__(self, pro, parent=None, filter=None, name=None,
+    def __init__(self, pro, parent=None, fileTypeFilter=None, name=None,
                  startdir=None):
         """
         Constructor
         
         @param pro reference to the project object
         @param parent parent widget of this dialog (QWidget)
-        @param filter filter specification for the file to add (string)
+        @param fileTypeFilter filter specification for the file to add (string)
         @param name name of this dialog (string)
         @param startdir start directory for the selection dialog
         """
@@ -44,13 +44,13 @@
         self.targetDirPicker.setDefaultDirectory(startdir)
         
         self.targetDirPicker.setText(pro.ppath)
-        self.filter = filter
+        self.fileTypeFilter = fileTypeFilter
         self.ppath = pro.ppath
         self.startdir = startdir
         self.filetypes = pro.pdata["FILETYPES"]
         # save a reference to the filetypes dict
         
-        if self.filter is not None:
+        if self.fileTypeFilter is not None:
             self.sourcecodeCheckBox.hide()
         
         msh = self.minimumSizeHint()
@@ -67,7 +67,7 @@
             path = self.startdir
         self.sourceFilesPicker.setDefaultDirectory(path)
         
-        if self.filter is None:
+        if self.fileTypeFilter is None:
             patterns = {
                 "SOURCES": [],
                 "FORMS": [],
@@ -92,7 +92,7 @@
                     " ".join(patterns["INTERFACES"]),
                     " ".join(patterns["TRANSLATIONS"]))
             caption = self.tr("Select Files")
-        elif self.filter == 'form':
+        elif self.fileTypeFilter == 'form':
             patterns = []
             for pattern, filetype in list(self.filetypes.items()):
                 if filetype == "FORMS":
@@ -100,7 +100,7 @@
             dfilter = self.tr("Forms Files ({0})")\
                 .format(" ".join(patterns))
             caption = self.tr("Select user-interface files")
-        elif self.filter == "resource":
+        elif self.fileTypeFilter == "resource":
             patterns = []
             for pattern, filetype in list(self.filetypes.items()):
                 if filetype == "RESOURCES":
@@ -108,7 +108,7 @@
             dfilter = self.tr("Resource Files ({0})")\
                 .format(" ".join(patterns))
             caption = self.tr("Select resource files")
-        elif self.filter == 'source':
+        elif self.fileTypeFilter == 'source':
             patterns = []
             for pattern, filetype in list(self.filetypes.items()):
                 if filetype == "SOURCES":
@@ -116,7 +116,7 @@
             dfilter = self.tr("Source Files ({0});;All Files (*)")\
                 .format(" ".join(patterns))
             caption = self.tr("Select source files")
-        elif self.filter == 'interface':
+        elif self.fileTypeFilter == 'interface':
             patterns = []
             for pattern, filetype in list(self.filetypes.items()):
                 if filetype == "INTERFACES":
@@ -124,7 +124,7 @@
             dfilter = self.tr("Interface Files ({0})")\
                 .format(" ".join(patterns))
             caption = self.tr("Select interface files")
-        elif self.filter == 'translation':
+        elif self.fileTypeFilter == 'translation':
             patterns = []
             for pattern, filetype in list(self.filetypes.items()):
                 if filetype == "TRANSLATIONS":
@@ -132,7 +132,7 @@
             dfilter = self.tr("Translation Files ({0})")\
                 .format(" ".join(patterns))
             caption = self.tr("Select translation files")
-        elif self.filter == 'others':
+        elif self.fileTypeFilter == 'others':
             dfilter = self.tr("All Files (*)")
             caption = self.tr("Select files")
         else:
@@ -157,10 +157,10 @@
         sfile = self.sourceFilesPicker.firstPath()
         if sfile.startswith(self.ppath):
             if os.path.isdir(sfile):
-                dir = sfile
+                directory = sfile
             else:
-                dir = os.path.dirname(sfile)
-            self.targetDirPicker.setText(dir)
+                directory = os.path.dirname(sfile)
+            self.targetDirPicker.setText(directory)
         
     def getData(self):
         """