Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions helpers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from urllib.parse import urlparse

from PyQt5.QtWidgets import QApplication
from qgis.PyQt.QtWidgets import QApplication
from qgis.PyQt.QtCore import Qt
from contextlib import contextmanager

Expand Down Expand Up @@ -37,8 +37,8 @@ def check_if_qgis_project_is_dirty_and_save() -> bool:
msgBox.setText("There are unsaved changes.")
msgBox.setInformativeText("Do you want to save your changes before continuing?")
msgBox.setStandardButtons(QMessageBox.StandardButton.Save | QMessageBox.StandardButton.Cancel)
msgBox.button(QMessageBox.Save).setText("Save")
msgBox.button(QMessageBox.Cancel).setText("Cancel")
msgBox.button(QMessageBox.StandardButton.Save).setText("Save")
msgBox.button(QMessageBox.StandardButton.Cancel).setText("Cancel")
msgBox.setDefaultButton(QMessageBox.StandardButton.Save)
ret = msgBox.exec()
if ret == QMessageBox.StandardButton.Save:
Expand Down Expand Up @@ -169,8 +169,8 @@ def show_question_box(text: str) -> int:
questionBox.setIcon(QMessageBox.Icon.Question)
questionBox.setText(text)
questionBox.setStandardButtons(QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No)
questionBox.button(QMessageBox.Yes).setText("Yes")
questionBox.button(QMessageBox.No).setText("No")
questionBox.button(QMessageBox.StandardButton.Yes).setText("Yes")
questionBox.button(QMessageBox.StandardButton.No).setText("No")
return questionBox.exec()


Expand Down
4 changes: 2 additions & 2 deletions main_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def setupUi(self, widget) -> None:
self.buttonBoxTab2.rejected.connect(self.reject)

# Set Button Tab2 to english
button_close_tab2 = self.buttonBoxTab2.button(QDialogButtonBox.Close)
button_close_tab2 = self.buttonBoxTab2.button(QDialogButtonBox.StandardButton.Close)
button_close_tab2.setText(self.tr("Close"))

def setupConnections(self) -> None:
Expand All @@ -139,7 +139,7 @@ def setupConnections(self) -> None:
self.serverTableWidget.doubleClicked.connect(self.on_edit_server_config_clicked)

# Set Button Tab1 to english
button_close_tab1 = self.buttonBoxTab1.button(QDialogButtonBox.Close)
button_close_tab1 = self.buttonBoxTab1.button(QDialogButtonBox.StandardButton.Close)
button_close_tab1.setText(self.tr("Close"))
# Button had a blue background
button_close_tab1.setAutoDefault(False)
Expand Down
3 changes: 1 addition & 2 deletions metadata.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ tags=mapbender, web, webmap, webmaps, webgis, publish, export, qgis server, wms,

version=1.1.0
qgisMinimumVersion=3.0
qgisMaximumVersion=3.99
qgisMaximumVersion=4.99

icon=qgis2mapbender.png
experimental=False
deprecated=False
supportsQt6=True
8 changes: 4 additions & 4 deletions plugin.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os
from typing import Optional
from PyQt5.QtCore import QTranslator, QCoreApplication, QSettings
from qgis.PyQt.QtCore import QTranslator, QCoreApplication, QSettings
from qgis.PyQt.QtWidgets import QAction
from qgis.PyQt.QtGui import QIcon
from qgis.core import QgsMessageLog, Qgis
Expand Down Expand Up @@ -59,7 +59,7 @@ def initGui(self) -> None:
QCoreApplication.installTranslator(self.translator)

except Exception as e:
QgsMessageLog.logMessage(f"{self.plugin_name}: Error in initGui: {e}", self.plugin_name, level=Qgis.Critical)
QgsMessageLog.logMessage(f"{self.plugin_name}: Error in initGui: {e}", self.plugin_name, level=Qgis.MessageLevel.Critical)

def unload(self) -> None:
"""
Expand All @@ -72,7 +72,7 @@ def unload(self) -> None:
self.iface.removePluginWebMenu(self.web_menu, self.action)
self.iface.removeToolBarIcon(self.action)
except Exception as e:
QgsMessageLog.logMessage(f"{self.plugin_name}: Error in unload: {e}", self.plugin_name, level=Qgis.Critical)
QgsMessageLog.logMessage(f"{self.plugin_name}: Error in unload: {e}", self.plugin_name, level=Qgis.MessageLevel.Critical)

def run(self) -> None:
"""
Expand All @@ -88,4 +88,4 @@ def run(self) -> None:
self.dlg.raise_()
self.dlg.activateWindow()
except Exception as e:
QgsMessageLog.logMessage(f"{self.plugin_name}: Error in run: {e}", self.plugin_name, level=Qgis.Critical)
QgsMessageLog.logMessage(f"{self.plugin_name}: Error in run: {e}", self.plugin_name, level=Qgis.MessageLevel.Critical)