Merge pull request #95 from Septima/porting_to_qt6

Porting to qt6

Author: MieWinstrup

src/QlrBrowser/core/filesystemmodel.py

@@ -61,7 +61,7 @@ def rootItemCreated(self, exception, result=None):
         except Exception as e:
                 self.status = "error"
                 self.updated.emit()
-                QgsMessageLog.logMessage("Exception: {}".format(str(e)), "Qlr Browser", Qgis.Critical)
+                QgsMessageLog.logMessage("Exception: {}".format(str(e)), "Qlr Browser", Qgis.MessageLevel.Critical)
 
     def filter(self, filterString = ""):
         if filterString == "":
@@ -92,7 +92,7 @@ def filterItemCreated(self, exception, result, task_id):
         else:
             self.status = "error"
             self.updated.emit()
-            QgsMessageLog.logMessage("Exception: {}".format(str(exception)), "Qlr Browser", Qgis.Critical)
+            QgsMessageLog.logMessage("Exception: {}".format(str(exception)), "Qlr Browser", Qgis.MessageLevel.Critical)
 
     def namingregex(self):
         if not self.settings.value("useSortDelimitChar"):
@@ -137,7 +137,7 @@ def __init__(self, file, recurse = True, recursion_counter = None, namingregex =
         if self.isdir and recurse:
             qdir = QDir(self.fullpath)
             for finfo in qdir.entryInfoList(
-                    FileSystemItem.fileExtensions , QDir.Files | QDir.AllDirs | QDir.NoDotAndDotDot,QDir.Name):
+                    FileSystemItem.fileExtensions , QDir.Filter.Files | QDir.Filter.AllDirs | QDir.Filter.NoDotAndDotDot,QDir.SortFlag.Name):
                 self.children.append(FileSystemItem(finfo, recurse, recursion_counter, self.namingregex))
         else:
             # file
