Add Qt6/QGIS 4 compatibility

cmd/qad_dimstyle_cmd.py

@@ -66,5 +66,5 @@ def run(self, msgMapTool = False, msg = None):
          self.showMsg(QadMsg.translate("QAD", "\nThe coordinate reference system of the project must be a projected coordinate system.\n"))
          return True # fine comando
       Form = QadDIMSTYLEDialog(self.plugIn)
-      Form.exec_()
+      Form.exec()
       return True

cmd/qad_dsettings_cmd.py

@@ -62,5 +62,5 @@ def __init__(self, plugIn):
 
    def run(self, msgMapTool = False, msg = None):
       Form = QadDSETTINGSDialog(self.plugIn)
-      Form.exec_()
+      Form.exec()
       return True

cmd/qad_generic_cmd.py

@@ -706,7 +706,7 @@ def setSnapTypeToDisableByPopupMenu(self):
 
    def showDSettingsByPopUpMenu(self):
       d = QadDSETTINGSDialog(self.plugIn)
-      d.exec_()
+      d.exec()
       self.plugIn.refreshCommandMapToolSnapType()
       self.plugIn.refreshCommandMapToolAutoSnap()
       self.plugIn.refreshCommandMapToolDynamicInput()

cmd/qad_options_cmd.py

@@ -60,5 +60,5 @@ def __init__(self, plugIn):
 
    def run(self, msgMapTool = False, msg = None):
       Form = QadOPTIONSDialog(self.plugIn)
-      Form.exec_()
+      Form.exec()
       return True

cmd/qad_pedit_cmd.py

@@ -348,7 +348,7 @@ def join(self):
       vectorLayer = createMemoryLayer("QAD_SelfJoinLines", "LineString", crs)
 
       provider = vectorLayer.dataProvider()
-      provider.addAttributes([QgsField('index', QMetaType.Int, 'Int')])
+      provider.addAttributes([QgsField('index', QMetaType.Type.Int, 'Int')])
       vectorLayer.updateFields()
 
       if vectorLayer.startEditing() == False:

metadata.txt

@@ -11,10 +11,11 @@
 name=QAD
 email=gam17@riseup.net
 author=gam17
-qgisMinimumVersion=3.40
+qgisMinimumVersion=3.40
+supportsQt6=True
 description=Quantum Aided Design: cad like commands in QGIS
 about=Quantum Aided Design: cad like commands in QGIS
-version=3.0.8
+version=3.0.9
 tracker=https://github.com/gam17/QAD/issues
 repository=https://github.com/gam17/QAD
 
@@ -35,6 +36,6 @@ experimental=False
 # deprecated flag (applies to the whole plugin, not just a single version
 deprecated=False
 
-qgisMaximumVersion=3.99
+qgisMaximumVersion=4.99
 
 

qad.py

@@ -181,7 +181,7 @@ class Qad(QObject):
    # version
    # ============================================================================
    def version(self):
-      return "3.0.8" # allinea con metadata.txt alla sez [general] voce "version"
+      return "3.0.9" # allinea con metadata.txt alla sez [general] voce "version"
 
 
    def setLastPointAndSegmentAng(self, point, segmentAng = None):
@@ -462,35 +462,35 @@ def sendKeyToCurrentMapTool(self, keyEvent):
          mt.keyPressEvent(keyEvent)
 
    def send_a_toTxtWindow(self):
-      self.keyPressEvent(QKeyEvent(QEvent.KeyPress, Qt.Key_A, Qt.NoModifier, "a"))
+      self.keyPressEvent(QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_A, Qt.KeyboardModifier.NoModifier, "a"))
    def send_A_toTxtWindow(self):
-      self.keyPressEvent(QKeyEvent(QEvent.KeyPress, Qt.Key_A, Qt.NoModifier, "A"))
+      self.keyPressEvent(QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_A, Qt.KeyboardModifier.NoModifier, "A"))
    def send_c_toTxtWindow(self):
-      self.keyPressEvent(QKeyEvent(QEvent.KeyPress, Qt.Key_C, Qt.NoModifier, "c"))
+      self.keyPressEvent(QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_C, Qt.KeyboardModifier.NoModifier, "c"))
    def send_C_toTxtWindow(self):
