forked from AG_QGIS/Plugin_SN_Basis
Wrappe modular aufgebaut, Tests erfolgreich, Menüleiste und Werzeugleiste werden eingetragen (QT6 und QT5)- (Es fehlen noch Fachplugins, um zu prüfen, ob es auch wirklich in QGIS geht)
This commit is contained in:
@@ -1,12 +1,17 @@
|
||||
# sn_basis/ui/base_dockwidget.py
|
||||
"""
|
||||
sn_basis/ui/base_dockwidget.py
|
||||
|
||||
from qgis.PyQt.QtWidgets import QDockWidget, QTabWidget
|
||||
from sn_basis.functions.qgisqt_wrapper import warning, error
|
||||
Basis-Dockwidget für alle LNO-Module.
|
||||
"""
|
||||
|
||||
from sn_basis.functions.qt_wrapper import QDockWidget, QTabWidget
|
||||
from sn_basis.functions.message_wrapper import warning, error
|
||||
|
||||
|
||||
class BaseDockWidget(QDockWidget):
|
||||
"""
|
||||
Basis-Dockwidget für alle LNO-Module.
|
||||
|
||||
- Titel wird automatisch aus base_title + subtitle erzeugt
|
||||
- Tabs werden dynamisch aus der Klassenvariable 'tabs' erzeugt
|
||||
- Die zugehörige Toolbar-Action wird beim Schließen zurückgesetzt
|
||||
@@ -23,19 +28,15 @@ class BaseDockWidget(QDockWidget):
|
||||
# Titel setzen
|
||||
# -----------------------------------------------------
|
||||
try:
|
||||
title = self.base_title if not subtitle else f"{self.base_title} | {subtitle}"
|
||||
title = (
|
||||
self.base_title
|
||||
if not subtitle
|
||||
else f"{self.base_title} | {subtitle}"
|
||||
)
|
||||
self.setWindowTitle(title)
|
||||
except Exception as e:
|
||||
warning("Titel konnte nicht gesetzt werden", str(e))
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Dock-Features
|
||||
# -----------------------------------------------------
|
||||
try:
|
||||
self.setFeatures(QDockWidget.DockWidgetFeature.DockWidgetClosable)
|
||||
except Exception as e:
|
||||
warning("Dock-Features konnten nicht gesetzt werden", str(e))
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Tabs erzeugen
|
||||
# -----------------------------------------------------
|
||||
@@ -45,15 +46,25 @@ class BaseDockWidget(QDockWidget):
|
||||
for tab_class in self.tabs:
|
||||
try:
|
||||
tab_instance = tab_class()
|
||||
tab_title = getattr(tab_class, "tab_title", tab_class.__name__)
|
||||
tab_title = getattr(
|
||||
tab_class,
|
||||
"tab_title",
|
||||
tab_class.__name__,
|
||||
)
|
||||
tab_widget.addTab(tab_instance, tab_title)
|
||||
except Exception as e:
|
||||
error("Tab konnte nicht geladen werden", f"{tab_class}: {e}")
|
||||
error(
|
||||
"Tab konnte nicht geladen werden",
|
||||
f"{tab_class}: {e}",
|
||||
)
|
||||
|
||||
self.setWidget(tab_widget)
|
||||
|
||||
except Exception as e:
|
||||
error("Tab-Widget konnte nicht initialisiert werden", str(e))
|
||||
error(
|
||||
"Tab-Widget konnte nicht initialisiert werden",
|
||||
str(e),
|
||||
)
|
||||
|
||||
# ---------------------------------------------------------
|
||||
# Dock schließen
|
||||
@@ -68,6 +79,9 @@ class BaseDockWidget(QDockWidget):
|
||||
if self.action:
|
||||
self.action.setChecked(False)
|
||||
except Exception as e:
|
||||
warning("Toolbar-Status konnte nicht zurückgesetzt werden", str(e))
|
||||
warning(
|
||||
"Toolbar-Status konnte nicht zurückgesetzt werden",
|
||||
str(e),
|
||||
)
|
||||
|
||||
super().closeEvent(event)
|
||||
|
||||
@@ -1,53 +1,69 @@
|
||||
# sn_basis/ui/dockmanager.py
|
||||
"""
|
||||
sn_basis/ui/dockmanager.py
|
||||
|
||||
from qgis.PyQt.QtCore import Qt
|
||||
from qgis.PyQt.QtWidgets import QDockWidget
|
||||
from qgis.utils import iface
|
||||
Verwaltet das Anzeigen und Ersetzen von DockWidgets.
|
||||
Stellt sicher, dass immer nur ein sn_basis-Dock gleichzeitig sichtbar ist.
|
||||
"""
|
||||
|
||||
from sn_basis.functions.qgisqt_wrapper import warning, error
|
||||
from typing import Any
|
||||
|
||||
from sn_basis.functions import (
|
||||
add_dock_widget,
|
||||
remove_dock_widget,
|
||||
find_dock_widgets,
|
||||
warning,
|
||||
error,
|
||||
)
|
||||
|
||||
|
||||
class DockManager:
|
||||
"""
|
||||
Verwaltet das Anzeigen und Ersetzen von DockWidgets.
|
||||
Stellt sicher, dass immer nur ein LNO-Dock gleichzeitig sichtbar ist.
|
||||
"""
|
||||
|
||||
default_area = Qt.DockWidgetArea.RightDockWidgetArea
|
||||
dock_prefix = "sn_dock_"
|
||||
|
||||
@classmethod
|
||||
def show(cls, dock_widget, area=None):
|
||||
def show(cls, dock_widget: Any, area=None) -> None:
|
||||
"""
|
||||
Zeigt ein DockWidget an und entfernt vorher alle anderen
|
||||
LNO-Docks (erkennbar am Prefix 'sn_dock_').
|
||||
sn_basis-Docks (erkennbar am Prefix 'sn_dock_').
|
||||
"""
|
||||
|
||||
if dock_widget is None:
|
||||
error("Dock konnte nicht angezeigt werden", "Dock-Widget ist None.")
|
||||
return
|
||||
|
||||
try:
|
||||
area = area or cls.default_area
|
||||
|
||||
# Prüfen, ob das Dock einen gültigen Namen hat
|
||||
# Sicherstellen, dass das Dock einen Namen hat
|
||||
if not dock_widget.objectName():
|
||||
dock_widget.setObjectName(f"{cls.dock_prefix}{id(dock_widget)}")
|
||||
|
||||
# Bestehende Plugin-Docks schließen
|
||||
# Vorhandene Plugin-Docks entfernen
|
||||
try:
|
||||
for widget in iface.mainWindow().findChildren(QDockWidget):
|
||||
if widget is not dock_widget and widget.objectName().startswith(cls.dock_prefix):
|
||||
iface.removeDockWidget(widget)
|
||||
for widget in find_dock_widgets():
|
||||
if (
|
||||
widget is not dock_widget
|
||||
and widget.objectName().startswith(cls.dock_prefix)
|
||||
):
|
||||
remove_dock_widget(widget)
|
||||
widget.deleteLater()
|
||||
except Exception as e:
|
||||
warning("Vorherige Docks konnten nicht entfernt werden", str(e))
|
||||
warning(
|
||||
"Vorherige Docks konnten nicht entfernt werden",
|
||||
str(e),
|
||||
)
|
||||
|
||||
# Neues Dock anzeigen
|
||||
try:
|
||||
iface.addDockWidget(area, dock_widget)
|
||||
add_dock_widget(area, dock_widget)
|
||||
dock_widget.show()
|
||||
except Exception as e:
|
||||
error("Dock konnte nicht angezeigt werden", str(e))
|
||||
error(
|
||||
"Dock konnte nicht angezeigt werden",
|
||||
str(e),
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
error("DockManager-Fehler", str(e))
|
||||
|
||||
|
||||
125
ui/navigation.py
125
ui/navigation.py
@@ -1,84 +1,115 @@
|
||||
#sn_basis/ui/navigation.py
|
||||
from qgis.PyQt.QtWidgets import QAction, QMenu, QToolBar, QActionGroup
|
||||
"""
|
||||
sn_basis/ui/navigation.py
|
||||
|
||||
Zentrale Navigation (Menü + Toolbar) für sn_basis.
|
||||
"""
|
||||
|
||||
from typing import Any, List, Tuple
|
||||
|
||||
from sn_basis.functions.qt_wrapper import (
|
||||
QAction,
|
||||
QMenu,
|
||||
QToolBar,
|
||||
QActionGroup,
|
||||
)
|
||||
from sn_basis.functions import (
|
||||
get_main_window,
|
||||
add_toolbar,
|
||||
remove_toolbar,
|
||||
add_menu,
|
||||
remove_menu,
|
||||
)
|
||||
|
||||
|
||||
class Navigation:
|
||||
def __init__(self, iface):
|
||||
self.iface = iface
|
||||
def __init__(self):
|
||||
self.actions = []
|
||||
|
||||
# Menü und Toolbar einmalig anlegen
|
||||
self.menu = QMenu("LNO Sachsen", iface.mainWindow())
|
||||
iface.mainWindow().menuBar().addMenu(self.menu)
|
||||
self.menu = None
|
||||
self.toolbar = None
|
||||
self.plugin_group = None
|
||||
|
||||
|
||||
self.toolbar = QToolBar("LNO Sachsen")
|
||||
|
||||
def init_ui(self):
|
||||
print(">>> Navigation.init_ui() CALLED")
|
||||
|
||||
main_window = get_main_window()
|
||||
if not main_window:
|
||||
return
|
||||
|
||||
self.menu = QMenu("LNO Sachsen", main_window)
|
||||
add_menu(self.menu)
|
||||
|
||||
self.toolbar = QToolBar("LNO Sachsen", main_window)
|
||||
self.toolbar.setObjectName("LnoSachsenToolbar")
|
||||
iface.addToolBar(self.toolbar)
|
||||
add_toolbar(self.toolbar)
|
||||
|
||||
# Gruppe für exklusive Auswahl (nur ein Plugin aktiv)
|
||||
self.plugin_group = QActionGroup(iface.mainWindow())
|
||||
self.plugin_group.setExclusive(True)
|
||||
test_action = QAction("TEST ACTION", main_window)
|
||||
self.menu.addAction(test_action)
|
||||
self.toolbar.addAction(test_action)
|
||||
|
||||
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Actions
|
||||
# -----------------------------------------------------
|
||||
|
||||
def add_action(self, text, callback, tooltip="", priority=100):
|
||||
action = QAction(text, self.iface.mainWindow())
|
||||
if not self.plugin_group:
|
||||
return None
|
||||
|
||||
action = QAction(text, get_main_window())
|
||||
action.setToolTip(tooltip)
|
||||
action.setCheckable(True) # Button kann aktiv sein
|
||||
action.setCheckable(True)
|
||||
action.triggered.connect(callback)
|
||||
|
||||
# Action in Gruppe aufnehmen
|
||||
self.plugin_group.addAction(action)
|
||||
|
||||
# Action mit Priority speichern
|
||||
self.actions.append((priority, action))
|
||||
return action
|
||||
|
||||
|
||||
def finalize_menu_and_toolbar(self):
|
||||
# Sortieren nach Priority
|
||||
if not self.menu or not self.toolbar:
|
||||
return
|
||||
|
||||
self.actions.sort(key=lambda x: x[0])
|
||||
|
||||
# Menüeinträge
|
||||
self.menu.clear()
|
||||
self.toolbar.clear()
|
||||
|
||||
for _, action in self.actions:
|
||||
self.menu.addAction(action)
|
||||
|
||||
# Toolbar-Einträge
|
||||
self.toolbar.clear()
|
||||
for _, action in self.actions:
|
||||
self.toolbar.addAction(action)
|
||||
|
||||
def set_active_plugin(self, active_action):
|
||||
# Alle zurücksetzen, dann aktives Plugin markieren
|
||||
for _, action in self.actions:
|
||||
action.setChecked(False)
|
||||
if active_action:
|
||||
active_action.setChecked(True)
|
||||
|
||||
def remove_all(self):
|
||||
"""Alles entfernen beim Entladen des Basisplugins"""
|
||||
# Menü entfernen
|
||||
if self.menu:
|
||||
self.iface.mainWindow().menuBar().removeAction(self.menu.menuAction())
|
||||
self.menu = None
|
||||
|
||||
# Toolbar entfernen
|
||||
if self.toolbar:
|
||||
self.iface.mainWindow().removeToolBar(self.toolbar)
|
||||
self.toolbar = None
|
||||
|
||||
# Actions zurücksetzen
|
||||
self.actions.clear()
|
||||
|
||||
# Gruppe leeren
|
||||
self.plugin_group = None
|
||||
# -----------------------------------------------------
|
||||
# Cleanup
|
||||
# -----------------------------------------------------
|
||||
|
||||
def remove_action(self, action):
|
||||
"""Entfernt eine einzelne Action aus Menü und Toolbar"""
|
||||
if not action:
|
||||
return
|
||||
# Menüeintrag entfernen
|
||||
|
||||
if self.menu:
|
||||
self.menu.removeAction(action)
|
||||
# Toolbar-Eintrag entfernen
|
||||
if self.toolbar:
|
||||
self.toolbar.removeAction(action)
|
||||
# Aus der internen Liste löschen
|
||||
|
||||
self.actions = [(p, a) for p, a in self.actions if a != action]
|
||||
|
||||
def remove_all(self):
|
||||
if self.menu:
|
||||
remove_menu(self.menu)
|
||||
self.menu = None
|
||||
|
||||
if self.toolbar:
|
||||
remove_toolbar(self.toolbar)
|
||||
self.toolbar = None
|
||||
|
||||
self.actions.clear()
|
||||
self.plugin_group = None
|
||||
|
||||
|
||||
@@ -1,129 +1,87 @@
|
||||
# sn_basis/ui/tabs/settings_tab.py
|
||||
"""
|
||||
sn_basis/ui/base_dockwidget.py
|
||||
|
||||
from sn_basis.functions.qgisqt_wrapper import (
|
||||
QWidget, QGridLayout, QLabel, QLineEdit,
|
||||
QGroupBox, QVBoxLayout, QPushButton,
|
||||
info, warning, error
|
||||
)
|
||||
Basis-Dockwidget für alle LNO-Module.
|
||||
"""
|
||||
|
||||
from sn_basis.functions.settings_logic import SettingsLogic
|
||||
from sn_basis.functions.qt_wrapper import QDockWidget, QTabWidget
|
||||
from sn_basis.functions.message_wrapper import warning, error
|
||||
|
||||
|
||||
class SettingsTab(QWidget):
|
||||
class BaseDockWidget(QDockWidget):
|
||||
"""
|
||||
Tab für benutzer- und projektspezifische Einstellungen.
|
||||
Nutzt SettingsLogic für das Laden/Speichern und den Wrapper für Meldungen.
|
||||
Basis-Dockwidget für alle LNO-Module.
|
||||
|
||||
- Titel wird automatisch aus base_title + subtitle erzeugt
|
||||
- Tabs werden dynamisch aus der Klassenvariable 'tabs' erzeugt
|
||||
- Die zugehörige Toolbar-Action wird beim Schließen zurückgesetzt
|
||||
"""
|
||||
|
||||
tab_title = "Projekteigenschaften"
|
||||
base_title = "LNO Sachsen"
|
||||
tabs = [] # Liste von Tab-Klassen
|
||||
action = None # Referenz auf die Toolbar-Action
|
||||
|
||||
def __init__(self, parent=None):
|
||||
def __init__(self, parent=None, subtitle=""):
|
||||
super().__init__(parent)
|
||||
self.logic = SettingsLogic()
|
||||
|
||||
main_layout = QVBoxLayout()
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Definition der Felder
|
||||
# Titel setzen
|
||||
# -----------------------------------------------------
|
||||
self.user_fields = {
|
||||
"amt": "Amt:",
|
||||
"behoerde": "Behörde:",
|
||||
"landkreis_user": "Landkreis:",
|
||||
"sachgebiet": "Sachgebiet:"
|
||||
}
|
||||
|
||||
self.project_fields = {
|
||||
"bezeichnung": "Bezeichnung:",
|
||||
"verfahrensnummer": "Verfahrensnummer:",
|
||||
"gemeinden": "Gemeinde(n):",
|
||||
"landkreise_proj": "Landkreis(e):"
|
||||
}
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Benutzer-Felder
|
||||
# -----------------------------------------------------
|
||||
user_group = QGroupBox("Benutzerspezifische Festlegungen")
|
||||
user_layout = QGridLayout()
|
||||
self.user_inputs = {}
|
||||
|
||||
for row, (key, label) in enumerate(self.user_fields.items()):
|
||||
line_edit = QLineEdit()
|
||||
self.user_inputs[key] = line_edit
|
||||
user_layout.addWidget(QLabel(label), row, 0)
|
||||
user_layout.addWidget(line_edit, row, 1)
|
||||
|
||||
user_group.setLayout(user_layout)
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Projekt-Felder
|
||||
# -----------------------------------------------------
|
||||
project_group = QGroupBox("Projektspezifische Festlegungen")
|
||||
project_layout = QGridLayout()
|
||||
self.project_inputs = {}
|
||||
|
||||
for row, (key, label) in enumerate(self.project_fields.items()):
|
||||
line_edit = QLineEdit()
|
||||
self.project_inputs[key] = line_edit
|
||||
project_layout.addWidget(QLabel(label), row, 0)
|
||||
project_layout.addWidget(line_edit, row, 1)
|
||||
|
||||
project_group.setLayout(project_layout)
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Speichern-Button
|
||||
# -----------------------------------------------------
|
||||
save_button = QPushButton("Speichern")
|
||||
save_button.clicked.connect(self.save_data)
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Layout zusammenfügen
|
||||
# -----------------------------------------------------
|
||||
main_layout.addWidget(user_group)
|
||||
main_layout.addWidget(project_group)
|
||||
main_layout.addStretch()
|
||||
main_layout.addWidget(save_button)
|
||||
|
||||
self.setLayout(main_layout)
|
||||
|
||||
# Daten laden
|
||||
self.load_data()
|
||||
|
||||
# ---------------------------------------------------------
|
||||
# Speichern
|
||||
# ---------------------------------------------------------
|
||||
|
||||
def save_data(self):
|
||||
"""
|
||||
Speichert alle Eingaben über SettingsLogic.
|
||||
Fehler werden über den Wrapper gemeldet.
|
||||
"""
|
||||
try:
|
||||
fields = {
|
||||
key: widget.text()
|
||||
for key, widget in {**self.user_inputs, **self.project_inputs}.items()
|
||||
}
|
||||
title = (
|
||||
self.base_title
|
||||
if not subtitle
|
||||
else f"{self.base_title} | {subtitle}"
|
||||
)
|
||||
self.setWindowTitle(title)
|
||||
except Exception as e:
|
||||
warning("Titel konnte nicht gesetzt werden", str(e))
|
||||
|
||||
self.logic.save(fields)
|
||||
info("Gespeichert", "Die Einstellungen wurden erfolgreich gespeichert.")
|
||||
# -----------------------------------------------------
|
||||
# Tabs erzeugen
|
||||
# -----------------------------------------------------
|
||||
try:
|
||||
tab_widget = QTabWidget()
|
||||
|
||||
for tab_class in self.tabs:
|
||||
try:
|
||||
tab_instance = tab_class()
|
||||
tab_title = getattr(
|
||||
tab_class,
|
||||
"tab_title",
|
||||
tab_class.__name__,
|
||||
)
|
||||
tab_widget.addTab(tab_instance, tab_title)
|
||||
except Exception as e:
|
||||
error(
|
||||
"Tab konnte nicht geladen werden",
|
||||
f"{tab_class}: {e}",
|
||||
)
|
||||
|
||||
self.setWidget(tab_widget)
|
||||
|
||||
except Exception as e:
|
||||
error("Fehler beim Speichern", str(e))
|
||||
error(
|
||||
"Tab-Widget konnte nicht initialisiert werden",
|
||||
str(e),
|
||||
)
|
||||
|
||||
# ---------------------------------------------------------
|
||||
# Laden
|
||||
# Dock schließen
|
||||
# ---------------------------------------------------------
|
||||
|
||||
def load_data(self):
|
||||
def closeEvent(self, event):
|
||||
"""
|
||||
Lädt gespeicherte Einstellungen und füllt die Felder.
|
||||
Fehler werden über den Wrapper gemeldet.
|
||||
Wird aufgerufen, wenn das Dock geschlossen wird.
|
||||
Setzt die zugehörige Toolbar-Action zurück.
|
||||
"""
|
||||
try:
|
||||
data = self.logic.load()
|
||||
|
||||
for key, widget in {**self.user_inputs, **self.project_inputs}.items():
|
||||
widget.setText(data.get(key, ""))
|
||||
|
||||
if self.action:
|
||||
self.action.setChecked(False)
|
||||
except Exception as e:
|
||||
warning("Einstellungen konnten nicht geladen werden", str(e))
|
||||
warning(
|
||||
"Toolbar-Status konnte nicht zurückgesetzt werden",
|
||||
str(e),
|
||||
)
|
||||
|
||||
super().closeEvent(event)
|
||||
|
||||
Reference in New Issue
Block a user