Mercurial Repositories > eric / file comparison
comparison: eric6/Project/CreateDialogCodeDialog.py
eric6/Project/CreateDialogCodeDialog.py
- changeset 7050
- b66cac9a6560
- parent 6942
- 2602857055c5
- child 7192
- a22eee00b052
equal
deleted
inserted
replaced
| 7049:0a8a9bd15242 | 7050:b66cac9a6560 |
|---|---|
| 80 self.slotsView.setModel(self.proxyModel) | 80 self.slotsView.setModel(self.proxyModel) |
| 81 | 81 |
| 82 # initialize some member variables | 82 # initialize some member variables |
| 83 self.__initError = False | 83 self.__initError = False |
| 84 self.__module = None | 84 self.__module = None |
| 85 | |
| 86 packagesRoot = self.project.getUicParameter("PackagesRoot") | |
| 87 if packagesRoot: | |
| 88 self.packagesPath = os.path.join(self.project.getProjectPath(), | |
| 89 packagesRoot) | |
| 90 else: | |
| 91 self.packagesPath = self.project.getProjectPath() | |
| 85 | 92 |
| 86 if os.path.exists(self.srcFile): | 93 if os.path.exists(self.srcFile): |
| 87 vm = e5App().getObject("ViewManager") | 94 vm = e5App().getObject("ViewManager") |
| 88 ed = vm.getOpenEditor(self.srcFile) | 95 ed = vm.getOpenEditor(self.srcFile) |
| 89 if ed and not vm.checkDirty(ed): | 96 if ed and not vm.checkDirty(ed): |
| 174 loadUi = os.path.join(os.path.dirname(__file__), "UicLoadUi.py") | 181 loadUi = os.path.join(os.path.dirname(__file__), "UicLoadUi.py") |
| 175 args = [ | 182 args = [ |
| 176 loadUi, | 183 loadUi, |
| 177 command, | 184 command, |
| 178 self.formFile, | 185 self.formFile, |
| 179 self.project.getProjectPath(), | 186 self.packagesPath, |
| 180 ] | 187 ] |
| 181 | 188 |
| 182 uicText = "" | 189 uicText = "" |
| 183 ok = False | 190 ok = False |
| 184 | 191 |
| 185 proc = QProcess() | 192 proc = QProcess() |
| 186 proc.setWorkingDirectory(self.project.getProjectPath()) | 193 proc.setWorkingDirectory(self.packagesPath) |
| 187 proc.setProcessEnvironment(env) | 194 proc.setProcessEnvironment(env) |
| 188 proc.start(interpreter, args) | 195 proc.start(interpreter, args) |
| 189 started = proc.waitForStarted(5000) | 196 started = proc.waitForStarted(5000) |
| 190 finished = proc.waitForFinished(30000) | 197 finished = proc.waitForFinished(30000) |
| 191 if started and finished: | 198 if started and finished: |
