Mercurial Repositories > eric / changeset
changeset
Merged with branch 'eric7' in order to track these changes.
Wed, 14 Feb 2024 10:24:23 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 14 Feb 2024 10:24:23 +0100
- branch
- server
- changeset 10573
- c4f503f40caf
- parent 10572
- f044df7c4bfb (current diff)
- parent 10571
- d7cf5619662f (diff)
- child 10574
- 622e59b51640
Merged with branch 'eric7' in order to track these changes.
| src/eric7/QScintilla/Editor.py | file | annotate | diff | comparison | revisions |
--- a/src/eric7/EricWidgets/EricToolBarDialog.py Wed Feb 14 09:39:37 2024 +0100 +++ b/src/eric7/EricWidgets/EricToolBarDialog.py Wed Feb 14 10:24:23 2024 +0100 @@ -108,7 +108,7 @@ Qt.ItemDataRole.ForegroundRole, QColor("#8b8bff") if ericApp().usesDarkPalette() - else QColor(Qt.GlobalColor.blue) + else QColor(Qt.GlobalColor.blue), ) self.__widgetActionToToolBarItemID[id(action)] = None categoryItem.setExpanded(True)
--- a/src/eric7/Project/Project.py Wed Feb 14 09:39:37 2024 +0100 +++ b/src/eric7/Project/Project.py Wed Feb 14 10:24:23 2024 +0100 @@ -551,7 +551,7 @@ "HASH": "", "PROGLANGUAGE": "Python3", "MIXEDLANGUAGE": False, - "PROJECTTYPE": "PyQt5", + "PROJECTTYPE": "PyQt6", "SPELLLANGUAGE": Preferences.getEditor("SpellCheckingDefaultLanguage"), "SPELLWORDS": "", "SPELLEXCLUDES": "",
--- a/src/eric7/Project/ProjectBaseBrowser.py Wed Feb 14 09:39:37 2024 +0100 +++ b/src/eric7/Project/ProjectBaseBrowser.py Wed Feb 14 10:24:23 2024 +0100 @@ -97,6 +97,9 @@ self._model.rowsInserted.connect(self.__modelRowsInserted) self._connectExpandedCollapsed() + self._initHookMethods() # perform initialization of the hooks + self.hooksMenuEntries = {} + self._createPopupMenus() self.currentItemName = None @@ -107,9 +110,6 @@ self._keyboardSearchTimer = QElapsedTimer() self._keyboardSearchTimer.invalidate() - self._initHookMethods() # perform initialization of the hooks - self.hooksMenuEntries = {} - def _connectExpandedCollapsed(self): """ Protected method to connect the expanded and collapsed signals.
--- a/src/eric7/QScintilla/Editor.py Wed Feb 14 09:39:37 2024 +0100 +++ b/src/eric7/QScintilla/Editor.py Wed Feb 14 10:24:23 2024 +0100 @@ -6495,12 +6495,8 @@ # now check ourselves fn = self.getFileName() if fn is not None: - prEnable |= self.project.isPy3Project() and bool( - Utilities.getProfileFileName(fn) - ) - coEnable |= self.project.isPy3Project() and bool( - Utilities.getCoverageFileName(fn) - ) + prEnable |= self.isPyFile() and bool(Utilities.getProfileFileName(fn)) + coEnable |= self.isPyFile() and bool(Utilities.getCoverageFileName(fn)) coEnable |= bool(self.__coverageFile)
