Mercurial Repositories > eric / file comparison
comparison: src/eric7/Project/MakePropertiesDialog.py
src/eric7/Project/MakePropertiesDialog.py
- branch
- eric7
- changeset 10692
- 9becf9ca115c
- parent 10439
- 21c28b0f9e41
- child 11090
- f5f5f5803935
equal
deleted
inserted
replaced
| 10691:d1a603a70f83 | 10692:9becf9ca115c |
|---|---|
| 44 self.tr("Makefiles (*makefile Makefile *.mak);;All Files (*)") | 44 self.tr("Makefiles (*makefile Makefile *.mak);;All Files (*)") |
| 45 ) | 45 ) |
| 46 | 46 |
| 47 self.makeTargetEdit.textChanged.connect(self.__updateOkButton) | 47 self.makeTargetEdit.textChanged.connect(self.__updateOkButton) |
| 48 | 48 |
| 49 self.initDialog() | 49 self.initDialog(new) |
| 50 | 50 |
| 51 msh = self.minimumSizeHint() | 51 msh = self.minimumSizeHint() |
| 52 self.resize(max(self.width(), msh.width()), msh.height()) | 52 self.resize(max(self.width(), msh.width()), msh.height()) |
| 53 | 53 |
| 54 def initDialog(self): | 54 def initDialog(self, new): |
| 55 """ | 55 """ |
| 56 Public method to initialize the dialog's data. | 56 Public method to initialize the dialog's data. |
| 57 | |
| 58 @param new flag indicating the generation of a new project | |
| 59 @type bool | |
| 57 """ | 60 """ |
| 58 makeData = self.__project.getProjectData(dataKey="MAKEPARAMS") | 61 if new: |
| 62 self.makePicker.setText(self.__project.DefaultMake) | |
| 63 self.makefilePicker.setText(self.__project.DefaultMakefile) | |
| 64 else: | |
| 65 makeData = self.__project.getProjectData(dataKey="MAKEPARAMS") | |
| 59 | 66 |
| 60 if makeData["MakeExecutable"]: | 67 if makeData["MakeExecutable"]: |
| 61 self.makePicker.setText(makeData["MakeExecutable"]) | 68 self.makePicker.setText(makeData["MakeExecutable"]) |
| 62 else: | 69 else: |
| 63 self.makePicker.setText(self.__project.DefaultMake) | 70 self.makePicker.setText(self.__project.DefaultMake) |
| 64 if makeData["MakeFile"]: | 71 if makeData["MakeFile"]: |
| 65 self.makefilePicker.setText(makeData["MakeFile"]) | 72 self.makefilePicker.setText(makeData["MakeFile"]) |
| 66 else: | 73 else: |
| 67 self.makefilePicker.setText(self.__project.DefaultMakefile) | 74 self.makefilePicker.setText(self.__project.DefaultMakefile) |
| 68 self.makeTargetEdit.setText(makeData["MakeTarget"]) | 75 self.makeTargetEdit.setText(makeData["MakeTarget"]) |
| 69 self.makeParametersEdit.setText(makeData["MakeParameters"]) | 76 self.makeParametersEdit.setText(makeData["MakeParameters"]) |
| 70 self.testOnlyCheckBox.setChecked(makeData["MakeTestOnly"]) | 77 self.testOnlyCheckBox.setChecked(makeData["MakeTestOnly"]) |
| 71 | 78 |
| 72 self.__updateOkButton() | 79 self.__updateOkButton() |
| 73 | 80 |
| 74 def __updateOkButton(self): | 81 def __updateOkButton(self): |
| 75 """ | 82 """ |