-      self.keyPressEvent(QKeyEvent(QEvent.KeyPress, Qt.Key_C, Qt.NoModifier, "C"))
+      self.keyPressEvent(QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_C, Qt.KeyboardModifier.NoModifier, "C"))
    def send_d_toTxtWindow(self):
-      self.keyPressEvent(QKeyEvent(QEvent.KeyPress, Qt.Key_D, Qt.NoModifier, "d"))
+      self.keyPressEvent(QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_D, Qt.KeyboardModifier.NoModifier, "d"))
    def send_D_toTxtWindow(self):
-      self.keyPressEvent(QKeyEvent(QEvent.KeyPress, Qt.Key_D, Qt.NoModifier, "D"))
+      self.keyPressEvent(QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_D, Qt.KeyboardModifier.NoModifier, "D"))
    def send_p_toTxtWindow(self):
-      self.keyPressEvent(QKeyEvent(QEvent.KeyPress, Qt.Key_P, Qt.NoModifier, "p"))
+      self.keyPressEvent(QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_P, Qt.KeyboardModifier.NoModifier, "p"))
    def send_P_toTxtWindow(self):
-      self.keyPressEvent(QKeyEvent(QEvent.KeyPress, Qt.Key_P, Qt.NoModifier, "P"))
+      self.keyPressEvent(QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_P, Qt.KeyboardModifier.NoModifier, "P"))
    def send_x_toTxtWindow(self):
-      self.keyPressEvent(QKeyEvent(QEvent.KeyPress, Qt.Key_X, Qt.NoModifier, "x"))
+      self.keyPressEvent(QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_X, Qt.KeyboardModifier.NoModifier, "x"))
    def send_X_toTxtWindow(self):
-      self.keyPressEvent(QKeyEvent(QEvent.KeyPress, Qt.Key_X, Qt.NoModifier, "X"))
+      self.keyPressEvent(QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_X, Qt.KeyboardModifier.NoModifier, "X"))
    def send_y_toTxtWindow(self):
-      self.keyPressEvent(QKeyEvent(QEvent.KeyPress, Qt.Key_Y, Qt.NoModifier, "y"))
+      self.keyPressEvent(QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_Y, Qt.KeyboardModifier.NoModifier, "y"))
    def send_Y_toTxtWindow(self):
-      self.keyPressEvent(QKeyEvent(QEvent.KeyPress, Qt.Key_Y, Qt.NoModifier, "Y"))
+      self.keyPressEvent(QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_Y, Qt.KeyboardModifier.NoModifier, "Y"))
    def send_F3_toTxtWindow(self):
-      self.keyPressEvent(QKeyEvent(QEvent.KeyPress, Qt.Key_F3, Qt.NoModifier))
+      self.keyPressEvent(QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_F3, Qt.KeyboardModifier.NoModifier))
    def send_Backspace_toTxtWindow(self):
-      self.keyPressEvent(QKeyEvent(QEvent.KeyPress, Qt.Key_Backspace, Qt.NoModifier))
+      self.keyPressEvent(QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_Backspace, Qt.KeyboardModifier.NoModifier))
    def send_Delete_toTxtWindow(self):
-      self.keyPressEvent(QKeyEvent(QEvent.KeyPress, Qt.Key_Delete, Qt.NoModifier))
+      self.keyPressEvent(QKeyEvent(QEvent.Type.KeyPress, Qt.Key.Key_Delete, Qt.KeyboardModifier.NoModifier))
 
 
    # ============================================================================
@@ -1274,7 +1274,7 @@ def createDimMenu(self):
 
    def createHelpToolButton(self):
       helpToolButton = QToolButton(self.toolBar)
-      helpToolButton.setPopupMode(QToolButton.MenuButtonPopup)
+      helpToolButton.setPopupMode(QToolButton.ToolButtonPopupMode.MenuButtonPopup)
       helpToolButton.setMenu(self.helpMenu)
       helpToolButton.setDefaultAction(self.helpMenu.actions()[0]) # prima voce di menu
       helpToolButton.triggered.connect(self.helpToolButtonTriggered)
@@ -1285,7 +1285,7 @@ def helpToolButtonTriggered(self, action):
 
    def createArcToolButton(self):
       arcToolButton = QToolButton(self.toolBar)