@@ -202,7 +202,7 @@ def get_searchable_content(self):
         Pulls out tags from the object and returns them in order to be used by the filtered() method.
         """
         f = QFile(self.fileinfo.absoluteFilePath())
-        f.open(QIODevice.ReadOnly)
+        f.open(QIODevice.OpenModeFlag.ReadOnly)
         try:
             doc = QDomDocument()
             doc.setContent( f.readAll() )

src/QlrBrowser/core/qlrmanager.py

@@ -64,7 +64,7 @@ def log(self, message):
         QgsMessageLog.logMessage(
             '{}'.format(message),
             'QlrBrowser',
-             Qgis.Info
+             Qgis.MessageLevel.Info
         )
 
 
@@ -127,7 +127,7 @@ def browser_itemclicked(self, fileinfo, newState):
                 pass
             else:
                 message = self.tr(u"Adding qlr-file to the layer panel")
-                self.iface.messageBar().pushMessage(self.tr('QlrBrowser'), message, level=Qgis.Info, duration=5)
+                self.iface.messageBar().pushMessage(self.tr('QlrBrowser'), message, level=Qgis.MessageLevel.Info, duration=5)
 
                 # Force show messageBar
                 QCoreApplication.processEvents()

src/QlrBrowser/metadata.txt

@@ -9,9 +9,10 @@
 [general]
 name=Qlr Browser
 qgisMinimumVersion=3.00
-qgisMaximumVersion=3.99
+qgisMaximumVersion=4.99
+supportsQt6=True
 description=This plugin lets the user browse and open qlr files
-version=3.0.0
+version=4.0.0
 author=Septima
 [email protected]
 
@@ -28,7 +29,8 @@ repository=https://github.com/Septima/qgis-qlrbrowser
 # Recommended items:
 
 # Uncomment the following line and add your changelog:
-changelog=2021-12-16 3.0.0 Async load filtering, fix display of groups
+changelog=2025-11-11 4.0.0 Updated to Qt6
+    2021-12-16 3.0.0 Async load filtering, fix display of groups
     2020-01-23 2.1.0 Added german translation contributed by Stadtwerke München. Minor bug fixes.
     2018-07-25 2.0.1 Changed icon and ready for plugin repository
     2018-06-18 2.0.0 Upgrade to 3.nightly
@@ -41,7 +43,7 @@ changelog=2021-12-16 3.0.0 Async load filtering, fix display of groups
     2015-12-12 0.1.0 Initial version
 
 # Tags are comma separated with spaces allowed
-tags=qlr browse browser data
+tags=qlr browse, browser, data, danmark, geodata
 
 homepage=https://github.com/Septima/qgis-qlrbrowser
 category=Plugins

src/QlrBrowser/mysettings/options_factory.py

@@ -1,7 +1,7 @@
 import os
 from qgis.gui import (QgsOptionsWidgetFactory)
 from qgis.core import QgsApplication
-from PyQt5.QtGui import QIcon
+from qgis.PyQt.QtGui import QIcon
 from .settings_dialog import ConfigOptionsPage
 
 class OptionsFactory(QgsOptionsWidgetFactory):

src/QlrBrowser/mysettings/qgissettingmanager/setting.py

@@ -26,7 +26,7 @@
 #
 #---------------------------------------------------------------------
 
-from PyQt5.QtCore import QObject, pyqtSignal, QSettings
+from qgis.PyQt.QtCore import QObject, pyqtSignal, QSettings
 from qgis.core import QgsProject
 
 

src/QlrBrowser/mysettings/qgissettingmanager/setting_dialog.py

@@ -26,7 +26,7 @@
 #
 # ---------------------------------------------------------------------
 
-from PyQt5.QtWidgets import QDialog, QWidget, QButtonGroup
+from qgis.PyQt.QtWidgets import QDialog, QWidget, QButtonGroup
 
 from .setting_manager import Debug
 

src/QlrBrowser/mysettings/qgissettingmanager/setting_widget.py

@@ -26,7 +26,7 @@
 #
 #---------------------------------------------------------------------
 
-from PyQt5.QtCore import pyqtSlot, QObject
+from qgis.PyQt.QtCore import pyqtSlot, QObject
 
 
 class SettingWidget(QObject):

src/QlrBrowser/mysettings/qgissettingmanager/types/bool.py

@@ -26,7 +26,7 @@
 #
 #---------------------------------------------------------------------
 
-from PyQt5.QtWidgets import QCheckBox
+from qgis.PyQt.QtWidgets import QCheckBox
 from qgis.core import QgsProject
 from ..setting import Setting
 from ..setting_widget import SettingWidget

src/QlrBrowser/mysettings/qgissettingmanager/types/color.py

@@ -32,8 +32,8 @@
 # alpha: use or not alpha channel
 
 
-from PyQt5.QtGui import QColor
-from PyQt5.QtWidgets import QColorDialog
+from qgis.PyQt.QtGui import QColor
+from qgis.PyQt.QtWidgets import QColorDialog
 from qgis.core import QgsProject
 from qgis.gui import QgsColorButton
 
@@ -80,7 +80,7 @@ def __init__(self, setting, widget, options):
         SettingWidget.__init__(self, setting, widget, options, signal)
 
         if type(self.widget) == QgsColorButton:
-            self.widget.setColorDialogOptions(QColorDialog.ShowAlphaChannel)
+            self.widget.setColorDialogOptions(QColorDialog.ColorDialogOption.ShowAlphaChannel)
         else:
             self.widget.setAllowAlpha(self.options.get("allowAlpha", False))
 

src/QlrBrowser/mysettings/qgissettingmanager/types/double.py

@@ -26,7 +26,7 @@
 #
 #---------------------------------------------------------------------
 
-from PyQt5.QtWidgets import QLineEdit, QDoubleSpinBox
+from qgis.PyQt.QtWidgets import QLineEdit, QDoubleSpinBox
 from qgis.core import QgsProject
 
 from ..setting import Setting