Remove qgis2 support

COMPONENTS

@@ -1,3 +1 @@
-
-<p><strong>Python tile layer:</strong> <a href="https://github.com/minorua/TileLayerPlugin">TileLayer Plugin by Minoru Akagi</a></p>
 <p><strong>Some icons from QGIS:</strong> <a href="https://github.com/qgis/QGIS">QGIS GitHub</a></p>

pyproject.toml

@@ -19,7 +19,6 @@ ui-files = [
     "src/quick_map_services/gui/*.ui",
     "src/quick_map_services/scales.xml",
     "src/quick_map_services/*.ui",
-    "src/quick_map_services/py_tiled_layer/*.ui",
 ]
 compile = false
 

src/quick_map_services/data_sources_list.py

@@ -25,13 +25,12 @@
 import os
 import sys
 
-from qgis.core import QgsMessageLog
+from qgis.core import Qgis, QgsMessageLog
 from qgis.PyQt.QtCore import QCoreApplication
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QAction
 
 from . import extra_sources
-from .compat2qgis import message_log_levels
 from .config_reader_helper import ConfigReaderHelper
 from .custom_translator import CustomTranslator
 from .data_source_info import DataSourceCategory, DataSourceInfo
@@ -96,10 +95,10 @@ def _fill_data_sources_list(self):
 
                     except Exception as e:
                         error_message = (
-                            "INI file can't be parsed: " + e.message
+                            "INI file can't be parsed: " + str(e)
                         )
                         QgsMessageLog.logMessage(
-                            error_message, level=message_log_levels["Critical"]
+                            error_message, level=Qgis.Critical
                         )
 
     # noinspection PyMethodMayBeStatic

src/quick_map_services/ds_edit_dialog.py

@@ -4,10 +4,9 @@
 
 from qgis.PyQt import uic
 from qgis.PyQt.QtGui import QIcon, QPixmap
-from qgis.PyQt.QtWidgets import QDialog, QMessageBox
+from qgis.PyQt.QtWidgets import QDialog, QFileDialog, QMessageBox
 
 from . import extra_sources
-from .compat2qgis import getOpenFileName
 from .data_source_info import DataSourceInfo
 from .data_source_serializer import DataSourceSerializer
 from .data_sources_list import DataSourcesList
@@ -112,7 +111,7 @@ def fill_ds_info(self, ds_info):
         self.feel_specific_fields()
 
     def choose_icon(self):
-        icon_path = getOpenFileName(
+        icon_path = QFileDialog.getOpenFileName(
             self,
             self.tr("Select icon for data source"),
             PluginSettings.get_default_user_icon_path(),

src/quick_map_services/extra_sources.py

@@ -27,15 +27,14 @@
 import tempfile
 from zipfile import ZipFile
 
-from qgis.core import QgsNetworkAccessManager
+from qgis.core import QgsApplication, QgsNetworkAccessManager
 from qgis.PyQt.QtCore import QEventLoop, QFile, QUrl
 from qgis.PyQt.QtNetwork import QNetworkReply, QNetworkRequest
 
 from .compat import OpenModeFlag
-from .compat2qgis import getQGisUserDatabaseFilePath
 from .plugin_settings import PluginSettings
 
-LOCAL_SETTINGS_PATH = os.path.dirname(getQGisUserDatabaseFilePath())
+LOCAL_SETTINGS_PATH = os.path.dirname(QgsApplication.qgisUserDatabaseFilePath())
 PLUGIN_SETTINGS_PATH = os.path.join(
     LOCAL_SETTINGS_PATH, PluginSettings.product_name()
 )

src/quick_map_services/file_selection_widget.py

@@ -39,8 +39,6 @@
     QWidget,
 )
 
-from .compat2qgis import getOpenFileName
-
 try:
     _fromUtf8 = QtCore.QString.fromUtf8
 except AttributeError:
@@ -79,7 +77,7 @@ def show_selection_dialog(self):
                 self.leText.setText(folder)
                 PluginSettings.set_last_icon_path(os.path.dirname(folder))
         else:
-            filename = getOpenFileName(self, self.dialog_title, path, self.ext)
+            filename = QFileDialog.getOpenFileName(self, self.dialog_title, path, self.ext)
             if filename:
                 self.leText.setText(filename)
                 PluginSettings.set_last_icon_path(os.path.dirname(filename))
@@ -97,7 +95,7 @@ def set_dialog_ext(self, ext):
         self.ext = ext
 
     def set_dialog_title(self, title):
-        self.dialog_titledialog_title = title
+        self.dialog_title = title
 
     def setupUi(self, Form):
         Form.setObjectName(_fromUtf8("Form"))

src/quick_map_services/group_edit_dialog.py

@@ -5,10 +5,9 @@
 
 from qgis.PyQt import uic
 from qgis.PyQt.QtGui import QPixmap
-from qgis.PyQt.QtWidgets import QDialog, QMessageBox
+from qgis.PyQt.QtWidgets import QDialog, QFileDialog, QMessageBox
 
 from . import extra_sources
-from .compat2qgis import getOpenFileName
 from .fixed_config_parser import FixedConfigParser
 from .groups_list import GroupsList
 from .gui.line_edit_color_validator import LineEditColorValidator
@@ -73,8 +72,16 @@ def fill_group_info(self, group_info):
         self.set_icon(self.group_info.icon)
 
     def choose_icon(self):
+        """
+        Opens a file dialog to select an icon for the group and sets it.
+
+        The selected icon path is stored using PluginSettings and applied
+        via `set_icon()`. If no icon is selected, the method exits silently.
+        """
         print(PluginSettings.get_default_user_icon_path())
-        icon_path = getOpenFileName(
+
+        # Open a file dialog to choose an icon
+        icon_path, _ = QFileDialog.getOpenFileName(
             self,
             self.tr("Select icon for group"),
             PluginSettings.get_default_user_icon_path(),
@@ -84,6 +91,8 @@ def choose_icon(self):
         )
 
         print(icon_path)
+
+        # If a file was selected, update the default path and apply the icon
         if icon_path != "":
             PluginSettings.set_default_user_icon_path(icon_path)
             self.set_icon(icon_path)

src/quick_map_services/groups_list.py

@@ -26,13 +26,12 @@
 import os
 import sys
 
-from qgis.core import QgsMessageLog
+from qgis.core import Qgis, QgsMessageLog
 from qgis.PyQt.QtCore import QCoreApplication
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QMenu
 
 from . import extra_sources
-from .compat2qgis import message_log_levels
 from .config_reader_helper import ConfigReaderHelper
 from .custom_translator import CustomTranslator
 from .group_info import GroupCategory, GroupInfo
@@ -123,10 +122,10 @@ def _read_ini_file(self, root, ini_file_path, category):
             )
         except Exception as e:
             error_message = (
-                self.tr("Group INI file can't be parsed: ") + e.message
+                self.tr("Group INI file can't be parsed: ") + str(e)
             )
             QgsMessageLog.logMessage(
-                error_message, level=message_log_levels["Critical"]
+                error_message, level=Qgis.Critical
             )
 
     def get_group_menu(self, group_id):