Mercurial Repositories > eric / file comparison
comparison: Project/ProjectResourcesBrowser.py
Project/ProjectResourcesBrowser.py
- changeset 6291
- 94e0e688dcad
- parent 6048
- 82ad8ec9548c
- child 6292
- e08a94e1ecdd
equal
deleted
inserted
replaced
| 6290:bf4624957d2d | 6291:94e0e688dcad |
|---|---|
| 82 self.dirMultiMenuActions = [] | 82 self.dirMultiMenuActions = [] |
| 83 | 83 |
| 84 self.menu = QMenu(self) | 84 self.menu = QMenu(self) |
| 85 if self.project.getProjectType() in \ | 85 if self.project.getProjectType() in \ |
| 86 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", | 86 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", |
| 87 "PySide", "PySideC"]: | 87 "PySide", "PySideC", "PySide2", "PySideC2"]: |
| 88 self.menu.addAction( | 88 self.menu.addAction( |
| 89 self.tr('Compile resource'), | 89 self.tr('Compile resource'), |
| 90 self.__compileResource) | 90 self.__compileResource) |
| 91 self.menu.addAction( | 91 self.menu.addAction( |
| 92 self.tr('Compile all resources'), | 92 self.tr('Compile all resources'), |
| 118 act = self.menu.addAction(self.tr('Delete'), self.__deleteFile) | 118 act = self.menu.addAction(self.tr('Delete'), self.__deleteFile) |
| 119 self.menuActions.append(act) | 119 self.menuActions.append(act) |
| 120 self.menu.addSeparator() | 120 self.menu.addSeparator() |
| 121 if self.project.getProjectType() in \ | 121 if self.project.getProjectType() in \ |
| 122 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", | 122 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", |
| 123 "PySide", "PySideC"]: | 123 "PySide", "PySideC", "PySide2", "PySideC2"]: |
| 124 self.menu.addAction( | 124 self.menu.addAction( |
| 125 self.tr('New resource...'), self.__newResource) | 125 self.tr('New resource...'), self.__newResource) |
| 126 else: | 126 else: |
| 127 if self.hooks["newResource"] is not None: | 127 if self.hooks["newResource"] is not None: |
| 128 self.menu.addAction( | 128 self.menu.addAction( |
| 146 self.menu.addAction(self.tr('Configure...'), self._configure) | 146 self.menu.addAction(self.tr('Configure...'), self._configure) |
| 147 | 147 |
| 148 self.backMenu = QMenu(self) | 148 self.backMenu = QMenu(self) |
| 149 if self.project.getProjectType() in \ | 149 if self.project.getProjectType() in \ |
| 150 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", | 150 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", |
| 151 "PySide", "PySideC"]: | 151 "PySide", "PySideC", "PySide2", "PySideC2"]: |
| 152 self.backMenu.addAction( | 152 self.backMenu.addAction( |
| 153 self.tr('Compile all resources'), | 153 self.tr('Compile all resources'), |
| 154 self.__compileAllResources) | 154 self.__compileAllResources) |
| 155 self.backMenu.addSeparator() | 155 self.backMenu.addSeparator() |
| 156 self.backMenu.addAction( | 156 self.backMenu.addAction( |
| 184 | 184 |
| 185 # create the menu for multiple selected files | 185 # create the menu for multiple selected files |
| 186 self.multiMenu = QMenu(self) | 186 self.multiMenu = QMenu(self) |
| 187 if self.project.getProjectType() in \ | 187 if self.project.getProjectType() in \ |
| 188 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", | 188 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", |
| 189 "PySide", "PySideC"]: | 189 "PySide", "PySideC", "PySide2", "PySideC2"]: |
| 190 act = self.multiMenu.addAction( | 190 act = self.multiMenu.addAction( |
| 191 self.tr('Compile resources'), | 191 self.tr('Compile resources'), |
| 192 self.__compileSelectedResources) | 192 self.__compileSelectedResources) |
| 193 self.multiMenu.addSeparator() | 193 self.multiMenu.addSeparator() |
| 194 else: | 194 else: |
| 216 self.multiMenu.addAction(self.tr('Configure...'), self._configure) | 216 self.multiMenu.addAction(self.tr('Configure...'), self._configure) |
| 217 | 217 |
| 218 self.dirMenu = QMenu(self) | 218 self.dirMenu = QMenu(self) |
| 219 if self.project.getProjectType() in \ | 219 if self.project.getProjectType() in \ |
| 220 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", | 220 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", |
| 221 "PySide", "PySideC"]: | 221 "PySide", "PySideC", "PySide2", "PySideC2"]: |
| 222 self.dirMenu.addAction( | 222 self.dirMenu.addAction( |
| 223 self.tr('Compile all resources'), | 223 self.tr('Compile all resources'), |
| 224 self.__compileAllResources) | 224 self.__compileAllResources) |
| 225 self.dirMenu.addSeparator() | 225 self.dirMenu.addSeparator() |
| 226 else: | 226 else: |
| 257 self.dirMenu.addAction(self.tr('Configure...'), self._configure) | 257 self.dirMenu.addAction(self.tr('Configure...'), self._configure) |
| 258 | 258 |
| 259 self.dirMultiMenu = QMenu(self) | 259 self.dirMultiMenu = QMenu(self) |
| 260 if self.project.getProjectType() in \ | 260 if self.project.getProjectType() in \ |
| 261 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", | 261 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", |
| 262 "PySide", "PySideC"]: | 262 "PySide", "PySideC", "PySide2", "PySideC2"]: |
| 263 self.dirMultiMenu.addAction( | 263 self.dirMultiMenu.addAction( |
| 264 self.tr('Compile all resources'), | 264 self.tr('Compile all resources'), |
| 265 self.__compileAllResources) | 265 self.__compileAllResources) |
| 266 self.dirMultiMenu.addSeparator() | 266 self.dirMultiMenu.addSeparator() |
| 267 else: | 267 else: |
| 525 ########################################################################### | 525 ########################################################################### |
| 526 | 526 |
| 527 def __readStdout(self): | 527 def __readStdout(self): |
| 528 """ | 528 """ |
| 529 Private slot to handle the readyReadStandardOutput signal of the | 529 Private slot to handle the readyReadStandardOutput signal of the |
| 530 pyrcc4/pyrcc5/pyside-rcc/rbrcc process. | 530 pyrcc4/pyrcc5/pyside-rcc/pyside2-rcc/rbrcc process. |
| 531 """ | 531 """ |
| 532 if self.compileProc is None: | 532 if self.compileProc is None: |
| 533 return | 533 return |
| 534 self.compileProc.setReadChannel(QProcess.StandardOutput) | 534 self.compileProc.setReadChannel(QProcess.StandardOutput) |
| 535 | 535 |
| 539 'replace') | 539 'replace') |
| 540 | 540 |
| 541 def __readStderr(self): | 541 def __readStderr(self): |
| 542 """ | 542 """ |
| 543 Private slot to handle the readyReadStandardError signal of the | 543 Private slot to handle the readyReadStandardError signal of the |
| 544 pyrcc4/pyrcc5/pyside-rcc/rbrcc process. | 544 pyrcc4/pyrcc5/pyside-rcc/pyside2-rcc/rbrcc process. |
| 545 """ | 545 """ |
| 546 if self.compileProc is None: | 546 if self.compileProc is None: |
| 547 return | 547 return |
| 548 | 548 |
| 549 ioEncoding = Preferences.getSystem("IOEncoding") | 549 ioEncoding = Preferences.getSystem("IOEncoding") |
| 649 args.append("-py3") | 649 args.append("-py3") |
| 650 else: | 650 else: |
| 651 self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5') | 651 self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5') |
| 652 elif self.project.getProjectType() in ["PySide", "PySideC"]: | 652 elif self.project.getProjectType() in ["PySide", "PySideC"]: |
| 653 self.rccCompiler = Utilities.generatePySideToolPath( | 653 self.rccCompiler = Utilities.generatePySideToolPath( |
| 654 'pyside-rcc') | 654 'pyside-rcc', "1") |
| 655 if self.project.getProjectLanguage() in \ | 655 if self.project.getProjectLanguage() in \ |
| 656 ["Python", "Python2"]: | 656 ["Python", "Python2"]: |
| 657 args.append("-py2") | 657 args.append("-py2") |
| 658 else: | 658 else: |
| 659 args.append("-py3") | 659 args.append("-py3") |
| 660 # TODO: add entry for PySide2 | |
| 660 else: | 661 else: |
| 661 return None | 662 return None |
| 662 elif self.project.getProjectLanguage() == "Ruby": | 663 elif self.project.getProjectLanguage() == "Ruby": |
| 663 if self.project.getProjectType() == "Qt4": | 664 if self.project.getProjectType() == "Qt4": |
| 664 self.rccCompiler = 'rbrcc' | 665 self.rccCompiler = 'rbrcc' |
