diff options
author | Friedemann Kleint <[email protected]> | 2024-12-17 16:49:50 +0100 |
---|---|---|
committer | Friedemann Kleint <[email protected]> | 2024-12-18 16:15:45 +0100 |
commit | 1f26c800e0dff519b89418aaed4395d5497486df (patch) | |
tree | 1e5d7df257da6e2746353290962873c400b2720a /examples/widgets/itemviews | |
parent | d27ad166e888c52e5ec77eb9db85bf7da2ed9ddc (diff) |
Widget examples: Use fully qualified enumerations
Pick-to: 6.8
Task-number: PYSIDE-1735
Change-Id: I99890e66ff29600072175185f471be0d7646c45b
Reviewed-by: Cristian Maureira-Fredes <[email protected]>
Diffstat (limited to 'examples/widgets/itemviews')
7 files changed, 22 insertions, 22 deletions
diff --git a/examples/widgets/itemviews/address_book/adddialogwidget.py b/examples/widgets/itemviews/address_book/adddialogwidget.py index 29d0a4756..cd850bed0 100644 --- a/examples/widgets/itemviews/address_book/adddialogwidget.py +++ b/examples/widgets/itemviews/address_book/adddialogwidget.py @@ -16,8 +16,8 @@ class AddDialogWidget(QDialog): name_label = QLabel("Name") address_label = QLabel("Address") - button_box = QDialogButtonBox(QDialogButtonBox.Ok - | QDialogButtonBox.Cancel) + button_box = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok + | QDialogButtonBox.StandardButton.Cancel) self._name_text = QLineEdit() self._address_text = QTextEdit() @@ -26,8 +26,8 @@ class AddDialogWidget(QDialog): grid.setColumnStretch(1, 2) grid.addWidget(name_label, 0, 0) grid.addWidget(self._name_text, 0, 1) - grid.addWidget(address_label, 1, 0, Qt.AlignLeft | Qt.AlignTop) - grid.addWidget(self._address_text, 1, 1, Qt.AlignLeft) + grid.addWidget(address_label, 1, 0, Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignTop) + grid.addWidget(self._address_text, 1, 1, Qt.AlignmentFlag.AlignLeft) layout = QVBoxLayout() layout.addLayout(grid) diff --git a/examples/widgets/itemviews/address_book/addresswidget.py b/examples/widgets/itemviews/address_book/addresswidget.py index a584dcbea..37bd06f85 100644 --- a/examples/widgets/itemviews/address_book/addresswidget.py +++ b/examples/widgets/itemviews/address_book/addresswidget.py @@ -149,11 +149,11 @@ class AddressWidget(QTabWidget): table_view = QTableView() table_view.setModel(proxy_model) table_view.setSortingEnabled(True) - table_view.setSelectionBehavior(QAbstractItemView.SelectRows) + table_view.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows) table_view.horizontalHeader().setStretchLastSection(True) table_view.verticalHeader().hide() - table_view.setEditTriggers(QAbstractItemView.NoEditTriggers) - table_view.setSelectionMode(QAbstractItemView.SingleSelection) + table_view.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers) + table_view.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) # This here be the magic: we use the group name (e.g. "ABC") to # build the regex for the QSortFilterProxyModel for the group's @@ -162,10 +162,10 @@ class AddressWidget(QTabWidget): # "A", "B", or "C". Notice that we set it to be case-insensitive. re = QRegularExpression(f"^[{group}].*") assert re.isValid() - re.setPatternOptions(QRegularExpression.CaseInsensitiveOption) + re.setPatternOptions(QRegularExpression.PatternOption.CaseInsensitiveOption) proxy_model.setFilterRegularExpression(re) proxy_model.setFilterKeyColumn(0) # Filter on the "name" column - proxy_model.sort(0, Qt.AscendingOrder) + proxy_model.sort(0, Qt.SortOrder.AscendingOrder) # This prevents an application crash (see: # https://www.qtcentre.org/threads/58874-QListView-SelectionModel-selectionChanged-Crash) # noqa: E501 diff --git a/examples/widgets/itemviews/address_book/newaddresstab.py b/examples/widgets/itemviews/address_book/newaddresstab.py index 055137db9..414101764 100644 --- a/examples/widgets/itemviews/address_book/newaddresstab.py +++ b/examples/widgets/itemviews/address_book/newaddresstab.py @@ -26,7 +26,7 @@ class NewAddressTab(QWidget): layout = QVBoxLayout() layout.addWidget(description_label) - layout.addWidget(add_button, 0, Qt.AlignCenter) + layout.addWidget(add_button, 0, Qt.AlignmentFlag.AlignCenter) self.setLayout(layout) diff --git a/examples/widgets/itemviews/address_book/tablemodel.py b/examples/widgets/itemviews/address_book/tablemodel.py index 8e9f5b76a..6654edfad 100644 --- a/examples/widgets/itemviews/address_book/tablemodel.py +++ b/examples/widgets/itemviews/address_book/tablemodel.py @@ -105,6 +105,6 @@ class TableModel(QAbstractTableModel): manually adjust each tableView to have NoEditTriggers. """ if not index.isValid(): - return Qt.ItemIsEnabled + return Qt.ItemFlag.ItemIsEnabled return Qt.ItemFlags(QAbstractTableModel.flags(self, index) - | Qt.ItemIsEditable) + | Qt.ItemFlag.ItemIsEditable) diff --git a/examples/widgets/itemviews/fetchmore/fetchmore.py b/examples/widgets/itemviews/fetchmore/fetchmore.py index c1c84f0f2..8f41910aa 100644 --- a/examples/widgets/itemviews/fetchmore/fetchmore.py +++ b/examples/widgets/itemviews/fetchmore/fetchmore.py @@ -81,8 +81,8 @@ class FileListModel(QAbstractListModel): directory = QDir(path) self.beginResetModel() - directory_filter = QDir.AllEntries | QDir.NoDot - self._file_list = directory.entryInfoList(directory_filter, QDir.Name) + directory_filter = QDir.Filter.AllEntries | QDir.Filter.NoDot + self._file_list = directory.entryInfoList(directory_filter, QDir.SortFlag.Name) self._file_count = 0 self.endResetModel() @@ -101,8 +101,8 @@ class Window(QWidget): self._view.setModel(self._model) self._log_viewer = QPlainTextEdit() - self._log_viewer.setSizePolicy(QSizePolicy(QSizePolicy.Preferred, - QSizePolicy.Preferred)) + self._log_viewer.setSizePolicy(QSizePolicy(QSizePolicy.Policy.Preferred, + QSizePolicy.Policy.Preferred)) self._model.number_populated.connect(self.update_log) self._view.activated.connect(self.activated) diff --git a/examples/widgets/itemviews/stardelegate/stardelegate.py b/examples/widgets/itemviews/stardelegate/stardelegate.py index 394bfc98f..93b09cdff 100644 --- a/examples/widgets/itemviews/stardelegate/stardelegate.py +++ b/examples/widgets/itemviews/stardelegate/stardelegate.py @@ -34,7 +34,7 @@ class StarDelegate(QStyledItemDelegate): # If the row is currently selected, we need to make sure we # paint the background accordingly. - if option.state & QStyle.State_Selected: + if option.state & QStyle.StateFlag.State_Selected: # The original C++ example used option.palette.foreground() to # get the brush for painting, but there are a couple of # problems with that: @@ -112,9 +112,9 @@ if __name__ == "__main__": # Create and populate the tableWidget table_widget = QTableWidget(4, 4) table_widget.setItemDelegate(StarDelegate()) - table_widget.setEditTriggers(QAbstractItemView.DoubleClicked - | QAbstractItemView.SelectedClicked) - table_widget.setSelectionBehavior(QAbstractItemView.SelectRows) + table_widget.setEditTriggers(QAbstractItemView.EditTrigger.DoubleClicked + | QAbstractItemView.EditTrigger.SelectedClicked) + table_widget.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows) table_widget.setHorizontalHeaderLabels(["Title", "Genre", "Artist", "Rating"]) data = [["Mass in B-Minor", "Baroque", "J.S. Bach", 5], diff --git a/examples/widgets/itemviews/stardelegate/starrating.py b/examples/widgets/itemviews/stardelegate/starrating.py index 38faade64..694bb43eb 100644 --- a/examples/widgets/itemviews/stardelegate/starrating.py +++ b/examples/widgets/itemviews/stardelegate/starrating.py @@ -42,7 +42,7 @@ class StarRating: painter.save() painter.setRenderHint(QPainter.RenderHint.Antialiasing, True) - painter.setPen(Qt.NoPen) + painter.setPen(Qt.PenStyle.NoPen) if isEditable: painter.setBrush(palette.highlight()) @@ -55,7 +55,7 @@ class StarRating: for i in range(self.MAX_STAR_COUNT): if i < self.star_count: - painter.drawPolygon(self._star_polygon, Qt.WindingFill) + painter.drawPolygon(self._star_polygon, Qt.FillRule.WindingFill) elif isEditable: painter.drawPolygon(self._diamond_polygon, Qt.WindingFill) painter.translate(1.0, 0.0) |