diff --git a/Core/Interface/CentralPane.py b/Core/Interface/CentralPane.py index fe18ef6..5fc0f54 100644 --- a/Core/Interface/CentralPane.py +++ b/Core/Interface/CentralPane.py @@ -90,7 +90,7 @@ class TabBar(QtWidgets.QTabBar): self.setMovable(True) def mouseDoubleClickEvent(self, event) -> None: - if event.button() != QtGui.Qt.LeftButton: + if event.button() != QtGui.Qt.MouseButton.LeftButton: return currIndex = self.currentIndex() currName = self.tabText(currIndex) @@ -352,7 +352,7 @@ class TabbedPane(QtWidgets.QTabWidget): progress = QtWidgets.QProgressDialog(f'Resolving new nodes for resolution: {resolution_name}, please wait...', 'Abort Resolving Nodes', 0, steps, self) - progress.setWindowModality(QtCore.Qt.WindowModal) + progress.setWindowModality(QtCore.Qt.WindowModality.WindowModal) progress.setMinimumDuration(1500) # In case we have no entities in the database when the resolution finishes, i.e. the user deletes the origin @@ -600,8 +600,9 @@ class TabbedPane(QtWidgets.QTabWidget): # Save canvases with open(canvasDBPathTmp, "wb") as canvasDBFile: - saveJson = {canvasName: [self.resourceHandler.deconstructGraphForFileDump(self.canvasTabs[canvasName].scene().sceneGraph), - self.canvasTabs[canvasName].scene().scenePos] for canvasName in self.canvasTabs} + saveJson = {canvasName: [self.resourceHandler.deconstructGraphForFileDump( + self.canvasTabs[canvasName].scene().sceneGraph), + self.canvasTabs[canvasName].scene().scenePos] for canvasName in self.canvasTabs} dump(saveJson, canvasDBFile) move(canvasDBPathTmp, canvasDBPath) @@ -746,19 +747,19 @@ class CanvasView(QtWidgets.QGraphicsView): self.name = name self.urlManager = urlManager - self.setRenderHint(QtGui.QPainter.Antialiasing) - self.setTransformationAnchor(QtWidgets.QGraphicsView.AnchorUnderMouse) - self.setViewportUpdateMode(QtWidgets.QGraphicsView.FullViewportUpdate) - self.setResizeAnchor(QtWidgets.QGraphicsView.AnchorUnderMouse) + self.setRenderHint(QtGui.QPainter.RenderHint.Antialiasing) + self.setTransformationAnchor(QtWidgets.QGraphicsView.ViewportAnchor.AnchorUnderMouse) + self.setViewportUpdateMode(QtWidgets.QGraphicsView.ViewportUpdateMode.FullViewportUpdate) + self.setResizeAnchor(QtWidgets.QGraphicsView.ViewportAnchor.AnchorUnderMouse) # self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) # self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) self.setBackgroundBrush(QtGui.QBrush(QtGui.QColor(54, 69, 79))) - self.setFrameShape(QtWidgets.QFrame.NoFrame) + self.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) self.setAcceptDrops(True) - self.setDragMode(QtWidgets.QGraphicsView.NoDrag) + self.setDragMode(QtWidgets.QGraphicsView.DragMode.NoDrag) self.setSizePolicy(QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)) + QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)) self.dragOver = False self.synced = False @@ -998,7 +999,7 @@ class CanvasView(QtWidgets.QGraphicsView): def mouseReleaseEvent(self, event) -> None: QtWidgets.QGraphicsView.mouseReleaseEvent(self, event) - self.setDragMode(QtWidgets.QGraphicsView.NoDrag) + self.setDragMode(QtWidgets.QGraphicsView.DragMode.NoDrag) itemsMoved = [item for item in self.scene().selectedItems() if isinstance(item, Entity.BaseNode)] for item in itemsMoved: @@ -1027,7 +1028,7 @@ class CanvasView(QtWidgets.QGraphicsView): if event.button() == QtCore.Qt.MouseButton.RightButton and \ not self.scene().linking and not self.scene().appendingToGroup: if len(self.scene().selectedItems()) == 0: - self.setDragMode(QtWidgets.QGraphicsView.RubberBandDrag) + self.setDragMode(QtWidgets.QGraphicsView.DragMode.RubberBandDrag) else: items = self.scene().selectedItems() groupItems = [groupItem for groupItem in items if isinstance(groupItem, Entity.GroupNode)] @@ -1055,7 +1056,7 @@ class CanvasView(QtWidgets.QGraphicsView): elif event.button() == QtCore.Qt.MouseButton.RightButton and self.scene().appendingToGroup: self.scene().appendSelectedItemsToGroupToggle() elif event.button() == QtCore.Qt.MouseButton.LeftButton: - self.setDragMode(QtWidgets.QGraphicsView.ScrollHandDrag) + self.setDragMode(QtWidgets.QGraphicsView.DragMode.ScrollHandDrag) super(CanvasView, self).mousePressEvent(event) def deleteSelectedLinks(self) -> None: @@ -1144,7 +1145,7 @@ class CanvasView(QtWidgets.QGraphicsView): for item in selectedItems: item.setSelected(False) if justViewport: - picture = QtGui.QImage(self.viewport().size(), QtGui.QImage.Format_ARGB32_Premultiplied) + picture = QtGui.QImage(self.viewport().size(), QtGui.QImage.Format.Format_ARGB32_Premultiplied) # Pictures are initialised with junk data - need to clear it out before painting # to avoid visual artifacts. picture.fill(QtGui.QColor(0, 0, 0, 0)) @@ -1157,7 +1158,7 @@ class CanvasView(QtWidgets.QGraphicsView): else: # Convert QRectF to QRect - can't have floats when it comes to picture size. rectToPrint = self.scene().sceneRect().toRect() - picture = QtGui.QImage(rectToPrint.size(), QtGui.QImage.Format_ARGB32_Premultiplied) + picture = QtGui.QImage(rectToPrint.size(), QtGui.QImage.Format.Format_ARGB32_Premultiplied) # Pictures are initialised with junk data - need to clear it out before painting # to avoid visual artifacts. picture.fill(QtGui.QColor(0, 0, 0, 0)) @@ -1365,7 +1366,7 @@ class CanvasScene(QtWidgets.QGraphicsScene): # Remove Cancel button from progress bar (user should not be able to stop canvas from loading). progress.setMinimumDuration(1500) progress.setCancelButton(None) - progress.setWindowModality(QtCore.Qt.WindowModal) + progress.setWindowModality(QtCore.Qt.WindowModality.WindowModal) progressValue = 0 for node in sceneGraphNodes: @@ -2005,16 +2006,16 @@ class PropertiesEditor(QtWidgets.QDialog): def accept(self): for row in range(self.itemProperties.rowCount()): key = self.itemProperties.itemAt( - row, self.itemProperties.LabelRole).widget().text() + row, self.itemProperties.ItemRole.LabelRole).widget().text() if key == "Notes": value = self.itemProperties.itemAt( - row, self.itemProperties.FieldRole).widget().toMarkdown() + row, self.itemProperties.ItemRole.FieldRole).widget().toMarkdown() elif key == 'Icon': value = self.itemProperties.itemAt( - row, self.itemProperties.FieldRole).widget().pictureByteArray + row, self.itemProperties.ItemRole.FieldRole).widget().pictureByteArray elif key == 'File Path': value = self.itemProperties.itemAt( - row, self.itemProperties.FieldRole).widget().text() + row, self.itemProperties.ItemRole.FieldRole).widget().text() projectFilesPath = Path(self.canvas.parent().mainWindow.SETTINGS.value("Project/FilesDir")) newPath = projectFilesPath / value if not newPath.is_relative_to(projectFilesPath): @@ -2024,7 +2025,7 @@ class PropertiesEditor(QtWidgets.QDialog): value = 'None' else: value = self.itemProperties.itemAt( - row, self.itemProperties.FieldRole).widget().text() + row, self.itemProperties.ItemRole.FieldRole).widget().text() # The last row is the Cancel / Accept buttons. if key != "Cancel": self.objectJson[key] = value @@ -2053,8 +2054,10 @@ class PropertiesEditorFilePathField(QtWidgets.QLineEdit): self.setText(str(value)) def mousePressEvent(self, event: QtGui.QMouseEvent) -> None: - selectedPath = QtWidgets.QFileDialog().getOpenFileName(parent=self, caption='Select File Path', - options=QtWidgets.QFileDialog.DontUseNativeDialog)[0] + selectedPath = QtWidgets.QFileDialog().getOpenFileName( + parent=self, + caption='Select File Path', + options=QtWidgets.QFileDialog.Option.DontUseNativeDialog)[0] if selectedPath != '': self.setText(str(Path(selectedPath).absolute())) @@ -2075,7 +2078,7 @@ class PropertiesEditorIconField(QtWidgets.QLabel): def mousePressEvent(self, event: QtGui.QMouseEvent) -> None: selectedPath = QtWidgets.QFileDialog().getOpenFileName(parent=self, caption='Select New Icon', - options=QtWidgets.QFileDialog.DontUseNativeDialog, + options=QtWidgets.QFileDialog.Option.DontUseNativeDialog, filter="Image Files (*.png *.jpg *.bmp *.svg)")[0] if selectedPath != '': try: @@ -2099,7 +2102,7 @@ class PropertiesEditorIconField(QtWidgets.QLabel): self.pictureByteArray = QtCore.QByteArray() imageBuffer = QtCore.QBuffer(self.pictureByteArray) - imageBuffer.open(QtCore.QIODevice.WriteOnly) + imageBuffer.open(QtCore.QIODevice.OpenModeFlag.WriteOnly) thumbnail.save(imageBuffer, "PNG") imageBuffer.close() diff --git a/Core/Interface/DockBarOne.py b/Core/Interface/DockBarOne.py index b797ebc..66c9e6d 100644 --- a/Core/Interface/DockBarOne.py +++ b/Core/Interface/DockBarOne.py @@ -36,11 +36,11 @@ class DockBarOne(QtWidgets.QDockWidget): self.resolutionManager = resolutionManager self.resourceHandler = resourceHandler self.lentDB = entityDatabase - self.setAllowedAreas(QtCore.Qt.LeftDockWidgetArea | - QtCore.Qt.RightDockWidgetArea) - self.setFeatures(QtWidgets.QDockWidget.DockWidgetMovable | - QtWidgets.QDockWidget.DockWidgetFloatable | - QtWidgets.QDockWidget.DockWidgetClosable) + self.setAllowedAreas(QtCore.Qt.DockWidgetArea.LeftDockWidgetArea | + QtCore.Qt.DockWidgetArea.RightDockWidgetArea) + self.setFeatures(QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetMovable | + QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetFloatable | + QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetClosable) self.setWindowTitle(title) self.setObjectName(title) @@ -80,7 +80,7 @@ class EntityList(QtWidgets.QTreeWidget): self.setHeaderLabels(['Entity List']) self.setAlternatingRowColors(False) self.setMinimumWidth(200) - self.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection) + self.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection) self.menu = QtWidgets.QMenu() actionDelete = QtGui.QAction('Delete Selected Items', @@ -250,7 +250,7 @@ class DocList(QtWidgets.QTreeWidget): self.setHeaderLabels(['Files Loaded']) self.uploadingFileWidgets = [] self.uploadedFileWidgets = [] - self.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection) + self.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection) def addUploadingFileToList(self, fileName: str) -> None: newWidget = DocWidget(self, @@ -310,7 +310,7 @@ class ResolutionList(QtWidgets.QTreeWidget): self.setAlternatingRowColors(False) self.setMinimumWidth(200) self.setSortingEnabled(True) - self.sortByColumn(0, QtCore.Qt.AscendingOrder) + self.sortByColumn(0, QtCore.Qt.SortOrder.AscendingOrder) self.loadAllResolutions() @@ -374,7 +374,7 @@ class NodeList(QtWidgets.QTreeWidget): self.setHeaderLabels(['Entities']) self.setAlternatingRowColors(False) self.setSortingEnabled(True) - self.sortByColumn(0, QtCore.Qt.AscendingOrder) + self.sortByColumn(0, QtCore.Qt.SortOrder.AscendingOrder) self.allEntities = [] self.loadEntities() diff --git a/Core/Interface/DockBarThree.py b/Core/Interface/DockBarThree.py index c3f1f9e..3074f4e 100644 --- a/Core/Interface/DockBarThree.py +++ b/Core/Interface/DockBarThree.py @@ -35,11 +35,11 @@ class DockBarThree(QtWidgets.QDockWidget): def __init__(self, mainWindow, title="Dockbar Three"): super(DockBarThree, self).__init__(parent=mainWindow) - self.setAllowedAreas(QtCore.Qt.TopDockWidgetArea | - QtCore.Qt.BottomDockWidgetArea) - self.setFeatures(QtWidgets.QDockWidget.DockWidgetMovable | - QtWidgets.QDockWidget.DockWidgetFloatable | - QtWidgets.QDockWidget.DockWidgetClosable) + self.setAllowedAreas(QtCore.Qt.DockWidgetArea.TopDockWidgetArea | + QtCore.Qt.DockWidgetArea.BottomDockWidgetArea) + self.setFeatures(QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetMovable | + QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetFloatable | + QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetClosable) self.setWindowTitle(title) self.setObjectName(title) self.setMaximumHeight(275) @@ -77,11 +77,11 @@ class TimeWidget(QtWidgets.QWidget): self.timelineChart = QtCharts.QChart() self.timelineChart.setTitle("Timeline") - self.timelineChart.setTheme(QtCharts.QChart.ChartThemeBlueCerulean) + self.timelineChart.setTheme(QtCharts.QChart.ChartTheme.ChartThemeBlueCerulean) self.timelineChart.setMargins(QtCore.QMargins(0, 0, 0, 0)) self.chartView = QtCharts.QChartView(self.timelineChart) - self.chartView.setRubberBand(QtCharts.QChartView.NoRubberBand) - self.timelineChart.setAnimationOptions(QtCharts.QChart.AllAnimations) + self.chartView.setRubberBand(QtCharts.QChartView.RubberBand.NoRubberBand) + self.timelineChart.setAnimationOptions(QtCharts.QChart.AnimationOption.AllAnimations) self.timelineChart.setAnimationDuration(250) self.timelineChart.legend().hide() @@ -96,7 +96,7 @@ class TimeWidget(QtWidgets.QWidget): # Ref: https://qtcentre.org/threads/10975-Help-Export-QGraphicsView-to-Image-File # Rendering best optimized to rgb32 and argb32_premultiplied. # Ref: https://doc.qt.io/qtforpython/PySide6/QtGui/QImage.html?highlight=qimage#image-formats - picture = QtGui.QImage(self.chartView.size(), QtGui.QImage.Format_ARGB32_Premultiplied) + picture = QtGui.QImage(self.chartView.size(), QtGui.QImage.Format.Format_ARGB32_Premultiplied) # Pictures are initialised with junk data - need to clear it out before painting # to avoid visual artifacts. picture.fill(QtGui.QColor(0, 0, 0, 0)) @@ -222,7 +222,7 @@ class TimeWidget(QtWidgets.QWidget): xAxisValues = [] barSet = TimelineBarSet('Entities', self, timestep, list(barsDict)) - barSet.setColor(QtGui.Qt.darkCyan) + barSet.setColor(QtGui.Qt.GlobalColor.darkCyan) for bar in barsDict: barSet.append(barsDict[bar]) timelineSeries.append(barSet) @@ -296,28 +296,28 @@ class TimelineTimescaleSelector(QtWidgets.QLabel): self.setMaximumHeight(150) self.setLayout(QtWidgets.QFormLayout()) - self.setFrameStyle(QtWidgets.QFrame.Sunken) + self.setFrameStyle(QtWidgets.QFrame.Shadow.Sunken) self.yearButton = QtWidgets.QPushButton(' Year: ') self.yearButton.clicked.connect(self.yearButtonPressed) self.yearText = QtWidgets.QLabel('-') - self.yearText.setFrameStyle(QtWidgets.QFrame.Sunken) + self.yearText.setFrameStyle(QtWidgets.QFrame.Shadow.Sunken) self.monthButton = QtWidgets.QPushButton(' Month: ') self.monthButton.clicked.connect(self.monthButtonPressed) self.monthText = QtWidgets.QLabel('X') - self.monthText.setFrameStyle(QtWidgets.QFrame.Sunken) + self.monthText.setFrameStyle(QtWidgets.QFrame.Shadow.Sunken) self.dayButton = QtWidgets.QPushButton(' Day: ') self.dayButton.clicked.connect(self.dayButtonPressed) self.dayText = QtWidgets.QLabel('X') - self.dayText.setFrameStyle(QtWidgets.QFrame.Sunken) + self.dayText.setFrameStyle(QtWidgets.QFrame.Shadow.Sunken) self.hourButton = QtWidgets.QPushButton(' Hour: ') self.hourButton.clicked.connect(self.hourButtonPressed) self.hourText = QtWidgets.QLabel('X') - self.hourText.setFrameStyle(QtWidgets.QFrame.Sunken) + self.hourText.setFrameStyle(QtWidgets.QFrame.Shadow.Sunken) self.minuteButton = QtWidgets.QPushButton(' Minute: ') self.minuteButton.clicked.connect(self.minuteButtonPressed) self.minuteText = QtWidgets.QLabel('X') - self.minuteText.setFrameStyle(QtWidgets.QFrame.Sunken) + self.minuteText.setFrameStyle(QtWidgets.QFrame.Shadow.Sunken) self.layout().addRow(self.yearButton, self.yearText) self.layout().addRow(self.monthButton, self.monthText) @@ -462,8 +462,8 @@ class ServerStatusBox(QtWidgets.QLabel): def __init__(self, parent): super(ServerStatusBox, self).__init__(parent=parent) - self.setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter) - self.setFrameStyle(QtWidgets.QFrame.Sunken | QtWidgets.QFrame.StyledPanel) + self.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) + self.setFrameStyle(QtWidgets.QFrame.Shadow.Sunken | QtWidgets.QFrame.Shape.StyledPanel) self.setText("Not connected to a server") def updateStatus(self, status: str): @@ -492,7 +492,7 @@ class ChatBox(QtWidgets.QWidget): chatLabel = QtWidgets.QLabel('Project Collaboration Chat') chatLabel.setStyleSheet(Stylesheets.DOCK_BAR_LABEL) - chatLabel.setAlignment(QtCore.Qt.AlignCenter) + chatLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.textView = QtWidgets.QPlainTextEdit() self.textView.setReadOnly(True) self.textSendBox = QtWidgets.QLineEdit() diff --git a/Core/Interface/DockBarTwo.py b/Core/Interface/DockBarTwo.py index 271dc9f..31307c7 100644 --- a/Core/Interface/DockBarTwo.py +++ b/Core/Interface/DockBarTwo.py @@ -15,9 +15,9 @@ class DockBarTwo(QtWidgets.QDockWidget): scrollAreaWidget = QtWidgets.QScrollArea() scrollAreaWidget.setWidget(self.entDetails) - scrollAreaWidget.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) + scrollAreaWidget.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded) scrollAreaWidget.setWidgetResizable(True) - scrollAreaWidget.setSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + scrollAreaWidget.setSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) childWidget.addTab(scrollAreaWidget, 'Entity Details') childWidget.addTab(self.oracle, 'Oracle') @@ -30,11 +30,11 @@ class DockBarTwo(QtWidgets.QDockWidget): title="DockBar Two"): super(DockBarTwo, self).__init__(parent=mainWindow) - self.setAllowedAreas(QtCore.Qt.LeftDockWidgetArea | - QtCore.Qt.RightDockWidgetArea) - self.setFeatures(QtWidgets.QDockWidget.DockWidgetMovable | - QtWidgets.QDockWidget.DockWidgetFloatable | - QtWidgets.QDockWidget.DockWidgetClosable) + self.setAllowedAreas(QtCore.Qt.DockWidgetArea.LeftDockWidgetArea | + QtCore.Qt.DockWidgetArea.RightDockWidgetArea) + self.setFeatures(QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetMovable | + QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetFloatable | + QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetClosable) self.setWindowTitle(title) self.resourceHandler = resourceHandler self.entityDB = entityDB @@ -98,7 +98,7 @@ class EntityDetails(QtWidgets.QWidget): self.entityDB = entityDB self.detailsLayout = MinSizeStackedLayout() self.setLayout(self.detailsLayout) - self.setSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + self.setSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) layoutNothingSelected = QtWidgets.QVBoxLayout() widgetNothing = QtWidgets.QWidget() @@ -118,7 +118,7 @@ class EntityDetails(QtWidgets.QWidget): # Need to keep track of how many nodes are selected. # ~ Nothing Selected/Hovered Layout nothingLabel = QtWidgets.QLabel("Nothing is Selected.") - nothingLabel.setAlignment(QtCore.Qt.AlignCenter) + nothingLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) layoutNothingSelected.addWidget(nothingLabel) ### @@ -128,7 +128,7 @@ class EntityDetails(QtWidgets.QWidget): summaryPanel = QtWidgets.QWidget() summaryPanel.setLayout(summaryLayout) self.summaryIcon = QtWidgets.QLabel("") - self.summaryIcon.setSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + self.summaryIcon.setSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) self.entityTypeLabel = QtWidgets.QLabel("") self.entityUIDLabel = QtWidgets.QLabel("") self.entityPrimaryLabel = QtWidgets.QLabel("") @@ -168,7 +168,7 @@ class EntityDetails(QtWidgets.QWidget): self.linkIcon = QtWidgets.QLabel("") self.linkIcon.setMaximumHeight(90) self.linkIcon.setStyleSheet(Stylesheets.DOCK_BAR_TWO_LINK) - self.linkIcon.setAlignment(QtCore.Qt.AlignCenter) + self.linkIcon.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.linkChild = SingleLinkItem(self, mainWindow) self.linkChild.setStyleSheet(Stylesheets.DOCK_BAR_TWO_LINK) oneLinkRelLayout.addWidget(self.linkParent) @@ -304,7 +304,9 @@ class EntityDetails(QtWidgets.QWidget): else: previewPixmap = QtGui.QPixmap(previewImage) previewLabel = QtWidgets.QLabel() - previewLabel.setPixmap(previewPixmap.scaled(250, 250, QtCore.Qt.KeepAspectRatio)) + previewLabel.setPixmap(previewPixmap.scaled(250, + 250, + QtCore.Qt.AspectRatioMode.KeepAspectRatio)) self.detailsLayoutOneNode.addWidget(QtWidgets.QLabel('Preview:'), rowCount, 0) self.detailsLayoutOneNode.addWidget(previewLabel, rowCount, 1, 10, 1) @@ -415,10 +417,10 @@ class SingleLinkItem(QtWidgets.QWidget): self.linkItemPic = QtWidgets.QLabel() - self.linkItemPic.setAlignment(QtCore.Qt.AlignCenter) + self.linkItemPic.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.linkItemName = QtWidgets.QLabel() - self.linkItemName.setAlignment(QtCore.Qt.AlignCenter) + self.linkItemName.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.linkItemUid = "" self.setMaximumHeight(90) @@ -543,8 +545,7 @@ class Oracle(QtWidgets.QWidget): self.answerLabel = QtWidgets.QLabel("Answer Section") self.answerLabel.setStyleSheet(Stylesheets.DOCK_BAR_LABEL) - self.answerLabel.setAlignment(QtCore.Qt.AlignHCenter | - QtCore.Qt.AlignVCenter) + self.answerLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) oracleLayout.addWidget(self.answerLabel, 1, 0, 1, 2) self.answerSection = QtWidgets.QPlainTextEdit() self.answerSection.setReadOnly(True) @@ -555,8 +556,7 @@ class Oracle(QtWidgets.QWidget): self.questionLabel = QtWidgets.QLabel("Ask a Question") self.questionLabel.setStyleSheet(Stylesheets.DOCK_BAR_LABEL) - self.questionLabel.setAlignment(QtCore.Qt.AlignHCenter | - QtCore.Qt.AlignVCenter) + self.questionLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) oracleLayout.addWidget(self.questionLabel, 3, 0, 1, 2) self.questionSection = QtWidgets.QLineEdit() self.questionSection.setPlaceholderText("Ask a Question here.") diff --git a/Core/Interface/Entity.py b/Core/Interface/Entity.py index 03f50e8..fa189f7 100644 --- a/Core/Interface/Entity.py +++ b/Core/Interface/Entity.py @@ -20,7 +20,7 @@ class BaseNode(QGraphicsItemGroup): brush: QtGui.QBrush) -> None: super(BaseNode, self).__init__() - self.setCacheMode(self.DeviceCoordinateCache) + self.setCacheMode(QGraphicsItemGroup.CacheMode.DeviceCoordinateCache) self.pixmapItem = QtGui.QPixmap() self.pixmapItem.loadFromData(pictureByteArray) @@ -39,8 +39,8 @@ class BaseNode(QGraphicsItemGroup): labelDocument = self.labelItem.document() labelDocument.setTextWidth(280) textOption = labelDocument.defaultTextOption() - textOption.setWrapMode(QtGui.QTextOption.WrapAtWordBoundaryOrAnywhere) - textOption.setAlignment(QtCore.Qt.AlignHCenter) + textOption.setWrapMode(QtGui.QTextOption.WrapMode.WrapAtWordBoundaryOrAnywhere) + textOption.setAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter) labelDocument.setDefaultTextOption(textOption) self.labelItem.setDocument(labelDocument) @@ -117,7 +117,7 @@ class BaseNode(QGraphicsItemGroup): def paint(self, painter: QtGui.QPainter, option: QtWidgets.QStyleOptionGraphicsItem, widget: Optional[QtWidgets.QWidget] = ...) -> None: - painter.setPen(QtCore.Qt.NoPen) + painter.setPen(QtCore.Qt.PenStyle.NoPen) if self.scene().views()[0].zoom < self.scene().hideZoom: self.labelItem.hide() else: @@ -145,7 +145,7 @@ class GroupNode(BaseNode): self.listProxyWidget = None def itemChange(self, change: QtWidgets.QGraphicsItem.GraphicsItemChange, value: Any) -> Any: - if change == QtWidgets.QGraphicsItem.ItemSelectedChange: + if change == QtWidgets.QGraphicsItem.GraphicsItemChange.ItemSelectedChange: if value: self.showList(None) else: @@ -185,7 +185,7 @@ class GroupNode(BaseNode): def formGroup(self, childNodeUIDs, listProxyWidget: QtWidgets.QGraphicsProxyWidget) -> None: [self.addItemToGroup(uid) for uid in childNodeUIDs] # Should be faster than just a for loop self.listProxyWidget = listProxyWidget - self.listProxyWidget.setCacheMode(self.DeviceCoordinateCache) + self.listProxyWidget.setCacheMode(QGraphicsItemGroup.CacheMode.DeviceCoordinateCache) def addItemToGroup(self, uid: str) -> None: self.groupedNodesUid.add(uid) @@ -250,8 +250,8 @@ class BaseConnector(QGraphicsItemGroup): self.colorDefault = QtGui.QColor(200, 200, 200) self.myColor = self.colorDefault - self.pen = QtGui.QPen(self.myColor, 2, QtCore.Qt.SolidLine, - QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin) + self.pen = QtGui.QPen(self.myColor, 2, QtCore.Qt.PenStyle.SolidLine, + QtCore.Qt.PenCapStyle.RoundCap, QtCore.Qt.PenJoinStyle.RoundJoin) self.arrowHead = QtGui.QPolygonF() self.line = QtCore.QLineF() @@ -371,7 +371,7 @@ class GroupNodeChildList(QtWidgets.QWidget): self.setLayout(QtWidgets.QVBoxLayout()) titleLabel = QtWidgets.QLabel('Child Items') - titleLabel.setAlignment(QtCore.Qt.AlignVCenter | QtCore.Qt.AlignHCenter) + titleLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.layout().addWidget(titleLabel) self.itemList = ChildListWidget() diff --git a/Core/Interface/MenuBar.py b/Core/Interface/MenuBar.py index 571d173..e5937ae 100644 --- a/Core/Interface/MenuBar.py +++ b/Core/Interface/MenuBar.py @@ -1175,7 +1175,7 @@ class MenuBar(QtWidgets.QMenuBar): steps = 3 progress = QtWidgets.QProgressDialog('Importing tabs, please wait...', 'Abort Import', 0, steps, self) - progress.setWindowModality(QtCore.Qt.WindowModal) + progress.setWindowModality(QtCore.Qt.WindowModality.WindowModal) progress.setMinimumDuration(0) importTabsThread.progressSignal.connect(progress.setValue) progress.canceled.connect(lambda: importTabsThread.cancelOperation()) @@ -1342,7 +1342,7 @@ class DeleteProjectConfirmationDialog(QtWidgets.QDialog): resolutionsLabel = QtWidgets.QLabel(f'Delete Project: "{currentServerProject}" ?') resolutionsLabel.setWordWrap(True) - resolutionsLabel.setAlignment(QtCore.Qt.AlignCenter) + resolutionsLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.layout().addWidget(resolutionsLabel) buttonsWidget = QtWidgets.QWidget() @@ -1449,7 +1449,7 @@ class ServerConnectWizard(QtWidgets.QDialog): serverPasswordLabel = QtWidgets.QLabel("Server Password:") self.serverPasswordTextbox = QtWidgets.QLineEdit() - self.serverPasswordTextbox.setEchoMode(QtWidgets.QLineEdit.Password) + self.serverPasswordTextbox.setEchoMode(QtWidgets.QLineEdit.EchoMode.Password) self.layout().addRow(serverPasswordLabel, self.serverPasswordTextbox) self.confirmConnect = False @@ -1488,7 +1488,7 @@ class ServerCreateOrOpenProject(QtWidgets.QDialog): self.openProjectDropdown.addItems(serverProjects) self.openProjectPassword = QtWidgets.QLineEdit('') self.openProjectPassword.setToolTip('Enter the password of the selected server project.') - self.openProjectPassword.setEchoMode(QtWidgets.QLineEdit.Password) + self.openProjectPassword.setEchoMode(QtWidgets.QLineEdit.EchoMode.Password) openProjectLayout.addRow('Open Project:', self.openProjectDropdown) openProjectLayout.addRow('Password:', self.openProjectPassword) openProjectButton = QtWidgets.QPushButton('Open Project') @@ -1502,7 +1502,7 @@ class ServerCreateOrOpenProject(QtWidgets.QDialog): self.createProjectNameTextbox = QtWidgets.QLineEdit('') self.createProjectNameTextbox.setToolTip('Specify the name of the server project. Must be unique.') self.createProjectPasswordTextbox = QtWidgets.QLineEdit('') - self.createProjectPasswordTextbox.setEchoMode(QtWidgets.QLineEdit.Password) + self.createProjectPasswordTextbox.setEchoMode(QtWidgets.QLineEdit.EchoMode.Password) self.createProjectPasswordTextbox.setToolTip('Specify a password to be entered' ' in order to access this project.') @@ -1546,7 +1546,7 @@ class ViewAndStopResolutionsDialog(QtWidgets.QDialog): resolutionsLabel = QtWidgets.QLabel('Running Resolutions:') - resolutionsLabel.setAlignment(QtCore.Qt.AlignCenter) + resolutionsLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.layout().addWidget(resolutionsLabel) scrollArea = QtWidgets.QScrollArea() @@ -1603,7 +1603,7 @@ class CollectorsDialog(QtWidgets.QDialog): self.runningCollectorTreeItems = {} collectorsLabel = QtWidgets.QLabel("Collectors") - collectorsLabel.setAlignment(QtCore.Qt.AlignCenter) + collectorsLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.baseLayout.addWidget(collectorsLabel) if collectorsDict is None: @@ -1633,9 +1633,10 @@ class CollectorsDialog(QtWidgets.QDialog): newCollectorInstanceTree = QtWidgets.QTreeWidget() newCollectorInstanceTree.setColumnCount(2) newCollectorInstanceTree.setHeaderLabels(['UID', 'Stop Button']) - newCollectorInstanceTree.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows) + newCollectorInstanceTree.setSelectionBehavior( + QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) newCollectorInstanceTree.header().setStretchLastSection(False) - newCollectorInstanceTree.header().setSectionResizeMode(0, QtWidgets.QHeaderView.Stretch) + newCollectorInstanceTree.header().setSectionResizeMode(0, QtWidgets.QHeaderView.ResizeMode.Stretch) newCollectorWidgetLayout.addWidget(newCollectorInstanceTree, 1, 0, 2, 2) if runningCollectors is not None: @@ -1718,16 +1719,16 @@ class CollectorStartDialog(QtWidgets.QDialog): entitySelectTabLabel.setWordWrap(True) entitySelectTabLabel.setMaximumWidth(600) - entitySelectTabLabel.setAlignment(QtCore.Qt.AlignCenter) + entitySelectTabLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) entitySelectTab.layout().addWidget(entitySelectTabLabel) self.entitySelector = QtWidgets.QTreeWidget() self.entitySelector.setHeaderLabels(['Primary Field', 'Entity Type', 'Icon']) - self.entitySelector.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows) + self.entitySelector.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) self.entitySelector.setSortingEnabled(True) # Stretch the first column, since it contains the primary field. self.entitySelector.header().setStretchLastSection(False) - self.entitySelector.header().setSectionResizeMode(0, QtWidgets.QHeaderView.Stretch) + self.entitySelector.header().setSectionResizeMode(0, QtWidgets.QHeaderView.ResizeMode.Stretch) relevantEntityFields = [(entity['uid'], entity[list(entity)[1]], entity['Entity Type'], entity['Icon']) for entity in entityDB.getAllEntities() if entity['Entity Type'] in originTypes or '*' in originTypes] @@ -1741,7 +1742,7 @@ class CollectorStartDialog(QtWidgets.QDialog): # Hidden, so we can pull the UID later. newTreeWidgetItem.setText(3, eligibleEntity[0]) - self.entitySelector.setSelectionMode(self.entitySelector.MultiSelection) + self.entitySelector.setSelectionMode(self.entitySelector.SelectionMode.MultiSelection) entitySelectTab.layout().addWidget(self.entitySelector) self.childWidget.addTab(entitySelectTab, 'Entities') @@ -1756,7 +1757,7 @@ class CollectorStartDialog(QtWidgets.QDialog): propertyLabel.setWordWrap(True) propertyLabel.setMaximumWidth(600) - propertyLabel.setAlignment(QtCore.Qt.AlignCenter) + propertyLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) propertyKeyLayout.addWidget(propertyLabel) propertyType = parameters[key].get('type') @@ -1846,7 +1847,7 @@ class ImportLinksFromCSVFile(QtWidgets.QDialog): columnNumber = len(csvTableContents.columns) titleLabel = QtWidgets.QLabel("Import Links from CSV") - titleLabel.setAlignment(QtCore.Qt.AlignCenter) + titleLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) descLabel = QtWidgets.QLabel("Select the Entity Type of the Parent entity (Entity One) and the Entity Type of " "the Child entity (Entity Two). Then, map these entities to columns in the CSV " @@ -1902,7 +1903,7 @@ class ImportLinksFromCSVFile(QtWidgets.QDialog): rowValues = list(row) for column in range(columnNumber): columnItem = QtWidgets.QTableWidgetItem(str(rowValues[column + 1])) - columnItem.setFlags(columnItem.flags() & ~QtCore.Qt.ItemIsEditable) + columnItem.setFlags(columnItem.flags() & ~QtCore.Qt.ItemFlag.ItemIsEditable) csvTable.setItem(rowValues[0], column, columnItem) randomizationLabel = QtWidgets.QLabel("If the resolution identifiers (i.e. 'Resolution ID') are not guaranteed " @@ -1911,7 +1912,7 @@ class ImportLinksFromCSVFile(QtWidgets.QDialog): "have random tokens as the Resolution IDs.\nPlease select what you would " "like to do:") randomizationLabel.setWordWrap(True) - randomizationLabel.setAlignment(QtCore.Qt.AlignCenter) + randomizationLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.randAsIs = QtWidgets.QRadioButton("Use 'Resolution ID' as-is.") self.randMerge = QtWidgets.QRadioButton("Append a random token to the values mapped to the 'Resolution ID' " "field.") @@ -1986,7 +1987,7 @@ class ImportLinkEntitiesFromCSVFile(QtWidgets.QDialog): columnNumber = len(csvTableContents.columns) titleLabel = QtWidgets.QLabel("Create Entities from Link Fields") - titleLabel.setAlignment(QtCore.Qt.AlignCenter) + titleLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) descLabel = QtWidgets.QLabel("Select the entity type to import the remaining fields as. " "Then, configure the mapping between the CSV fields and entity attributes. To do " @@ -2036,7 +2037,7 @@ class ImportLinkEntitiesFromCSVFile(QtWidgets.QDialog): rowValues = list(row) for column in range(columnNumber): columnItem = QtWidgets.QTableWidgetItem(str(rowValues[column + 1])) - columnItem.setFlags(columnItem.flags() & ~QtCore.Qt.ItemIsEditable) + columnItem.setFlags(columnItem.flags() & ~QtCore.Qt.ItemFlag.ItemIsEditable) csvTable.setItem(rowValues[0], column, columnItem) buttonsWidget = QtWidgets.QWidget() @@ -2099,7 +2100,7 @@ class ImportEntityFromCSVFile(QtWidgets.QDialog): columnNumber = len(csvTableContents.columns) titleLabel = QtWidgets.QLabel("Import Entities from CSV") - titleLabel.setAlignment(QtCore.Qt.AlignCenter) + titleLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) descLabel = QtWidgets.QLabel("Select the entity type to import the entities from the CSV file as. " "Then, configure the mapping between the CSV fields and entity attributes. To do " @@ -2139,7 +2140,7 @@ class ImportEntityFromCSVFile(QtWidgets.QDialog): rowValues = list(row) for column in range(columnNumber): columnItem = QtWidgets.QTableWidgetItem(str(rowValues[column + 1])) - columnItem.setFlags(columnItem.flags() & ~QtCore.Qt.ItemIsEditable) + columnItem.setFlags(columnItem.flags() & ~QtCore.Qt.ItemFlag.ItemIsEditable) csvTable.setItem(rowValues[0], column, columnItem) importToCanvasChoiceWidget = QtWidgets.QWidget() @@ -2212,7 +2213,7 @@ class ImportFromFileDialog(QtWidgets.QDialog): self.fileDirectory = QtWidgets.QFileDialog().getOpenFileName( parent=self, caption='Select File to Import From', dir=str(Path.home()), - options=QtWidgets.QFileDialog.DontUseNativeDialog, + options=QtWidgets.QFileDialog.Option.DontUseNativeDialog, filter="Import File (*.csv *.txt *.xls *.xlsx *.ods)")[0] if self.fileDirectory != '': self.fileDirectoryLine.setText(self.fileDirectory) @@ -2226,7 +2227,7 @@ class ImportFromFileDialog(QtWidgets.QDialog): dialogLayout = QtWidgets.QGridLayout() self.setLayout(dialogLayout) descriptionLabel = QtWidgets.QLabel('Select the file to import Entities or Links from:') - descriptionLabel.setAlignment(QtCore.Qt.AlignCenter) + descriptionLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) descriptionLabel.setWordWrap(True) dialogLayout.addWidget(descriptionLabel, 0, 0, 1, 2) @@ -2235,7 +2236,7 @@ class ImportFromFileDialog(QtWidgets.QDialog): self.fileDirectoryLine.setReadOnly(True) fileChoiceLabel = QtWidgets.QLabel('Specify the type of the chosen file and what to import:') - fileChoiceLabel.setAlignment(QtCore.Qt.AlignCenter) + fileChoiceLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) fileChoiceLabel.setWordWrap(True) self.textFileChoice = QtWidgets.QRadioButton('Text file - Entities Import') @@ -2281,7 +2282,7 @@ class ImportFromTextFileDialog(QtWidgets.QDialog): dialogLayout = QtWidgets.QGridLayout() self.setLayout(dialogLayout) descriptionLabel = QtWidgets.QLabel('Importing entities from text file, one entity per line.') - descriptionLabel.setAlignment(QtCore.Qt.AlignCenter) + descriptionLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) descriptionLabel.setWordWrap(True) dialogLayout.addWidget(descriptionLabel, 0, 0, 1, 2) @@ -2308,7 +2309,7 @@ class ImportFromTextFileDialog(QtWidgets.QDialog): textTable.setFixedWidth(450) for lineIndex, lineValue in enumerate(fileContents): columnItem = QtWidgets.QTableWidgetItem(lineValue) - columnItem.setFlags(columnItem.flags() & ~QtCore.Qt.ItemIsEditable) + columnItem.setFlags(columnItem.flags() & ~QtCore.Qt.ItemFlag.ItemIsEditable) textTable.setItem(lineIndex, 0, columnItem) textTable.setColumnWidth(0, 450) textTable.setHorizontalHeaderLabels(['File Entities Preview']) @@ -2420,10 +2421,10 @@ class CanvasPictureDialog(QtWidgets.QDialog): def popupFileDialog(self): saveAsDialog = QtWidgets.QFileDialog() - saveAsDialog.setOption(QtWidgets.QFileDialog.DontUseNativeDialog, True) - saveAsDialog.setViewMode(QtWidgets.QFileDialog.List) + saveAsDialog.setOption(QtWidgets.QFileDialog.Option.DontUseNativeDialog, True) + saveAsDialog.setViewMode(QtWidgets.QFileDialog.ViewMode.List) saveAsDialog.setNameFilter("Image (*.png)") - saveAsDialog.setAcceptMode(QtWidgets.QFileDialog.AcceptSave) + saveAsDialog.setAcceptMode(QtWidgets.QFileDialog.AcceptMode.AcceptSave) saveAsDialog.setDirectory(str(Path.home())) saveAsDialog.setStyleSheet(Stylesheets.MAIN_WINDOW_STYLESHEET) saveAsDialog.exec() diff --git a/Core/Interface/ToolBarOne.py b/Core/Interface/ToolBarOne.py index 59ca68c..19a0691 100644 --- a/Core/Interface/ToolBarOne.py +++ b/Core/Interface/ToolBarOne.py @@ -10,7 +10,7 @@ class ToolBarOne(QtWidgets.QToolBar): # Parent is (expected to be) mainWindow. super().__init__(title, parent=parent) self.setObjectName(title) - self.setToolButtonStyle(QtGui.Qt.ToolButtonTextUnderIcon) + self.setToolButtonStyle(QtGui.Qt.ToolButtonStyle.ToolButtonTextUnderIcon) self.setStyleSheet(Stylesheets.TOOLBAR_STYLESHEET) newCanvas = QtGui.QAction("Add Canvas", diff --git a/Core/ResourceHandler.py b/Core/ResourceHandler.py index 2cbcd2f..2b49a72 100644 --- a/Core/ResourceHandler.py +++ b/Core/ResourceHandler.py @@ -421,7 +421,7 @@ class FilePropertyInput(QtWidgets.QLineEdit): fileChosen = self.fileDialog.getOpenFileName(self, "Open File", str(Path.home()), - options=QtWidgets.QFileDialog.DontUseNativeDialog) + options=QtWidgets.QFileDialog.Option.DontUseNativeDialog) self.setText(fileChosen[0]) @@ -536,7 +536,7 @@ class RichNotesEditor(QtWidgets.QTextBrowser): def mousePressEvent(self, ev: QtGui.QMouseEvent) -> None: potentialLink = self.anchorAt(ev.pos()) - if not potentialLink and ev.button() == QtGui.Qt.LeftButton: + if not potentialLink and ev.button() == QtGui.Qt.MouseButton.LeftButton: self.startEditing() super(RichNotesEditor, self).mousePressEvent(ev) diff --git a/Installer/Installer.py b/Installer/Installer.py index 7d7231b..73e5c56 100644 --- a/Installer/Installer.py +++ b/Installer/Installer.py @@ -815,7 +815,7 @@ class InstallWizard(QtWidgets.QWizard): sudoPassword = QtWidgets.QInputDialog.getText(self, 'Sudo Password', 'Installation requires elevated privileges. ' 'Please enter your password: ', - QtWidgets.QLineEdit.Password) + QtWidgets.QLineEdit.EchoMode.Password) if sudoPassword[1] and sudoPassword[0] != '': sudoPrivs = subprocess.Popen(['sudo', '-S', '-H', '-k', sys.executable, *newArgs], stdin=subprocess.PIPE, stdout=subprocess.PIPE, @@ -865,7 +865,7 @@ class InstallWizard(QtWidgets.QWizard): sys.exit(-2) self.appPath = Path(sys.argv[6]) - self.setWizardStyle(self.ModernStyle) + self.setWizardStyle(self.WizardStyle.ModernStyle) self.setWindowTitle('LinkScope Installer') # Normally one would use enums to keep track of pages, but the installer crashes if we try, so we @@ -888,8 +888,8 @@ class InstallWizard(QtWidgets.QWizard): self.addPage(licensePage) self.addPage(installUpgradePage) self.addPage(DonePage()) - self.setOptions(self.NoBackButtonOnStartPage | self.NoBackButtonOnLastPage | self.CancelButtonOnLeft | - self.NoCancelButtonOnLastPage) + self.setOptions(self.WizardOption.NoBackButtonOnStartPage | self.WizardOption.NoBackButtonOnLastPage | + self.WizardOption.CancelButtonOnLeft | self.WizardOption.NoCancelButtonOnLastPage) self.show() @@ -1000,7 +1000,7 @@ class IntroInstallUninstallPage(QtWidgets.QWizardPage): self.setLayout(installUninstallLayout) actionLabel = QtWidgets.QLabel("Please select the action that you wish to carry out:") - actionLabel.setAlignment(QtCore.Qt.AlignCenter) + actionLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) installUninstallLayout.addWidget(actionLabel) self.installRadio = QtWidgets.QRadioButton('Install LinkScope') @@ -1034,7 +1034,7 @@ class WindowsGraphVizPage(QtWidgets.QWizardPage): 'function, and will be installed along with the software. The licensing terms ' 'for GraphViz can be found at: https://graphviz.org/license/.') graphVizLabel.setWordWrap(True) - graphVizLabel.setAlignment(QtCore.Qt.AlignCenter) + graphVizLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.setLayout(graphVizLayout) graphVizLayout.addWidget(graphVizLabel) @@ -1082,7 +1082,7 @@ class LinkScopeInstallLatestPage(QtWidgets.QWizardPage): self.installThread = None self.installLabel.setWordWrap(True) - self.installLabel.setAlignment(QtCore.Qt.AlignCenter) + self.installLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) installLayout.addWidget(self.installLabel) self.installProgressWidget = QtWidgets.QWidget() @@ -1097,7 +1097,7 @@ class LinkScopeInstallLatestPage(QtWidgets.QWizardPage): self.downloadingLabel = QtWidgets.QLabel('Downloading files. This may take some time...') self.downloadingLabel.setWordWrap(True) - self.downloadingLabel.setAlignment(QtCore.Qt.AlignCenter) + self.downloadingLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.downloadingLabel.setVisible(False) installLayout.addWidget(self.installProgressWidget) @@ -1135,7 +1135,7 @@ class LinkScopeUninstallPage(QtWidgets.QWizardPage): self.uninstallLabel = QtWidgets.QLabel('The installer will now uninstall LinkScope from this computer. Click ' '"Commit" to begin the removal process.') self.uninstallLabel.setWordWrap(True) - self.uninstallLabel.setAlignment(QtCore.Qt.AlignCenter) + self.uninstallLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) uninstallLayout.addWidget(self.uninstallLabel) self.uninstallProgressWidget = QtWidgets.QWidget() @@ -1183,7 +1183,7 @@ class CreateDesktopShortcutPage(QtWidgets.QWizardPage): desktopShortcutLayout = QtWidgets.QVBoxLayout() self.setLayout(desktopShortcutLayout) desktopShortcutLabel = QtWidgets.QLabel('Create a Shortcut for LinkScope on the Desktop?') - desktopShortcutLabel.setAlignment(QtCore.Qt.AlignCenter) + desktopShortcutLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.shortcutCheckbox = QtWidgets.QCheckBox('Create a Desktop Shortcut?') self.shortcutCheckbox.setChecked(True) @@ -1202,7 +1202,7 @@ class LicensePage(QtWidgets.QWizardPage): self.setLayout(licenseLayout) licenseLabel = QtWidgets.QLabel('Please review carefully the license terms for the LinkScope Client software.') - licenseLabel.setAlignment(QtCore.Qt.AlignCenter) + licenseLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) licenseLabel.setWordWrap(True) licenseText = QtWidgets.QPlainTextEdit(AGPL_LICENSE) @@ -1235,7 +1235,7 @@ class DonePage(QtWidgets.QWizardPage): self.setLayout(doneLayout) self.doneLabel = QtWidgets.QLabel('Thank you for using LinkScope!\nClick "Finish" to exit the installer.') self.doneLabel.setWordWrap(True) - self.doneLabel.setAlignment(QtCore.Qt.AlignCenter) + self.doneLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) doneLayout.addWidget(self.doneLabel) diff --git a/LinkScope.py b/LinkScope.py index 67aac80..ea65559 100644 --- a/LinkScope.py +++ b/LinkScope.py @@ -149,10 +149,10 @@ class MainWindow(QtWidgets.QMainWindow): # Native file dialogs (at least on Ubuntu) return sandboxed paths in some occasions, which messes with the # saving of the project, since we need to create a directory to save the project in. saveAsDialog = QtWidgets.QFileDialog() - saveAsDialog.setOption(QtWidgets.QFileDialog.DontUseNativeDialog, True) - saveAsDialog.setViewMode(QtWidgets.QFileDialog.List) - saveAsDialog.setFileMode(QtWidgets.QFileDialog.AnyFile) - saveAsDialog.setAcceptMode(QtWidgets.QFileDialog.AcceptSave) + saveAsDialog.setOption(QtWidgets.QFileDialog.Option.DontUseNativeDialog, True) + saveAsDialog.setViewMode(QtWidgets.QFileDialog.ViewMode.List) + saveAsDialog.setFileMode(QtWidgets.QFileDialog.FileMode.AnyFile) + saveAsDialog.setAcceptMode(QtWidgets.QFileDialog.AcceptMode.AcceptSave) saveAsDialog.setStyleSheet(Stylesheets.MAIN_WINDOW_STYLESHEET) saveAsDialog.setDirectory(str(Path.home())) @@ -216,10 +216,10 @@ class MainWindow(QtWidgets.QMainWindow): def exportCanvasToGraphML(self): currentCanvasGraph = self.centralWidget().tabbedPane.getCurrentScene().sceneGraph saveAsDialog = QtWidgets.QFileDialog() - saveAsDialog.setOption(QtWidgets.QFileDialog.DontUseNativeDialog, True) - saveAsDialog.setViewMode(QtWidgets.QFileDialog.List) + saveAsDialog.setOption(QtWidgets.QFileDialog.Option.DontUseNativeDialog, True) + saveAsDialog.setViewMode(QtWidgets.QFileDialog.ViewMode.List) saveAsDialog.setNameFilter("GraphML (*.xml)") - saveAsDialog.setAcceptMode(QtWidgets.QFileDialog.AcceptSave) + saveAsDialog.setAcceptMode(QtWidgets.QFileDialog.AcceptMode.AcceptSave) saveAsDialog.setStyleSheet(Stylesheets.MAIN_WINDOW_STYLESHEET) saveAsDialog.setDirectory(str(Path.home())) @@ -236,8 +236,8 @@ class MainWindow(QtWidgets.QMainWindow): def importCanvasFromGraphML(self): openDialog = QtWidgets.QFileDialog() - openDialog.setOption(QtWidgets.QFileDialog.DontUseNativeDialog, True) - openDialog.setViewMode(QtWidgets.QFileDialog.List) + openDialog.setOption(QtWidgets.QFileDialog.Option.DontUseNativeDialog, True) + openDialog.setViewMode(QtWidgets.QFileDialog.ViewMode.List) openDialog.setNameFilter("GraphML (*.xml)") openDialog.setStyleSheet(Stylesheets.MAIN_WINDOW_STYLESHEET) openDialog.setDirectory(str(Path.home())) @@ -291,10 +291,10 @@ class MainWindow(QtWidgets.QMainWindow): currentDatabase.edges[edge]['uid'] = str(currentDatabase.edges[edge]['uid']) saveAsDialog = QtWidgets.QFileDialog() - saveAsDialog.setOption(QtWidgets.QFileDialog.DontUseNativeDialog, True) - saveAsDialog.setViewMode(QtWidgets.QFileDialog.List) + saveAsDialog.setOption(QtWidgets.QFileDialog.Option.DontUseNativeDialog, True) + saveAsDialog.setViewMode(QtWidgets.QFileDialog.ViewMode.List) saveAsDialog.setNameFilter("GraphML (*.xml)") - saveAsDialog.setAcceptMode(QtWidgets.QFileDialog.AcceptSave) + saveAsDialog.setAcceptMode(QtWidgets.QFileDialog.AcceptMode.AcceptSave) saveAsDialog.setStyleSheet(Stylesheets.MAIN_WINDOW_STYLESHEET) saveAsDialog.setDirectory(str(Path.home())) @@ -311,8 +311,8 @@ class MainWindow(QtWidgets.QMainWindow): def importDatabaseFromGraphML(self): openDialog = QtWidgets.QFileDialog() - openDialog.setOption(QtWidgets.QFileDialog.DontUseNativeDialog, True) - openDialog.setViewMode(QtWidgets.QFileDialog.List) + openDialog.setOption(QtWidgets.QFileDialog.Option.DontUseNativeDialog, True) + openDialog.setViewMode(QtWidgets.QFileDialog.ViewMode.List) openDialog.setNameFilter("GraphML (*.xml)") openDialog.setStyleSheet(Stylesheets.MAIN_WINDOW_STYLESHEET) openDialog.setDirectory(str(Path.home())) @@ -350,7 +350,7 @@ class MainWindow(QtWidgets.QMainWindow): newName, confirm = QtWidgets.QInputDialog.getText(self, 'Rename Project', 'New Name:', - QtWidgets.QLineEdit.Normal, + QtWidgets.QLineEdit.EchoMode.Normal, text=self.SETTINGS.value("Project/Name")) if confirm: if newName == self.SETTINGS.value("Project/Name"): @@ -419,14 +419,14 @@ class MainWindow(QtWidgets.QMainWindow): if self.linkingNodes: self.centralWidget().tabbedPane.enableAllTabs() currentScene.linking = False - self.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor)) + self.setCursor(QtGui.QCursor(QtCore.Qt.CursorShape.ArrowCursor)) self.linkingNodes = False else: self.centralWidget().tabbedPane.disableAllTabsExceptCurrent() currentScene.linking = True currentScene.itemsToLink = [] currentScene.clearSelection() - self.setCursor(QtGui.QCursor(QtCore.Qt.CrossCursor)) + self.setCursor(QtGui.QCursor(QtCore.Qt.CursorShape.CrossCursor)) self.linkingNodes = True def deleteSpecificEntity(self, itemUID: str) -> None: @@ -458,10 +458,10 @@ class MainWindow(QtWidgets.QMainWindow): return if enable: self.centralWidget().tabbedPane.disableAllTabsExceptCurrent() - self.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor)) + self.setCursor(QtGui.QCursor(QtCore.Qt.CursorShape.PointingHandCursor)) else: self.centralWidget().tabbedPane.enableAllTabs() - self.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor)) + self.setCursor(QtGui.QCursor(QtCore.Qt.CursorShape.ArrowCursor)) def selectLeafNodes(self) -> None: """ @@ -1871,11 +1871,11 @@ class MainWindow(QtWidgets.QMainWindow): self.restoreGeometry(QtCore.QByteArray(self.SETTINGS.value("MainWindow/Geometry"))) self.restoreState(QtCore.QByteArray(self.SETTINGS.value("MainWindow/WindowState"))) - self.addDockWidget(QtCore.Qt.LeftDockWidgetArea, + self.addDockWidget(QtCore.Qt.DockWidgetArea.LeftDockWidgetArea, self.dockbarOne) - self.addDockWidget(QtCore.Qt.RightDockWidgetArea, + self.addDockWidget(QtCore.Qt.DockWidgetArea.RightDockWidgetArea, self.dockbarTwo) - self.addDockWidget(QtCore.Qt.BottomDockWidgetArea, + self.addDockWidget(QtCore.Qt.DockWidgetArea.BottomDockWidgetArea, self.dockbarThree) self.addToolBar(self.primaryToolbar) @@ -1938,13 +1938,13 @@ class MainWindow(QtWidgets.QMainWindow): QtWidgets.QMessageBox.warning(self, 'Cannot create project', 'Cannot save project to an existing directory. ' 'Please choose a unique name.', - QtWidgets.QMessageBox.Ok) + QtWidgets.QMessageBox.StandardButton.Ok) return except FileNotFoundError: QtWidgets.QMessageBox.warning(self, 'Cannot create project', 'Cannot save project into a non-existing parent directory. ' 'Please create the required parent directories and try again.', - QtWidgets.QMessageBox.Ok) + QtWidgets.QMessageBox.StandardButton.Ok) return elif nW.openProject is not None: @@ -1971,7 +1971,7 @@ class MainWindow(QtWidgets.QMainWindow): self.saveTimer = QtCore.QTimer(self) self.saveTimer.timeout.connect(self.autoSaveProject) self.saveTimer.setSingleShot(False) - self.saveTimer.setTimerType(QtCore.Qt.VeryCoarseTimer) + self.saveTimer.setTimerType(QtCore.Qt.TimerType.VeryCoarseTimer) self.syncedCanvases = [] self.syncedCanvasesLock = threading.Lock() @@ -2068,10 +2068,10 @@ class ReportWizard(QtWidgets.QWizard): self.primaryFieldsList.append(self.primaryField) self.addPage(EntityPage(self)) - self.setWizardStyle(QtWidgets.QWizard.ModernStyle) + self.setWizardStyle(QtWidgets.QWizard.WizardStyle.ModernStyle) self.setWindowTitle("Generate Report Wizard") - self.button(QtWidgets.QWizard.FinishButton).clicked.connect(self.onFinish) + self.button(QtWidgets.QWizard.WizardButton.FinishButton).clicked.connect(self.onFinish) def onFinish(self): reportData = [] @@ -2173,7 +2173,7 @@ class InitialConfigPage(QtWidgets.QWizardPage): "File Name to Save As", str(Path.home()), filter="PDF Files (*.pdf)", - options=QtWidgets.QFileDialog.DontUseNativeDialog) + options=QtWidgets.QFileDialog.Option.DontUseNativeDialog) selectedPath = selectedPath[0] if selectedPath != '': savePath = Path(selectedPath).absolute() @@ -2310,7 +2310,7 @@ class EntityPage(QtWidgets.QWizardPage): def editPath(self) -> None: selectedPath = QtWidgets.QFileDialog().getOpenFileName(parent=self, caption='Select New Icon', dir=str(Path.home()), - options=QtWidgets.QFileDialog.DontUseNativeDialog, + options=QtWidgets.QFileDialog.Option.DontUseNativeDialog, filter="Image Files (*.png *.jpg)")[0] if selectedPath != '': self.inputImageEdit.setText(str(Path(selectedPath).absolute())) @@ -2391,7 +2391,7 @@ class AppendixWidget(QtWidgets.QWidget): def editAppendixPath(self) -> None: selectedPath = QtWidgets.QFileDialog().getOpenFileName(parent=self, caption='Select New Icon', dir=str(Path.home()), - options=QtWidgets.QFileDialog.DontUseNativeDialog, + options=QtWidgets.QFileDialog.Option.DontUseNativeDialog, filter="Image Files (*.png *.jpg)")[0] if selectedPath != '': @@ -2412,9 +2412,9 @@ class CreateOrOpenCanvas(QtWidgets.QDialog): createCanvasTitleLabel = QtWidgets.QLabel("Create New Canvas") createCanvasTitleLabel.setStyleSheet(Stylesheets.DOCK_BAR_LABEL) - createCanvasTitleLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Bold)) + createCanvasTitleLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Weight.Bold)) - createCanvasTitleLabel.setAlignment(QtCore.Qt.AlignCenter) + createCanvasTitleLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) createCanvasNameLabel = QtWidgets.QLabel("New Canvas Name:") self.createCanvasTextbox = QtWidgets.QLineEdit("") createCanvasButton = QtWidgets.QPushButton("Create New Canvas") @@ -2432,13 +2432,13 @@ class CreateOrOpenCanvas(QtWidgets.QDialog): openExistingCanvasTitleLabel = QtWidgets.QLabel("Open Existing Canvas") openExistingCanvasTitleLabel.setStyleSheet(Stylesheets.DOCK_BAR_LABEL) - openExistingCanvasTitleLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Bold)) + openExistingCanvasTitleLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Weight.Bold)) - openExistingCanvasTitleLabel.setAlignment(QtCore.Qt.AlignCenter) + openExistingCanvasTitleLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) openExistingCanvasNameLabel = QtWidgets.QLabel("Canvas Name:") self.openExistingCanvasDropdown = QtWidgets.QComboBox() self.openExistingCanvasDropdown.setEditable(False) - self.openExistingCanvasDropdown.SizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents) + self.openExistingCanvasDropdown.SizeAdjustPolicy(QtWidgets.QComboBox.SizeAdjustPolicy.AdjustToContents) tabbedPane = self.parent().centralWidget().tabbedPane canvasTabs = tabbedPane.canvasTabs existingTabNames = [] @@ -2467,13 +2467,13 @@ class CreateOrOpenCanvas(QtWidgets.QDialog): openServerCanvasTitleLabel = QtWidgets.QLabel("Open Canvas From Server") openServerCanvasTitleLabel.setStyleSheet(Stylesheets.DOCK_BAR_LABEL) - openServerCanvasTitleLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Bold)) + openServerCanvasTitleLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Weight.Bold)) - openServerCanvasTitleLabel.setAlignment(QtCore.Qt.AlignCenter) + openServerCanvasTitleLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) openServerCanvasNameLabel = QtWidgets.QLabel("Canvas Name:") self.openServerCanvasDropdown = QtWidgets.QComboBox() self.openServerCanvasDropdown.setEditable(False) - self.openServerCanvasDropdown.SizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents) + self.openServerCanvasDropdown.SizeAdjustPolicy(QtWidgets.QComboBox.SizeAdjustPolicy.AdjustToContents) self.openServerCanvasDropdown.addItems(syncedCanvases) openServerCanvasButton = QtWidgets.QPushButton("Open Canvas from Server") openServerCanvasButton.clicked.connect(self.confirmOpenServerCanvas) @@ -2532,19 +2532,19 @@ class NewOrOpenWidget(QtWidgets.QDialog): self.createProject = False newProjectNameLabel = QtWidgets.QLabel("New Project") newProjectNameLabel.setStyleSheet(Stylesheets.MENUS_STYLESHEET) - newProjectNameLabel.setAlignment(QtCore.Qt.AlignCenter) + newProjectNameLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) pProjectPathLabel = QtWidgets.QLabel("Project Path:") pProjectPathLabel.setStyleSheet(Stylesheets.MENUS_STYLESHEET) pDirLabel = QtWidgets.QLabel("Directory") pDirLabel.setStyleSheet(Stylesheets.MENUS_STYLESHEET) - pDirLabel.setAlignment(QtCore.Qt.AlignCenter) + pDirLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) pNameLabel = QtWidgets.QLabel("Name") pNameLabel.setStyleSheet(Stylesheets.MENUS_STYLESHEET) - pNameLabel.setAlignment(QtCore.Qt.AlignCenter) + pNameLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) pSlashLabel = QtWidgets.QLabel("/") pSlashLabel.setStyleSheet(Stylesheets.MENUS_STYLESHEET) - pSlashLabel.setAlignment(QtCore.Qt.AlignCenter) + pSlashLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.pName = QtWidgets.QLineEdit("Untitled") self.pName.setStyleSheet(Stylesheets.PATH_INPUT_STYLESHEET) @@ -2576,7 +2576,7 @@ class NewOrOpenWidget(QtWidgets.QDialog): self.openProject = None openProjectFileLabel = QtWidgets.QLabel("Open Project File") openProjectFileLabel.setStyleSheet(Stylesheets.MENUS_STYLESHEET) - openProjectFileLabel.setAlignment(QtCore.Qt.AlignCenter) + openProjectFileLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) openProjectButton = QtWidgets.QPushButton("Open...") openProjectButton.setStyleSheet(Stylesheets.BUTTON_STYLESHEET) openProjectButton.clicked.connect(self.openFilename) @@ -2593,8 +2593,8 @@ class NewOrOpenWidget(QtWidgets.QDialog): if errorMessage != "": showError = QtWidgets.QMessageBox(self) showError.setText(errorMessage) - showError.setStandardButtons(QtWidgets.QMessageBox().Ok) - showError.setDefaultButton(QtWidgets.QMessageBox().Ok) + showError.setStandardButtons(QtWidgets.QMessageBox().StandardButton.Ok) + showError.setDefaultButton(QtWidgets.QMessageBox().StandardButton.Ok) showError.exec() else: @@ -2608,7 +2608,7 @@ class NewOrOpenWidget(QtWidgets.QDialog): filename = QtWidgets.QFileDialog.getExistingDirectory(self, "Select Project Directory", str(Path.home()), - options=QtWidgets.QFileDialog.DontUseNativeDialog) + options=QtWidgets.QFileDialog.Option.DontUseNativeDialog) if access(filename, R_OK | W_OK): self.pDir.setText(filename) @@ -2620,7 +2620,7 @@ class NewOrOpenWidget(QtWidgets.QDialog): "Open Project File", str(Path.home()), "LinkScope Projects(*.linkscope)", - options=QtWidgets.QFileDialog.DontUseNativeDialog) + options=QtWidgets.QFileDialog.Option.DontUseNativeDialog) if filename[0].endswith('.linkscope') and access(filename[0], R_OK | W_OK): self.openProject = filename[0] @@ -2699,14 +2699,14 @@ class ResolutionParametersSelector(QtWidgets.QDialog): entitySelectTabLabel.setWordWrap(True) entitySelectTabLabel.setMaximumWidth(600) - entitySelectTabLabel.setAlignment(QtCore.Qt.AlignCenter) + entitySelectTabLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) entitySelectTab.layout().addWidget(entitySelectTabLabel) self.entitySelector = QtWidgets.QListWidget() self.entitySelector.setSortingEnabled(True) self.entitySelector.addItems(includeEntitySelector) - self.entitySelector.setSelectionMode(self.entitySelector.MultiSelection) + self.entitySelector.setSelectionMode(self.entitySelector.SelectionMode.MultiSelection) entitySelectTab.layout().addWidget(self.entitySelector) self.childWidget.addTab(entitySelectTab, 'Entities') @@ -2720,7 +2720,7 @@ class ResolutionParametersSelector(QtWidgets.QDialog): propertyLabel.setWordWrap(True) propertyLabel.setMaximumWidth(600) - propertyLabel.setAlignment(QtCore.Qt.AlignCenter) + propertyLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) propertyKeyLayout.addWidget(propertyLabel) propertyType = properties[key].get('type') @@ -2827,8 +2827,8 @@ class GraphicsEditDialog(QtWidgets.QDialog): editDialogLayout = QtWidgets.QGridLayout() self.setLayout(editDialogLayout) scrollArea = QtWidgets.QScrollArea() - scrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) - scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) + scrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded) + scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded) scrollArea.setWidgetResizable(True) scrollContainer = QtWidgets.QWidget() scrollLayout = QtWidgets.QVBoxLayout() @@ -2841,10 +2841,10 @@ class GraphicsEditDialog(QtWidgets.QDialog): resolutionCategoryWidget.setLayout(self.resolutionCategoryLayout) resolutionCategoryLabel = QtWidgets.QLabel('Graphics Settings') - resolutionCategoryLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Bold)) - resolutionCategoryLabel.setFrameStyle(QtWidgets.QFrame.Raised | QtWidgets.QFrame.Panel) + resolutionCategoryLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Weight.Bold)) + resolutionCategoryLabel.setFrameStyle(QtWidgets.QFrame.Shadow.Raised | QtWidgets.QFrame.Shape.Panel) - resolutionCategoryLabel.setAlignment(QtCore.Qt.AlignCenter) + resolutionCategoryLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) scrollLayout.addWidget(resolutionCategoryLabel) scrollLayout.addWidget(resolutionCategoryWidget) @@ -2884,7 +2884,7 @@ class GraphicsEditDialog(QtWidgets.QDialog): self.colorPicker = QtWidgets.QColorDialog() self.colorPicker.setStyleSheet(Stylesheets.MAIN_WINDOW_STYLESHEET) - self.colorPicker.setOption(QtWidgets.QColorDialog.DontUseNativeDialog, True) + self.colorPicker.setOption(QtWidgets.QColorDialog.ColorDialogOption.DontUseNativeDialog, True) etcSettingWidget = QtWidgets.QWidget() etcSettingLayout = QtWidgets.QHBoxLayout() @@ -2961,8 +2961,8 @@ class ProgramEditDialog(QtWidgets.QDialog): resolutionsEditDialog = QtWidgets.QGridLayout() self.setLayout(resolutionsEditDialog) scrollArea = QtWidgets.QScrollArea() - scrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) - scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) + scrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded) + scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded) scrollArea.setWidgetResizable(True) scrollContainer = QtWidgets.QWidget() scrollLayout = QtWidgets.QVBoxLayout() @@ -2975,10 +2975,10 @@ class ProgramEditDialog(QtWidgets.QDialog): resolutionCategoryWidget.setLayout(self.resolutionCategoryLayout) resolutionCategoryLabel = QtWidgets.QLabel('Program Settings') - resolutionCategoryLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Bold)) - resolutionCategoryLabel.setFrameStyle(QtWidgets.QFrame.Raised | QtWidgets.QFrame.Panel) + resolutionCategoryLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Weight.Bold)) + resolutionCategoryLabel.setFrameStyle(QtWidgets.QFrame.Shadow.Raised | QtWidgets.QFrame.Shape.Panel) - resolutionCategoryLabel.setAlignment(QtCore.Qt.AlignCenter) + resolutionCategoryLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) scrollLayout.addWidget(resolutionCategoryLabel) scrollLayout.addWidget(resolutionCategoryWidget) @@ -3042,8 +3042,8 @@ class ResolutionsEditDialog(QtWidgets.QDialog): resolutionsEditDialog = QtWidgets.QGridLayout() self.setLayout(resolutionsEditDialog) scrollArea = QtWidgets.QScrollArea() - scrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) - scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) + scrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded) + scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded) scrollArea.setWidgetResizable(True) scrollContainer = QtWidgets.QWidget() scrollLayout = QtWidgets.QVBoxLayout() @@ -3056,10 +3056,10 @@ class ResolutionsEditDialog(QtWidgets.QDialog): resolutionCategoryWidget.setLayout(self.resolutionCategoryLayout) resolutionCategoryLabel = QtWidgets.QLabel('Resolutions Settings') - resolutionCategoryLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Bold)) - resolutionCategoryLabel.setFrameStyle(QtWidgets.QFrame.Raised | QtWidgets.QFrame.Panel) + resolutionCategoryLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Weight.Bold)) + resolutionCategoryLabel.setFrameStyle(QtWidgets.QFrame.Shadow.Raised | QtWidgets.QFrame.Shape.Panel) - resolutionCategoryLabel.setAlignment(QtCore.Qt.AlignCenter) + resolutionCategoryLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) scrollLayout.addWidget(resolutionCategoryLabel) scrollLayout.addWidget(resolutionCategoryWidget) @@ -3109,8 +3109,8 @@ class LoggingSettingsDialog(QtWidgets.QDialog): loggingSettingsLayout = QtWidgets.QGridLayout() self.setLayout(loggingSettingsLayout) scrollArea = QtWidgets.QScrollArea() - scrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) - scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) + scrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded) + scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded) scrollArea.setWidgetResizable(True) scrollContainer = QtWidgets.QWidget() scrollLayout = QtWidgets.QVBoxLayout() @@ -3125,10 +3125,10 @@ class LoggingSettingsDialog(QtWidgets.QDialog): loggingCategoryWidget.setLayout(self.loggingCategoryLayout) loggingCategoryLabel = QtWidgets.QLabel('Logging Settings') - loggingCategoryLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Bold)) - loggingCategoryLabel.setFrameStyle(QtWidgets.QFrame.Raised | QtWidgets.QFrame.Panel) + loggingCategoryLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Weight.Bold)) + loggingCategoryLabel.setFrameStyle(QtWidgets.QFrame.Shadow.Raised | QtWidgets.QFrame.Shape.Panel) - loggingCategoryLabel.setAlignment(QtCore.Qt.AlignCenter) + loggingCategoryLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) scrollLayout.addWidget(loggingCategoryLabel) scrollLayout.addWidget(loggingCategoryWidget) @@ -3178,8 +3178,8 @@ class ProjectEditDialog(QtWidgets.QDialog): editDialogLayout = QtWidgets.QGridLayout() self.setLayout(editDialogLayout) scrollArea = QtWidgets.QScrollArea() - scrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) - scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) + scrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded) + scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAsNeeded) scrollArea.setWidgetResizable(True) scrollContainer = QtWidgets.QWidget() scrollLayout = QtWidgets.QVBoxLayout() @@ -3192,10 +3192,10 @@ class ProjectEditDialog(QtWidgets.QDialog): resolutionCategoryWidget.setLayout(self.resolutionCategoryLayout) resolutionCategoryLabel = QtWidgets.QLabel('Project Settings') - resolutionCategoryLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Bold)) - resolutionCategoryLabel.setFrameStyle(QtWidgets.QFrame.Raised | QtWidgets.QFrame.Panel) + resolutionCategoryLabel.setFont(QtGui.QFont("Times", 13, QtGui.QFont.Weight.Bold)) + resolutionCategoryLabel.setFrameStyle(QtWidgets.QFrame.Shadow.Raised | QtWidgets.QFrame.Shape.Panel) - resolutionCategoryLabel.setAlignment(QtCore.Qt.AlignCenter) + resolutionCategoryLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) scrollLayout.addWidget(resolutionCategoryLabel) scrollLayout.addWidget(resolutionCategoryWidget) @@ -3274,7 +3274,7 @@ class SettingsEditSingleChoice(QtWidgets.QWidget): self.settingsKey = settingsKey self.keyDeleted = False self.setLayout(QtWidgets.QVBoxLayout()) - self.layout().setAlignment(QtCore.Qt.AlignCenter) + self.layout().setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.options = [] @@ -3298,7 +3298,7 @@ class SettingsCategoryLayout(QtWidgets.QVBoxLayout): rowWidget.setLayout(rowWidgetLayout) keyLabel = QtWidgets.QLabel(labelText) - keyLabel.setAlignment(QtCore.Qt.AlignCenter) + keyLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) rowWidgetLayout.addWidget(keyLabel) rowWidgetLayout.addWidget(valueWidget) if self.supportsDeletion: @@ -3333,7 +3333,7 @@ class FindEntityOnCanvasDialog(QtWidgets.QDialog): findLabel = QtWidgets.QLabel('Find:') - findLabel.setAlignment(QtCore.Qt.AlignCenter) + findLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.findInput = QtWidgets.QLineEdit('') self.findInput.setPlaceholderText('Type the primary field value to search for') @@ -3351,8 +3351,8 @@ class FindEntityOnCanvasDialog(QtWidgets.QDialog): # autoCompleter.setFilterMode(QtGui.Qt.MatchRegularExpression) pass else: - autoCompleter.setCaseSensitivity(QtCore.Qt.CaseInsensitive) - autoCompleter.setFilterMode(QtCore.Qt.MatchContains) + autoCompleter.setCaseSensitivity(QtCore.Qt.CaseSensitivity.CaseInsensitive) + autoCompleter.setFilterMode(QtCore.Qt.MatchFlag.MatchContains) self.findInput.setCompleter(autoCompleter) findLayout = QtWidgets.QGridLayout() @@ -3384,7 +3384,7 @@ class FindEntityOfTypeOnCanvasDialog(QtWidgets.QDialog): self.typeInput.currentIndexChanged.connect(self.changeSelectedType) findLabel = QtWidgets.QLabel('Find Entity:') - findLabel.setAlignment(QtCore.Qt.AlignCenter) + findLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.findInput = QtWidgets.QLineEdit('') self.findInput.setPlaceholderText('Type the primary field value to search for') @@ -3405,8 +3405,8 @@ class FindEntityOfTypeOnCanvasDialog(QtWidgets.QDialog): # autoCompleter.setFilterMode(QtGui.Qt.MatchRegularExpression) pass else: - autoCompleter.setCaseSensitivity(QtCore.Qt.CaseInsensitive) - autoCompleter.setFilterMode(QtCore.Qt.MatchContains) + autoCompleter.setCaseSensitivity(QtCore.Qt.CaseSensitivity.CaseInsensitive) + autoCompleter.setFilterMode(QtCore.Qt.MatchFlag.MatchContains) findLayout = QtWidgets.QGridLayout() self.setLayout(findLayout) @@ -3606,7 +3606,7 @@ class MergeEntitiesDialog(QtWidgets.QDialog): entityPixmap.loadFromData(entityJSON.get('Icon')) pixmapLabel.setPixmap(entityPixmap) - pixmapLabel.setAlignment(QtCore.Qt.AlignCenter) + pixmapLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) entityTypeWidget = QtWidgets.QWidget() entityTypeWidgetLayout = QtWidgets.QHBoxLayout() entityTypeWidget.setLayout(entityTypeWidgetLayout) @@ -3617,11 +3617,11 @@ class MergeEntitiesDialog(QtWidgets.QDialog): incomingLinks = QtWidgets.QLabel(str(len(self.parent.LENTDB.getIncomingLinks(entityJSON['uid'])))) - incomingLinks.setAlignment(QtCore.Qt.AlignCenter) + incomingLinks.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.entitiesTable.setCellWidget(newRowIndex, 2, incomingLinks) outgoingLinks = QtWidgets.QLabel(str(len(self.parent.LENTDB.getOutgoingLinks(entityJSON['uid'])))) - outgoingLinks.setAlignment(QtCore.Qt.AlignCenter) + outgoingLinks.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.entitiesTable.setCellWidget(newRowIndex, 3, outgoingLinks) upDownButtons = MergeTableShiftRowUpDownButtons(self.entitiesTable, entityJSON['uid']) @@ -3876,7 +3876,7 @@ class QueryBuilderWizard(QtWidgets.QDialog): selectStatementValuePickerWidget.setLayout(self.selectStatementValuePickerLayout) self.selectStatementList = QtWidgets.QListWidget() self.selectStatementList.setSortingEnabled(True) - self.selectStatementList.setSelectionMode(QtWidgets.QListWidget.ExtendedSelection) + self.selectStatementList.setSelectionMode(QtWidgets.QListWidget.SelectionMode.ExtendedSelection) self.selectStatementList.setMinimumHeight(125) self.selectStatementList.setToolTip('Highlight all the fields you wish to select.') self.selectStatementTextbox = QtWidgets.QLineEdit('') @@ -3906,7 +3906,7 @@ class QueryBuilderWizard(QtWidgets.QDialog): self.sourceValues = [] self.sourceValuesArea = QtWidgets.QScrollArea() self.sourceValuesArea.setWidgetResizable(True) - self.sourceValuesArea.setSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + self.sourceValuesArea.setSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Minimum) sourceValuesAreaWidget = QtWidgets.QWidget() self.sourceValuesAreaWidgetLayout = QtWidgets.QVBoxLayout() @@ -3947,7 +3947,8 @@ class QueryBuilderWizard(QtWidgets.QDialog): self.conditionValuesAreaWidgetLayout = QtWidgets.QVBoxLayout() conditionValuesAreaWidget.setLayout(self.conditionValuesAreaWidgetLayout) self.conditionValuesArea.setWidget(conditionValuesAreaWidget) - self.conditionValuesArea.setSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + self.conditionValuesArea.setSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, + QtWidgets.QSizePolicy.Policy.Minimum) conditionsButtonsWidget = QtWidgets.QWidget() conditionsButtonsWidgetLayout = QtWidgets.QHBoxLayout() @@ -3975,7 +3976,8 @@ class QueryBuilderWizard(QtWidgets.QDialog): self.modificationValues = [] self.modificationValuesArea = QtWidgets.QScrollArea() self.modificationValuesArea.setWidgetResizable(True) - self.modificationValuesArea.setSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + self.modificationValuesArea.setSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, + QtWidgets.QSizePolicy.Policy.Minimum) modificationValuesAreaWidget = QtWidgets.QWidget() self.modificationValuesAreaWidgetLayout = QtWidgets.QVBoxLayout() @@ -4003,12 +4005,12 @@ class QueryBuilderWizard(QtWidgets.QDialog): self.entityDropdownTriplets = [] self.historyTable = QtWidgets.QTableWidget(0, 7, self) - self.historyTable.setSelectionBehavior(self.historyTable.SelectRows) - self.historyTable.setSelectionMode(self.historyTable.SingleSelection) + self.historyTable.setSelectionBehavior(self.historyTable.SelectionBehavior.SelectRows) + self.historyTable.setSelectionMode(self.historyTable.SelectionMode.SingleSelection) self.historyTable.setAcceptDrops(False) - self.historyTable.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) + self.historyTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) self.historyTable.verticalHeader().setCascadingSectionResizes(True) - self.historyTable.horizontalHeader().setSectionResizeMode(0, QtWidgets.QHeaderView.Stretch) + self.historyTable.horizontalHeader().setSectionResizeMode(0, QtWidgets.QHeaderView.ResizeMode.Stretch) self.historyTable.setHorizontalHeaderLabels(['Query UID', 'Select Clause', 'Select Value(s)', 'Source Clause', 'Source Value(s)', 'Condition Clause(s)', 'Modification Values']) self.queryNewOrHistory.addTab(self.historyTable, 'History') @@ -4031,7 +4033,7 @@ class QueryBuilderWizard(QtWidgets.QDialog): clauseWidget = QtWidgets.QFrame() clauseWidgetLayout = QtWidgets.QVBoxLayout() clauseWidget.setLayout(clauseWidgetLayout) - clauseWidget.setFrameStyle(clauseWidget.Panel | clauseWidget.Raised) + clauseWidget.setFrameStyle(QtWidgets.QFrame.Shape.Panel | QtWidgets.QFrame.Shadow.Raised) clauseWidget.setLineWidth(3) andOrClause = QtWidgets.QComboBox() @@ -4042,7 +4044,7 @@ class QueryBuilderWizard(QtWidgets.QDialog): negation.addItems(['MATCHES', 'DOES NOT MATCH']) inputDropdown = QtWidgets.QListWidget() inputDropdown.setSortingEnabled(True) - inputDropdown.setSelectionMode(QtWidgets.QListWidget.SingleSelection) + inputDropdown.setSelectionMode(QtWidgets.QListWidget.SelectionMode.SingleSelection) inputDropdown.setMinimumHeight(125) inputDropdown.addItems(self.mainWindowObject.LQLWIZARD.allCanvases) inputText = QtWidgets.QLineEdit('') @@ -4098,7 +4100,7 @@ class QueryBuilderWizard(QtWidgets.QDialog): clauseWidget = QtWidgets.QFrame() clauseWidgetLayout = QtWidgets.QVBoxLayout() clauseWidget.setLayout(clauseWidgetLayout) - clauseWidget.setFrameStyle(clauseWidget.Panel | clauseWidget.Raised) + clauseWidget.setFrameStyle(QtWidgets.QFrame.Shape.Panel | QtWidgets.QFrame.Shadow.Raised) clauseWidget.setLineWidth(3) andOrClause = QtWidgets.QLabel('AND') @@ -4113,7 +4115,7 @@ class QueryBuilderWizard(QtWidgets.QDialog): inputDropdown = QtWidgets.QListWidget() inputDropdown.setSortingEnabled(True) - inputDropdown.setSelectionMode(QtWidgets.QListWidget.SingleSelection) + inputDropdown.setSelectionMode(QtWidgets.QListWidget.SelectionMode.SingleSelection) inputDropdown.addItems(self.mainWindowObject.LQLWIZARD.allEntityFields) inputDropdown.setMinimumHeight(125) inputText = QtWidgets.QLineEdit('') @@ -4313,10 +4315,10 @@ class QueryResultsViewer(QtWidgets.QDialog): self.resultsTable = QtWidgets.QTableWidget(0, len(self.headerFields), self) self.resultsTable.setHorizontalHeaderLabels(self.headerFields) self.resultsTable.setAcceptDrops(False) - self.resultsTable.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) + self.resultsTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) self.resultsTable.verticalHeader().setCascadingSectionResizes(True) for index in range(1, len(self.headerFields)): - self.resultsTable.horizontalHeader().setSectionResizeMode(index, QtWidgets.QHeaderView.Stretch) + self.resultsTable.horizontalHeader().setSectionResizeMode(index, QtWidgets.QHeaderView.ResizeMode.Stretch) for count, uid in enumerate(selectedUIDs): self.resultsTable.insertRow(count) @@ -4343,15 +4345,15 @@ class QueryResultsViewer(QtWidgets.QDialog): fieldChart = QtCharts.QChart() chartTitle = headerField + " Chart" fieldChart.setTitle(chartTitle) - fieldChart.setTheme(QtCharts.QChart.ChartThemeBlueCerulean) + fieldChart.setTheme(QtCharts.QChart.ChartTheme.ChartThemeBlueCerulean) fieldChart.setMargins(QtCore.QMargins(0, 0, 0, 0)) chartView = QtCharts.QChartView(fieldChart) - chartView.setRubberBand(QtCharts.QChartView.NoRubberBand) - chartView.setRenderHint(QtGui.QPainter.Antialiasing) - fieldChart.setAnimationOptions(QtCharts.QChart.AllAnimations) + chartView.setRubberBand(QtCharts.QChartView.RubberBand.NoRubberBand) + chartView.setRenderHint(QtGui.QPainter.RenderHint.Antialiasing) + fieldChart.setAnimationOptions(QtCharts.QChart.AnimationOption.AllAnimations) fieldChart.setAnimationDuration(250) fieldChart.legend().setVisible(True) - fieldChart.legend().setAlignment(QtCore.Qt.AlignBottom) + fieldChart.legend().setAlignment(QtCore.Qt.AlignmentFlag.AlignBottom) self.charts[headerField] = (fieldChart, chartView) self.resultsTabbedPane.addTab(chartView, chartTitle) @@ -4367,13 +4369,13 @@ class QueryResultsViewer(QtWidgets.QDialog): xAxis = QtCharts.QBarCategoryAxis() xAxis.append([headerField]) - fieldChart.addAxis(xAxis, QtCore.Qt.AlignBottom) + fieldChart.addAxis(xAxis, QtCore.Qt.AlignmentFlag.AlignBottom) barSeries.attachAxis(xAxis) yAxis = QtCharts.QValueAxis() yAxis.setRange(0, max(values.values()) + 1) yAxis.applyNiceNumbers() - fieldChart.addAxis(yAxis, QtCore.Qt.AlignLeft) + fieldChart.addAxis(yAxis, QtCore.Qt.AlignmentFlag.AlignLeft) barSeries.attachAxis(yAxis) if numifiedFields: @@ -4433,10 +4435,10 @@ class QueryResultsViewer(QtWidgets.QDialog): def exportData(self): exportDialog = QtWidgets.QFileDialog() - exportDialog.setOption(QtWidgets.QFileDialog.DontUseNativeDialog, True) - exportDialog.setViewMode(QtWidgets.QFileDialog.List) - exportDialog.setFileMode(QtWidgets.QFileDialog.AnyFile) - exportDialog.setAcceptMode(QtWidgets.QFileDialog.AcceptSave) + exportDialog.setOption(QtWidgets.QFileDialog.Option.DontUseNativeDialog, True) + exportDialog.setViewMode(QtWidgets.QFileDialog.ViewMode.List) + exportDialog.setFileMode(QtWidgets.QFileDialog.FileMode.AnyFile) + exportDialog.setAcceptMode(QtWidgets.QFileDialog.AcceptMode.AcceptSave) exportDialog.setStyleSheet(Stylesheets.MAIN_WINDOW_STYLESHEET) exportDialog.setDirectory(str(Path.home())) @@ -4476,7 +4478,7 @@ class ConditionClauseWidget(QtWidgets.QFrame): super(ConditionClauseWidget, self).__init__() clauseWidgetLayout = QtWidgets.QVBoxLayout() self.setLayout(clauseWidgetLayout) - self.setFrameStyle(self.Panel | self.Raised) + self.setFrameStyle(QtWidgets.QFrame.Shape.Panel | QtWidgets.QFrame.Shadow.Raised) self.setLineWidth(3) self.andOrClause = QtWidgets.QComboBox() @@ -4523,7 +4525,7 @@ class ConditionClauseWidget(QtWidgets.QFrame): graphEntitiesDropdown = QtWidgets.QTreeWidget() graphEntitiesDropdown.setHeaderLabels(['Primary Field', 'UID', 'Icon']) - graphEntitiesDropdown.setSelectionMode(QtWidgets.QAbstractItemView.SingleSelection) + graphEntitiesDropdown.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.SingleSelection) for entityDropdownTriplet in parentWizard.entityDropdownTriplets: newItem = QtWidgets.QTreeWidgetItem() newItem.setText(0, entityDropdownTriplet[0]) @@ -4630,14 +4632,14 @@ class MacroDialog(QtWidgets.QDialog): "Click on a Macro to view the Resolutions included in it.") macroLabel.setWordWrap(True) self.macroTree = MacroTree(self, mainWindowObject) - self.macroTree.setSelectionMode(self.macroTree.ExtendedSelection) - self.macroTree.setSelectionBehavior(self.macroTree.SelectRows) + self.macroTree.setSelectionMode(self.macroTree.SelectionMode.ExtendedSelection) + self.macroTree.setSelectionBehavior(self.macroTree.SelectionBehavior.SelectRows) self.macroTree.setHeaderLabels(['Macro UID', 'Delete']) - self.macroTree.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows) + self.macroTree.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) self.macroTree.setSortingEnabled(False) # Stretch the first column, since it contains the primary field. self.macroTree.header().setStretchLastSection(False) - self.macroTree.header().setSectionResizeMode(0, QtWidgets.QHeaderView.Stretch) + self.macroTree.header().setSectionResizeMode(0, QtWidgets.QHeaderView.ResizeMode.Stretch) buttonsWidget = QtWidgets.QWidget() buttonsWidgetLayout = QtWidgets.QHBoxLayout() @@ -4751,7 +4753,7 @@ class MacroCreatorDialog(QtWidgets.QDialog): viewItem = QtWidgets.QListWidgetItem(resolution) self.viewList.addItem(viewItem) self.viewList.sortItems() - self.viewList.setSelectionMode(self.viewList.ExtendedSelection) + self.viewList.setSelectionMode(self.viewList.SelectionMode.ExtendedSelection) buttonsAddRemoveWidget = QtWidgets.QWidget() buttonsAddRemoveWidgetLayout = QtWidgets.QVBoxLayout() @@ -4773,9 +4775,9 @@ class MacroCreatorDialog(QtWidgets.QDialog): buttonsRearrangeWidgetLayout.addWidget(buttonMoveUp) buttonsRearrangeWidgetLayout.addWidget(buttonMoveDown) allResolutionsLabel = QtWidgets.QLabel('All Resolutions') - allResolutionsLabel.setAlignment(QtCore.Qt.AlignCenter) + allResolutionsLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) selectedResolutionsLabel = QtWidgets.QLabel('Selected Resolutions') - selectedResolutionsLabel.setAlignment(QtCore.Qt.AlignCenter) + selectedResolutionsLabel.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) confirmButton = QtWidgets.QPushButton('Confirm') confirmButton.clicked.connect(self.accept) cancelButton = QtWidgets.QPushButton('Cancel') diff --git a/Modules/BreachData/HaveIBeenPwnedBreachDomains.py b/Modules/BreachData/HaveIBeenPwnedBreachDomains.py index 23f9ad4..6eb16a3 100644 --- a/Modules/BreachData/HaveIBeenPwnedBreachDomains.py +++ b/Modules/BreachData/HaveIBeenPwnedBreachDomains.py @@ -48,7 +48,7 @@ class HaveIBeenPwnedBreachDomains: breachIconByteArrayFin = QByteArray() breachImageBuffer = QBuffer(breachIconByteArrayFin) - breachImageBuffer.open(QIODevice.WriteOnly) + breachImageBuffer.open(QIODevice.OpenModeFlag.WriteOnly) breachIconImageRotated.save(breachImageBuffer, "PNG") breachImageBuffer.close() except Exception: diff --git a/Modules/BreachData/HaveIBeenPwnedBreaches.py b/Modules/BreachData/HaveIBeenPwnedBreaches.py index 3c62a26..0c4a331 100644 --- a/Modules/BreachData/HaveIBeenPwnedBreaches.py +++ b/Modules/BreachData/HaveIBeenPwnedBreaches.py @@ -51,7 +51,7 @@ class HaveIBeenPwnedBreaches: breachIconByteArrayFin = QByteArray() breachImageBuffer = QBuffer(breachIconByteArrayFin) - breachImageBuffer.open(QIODevice.WriteOnly) + breachImageBuffer.open(QIODevice.OpenModeFlag.WriteOnly) breachIconImageRotated.save(breachImageBuffer, "PNG") breachImageBuffer.close() except Exception: diff --git a/Modules/Interpol/InterpolRedNotices.py b/Modules/Interpol/InterpolRedNotices.py index 708bb68..a231883 100644 --- a/Modules/Interpol/InterpolRedNotices.py +++ b/Modules/Interpol/InterpolRedNotices.py @@ -49,7 +49,7 @@ class InterpolRedNotices: thumbnailIconImageScaled = thumbnailIconImageOriginal.scaled(QSize(40, 40)) thumbnailByteArrayFin = QByteArray() thumbnailImageBuffer = QBuffer(thumbnailByteArrayFin) - thumbnailImageBuffer.open(QIODevice.WriteOnly) + thumbnailImageBuffer.open(QIODevice.OpenModeFlag.WriteOnly) thumbnailIconImageScaled.save(thumbnailImageBuffer, "PNG") thumbnailImageBuffer.close() except Exception: diff --git a/Modules/Interpol/InterpolYellowNotices.py b/Modules/Interpol/InterpolYellowNotices.py index 5a6ba75..c9f48e9 100644 --- a/Modules/Interpol/InterpolYellowNotices.py +++ b/Modules/Interpol/InterpolYellowNotices.py @@ -44,7 +44,7 @@ class InterpolYellowNotices: thumbnailIconImageScaled = thumbnailIconImageOriginal.scaled(QSize(40, 40)) thumbnailByteArrayFin = QByteArray() thumbnailImageBuffer = QBuffer(thumbnailByteArrayFin) - thumbnailImageBuffer.open(QIODevice.WriteOnly) + thumbnailImageBuffer.open(QIODevice.OpenModeFlag.WriteOnly) thumbnailIconImageScaled.save(thumbnailImageBuffer, "PNG") thumbnailImageBuffer.close() except Exception: diff --git a/Modules/SocialMedia/SteamGroupChecker.py b/Modules/SocialMedia/SteamGroupChecker.py index 9f7baae..9283d10 100644 --- a/Modules/SocialMedia/SteamGroupChecker.py +++ b/Modules/SocialMedia/SteamGroupChecker.py @@ -106,7 +106,7 @@ class SteamGroupChecker: thumbnailIconImageScaled = thumbnailIconImageOriginal.scaled(QSize(40, 40)) thumbnailByteArrayFin = QByteArray() thumbnailImageBuffer = QBuffer(thumbnailByteArrayFin) - thumbnailImageBuffer.open(QIODevice.WriteOnly) + thumbnailImageBuffer.open(QIODevice.OpenModeFlag.WriteOnly) thumbnailIconImageScaled.save(thumbnailImageBuffer, "PNG") thumbnailImageBuffer.close() except Exception: diff --git a/Modules/SocialMedia/SteamGroupMembersChecker.py b/Modules/SocialMedia/SteamGroupMembersChecker.py index ab46939..f952ea1 100644 --- a/Modules/SocialMedia/SteamGroupMembersChecker.py +++ b/Modules/SocialMedia/SteamGroupMembersChecker.py @@ -41,7 +41,7 @@ class SteamGroupMembersChecker: thumbnailIconImageScaled = thumbnailIconImageOriginal.scaled(QSize(40, 40)) thumbnailByteArrayFin = QByteArray() thumbnailImageBuffer = QBuffer(thumbnailByteArrayFin) - thumbnailImageBuffer.open(QIODevice.WriteOnly) + thumbnailImageBuffer.open(QIODevice.OpenModeFlag.WriteOnly) thumbnailIconImageScaled.save(thumbnailImageBuffer, "PNG") thumbnailImageBuffer.close() except Exception: diff --git a/Modules/SocialMedia/SteamUsernameChecker.py b/Modules/SocialMedia/SteamUsernameChecker.py index 8530753..e78c21d 100644 --- a/Modules/SocialMedia/SteamUsernameChecker.py +++ b/Modules/SocialMedia/SteamUsernameChecker.py @@ -107,7 +107,7 @@ class SteamUsernameChecker: thumbnailIconImageScaled = thumbnailIconImageOriginal.scaled(QSize(40, 40)) thumbnailByteArrayFin = QByteArray() thumbnailImageBuffer = QBuffer(thumbnailByteArrayFin) - thumbnailImageBuffer.open(QIODevice.WriteOnly) + thumbnailImageBuffer.open(QIODevice.OpenModeFlag.WriteOnly) thumbnailIconImageScaled.save(thumbnailImageBuffer, "PNG") thumbnailImageBuffer.close() except Exception: diff --git a/Modules/SocialMedia/TwitterUser.py b/Modules/SocialMedia/TwitterUser.py index c1f251b..a68a90c 100644 --- a/Modules/SocialMedia/TwitterUser.py +++ b/Modules/SocialMedia/TwitterUser.py @@ -157,7 +157,7 @@ class TwitterUser: childIconImageScaled = childIconImageOriginal.scaled(QSize(40, 40)) childIconByteArrayFin = QByteArray() childImageBuffer = QBuffer(childIconByteArrayFin) - childImageBuffer.open(QIODevice.WriteOnly) + childImageBuffer.open(QIODevice.OpenModeFlag.WriteOnly) childIconImageScaled.save(childImageBuffer, "PNG") childImageBuffer.close() except Exception: @@ -216,7 +216,7 @@ class TwitterUser: iconImageScaled = iconImageOriginal.scaled(QSize(40, 40)) iconByteArrayFin = QByteArray() imageBuffer = QBuffer(iconByteArrayFin) - imageBuffer.open(QIODevice.WriteOnly) + imageBuffer.open(QIODevice.OpenModeFlag.WriteOnly) iconImageScaled.save(imageBuffer, "PNG") imageBuffer.close() except Exception: diff --git a/Modules/Username_Crosscheck/PinterestUsersSearch.py b/Modules/Username_Crosscheck/PinterestUsersSearch.py index 86749e9..6ff7cc3 100644 --- a/Modules/Username_Crosscheck/PinterestUsersSearch.py +++ b/Modules/Username_Crosscheck/PinterestUsersSearch.py @@ -63,7 +63,7 @@ class PinterestUsersSearch: childIconImageScaled = childIconImageOriginal.scaled(QSize(40, 40)) childIconByteArrayFin = QByteArray() childImageBuffer = QBuffer(childIconByteArrayFin) - childImageBuffer.open(QIODevice.WriteOnly) + childImageBuffer.open(QIODevice.OpenModeFlag.WriteOnly) childIconImageScaled.save(childImageBuffer, "PNG") childImageBuffer.close() except Exception: