eric: comparison Project/PropertiesDialog.py

-:76999ca7bbf1
+:3a1d1d4c6f4f
 from PyQt5.QtCore import QDir, pyqtSlot
 from PyQt5.QtWidgets import QDialog, QDialogButtonBox
 from E5Gui.E5Application import e5App
-from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
+from E5Gui.E5PathPicker import E5PathPickerModes
-from E5Gui import E5FileDialog
 from .Ui_PropertiesDialog import Ui_PropertiesDialog
 import Utilities
 import Preferences
-import UI.PixmapCache
 class PropertiesDialog(QDialog, Ui_PropertiesDialog):
 """
 Class implementing the project properties dialog.
 super(PropertiesDialog, self).__init__(parent)
 if name:
 self.setObjectName(name)
 self.setupUi(self)
-self.dirButton.setIcon(UI.PixmapCache.getIcon("open.png"))
+self.dirPicker.setMode(E5PathPickerModes.DirectoryMode)
-self.mainscriptButton.setIcon(UI.PixmapCache.getIcon("open.png"))
+self.mainscriptPicker.setMode(E5PathPickerModes.OpenFileMode)
 self.project = project
 self.newProject = new
 self.transPropertiesDlg = None
 self.spellPropertiesDlg = None
-self.dirCompleter = E5DirCompleter(self.dirEdit)
+patterns = []
-self.mainscriptCompleter = E5FileCompleter(self.mainscriptEdit)
+for pattern, filetype in self.project.pdata["FILETYPES"].items():
+if filetype == "SOURCES":
+patterns.append(pattern)
+filters = self.tr("Source Files ({0});;All Files (*)")\
+.format(" ".join(sorted(patterns)))
+self.mainscriptPicker.setFilters(filters)
 self.languageComboBox.addItems(project.getProgrammingLanguages())
 projectTypes = project.getProjectTypes()
 self.projectTypeComboBox.clear()
 curIndex = self.projectTypeComboBox.findData(
 self.project.pdata["PROJECTTYPE"][0])
 if curIndex == -1:
 curIndex = self.projectTypeComboBox.findData("Qt4")
 self.projectTypeComboBox.setCurrentIndex(curIndex)
-self.dirEdit.setText(self.project.ppath)
+self.dirPicker.setText(self.project.ppath)
 try:
 self.versionEdit.setText(self.project.pdata["VERSION"][0])
 except IndexError:
 pass
 try:
-self.mainscriptEdit.setText(
+self.mainscriptPicker.setText(
 self.project.pdata["MAINSCRIPT"][0])
 except IndexError:
 pass
 try:
 self.authorEdit.setText(self.project.pdata["AUTHOR"][0])
 else:
 self.languageComboBox.setCurrentIndex(
 self.languageComboBox.findText("Python3"))
 self.projectTypeComboBox.setCurrentIndex(
 self.projectTypeComboBox.findData("PyQt5"))
-self.dirEdit.setText(self.__initPaths[0])
+self.dirPicker.setText(self.__initPaths[0])
 self.versionEdit.setText('0.1')
 self.vcsLabel.hide()
 self.vcsInfoButton.hide()
 if not self.project.vcsSoftwareAvailable():
 self.vcsCheckBox.hide()
 self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(
-bool(self.dirEdit.text()) and
+bool(self.dirPicker.text()) and
-Utilities.fromNativeSeparators(self.dirEdit.text()) not in
+self.dirPicker.text() not in
 self.__initPaths)
 @pyqtSlot(str)
 def on_languageComboBox_currentIndexChanged(self, language):
 """
 if index == -1:
 index = 0
 self.projectTypeComboBox.setCurrentIndex(index)
 @pyqtSlot(str)
-def on_dirEdit_textChanged(self, txt):
+def on_dirPicker_textChanged(self, txt):
 """
 Private slot to handle a change of the project directory.
 @param txt name of the project directory (string)
 """
 self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(
 bool(txt) and
 Utilities.fromNativeSeparators(txt) not in self.__initPaths)
-@pyqtSlot()
-def on_dirButton_clicked(self):
-"""
-Private slot to display a directory selection dialog.
-"""
-directory = E5FileDialog.getExistingDirectory(
-self,
-self.tr("Select project directory"),
-self.dirEdit.text(),
-E5FileDialog.Options(E5FileDialog.ShowDirsOnly))
-if directory:
-self.dirEdit.setText(Utilities.toNativeSeparators(directory))
 @pyqtSlot()
 def on_spellPropertiesButton_clicked(self):
 """
 Private slot to display the spelling properties dialog.
 self.transPropertiesDlg.initFilters()
 res = self.transPropertiesDlg.exec_()
 if res == QDialog.Rejected:
 self.transPropertiesDlg.initDialog()  # reset the dialogs contents
-@pyqtSlot()
+@pyqtSlot(str)
-def on_mainscriptButton_clicked(self):
+def on_mainscriptPicker_pathSelected(self, script):
 """
-Private slot to display a file selection dialog.
+Private slot to check the selected main script name.
-"""
-dir = self.dirEdit.text()
+@param script name of the main script
-if not dir:
+@type str
-dir = QDir.currentPath()
+"""
-patterns = []
+if script:
-for pattern, filetype in list(self.project.pdata["FILETYPES"].items()):
+ppath = self.dirPicker.text()
-if filetype == "SOURCES":
-patterns.append(pattern)
-filters = self.tr("Source Files ({0});;All Files (*)")\
-.format(" ".join(patterns))
-fn = E5FileDialog.getOpenFileName(
-self,
-self.tr("Select main script file"),
-dir,
-filters)
-if fn:
-ppath = self.dirEdit.text()
 if ppath:
 ppath = QDir(ppath).absolutePath() + QDir.separator()
-fn = fn.replace(ppath, "")
+script = script.replace(ppath, "")
-self.mainscriptEdit.setText(Utilities.toNativeSeparators(fn))
+self.mainscriptPicker.setText(script)
+@pyqtSlot()
+def on_mainscriptPicker_aboutToShowPathPickerDialog(self):
+"""
+Private slot to perform actions before the main script selection dialog
+is shown.
+"""
+path = self.dirPicker.text()
+if not path:
+path = QDir.currentPath()
+self.mainscriptPicker.setDefaultDirectory(path)
 @pyqtSlot()
 def on_vcsInfoButton_clicked(self):
 """
 Private slot to display a vcs information dialog.
 """
 Public method to get the project path.
 @return data of the project directory edit (string)
 """
-return os.path.abspath(self.dirEdit.text())
+return os.path.abspath(self.dirPicker.text())
 def storeData(self):
 """
 Public method to store the entered/modified data.
 """
-self.project.ppath = os.path.abspath(self.dirEdit.text())
+self.project.ppath = os.path.abspath(self.dirPicker.text())
 fn = self.nameEdit.text()
 if fn:
 self.project.name = fn
 fn = "{0}.e4p".format(fn)
 self.project.pfile = os.path.join(self.project.ppath, fn)
 else:
 self.project.pfile = ""
 self.project.pdata["VERSION"] = [self.versionEdit.text()]
-fn = self.mainscriptEdit.text()
+fn = self.mainscriptPicker.text()
 if fn:
 fn = self.project.getRelativePath(fn)
 self.project.pdata["MAINSCRIPT"] = [fn]
 self.project.translationsRoot = os.path.splitext(fn)[0]
 else:

Mercurial Repositories > eric / file comparison

comparison: Project/PropertiesDialog.py

Project/PropertiesDialog.py