Mercurial Repositories > PyInstaller Interface / file comparison
comparison: PyInstaller/PyInstallerConfigDialog.py
PyInstaller/PyInstallerConfigDialog.py
- changeset 20
- a7ac91a1a57e
- parent 6
- 0f0f1598fc4a
- child 25
- 3d7e12729e7c
equal
deleted
inserted
replaced
| 19:9534f084fec6 | 20:a7ac91a1a57e |
|---|---|
| 102 # get a copy of the defaults to store the user settings | 102 # get a copy of the defaults to store the user settings |
| 103 self.__parameters = copy.deepcopy(self.__defaults) | 103 self.__parameters = copy.deepcopy(self.__defaults) |
| 104 | 104 |
| 105 # combine it with the values of params | 105 # combine it with the values of params |
| 106 if params is not None: | 106 if params is not None: |
| 107 for key, value in params.items(): | 107 self.__parameters.update(params) |
| 108 if key in self.__parameters: | |
| 109 self.__parameters[key] = params[key] | |
| 110 | 108 |
| 111 # initialize general tab | 109 # initialize general tab |
| 112 if mode == "installer" and bool(self.__parameters["pyinstaller"]): | 110 if mode == "installer" and bool(self.__parameters["pyinstaller"]): |
| 113 self.executableCombo.setCurrentIndex( | 111 self.executableCombo.setCurrentIndex( |
| 114 self.executableCombo.findText( | 112 self.executableCombo.findText( |
