Mercurial Repositories > eric / changeset

--- a/Preferences/ConfigurationPages/ProjectPage.py	Fri Apr 13 18:51:57 2018 +0200
+++ b/Preferences/ConfigurationPages/ProjectPage.py	Fri Apr 13 18:54:55 2018 +0200
@@ -48,6 +48,8 @@
             Preferences.getProject("AutoCompileForms"))
         self.projectAutoCompileResourcesCheckBox.setChecked(
             Preferences.getProject("AutoCompileResources"))
+        self.projectAutoMakeCheckBox.setChecked(
+            Preferences.getProject("AutoExecuteMake"))
         self.projectTimestampCheckBox.setChecked(
             Preferences.getProject("XMLTimestamp"))
         self.projectRecentSpinBox.setValue(
@@ -94,6 +96,9 @@
             "AutoCompileResources",
             self.projectAutoCompileResourcesCheckBox.isChecked())
         Preferences.setProject(
+            "AutoExecuteMake",
+            self.projectAutoMakeCheckBox.isChecked())
+        Preferences.setProject(
             "XMLTimestamp",
             self.projectTimestampCheckBox.isChecked())
         Preferences.setProject(

--- a/Preferences/ConfigurationPages/ProjectPage.ui	Fri Apr 13 18:51:57 2018 +0200
+++ b/Preferences/ConfigurationPages/ProjectPage.ui	Fri Apr 13 18:54:55 2018 +0200
@@ -10,7 +10,7 @@
     <height>732</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -160,16 +160,16 @@
    <item>
     <widget class="QGroupBox" name="groupBox_5">
      <property name="title">
-      <string>Automatically compile</string>
+      <string>Automatisations</string>
      </property>
-     <layout class="QGridLayout">
+     <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
        <widget class="QCheckBox" name="projectAutoCompileFormsCheckBox">
         <property name="toolTip">
          <string>Select, if changed forms should be compiled automatically upon a run action</string>
         </property>
         <property name="text">
-         <string>changed forms</string>
+         <string>compile changed forms</string>
         </property>
        </widget>
       </item>
@@ -179,7 +179,17 @@
          <string>Select, if changed resources should be compiled automatically upon a run action</string>
         </property>
         <property name="text">
-         <string>changed resources</string>
+         <string>compile changed resources</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="projectAutoMakeCheckBox">
+        <property name="toolTip">
+         <string>Select to execute the configured 'make' command before a run action is performed</string>
+        </property>
+        <property name="text">
+         <string>execute make</string>
         </property>
        </widget>
       </item>
@@ -306,8 +316,11 @@
   <tabstop>projectSessionAllBpCheckBox</tabstop>
   <tabstop>projectAutoCompileFormsCheckBox</tabstop>
   <tabstop>projectAutoCompileResourcesCheckBox</tabstop>
+  <tabstop>projectAutoMakeCheckBox</tabstop>
   <tabstop>pythonVariantCheckBox</tabstop>
   <tabstop>projectRecentSpinBox</tabstop>
+  <tabstop>autosaveTasksCheckBox</tabstop>
+  <tabstop>rescanTasksCheckBox</tabstop>
  </tabstops>
  <resources/>
  <connections>

--- a/Preferences/__init__.py	Fri Apr 13 18:51:57 2018 +0200
+++ b/Preferences/__init__.py	Fri Apr 13 18:54:55 2018 +0200
@@ -756,6 +756,7 @@
         "XMLTimestamp": True,
         "AutoCompileForms": False,
         "AutoCompileResources": False,
+        "AutoExecuteMake": False,
         "AutoLoadDbgProperties": False,
         "AutoSaveDbgProperties": False,
         "HideGeneratedForms": False,