-      arcToolButton.setPopupMode(QToolButton.MenuButtonPopup)
+      arcToolButton.setPopupMode(QToolButton.ToolButtonPopupMode.MenuButtonPopup)
       arcToolButton.setMenu(self.arcMenu)
       arcToolButton.setDefaultAction(self.arcMenu.actions()[0]) # prima voce di menu
       arcToolButton.triggered.connect(self.arcToolButtonTriggered)
@@ -1296,7 +1296,7 @@ def arcToolButtonTriggered(self, action):
 
    def createArrayToolButton(self):
       arrayToolButton = QToolButton(self.toolBar)
-      arrayToolButton.setPopupMode(QToolButton.MenuButtonPopup)
+      arrayToolButton.setPopupMode(QToolButton.ToolButtonPopupMode.MenuButtonPopup)
       arrayToolButton.setMenu(self.arrayMenu)
       arrayToolButton.setDefaultAction(self.arrayMenu.actions()[0]) # prima voce di menu
       arrayToolButton.triggered.connect(self.arrayToolButtonTriggered)
@@ -1307,7 +1307,7 @@ def arrayToolButtonTriggered(self, action):
 
    def createBreakToolButton(self):
       breakToolButton = QToolButton(self.toolBar)
-      breakToolButton.setPopupMode(QToolButton.MenuButtonPopup)
+      breakToolButton.setPopupMode(QToolButton.ToolButtonPopupMode.MenuButtonPopup)
       breakToolButton.setMenu(self.breakMenu)
       breakToolButton.setDefaultAction(self.breakMenu.actions()[0]) # prima voce di menu
       breakToolButton.triggered.connect(self.breakToolButtonTriggered)
@@ -1318,7 +1318,7 @@ def breakToolButtonTriggered(self, action):
 
    def createCircleToolButton(self):
       circleToolButton = QToolButton(self.toolBar)
-      circleToolButton.setPopupMode(QToolButton.MenuButtonPopup)
+      circleToolButton.setPopupMode(QToolButton.ToolButtonPopupMode.MenuButtonPopup)
       circleToolButton.setMenu(self.circleMenu)
       circleToolButton.setDefaultAction(self.circleMenu.actions()[0]) # prima voce di menu
       circleToolButton.triggered.connect(self.circleToolButtonTriggered)
@@ -1329,7 +1329,7 @@ def circleToolButtonTriggered(self, action):
 
    def createEllipseToolButton(self):
       ellipseToolButton = QToolButton(self.toolBar)
-      ellipseToolButton.setPopupMode(QToolButton.MenuButtonPopup)
+      ellipseToolButton.setPopupMode(QToolButton.ToolButtonPopupMode.MenuButtonPopup)
       ellipseToolButton.setMenu(self.ellipseMenu)
       ellipseToolButton.setDefaultAction(self.ellipseMenu.actions()[0]) # prima voce di menu
       ellipseToolButton.triggered.connect(self.ellipseToolButtonTriggered)
@@ -2173,33 +2173,33 @@ def shortCutManagement(self, e):
       # ritorna True se la funzione li ha gestiti altrimenti ritorna False e quindi l'evento keyPressed va gestito altrove
 
       # Se é stato premuto il tasto CTRL (o META) + 9 oppure il tasto F2
-      if (((e.modifiers() & Qt.ControlModifier) or (e.modifiers() & Qt.MetaModifier)) and e.key() == Qt.Key_9) or \
-         e.key() == Qt.Key_F2:
+      if (((e.modifiers() & Qt.KeyboardModifier.ControlModifier) or (e.modifiers() & Qt.KeyboardModifier.MetaModifier)) and e.key() == Qt.Key.Key_9) or \
+         e.key() == Qt.Key.Key_F2:
          # Accendo o spengo la finestra di testo
          if self.TextWindow is not None:
             self.TextWindow.toggleShow()
          return True
 
       # Se é stato premuto il tasto F3
-      if e.key() == Qt.Key_F3:
+      if e.key() == Qt.Key.Key_F3:
          # Attivo o disattivo lo snap
          self.toggleOsMode()
          return True
 
       # Se é stato premuto il tasto F8
-      if e.key() == Qt.Key_F8:
+      if e.key() == Qt.Key.Key_F8:
          # Attivo o disattivo la modalità ortogonale
          self.toggleOrthoMode()
          return True
 
       # Se é stato premuto il tasto F12
