Mercurial Repositories > eric / file diff

--- a/Project/PropertiesDialog.py	Mon Apr 02 12:04:56 2018 +0200
+++ b/Project/PropertiesDialog.py	Tue May 01 12:03:52 2018 +0200
@@ -21,6 +21,7 @@
 
 import Utilities
 import Preferences
+import UI.PixmapCache
 
 
 class PropertiesDialog(QDialog, Ui_PropertiesDialog):
@@ -44,10 +45,13 @@
         self.dirPicker.setMode(E5PathPickerModes.DirectoryMode)
         self.mainscriptPicker.setMode(E5PathPickerModes.OpenFileMode)
         
+        self.makeButton.setIcon(UI.PixmapCache.getIcon("makefile.png"))
+        
         self.project = project
         self.newProject = new
         self.transPropertiesDlg = None
         self.spellPropertiesDlg = None
+        self.makePropertiesDlg = None
         
         patterns = []
         for pattern, filetype in self.project.pdata["FILETYPES"].items():
@@ -112,6 +116,8 @@
                     self.tr("The project is not version controlled."))
                 self.vcsInfoButton.hide()
             self.vcsCheckBox.hide()
+            self.makeCheckBox.setChecked(
+                self.project.pdata["MAKEPARAMS"]["MakeEnabled"])
         else:
             self.languageComboBox.setCurrentIndex(
                 self.languageComboBox.findText("Python3"))
@@ -189,6 +195,19 @@
         if res == QDialog.Rejected:
             self.transPropertiesDlg.initDialog()  # reset the dialogs contents
     
+    @pyqtSlot()
+    def on_makeButton_clicked(self):
+        """
+        Private slot to display the make properties dialog.
+        """
+        if self.makePropertiesDlg is None:
+            from .MakePropertiesDialog import MakePropertiesDialog
+            self.makePropertiesDlg = \
+                MakePropertiesDialog(self.project, self.newProject, self)
+        res = self.makePropertiesDlg.exec_()
+        if res == QDialog.Rejected:
+            self.makePropertiesDlg.initDialog()
+    
     @pyqtSlot(str)
     def on_mainscriptPicker_pathSelected(self, script):
         """
@@ -285,3 +304,8 @@
         
         if self.transPropertiesDlg is not None:
             self.transPropertiesDlg.storeData()
+        
+        self.project.pdata["MAKEPARAMS"]["MakeEnabled"] = \
+            self.makeCheckBox.isChecked()
+        if self.makePropertiesDlg is not None:
+            self.makePropertiesDlg.storeData()