Mercurial Repositories > eric / file comparison
comparison: Project/ProjectResourcesBrowser.py
Project/ProjectResourcesBrowser.py
- changeset 3038
- 7fe9a53280bd
- parent 3034
- 7ce719013078
- child 3047
- 2a3c730dbb58
equal
deleted
inserted
replaced
| 3037:a417a0670a36 | 3038:7fe9a53280bd |
|---|---|
| 372 """ | 372 """ |
| 373 itm = self.model().item(self.currentIndex()) | 373 itm = self.model().item(self.currentIndex()) |
| 374 if isinstance(itm, ProjectBrowserFileItem): | 374 if isinstance(itm, ProjectBrowserFileItem): |
| 375 dn = os.path.dirname(itm.fileName()) | 375 dn = os.path.dirname(itm.fileName()) |
| 376 elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ | 376 elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ |
| 377 isinstance(itm, ProjectBrowserDirectoryItem): | 377 isinstance(itm, ProjectBrowserDirectoryItem): |
| 378 dn = itm.dirName() | 378 dn = itm.dirName() |
| 379 else: | 379 else: |
| 380 dn = None | 380 dn = None |
| 381 self.project.addFiles('resource', dn) | 381 self.project.addFiles('resource', dn) |
| 382 | 382 |
| 386 """ | 386 """ |
| 387 itm = self.model().item(self.currentIndex()) | 387 itm = self.model().item(self.currentIndex()) |
| 388 if isinstance(itm, ProjectBrowserFileItem): | 388 if isinstance(itm, ProjectBrowserFileItem): |
| 389 dn = os.path.dirname(itm.fileName()) | 389 dn = os.path.dirname(itm.fileName()) |
| 390 elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ | 390 elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ |
| 391 isinstance(itm, ProjectBrowserDirectoryItem): | 391 isinstance(itm, ProjectBrowserDirectoryItem): |
| 392 dn = itm.dirName() | 392 dn = itm.dirName() |
| 393 else: | 393 else: |
| 394 dn = None | 394 dn = None |
| 395 self.project.addDirectory('resource', dn) | 395 self.project.addDirectory('resource', dn) |
| 396 | 396 |
| 473 self, | 473 self, |
| 474 self.trUtf8("New Resource"), | 474 self.trUtf8("New Resource"), |
| 475 self.trUtf8( | 475 self.trUtf8( |
| 476 "<p>The new resource file <b>{0}</b> could not" | 476 "<p>The new resource file <b>{0}</b> could not" |
| 477 " be created.<br>Problem: {1}</p>") | 477 " be created.<br>Problem: {1}</p>") |
| 478 .format(fname, str(e))) | 478 .format(fname, str(e))) |
| 479 return | 479 return |
| 480 | 480 |
| 481 self.project.appendFile(fname) | 481 self.project.appendFile(fname) |
| 482 self.sourceFile.emit(fname) | 482 self.sourceFile.emit(fname) |
| 483 | 483 |
| 540 | 540 |
| 541 self.compileProc.setReadChannel(QProcess.StandardError) | 541 self.compileProc.setReadChannel(QProcess.StandardError) |
| 542 while self.compileProc and self.compileProc.canReadLine(): | 542 while self.compileProc and self.compileProc.canReadLine(): |
| 543 s = self.rccCompiler + ': ' | 543 s = self.rccCompiler + ': ' |
| 544 error = str(self.compileProc.readLine(), | 544 error = str(self.compileProc.readLine(), |
| 545 ioEncoding, 'replace') | 545 ioEncoding, 'replace') |
| 546 s += error | 546 s += error |
| 547 self.appendStderr.emit(s) | 547 self.appendStderr.emit(s) |
| 548 | 548 |
| 549 def __compileQRCDone(self, exitCode, exitStatus): | 549 def __compileQRCDone(self, exitCode, exitStatus): |
| 550 """ | 550 """ |
