Mercurial Repositories > eric / file diff

--- a/eric6/Preferences/ProgramsDialog.py	Sat Mar 06 10:00:52 2021 +0100
+++ b/eric6/Preferences/ProgramsDialog.py	Sun Mar 28 15:00:11 2021 +0200
@@ -29,7 +29,7 @@
     """
     Class implementing the Programs page.
     """
-    ToolAvailableRole = Qt.UserRole + 1
+    ToolAvailableRole = Qt.ItemDataRole.UserRole + 1
     
     def __init__(self, parent=None):
         """
@@ -40,7 +40,7 @@
         super(ProgramsDialog, self).__init__(parent)
         self.setupUi(self)
         self.setObjectName("ProgramsDialog")
-        self.setWindowFlags(Qt.Window)
+        self.setWindowFlags(Qt.WindowType.Window)
         
         self.__hasSearched = False
         
@@ -48,7 +48,7 @@
             self.programsList.columnCount(), "")
         
         self.searchButton = self.buttonBox.addButton(
-            self.tr("Search"), QDialogButtonBox.ActionRole)
+            self.tr("Search"), QDialogButtonBox.ButtonRole.ActionRole)
         self.searchButton.setToolTip(
             self.tr("Press to search for programs"))
         
@@ -82,7 +82,7 @@
         """
         self.programsList.clear()
         header = self.programsList.header()
-        header.setSortIndicator(0, Qt.AscendingOrder)
+        header.setSortIndicator(0, Qt.SortOrder.AscendingOrder)
         header.setSortIndicatorShown(False)
         
         with E5OverrideCursor():
@@ -323,7 +323,7 @@
                         info["version"]
                     )
             
-            self.programsList.sortByColumn(0, Qt.AscendingOrder)
+            self.programsList.sortByColumn(0, Qt.SortOrder.AscendingOrder)
             self.on_showComboBox_currentIndexChanged(
                 self.showComboBox.currentIndex())
         
@@ -356,7 +356,7 @@
         @return version string of detected or given version (string)
         """
         itmList = self.programsList.findItems(
-            description, Qt.MatchCaseSensitive)
+            description, Qt.MatchFlag.MatchCaseSensitive)
         if itmList:
             itm = itmList[0]
         else:
@@ -377,7 +377,8 @@
                 available = True
                 if versionCommand and versionPosition is not None:
                     proc = QProcess()
-                    proc.setProcessChannelMode(QProcess.MergedChannels)
+                    proc.setProcessChannelMode(
+                        QProcess.ProcessChannelMode.MergedChannels)
                     if exeModule:
                         args = exeModule[:] + [versionCommand]
                     else:
@@ -452,7 +453,8 @@
                     citm.setData(0, self.ToolAvailableRole, False)
                     itm.setExpanded(True)
         QApplication.processEvents()
-        self.programsList.header().resizeSections(QHeaderView.ResizeToContents)
+        self.programsList.header().resizeSections(
+            QHeaderView.ResizeMode.ResizeToContents)
         self.programsList.header().setStretchLastSection(True)
         return version
         
@@ -478,7 +480,8 @@
         else:
             itm.setText(1, self.tr("(not found)"))
         QApplication.processEvents()
-        self.programsList.header().resizeSections(QHeaderView.ResizeToContents)
+        self.programsList.header().resizeSections(
+            QHeaderView.ResizeMode.ResizeToContents)
         self.programsList.header().setStretchLastSection(True)
     
     @pyqtSlot(int)