Mercurial Repositories > eric / file comparison
comparison: Project/ProjectFormsBrowser.py
Project/ProjectFormsBrowser.py
- changeset 3038
- 7fe9a53280bd
- parent 3034
- 7ce719013078
- child 3060
- 5883ce99ee12
- child 3071
- 83d066710d60
equal
deleted
inserted
replaced
| 3037:a417a0670a36 | 3038:7fe9a53280bd |
|---|---|
| 435 """ | 435 """ |
| 436 itm = self.model().item(self.currentIndex()) | 436 itm = self.model().item(self.currentIndex()) |
| 437 if isinstance(itm, ProjectBrowserFileItem): | 437 if isinstance(itm, ProjectBrowserFileItem): |
| 438 dn = os.path.dirname(itm.fileName()) | 438 dn = os.path.dirname(itm.fileName()) |
| 439 elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ | 439 elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ |
| 440 isinstance(itm, ProjectBrowserDirectoryItem): | 440 isinstance(itm, ProjectBrowserDirectoryItem): |
| 441 dn = itm.dirName() | 441 dn = itm.dirName() |
| 442 else: | 442 else: |
| 443 dn = None | 443 dn = None |
| 444 self.project.addFiles('form', dn) | 444 self.project.addFiles('form', dn) |
| 445 | 445 |
| 449 """ | 449 """ |
| 450 itm = self.model().item(self.currentIndex()) | 450 itm = self.model().item(self.currentIndex()) |
| 451 if isinstance(itm, ProjectBrowserFileItem): | 451 if isinstance(itm, ProjectBrowserFileItem): |
| 452 dn = os.path.dirname(itm.fileName()) | 452 dn = os.path.dirname(itm.fileName()) |
| 453 elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ | 453 elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ |
| 454 isinstance(itm, ProjectBrowserDirectoryItem): | 454 isinstance(itm, ProjectBrowserDirectoryItem): |
| 455 dn = itm.dirName() | 455 dn = itm.dirName() |
| 456 else: | 456 else: |
| 457 dn = None | 457 dn = None |
| 458 self.project.addDirectory('form', dn) | 458 self.project.addDirectory('form', dn) |
| 459 | 459 |
| 656 | 656 |
| 657 self.compileProc.setReadChannel(QProcess.StandardError) | 657 self.compileProc.setReadChannel(QProcess.StandardError) |
| 658 while self.compileProc and self.compileProc.canReadLine(): | 658 while self.compileProc and self.compileProc.canReadLine(): |
| 659 s = self.uicompiler + ': ' | 659 s = self.uicompiler + ': ' |
| 660 error = str(self.compileProc.readLine(), | 660 error = str(self.compileProc.readLine(), |
| 661 ioEncoding, 'replace') | 661 ioEncoding, 'replace') |
| 662 s += error | 662 s += error |
| 663 self.appendStderr.emit(s) | 663 self.appendStderr.emit(s) |
| 664 | 664 |
| 665 def __compileUIDone(self, exitCode, exitStatus): | 665 def __compileUIDone(self, exitCode, exitStatus): |
| 666 """ | 666 """ |
