Mercurial Repositories > eric / changeset
changeset
Fixed a few issue using the Qt.ItemFlag enum.
Tue, 08 Jun 2021 19:33:51 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 08 Jun 2021 19:33:51 +0200
- branch
- eric7
- changeset 8412
- 16e8c2896469
- parent 8411
- da70caa2246d
- child 8413
- 65ed18753c40
Fixed a few issue using the Qt.ItemFlag enum.
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Tue Jun 08 19:29:24 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Tue Jun 08 19:33:51 2021 +0200 @@ -942,7 +942,8 @@ for index in range(self.statusList.topLevelItemCount()): itm = self.statusList.topLevelItem(index) if ( - itm.flags() & Qt.ItemFlag.ItemIsUserCheckable and + (itm.flags() & Qt.ItemFlag.ItemIsUserCheckable == + Qt.ItemFlag.ItemIsUserCheckable) and itm.checkState(self.__toBeCommittedColumn) == Qt.CheckState.Unchecked ): @@ -1053,7 +1054,10 @@ """ for index in range(self.statusList.topLevelItemCount()): itm = self.statusList.topLevelItem(index) - if itm.flags() & Qt.ItemFlag.ItemIsUserCheckable: + if ( + itm.flags() & Qt.ItemFlag.ItemIsUserCheckable == + Qt.ItemFlag.ItemIsUserCheckable + ): if selected: itm.setCheckState(self.__toBeCommittedColumn, Qt.CheckState.Checked)
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Tue Jun 08 19:29:24 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Tue Jun 08 19:33:51 2021 +0200 @@ -712,7 +712,8 @@ for index in range(self.statusList.topLevelItemCount()): itm = self.statusList.topLevelItem(index) if ( - itm.flags() & Qt.ItemFlag.ItemIsUserCheckable and + (itm.flags() & Qt.ItemFlag.ItemIsUserCheckable == + Qt.ItemFlag.ItemIsUserCheckable) and itm.checkState(self.__toBeCommittedColumn) == Qt.CheckState.Unchecked ): @@ -764,7 +765,10 @@ """ for index in range(self.statusList.topLevelItemCount()): itm = self.statusList.topLevelItem(index) - if itm.flags() & Qt.ItemFlag.ItemIsUserCheckable: + if ( + itm.flags() & Qt.ItemFlag.ItemIsUserCheckable == + Qt.ItemFlag.ItemIsUserCheckable + ): if selected: itm.setCheckState(self.__toBeCommittedColumn, Qt.CheckState.Checked)
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Tue Jun 08 19:29:24 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Tue Jun 08 19:33:51 2021 +0200 @@ -997,7 +997,10 @@ """ for index in range(self.statusList.topLevelItemCount()): itm = self.statusList.topLevelItem(index) - if itm.flags() & Qt.ItemFlag.ItemIsUserCheckable: + if ( + itm.flags() & Qt.ItemFlag.ItemIsUserCheckable == + Qt.ItemFlag.ItemIsUserCheckable + ): if selected: itm.setCheckState( self.__toBeCommittedColumn, Qt.CheckState.Checked)
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Tue Jun 08 19:29:24 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Tue Jun 08 19:33:51 2021 +0200 @@ -1093,7 +1093,10 @@ """ for index in range(self.statusList.topLevelItemCount()): itm = self.statusList.topLevelItem(index) - if itm.flags() & Qt.ItemFlag.ItemIsUserCheckable: + if ( + itm.flags() & Qt.ItemFlag.ItemIsUserCheckable == + Qt.ItemFlag.ItemIsUserCheckable + ): if selected: itm.setCheckState(self.__toBeCommittedColumn, Qt.CheckState.Checked)
--- a/eric7/Project/CreateDialogCodeDialog.py Tue Jun 08 19:29:24 2021 +0200 +++ b/eric7/Project/CreateDialogCodeDialog.py Tue Jun 08 19:33:51 2021 +0200 @@ -510,8 +510,9 @@ for childRow in range(topItem.rowCount()): child = topItem.child(childRow) if ( - child.checkState() and - child.flags() & Qt.ItemFlag.ItemIsUserCheckable + child.checkState() == Qt.CheckState.Checked and + (child.flags() & Qt.ItemFlag.ItemIsUserCheckable == + Qt.ItemFlag.ItemIsUserCheckable) ): slotsCode.append('{0}\n'.format(indentStr)) slotsCode.append('{0}{1}\n'.format(
--- a/eric7/WebBrowser/Bookmarks/BookmarksDialog.py Tue Jun 08 19:29:24 2021 +0200 +++ b/eric7/WebBrowser/Bookmarks/BookmarksDialog.py Tue Jun 08 19:33:51 2021 +0200 @@ -167,16 +167,19 @@ self.__openBookmarkInPrivateWindow) menu.addSeparator() act = menu.addAction(self.tr("Edit &Name"), self.__editName) - act.setEnabled(idx.flags() & Qt.ItemFlag.ItemIsEditable) + act.setEnabled(idx.flags() & Qt.ItemFlag.ItemIsEditable == + Qt.ItemFlag.ItemIsEditable) if idx.isValid() and node.type() != BookmarkNode.Folder: menu.addAction(self.tr("Edit &Address"), self.__editAddress) menu.addSeparator() act = menu.addAction( self.tr("&Delete"), self.bookmarksTree.removeSelected) - act.setEnabled(idx.flags() & Qt.ItemFlag.ItemIsDragEnabled) + act.setEnabled(idx.flags() & Qt.ItemFlag.ItemIsDragEnabled == + Qt.ItemFlag.ItemIsDragEnabled) menu.addSeparator() act = menu.addAction(self.tr("&Properties..."), self.__edit) - act.setEnabled(idx.flags() & Qt.ItemFlag.ItemIsEditable) + act.setEnabled(idx.flags() & Qt.ItemFlag.ItemIsEditable == + Qt.ItemFlag.ItemIsEditable) if idx.isValid() and node.type() == BookmarkNode.Folder: menu.addSeparator() menu.addAction(self.tr("New &Folder..."), self.__newFolder)
--- a/eric7/WebBrowser/TabManager/TabManagerWidget.py Tue Jun 08 19:29:24 2021 +0200 +++ b/eric7/WebBrowser/TabManager/TabManagerWidget.py Tue Jun 08 19:33:51 2021 +0200 @@ -244,15 +244,14 @@ else: parentItem = None itm = QTreeWidgetItem(parentItem) - flags = itm.flags() if parent: - flags |= Qt.ItemFlag.ItemIsUserCheckable + addFlags = Qt.ItemFlag.ItemIsUserCheckable else: - flags |= ( + addFlags = ( Qt.ItemFlag.ItemIsUserCheckable | Qt.ItemFlag.ItemIsAutoTristate ) - itm.setFlags(itm.flags() | flags) + itm.setFlags(itm.flags() | addFlags) itm.setCheckState(0, Qt.CheckState.Unchecked) return itm