-      if e.key() == Qt.Key_F12:
+      if e.key() == Qt.Key.Key_F12:
          # Attivo o disattivo l'input dinamico
          self.toggleDynamicInput()
          return True
 
       # Se é stato premuto il tasto ESC
-      if e.key() == Qt.Key_Escape:
+      if e.key() == Qt.Key.Key_Escape:
          # interrompo il comando corrente
          self.abortCommand()
          self.clearCurrentObjsSelection()
@@ -2209,13 +2209,13 @@ def shortCutManagement(self, e):
          return True
 
       # Se é stato premuto il tasto F10
-      if e.key() == Qt.Key_F10:
+      if e.key() == Qt.Key.Key_F10:
          # Attivo o disattivo il modo polare
          self.togglePolarMode()
          return True
 
       # Se é stato premuto il tasto F11
-      if e.key() == Qt.Key_F11:
+      if e.key() == Qt.Key.Key_F11:
          # Attivo o disattivo il puntamento snap ad oggetto
          self.toggleObjectSnapTracking()
          return True

qad_cacheareas.py

@@ -63,7 +63,7 @@ def __create_internal_layer(self):
       self.cacheLayer = createMemoryLayer("QadLayerCacheArea", getStrLayerGeomType(self.layer), self.layer.crs())
 
       provider = self.cacheLayer.dataProvider()
-      provider.addAttributes([QgsField("index", QMetaType.Int, "Int")])
+      provider.addAttributes([QgsField("index", QMetaType.Type.Int, "Int")])
       self.cacheLayer.updateFields()
 
       if provider.capabilities() & QgsVectorDataProvider.CreateSpatialIndex:
@@ -448,4 +448,4 @@ def getStrLayerGeomType(layer):
       elif gType == QgsWkbTypes.PolygonGeometry:
          return "MultiPolygon"
 
-   return "NoGeometry"     
+   return "NoGeometry"

qad_commands.py

@@ -248,7 +248,7 @@ def run(self, command, param = None):
          if command != QadMsg.translate("Command_list", "SUPPORTERS"):
             if incrementDailyCmdCounter() > self.plugIn.maxDailyCmdCounter:
                if QMessageBox.question(None, "QAD", QadMsg.translate("QAD", "QAD lets you run 200 commands per day free of popups. Donations help us to fund software development, documentation, translation and bug-fixing efforts. Do you want to donate ?"), \
-                                       QMessageBox.Yes, QMessageBox.No) == QMessageBox.Yes:
+                                       QMessageBox.StandardButton.Yes, QMessageBox.StandardButton.No) == QMessageBox.StandardButton.Yes:
                   command = "_SUPPORTERS";
 #                if QMessageBox.critical(None, "QAD", QadMsg.translate("QAD", "You have run out of daily commands available for this version of QAD, your reasonable donation will allow us to adapt the product to your needs. Do you want to donate ?"), \
 #                                        QMessageBox.Yes, QMessageBox.No) == QMessageBox.Yes:
@@ -315,7 +315,7 @@ def runMacro(self, args):
          if args[0] != QadMsg.translate("Command_list", "SUPPORTERS"):
             if incrementDailyCmdCounter() > self.plugIn.maxDailyCmdCounter:
                if QMessageBox.question(None, "QAD", QadMsg.translate("QAD", "QAD lets you run 200 commands per day free of popups. Donations help us to fund software development, documentation, translation and bug-fixing efforts. Do you want to donate ?"), \
-                                       QMessageBox.Yes, QMessageBox.No) == QMessageBox.Yes:
+                                       QMessageBox.StandardButton.Yes, QMessageBox.StandardButton.No) == QMessageBox.StandardButton.Yes:
                   args[0] = "_SUPPORTERS";               
 #                if QMessageBox.critical(None, "QAD", QadMsg.translate("QAD", "You have run out of daily commands available for this version of QAD, your reasonable donation will allow us to adapt the product to your needs. Do you want to donate ?"), \
 #                                        QMessageBox.Yes, QMessageBox.No) == QMessageBox.Yes:

qad_dimensioninput_settings_ui.py

@@ -8,14 +8,14 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from qgis.PyQt import QtCore, QtGui, QtWidgets
 
 
 class Ui_DimInput_Settings_Dialog(object):
     def setupUi(self, DimInput_Settings_Dialog):
         DimInput_Settings_Dialog.setObjectName("DimInput_Settings_Dialog")
         DimInput_Settings_Dialog.resize(400, 346)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(DimInput_Settings_Dialog.sizePolicy().hasHeightForWidth())

