Mercurial Repositories > eric / file comparison
comparison: Project/ProjectResourcesBrowser.py
Project/ProjectResourcesBrowser.py
- branch
- Py2 comp.
- changeset 2791
- a9577f248f04
- parent 2677
- 3d4277929fb3
- parent 2771
- 281c9b30dd91
- child 3057
- 10516539f238
equal
deleted
inserted
replaced
| 2790:6686a3326df8 | 2791:a9577f248f04 |
|---|---|
| 80 self.multiMenuActions = [] | 80 self.multiMenuActions = [] |
| 81 self.dirMenuActions = [] | 81 self.dirMenuActions = [] |
| 82 self.dirMultiMenuActions = [] | 82 self.dirMultiMenuActions = [] |
| 83 | 83 |
| 84 self.menu = QMenu(self) | 84 self.menu = QMenu(self) |
| 85 if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]: | 85 if self.project.getProjectType() in ["Qt4", "PyQt5", "E4Plugin", "PySide"]: |
| 86 self.menu.addAction(self.trUtf8('Compile resource'), | 86 self.menu.addAction(self.trUtf8('Compile resource'), |
| 87 self.__compileResource) | 87 self.__compileResource) |
| 88 self.menu.addAction(self.trUtf8('Compile all resources'), | 88 self.menu.addAction(self.trUtf8('Compile all resources'), |
| 89 self.__compileAllResources) | 89 self.__compileAllResources) |
| 90 self.menu.addSeparator() | 90 self.menu.addSeparator() |
| 109 act = self.menu.addAction(self.trUtf8('Remove from project'), self._removeFile) | 109 act = self.menu.addAction(self.trUtf8('Remove from project'), self._removeFile) |
| 110 self.menuActions.append(act) | 110 self.menuActions.append(act) |
| 111 act = self.menu.addAction(self.trUtf8('Delete'), self.__deleteFile) | 111 act = self.menu.addAction(self.trUtf8('Delete'), self.__deleteFile) |
| 112 self.menuActions.append(act) | 112 self.menuActions.append(act) |
| 113 self.menu.addSeparator() | 113 self.menu.addSeparator() |
| 114 if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]: | 114 if self.project.getProjectType() in ["Qt4", "PyQt5", "E4Plugin", "PySide"]: |
| 115 self.menu.addAction(self.trUtf8('New resource...'), self.__newResource) | 115 self.menu.addAction(self.trUtf8('New resource...'), self.__newResource) |
| 116 else: | 116 else: |
| 117 if self.hooks["newResource"] is not None: | 117 if self.hooks["newResource"] is not None: |
| 118 self.menu.addAction( | 118 self.menu.addAction( |
| 119 self.hooksMenuEntries.get("newResource", | 119 self.hooksMenuEntries.get("newResource", |
| 131 self._collapseAllDirs) | 131 self._collapseAllDirs) |
| 132 self.menu.addSeparator() | 132 self.menu.addSeparator() |
| 133 self.menu.addAction(self.trUtf8('Configure...'), self._configure) | 133 self.menu.addAction(self.trUtf8('Configure...'), self._configure) |
| 134 | 134 |
| 135 self.backMenu = QMenu(self) | 135 self.backMenu = QMenu(self) |
| 136 if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]: | 136 if self.project.getProjectType() in ["Qt4", "PyQt5", "E4Plugin", "PySide"]: |
| 137 self.backMenu.addAction(self.trUtf8('Compile all resources'), | 137 self.backMenu.addAction(self.trUtf8('Compile all resources'), |
| 138 self.__compileAllResources) | 138 self.__compileAllResources) |
| 139 self.backMenu.addSeparator() | 139 self.backMenu.addSeparator() |
| 140 self.backMenu.addAction(self.trUtf8('New resource...'), self.__newResource) | 140 self.backMenu.addAction(self.trUtf8('New resource...'), self.__newResource) |
| 141 else: | 141 else: |
| 162 self.backMenu.addAction(self.trUtf8('Configure...'), self._configure) | 162 self.backMenu.addAction(self.trUtf8('Configure...'), self._configure) |
| 163 self.backMenu.setEnabled(False) | 163 self.backMenu.setEnabled(False) |
| 164 | 164 |
| 165 # create the menu for multiple selected files | 165 # create the menu for multiple selected files |
| 166 self.multiMenu = QMenu(self) | 166 self.multiMenu = QMenu(self) |
| 167 if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]: | 167 if self.project.getProjectType() in ["Qt4", "PyQt5", "E4Plugin", "PySide"]: |
| 168 act = self.multiMenu.addAction(self.trUtf8('Compile resources'), | 168 act = self.multiMenu.addAction(self.trUtf8('Compile resources'), |
| 169 self.__compileSelectedResources) | 169 self.__compileSelectedResources) |
| 170 self.multiMenu.addSeparator() | 170 self.multiMenu.addSeparator() |
| 171 else: | 171 else: |
| 172 if self.hooks["compileSelectedResources"] is not None: | 172 if self.hooks["compileSelectedResources"] is not None: |
| 189 self._collapseAllDirs) | 189 self._collapseAllDirs) |
| 190 self.multiMenu.addSeparator() | 190 self.multiMenu.addSeparator() |
| 191 self.multiMenu.addAction(self.trUtf8('Configure...'), self._configure) | 191 self.multiMenu.addAction(self.trUtf8('Configure...'), self._configure) |
| 192 | 192 |
| 193 self.dirMenu = QMenu(self) | 193 self.dirMenu = QMenu(self) |
| 194 if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]: | 194 if self.project.getProjectType() in ["Qt4", "PyQt5", "E4Plugin", "PySide"]: |
| 195 self.dirMenu.addAction(self.trUtf8('Compile all resources'), | 195 self.dirMenu.addAction(self.trUtf8('Compile all resources'), |
| 196 self.__compileAllResources) | 196 self.__compileAllResources) |
| 197 self.dirMenu.addSeparator() | 197 self.dirMenu.addSeparator() |
| 198 else: | 198 else: |
| 199 if self.hooks["compileAllResources"] is not None: | 199 if self.hooks["compileAllResources"] is not None: |
| 221 self._collapseAllDirs) | 221 self._collapseAllDirs) |
| 222 self.dirMenu.addSeparator() | 222 self.dirMenu.addSeparator() |
| 223 self.dirMenu.addAction(self.trUtf8('Configure...'), self._configure) | 223 self.dirMenu.addAction(self.trUtf8('Configure...'), self._configure) |
| 224 | 224 |
| 225 self.dirMultiMenu = QMenu(self) | 225 self.dirMultiMenu = QMenu(self) |
| 226 if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]: | 226 if self.project.getProjectType() in ["Qt4", "PyQt5", "E4Plugin", "PySide"]: |
| 227 self.dirMultiMenu.addAction(self.trUtf8('Compile all resources'), | 227 self.dirMultiMenu.addAction(self.trUtf8('Compile all resources'), |
| 228 self.__compileAllResources) | 228 self.__compileAllResources) |
| 229 self.dirMultiMenu.addSeparator() | 229 self.dirMultiMenu.addSeparator() |
| 230 else: | 230 else: |
| 231 if self.hooks["compileAllResources"] is not None: | 231 if self.hooks["compileAllResources"] is not None: |
| 579 if PYQT_VERSION >= 0x040500: | 579 if PYQT_VERSION >= 0x040500: |
| 580 if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python2"]: | 580 if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python2"]: |
| 581 args.append("-py2") | 581 args.append("-py2") |
| 582 else: | 582 else: |
| 583 args.append("-py3") | 583 args.append("-py3") |
| 584 elif self.project.getProjectType() == "PyQt5": | |
| 585 self.rccCompiler = 'pyrcc5' | |
| 586 if Utilities.isWindowsPlatform(): | |
| 587 self.rccCompiler += '.exe' | |
| 584 elif self.project.getProjectType() == "PySide": | 588 elif self.project.getProjectType() == "PySide": |
| 585 self.rccCompiler = Utilities.generatePySideToolPath('pyside-rcc') | 589 self.rccCompiler = Utilities.generatePySideToolPath('pyside-rcc') |
| 586 if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python2"]: | 590 if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python2"]: |
| 587 args.append("-py2") | 591 args.append("-py2") |
| 588 else: | 592 else: |
| 617 self.compileProc.readyReadStandardOutput.connect(self.__readStdout) | 621 self.compileProc.readyReadStandardOutput.connect(self.__readStdout) |
| 618 self.compileProc.readyReadStandardError.connect(self.__readStderr) | 622 self.compileProc.readyReadStandardError.connect(self.__readStderr) |
| 619 | 623 |
| 620 self.noDialog = noDialog | 624 self.noDialog = noDialog |
| 621 self.compileProc.start(rcc, args) | 625 self.compileProc.start(rcc, args) |
| 622 procStarted = self.compileProc.waitForStarted() | 626 procStarted = self.compileProc.waitForStarted(5000) |
| 623 if procStarted: | 627 if procStarted: |
| 624 self.compileRunning = True | 628 self.compileRunning = True |
| 625 e5App().getObject("ViewManager").enableEditorsCheckFocusIn(False) | 629 e5App().getObject("ViewManager").enableEditorsCheckFocusIn(False) |
| 626 return self.compileProc | 630 return self.compileProc |
| 627 else: | 631 else: |