qad_dimstyle_details_dlg.py

@@ -847,8 +847,8 @@ def accept(self):
       if errMsg is not None:
          errMsg += QadMsg.translate("DimStyle_Details_Dialog", "\nDo you want to accepts these settings ?")
          res = QMessageBox.question(self, QadMsg.getQADTitle(), errMsg, \
-                                 QMessageBox.Yes | QMessageBox.No)
-         if res == QMessageBox.No:
+                                 QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No)
+         if res == QMessageBox.StandardButton.No:
             return
 
       self.plugIn.dimStyleLastUsedTabIndex = self.tabWidget.currentIndex()
@@ -862,7 +862,7 @@ class QadPreviewDim(QgsMapCanvas):
    def __init__(self, parent, plugIn):
       QgsMapCanvas.__init__(self, parent)
       self.plugIn = plugIn
-      self.setAttribute(Qt.WA_DeleteOnClose)
+      self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose)
 
       self.iface = self.plugIn.iface
       self.layerId2canvasLayer = {}

qad_dimstyle_details_ui.py

@@ -8,7 +8,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from qgis.PyQt import QtCore, QtGui, QtWidgets
 
 
 class Ui_DimStyle_Details_Dialog(object):

qad_dimstyle_diff_dlg.py

@@ -118,8 +118,8 @@ def showAllProps(self, dimStyle):
 
       self.tableWidget.sortItems(0)
 
-      self.tableWidget.horizontalHeader().setSectionResizeMode(0, QHeaderView.ResizeToContents)
-      self.tableWidget.horizontalHeader().setSectionResizeMode(1, QHeaderView.Interactive)
+      self.tableWidget.horizontalHeader().setSectionResizeMode(0, QHeaderView.ResizeMode.ResizeToContents)
+      self.tableWidget.horizontalHeader().setSectionResizeMode(1, QHeaderView.ResizeMode.Interactive)
 
       self.msg.setText(QadMsg.translate("DimStyle_Diff_Dialog", "All properties of dimension style: ") + dimStyle.name)
 
@@ -156,9 +156,9 @@ def showDiffProps(self, dimStyle1, dimStyle2):
 
       self.tableWidget.sortItems(0)
 
-      self.tableWidget.horizontalHeader().setSectionResizeMode(0, QHeaderView.ResizeToContents)
-      self.tableWidget.horizontalHeader().setSectionResizeMode(1, QHeaderView.Interactive)
-      self.tableWidget.horizontalHeader().setSectionResizeMode(2, QHeaderView.Interactive)
+      self.tableWidget.horizontalHeader().setSectionResizeMode(0, QHeaderView.ResizeMode.ResizeToContents)
+      self.tableWidget.horizontalHeader().setSectionResizeMode(1, QHeaderView.ResizeMode.Interactive)
+      self.tableWidget.horizontalHeader().setSectionResizeMode(2, QHeaderView.ResizeMode.Interactive)
 
       self.msg.setText(QadMsg.translate("DimStyle_Diff_Dialog", "Found {0} differences: ").format(str(self.count)))
 
@@ -167,16 +167,16 @@ def insertProp(self, description, val1, val2 = None):
       self.tableWidget.insertRow(self.count)
 
       item = QTableWidgetItem(unicode(description))
-      item.setFlags(Qt.ItemIsEnabled | Qt.ItemIsSelectable)
+      item.setFlags(Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable)
       self.tableWidget.setItem(self.count, 0, item)
 
       item = QTableWidgetItem(unicode(val1))
-      item.setFlags(Qt.ItemIsEnabled | Qt.ItemIsSelectable)
+      item.setFlags(Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable)
       self.tableWidget.setItem(self.count, 1, item)
 
       if val2 is not None:
          item = QTableWidgetItem(unicode(val2))
-         item.setFlags(Qt.ItemIsEnabled | Qt.ItemIsSelectable)
+         item.setFlags(Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable)
          self.tableWidget.setItem(self.count, 2, item)
       self.count += 1
 
@@ -215,4 +215,3 @@ def copyToClipboard(self):
          buffer += '\n' # vado a capo
 
       QApplication.clipboard().setText(buffer)
-