change: reference dataclass values in enum

dzgui/config/query.py

@@ -5,6 +5,7 @@ from dzgui.util._json import read_json
 
 from dzgui.const.enum import Preferences
 
+
 class ConfigFileError(Exception):
     pass
 
@@ -39,4 +40,4 @@ def get_favorites(path: Path) -> list[str]:
 
 
 def enum_to_key(enum: Preferences) -> str:
-    return str(enum.dict["key"])
+    return str(enum.key)

dzgui/const/enum.py

@@ -1,7 +1,9 @@
+from __future__ import annotations
+from dataclasses import dataclass
 from enum import Enum
-from typing import Any, Self
 
 from dzgui.util import strings
+from dzgui.strings import rows
 
 
 class Port(Enum):
@@ -46,125 +48,61 @@ class FilterMode(Enum):
     TOGGLE_ON = 3
 
 
-class EnumWithAttrs(Enum):
+@dataclass(slots=True, frozen=True)
-    def __new__(cls, *args: Any, **kwargs: Any) -> Self:
+class ModButtonMeta:
-        value = len(cls.__members__) + 1
+    label: str
-        obj = object.__new__(cls)
+    tooltip: str
-        obj._value_ = value
-        return obj
-
-    def __init__(self, d: dict):
-        self.dict = d
 
 
-class Preferences(EnumWithAttrs):
+@dataclass(slots=True, frozen=True)
-    STEAM = {
+class ButtonTypeMeta:
-        "key": "steam_api",
+    label: str
-    }
+    tooltip: str
-    CLIENT = {
+    opens: NotebookPage
-        "key": "client",
-    }
-    WINDOW = {
-        "key": "fullscreen",
-    }
-    DIST = {
-        "key": "use_miles",
-    }
-    NAME = {
-        "key": "name",
-    }
-    DEFAULT = {
-        "key": "default_steam_path",
-    }
-    FAV_LBL = {
-        "key": "fav_label",
-    }
-    FAV_SRV = {
-        "key": "fav_server",
-    }
-    IP_LIST = {
-        "key": "ip_list",
-    }
-    START_TAB = {
-        "key": "start_tab",
-    }
 
 
-class NotebookPage(EnumWithAttrs):
+@dataclass(slots=True, frozen=True)
-    OFFLINE = {"crumbs": strings.crumbs.offline, "statusbar": True}
+class ConfigKey:
-    CHANGELOG = {"crumbs": strings.crumbs.changelog, "statusbar": True}
+    key: str
-    DEVELOPERS = {"crumbs": strings.crumbs.developers, "statusbar": False}
-    HELP = {"crumbs": strings.crumbs._help, "statusbar": True}
-    KEYS = {"crumbs": strings.crumbs.keys, "statusbar": True}
-    LOG = {"crumbs": strings.crumbs.log, "statusbar": True}
-    MODS = {"crumbs": strings.crumbs.mods, "statusbar": True}
-    OPTIONS = {"crumbs": strings.crumbs.options, "statusbar": False}
-    SERVERS = {"crumbs": strings.crumbs.servers, "statusbar": True}
-    THANKS = {"crumbs": strings.crumbs.thanks, "statusbar": True}
-    CONNECTION = {"crumbs": "Connect", "statusbar": True}
 
 
-class RowType(EnumWithAttrs):
+@dataclass(slots=True, frozen=True)
-    # TODO: strings
+class NotebookMeta:
-    CHANGELOG = {
+    crumbs: str
-        "label": "View changelog",
+    has_statusbar: bool
-        "tooltip": "Opens the DZGUI changelog",
-    }
-    SHOW_LOG = {
-        "label": "Show debug log",
-        "tooltip": "Read the DZGUI log generated since startup",
-    }
-    SEPARATOR = {
-        "label": "SEPARATOR",
-        "tooltip": "",
-    }
-    DUMP_LOG = {
-        "label": "Output system info to log file",
-        "tooltip": "Dump diagnostic data for troubleshooting",
-    }
-    DOCS = {
-        "label": "Documentation/help files (GitHub) ⧉",
-        "tooltip": "Open the DZGUI documentation in a browser",
-    }
-    DOCS_FALLBACK = {
-        "label": "Documentation/help files (Codeberg mirror) ⧉",
-        "tooltip": "Open the DZGUI documentation in a browser",
-    }
-    BUGS = {
-        "label": "Report a bug (GitHub) ⧉",
-        "tooltip": "Open the DZGUI issue tracker in a browser",
-    }
-    FORUM = {
-        "label": "DZGUI Subreddit ⧉",
-        "tooltip": "Open the DZGUI discussion forum in a browser",
-    }
-    SPONSOR = {
-        "label": "Sponsor (GitHub) ⧉",
-        "tooltip": "Sponsor development of the DZGUI project",
-    }
-    THANKS = {
-        "label": "Special thanks",
-        "tooltip": "A list of contributors, testers, and sponsors",
-    }
 
 
-# TODO: rename to ContextMenuItem
+@dataclass(slots=True, frozen=True)
-class ContextMenu(EnumWithAttrs):
+class RowMeta:
-    ADD_NOTE = {"label": strings.add_note}
+    label: str
-    ADD_SERVER = {"label": strings.add}
+    tooltip: str
-    CONNECT = {"label": strings.connect}
+
-    COPY_LOG_CLIPBOARD = {"label": strings.copy_log}
+
-    COPY_SERVER_IP = {"label": strings.copy_ip}
+@dataclass(slots=True, frozen=True)
-    COPY_SERVER_NAME = {"label": strings.copy_name}
+class ContextMenuMeta:
-    UNSUB_MOD = {"label": strings.unsub_mod}
+    label: str
-    VALIDATE_MOD = {"label": strings.validate_mod}
+
-    OPEN_WORKSHOP = {"label": strings.open_workshop}
+
-    REFRESH_PLAYERS = {"label": strings.refresh_players}
+class ContextMenuItem(Enum):
-    REMOVE_HISTORY = {"label": strings.remove_history}
+    ADD_NOTE = ContextMenuMeta(strings.add_note)
-    REMOVE_SERVER = {"label": strings.remove}
+    ADD_SERVER = ContextMenuMeta(strings.add)
-    SET_FAV = {"label": strings.add_fav}
+    CONNECT = ContextMenuMeta(strings.connect)
-    SHOW_DETAILS = {"label": strings.show_details}
+    COPY_LOG_CLIPBOARD = ContextMenuMeta(strings.copy_log)
-    SHOW_MODS = {"label": strings.show_mods}
+    COPY_SERVER_IP = ContextMenuMeta(strings.copy_ip)
+    COPY_SERVER_NAME = ContextMenuMeta(strings.copy_name)
+    UNSUB_MOD = ContextMenuMeta(strings.unsub_mod)
+    VALIDATE_MOD = ContextMenuMeta(strings.validate_mod)
+    OPEN_WORKSHOP = ContextMenuMeta(strings.open_workshop)
+    REFRESH_PLAYERS = ContextMenuMeta(strings.refresh_players)
+    REMOVE_HISTORY = ContextMenuMeta(strings.remove_history)
+    REMOVE_SERVER = ContextMenuMeta(strings.remove)
+    SET_FAV = ContextMenuMeta(strings.add_fav)
+    SHOW_DETAILS = ContextMenuMeta(strings.show_details)
+    SHOW_MODS = ContextMenuMeta(strings.show_mods)
+
+    @property
+    def label(self) -> str:
+        return self.value.label
 
 
 class ContextMenuGroup(Enum):
@@ -172,113 +110,193 @@ class ContextMenuGroup(Enum):
     Groupings of context menu items
     """
 
-    SERVER_MOD = (ContextMenu.OPEN_WORKSHOP,)
+    SERVER_MOD = (ContextMenuItem.OPEN_WORKSHOP,)
-    MOD = (ContextMenu.OPEN_WORKSHOP, ContextMenu.UNSUB_MOD, ContextMenu.VALIDATE_MOD)
+    MOD = (
+        ContextMenuItem.OPEN_WORKSHOP,
+        ContextMenuItem.UNSUB_MOD,
+        ContextMenuItem.VALIDATE_MOD,
+    )
     MOD_OFFLINE = (None,)
-    LOG = (ContextMenu.COPY_LOG_CLIPBOARD,)
+    LOG = (ContextMenuItem.COPY_LOG_CLIPBOARD,)
     SERVER_BROWSER = (
-        ContextMenu.CONNECT,
+        ContextMenuItem.CONNECT,
-        ContextMenu.ADD_SERVER,
+        ContextMenuItem.ADD_SERVER,
-        ContextMenu.SET_FAV,
+        ContextMenuItem.SET_FAV,
-        ContextMenu.COPY_SERVER_NAME,
+        ContextMenuItem.COPY_SERVER_NAME,
-        ContextMenu.COPY_SERVER_IP,
+        ContextMenuItem.COPY_SERVER_IP,
-        ContextMenu.ADD_NOTE,
+        ContextMenuItem.ADD_NOTE,
-        ContextMenu.SHOW_MODS,
+        ContextMenuItem.SHOW_MODS,
-        ContextMenu.SHOW_DETAILS,
+        ContextMenuItem.SHOW_DETAILS,
-        ContextMenu.REFRESH_PLAYERS,
+        ContextMenuItem.REFRESH_PLAYERS,
     )
     SCAN_LAN = (
-        ContextMenu.CONNECT,
+        ContextMenuItem.CONNECT,
-        ContextMenu.SET_FAV,
+        ContextMenuItem.SET_FAV,
-        ContextMenu.COPY_SERVER_NAME,
+        ContextMenuItem.COPY_SERVER_NAME,
-        ContextMenu.COPY_SERVER_IP,
+        ContextMenuItem.COPY_SERVER_IP,
-        ContextMenu.ADD_NOTE,
+        ContextMenuItem.ADD_NOTE,
-        ContextMenu.SHOW_MODS,
+        ContextMenuItem.SHOW_MODS,
-        ContextMenu.SHOW_DETAILS,
+        ContextMenuItem.SHOW_DETAILS,
-        ContextMenu.REFRESH_PLAYERS,
+        ContextMenuItem.REFRESH_PLAYERS,
     )
     SAVED = (
-        ContextMenu.CONNECT,
+        ContextMenuItem.CONNECT,
-        ContextMenu.SET_FAV,
+        ContextMenuItem.SET_FAV,
-        ContextMenu.REMOVE_SERVER,
+        ContextMenuItem.REMOVE_SERVER,
-        ContextMenu.COPY_SERVER_NAME,
+        ContextMenuItem.COPY_SERVER_NAME,
-        ContextMenu.COPY_SERVER_IP,
+        ContextMenuItem.COPY_SERVER_IP,
-        ContextMenu.ADD_NOTE,
+        ContextMenuItem.ADD_NOTE,
-        ContextMenu.SHOW_MODS,
+        ContextMenuItem.SHOW_MODS,
-        ContextMenu.SHOW_DETAILS,
+        ContextMenuItem.SHOW_DETAILS,
-        ContextMenu.REFRESH_PLAYERS,
+        ContextMenuItem.REFRESH_PLAYERS,
     )
     RECENT = (
-        ContextMenu.CONNECT,
+        ContextMenuItem.CONNECT,
-        ContextMenu.ADD_SERVER,
+        ContextMenuItem.ADD_SERVER,
-        ContextMenu.SET_FAV,
+        ContextMenuItem.SET_FAV,
-        ContextMenu.REMOVE_HISTORY,
+        ContextMenuItem.REMOVE_HISTORY,
-        ContextMenu.COPY_SERVER_NAME,
+        ContextMenuItem.COPY_SERVER_NAME,
-        ContextMenu.COPY_SERVER_IP,
+        ContextMenuItem.COPY_SERVER_IP,
-        ContextMenu.ADD_NOTE,
+        ContextMenuItem.ADD_NOTE,
-        ContextMenu.SHOW_MODS,
+        ContextMenuItem.SHOW_MODS,
-        ContextMenu.SHOW_DETAILS,
+        ContextMenuItem.SHOW_DETAILS,
-        ContextMenu.REFRESH_PLAYERS,
+        ContextMenuItem.REFRESH_PLAYERS,
     )
 
 
-class ModButton(EnumWithAttrs):
+class Preferences(Enum):
-    SELECT_ALL = {
+    STEAM = ConfigKey("steam_api")
-        "label": strings.mod_panel.select_all,
+    CLIENT = ConfigKey("client")
-        "tooltip": strings.mod_panel.select_all_tooltip,
+    WINDOW = ConfigKey("fullscreen")
-    }
+    DIST = ConfigKey("use_miles")
-    UNSELECT_ALL = {
+    NAME = ConfigKey("name")
-        "label": strings.mod_panel.unselect_all,
+    DEFAULT = ConfigKey("default_steam_path")
-        "tooltip": strings.mod_panel.unselect_all_tooltip,
+    FAV_LBL = ConfigKey("fav_label")
-    }
+    FAV_SRV = ConfigKey("fav_server")
-    HIGHLIGHT_STALE = {
+    IP_LIST = ConfigKey("ip_list")
-        "label": strings.mod_panel.highlight_stale,
+    START_TAB = ConfigKey("start_tab")
-        "tooltip": strings.mod_panel.highlight_stale_tooltip,
+
-    }
+    @property
-    UNHIGHLIGHT_STALE = {
+    def key(self) -> str:
-        "label": strings.mod_panel.unhighlight_stale,
+        return self.value.key
-        "tooltip": strings.mod_panel.unhighlight_stale_tooltip,
-    }
-    UNSUB_SELECTED = {
-        "label": strings.mod_panel.unsub_selected,
-        "tooltip": strings.mod_panel.unsub_selected_tooltip,
-    }
-    SELECT_STALE = {
-        "label": strings.mod_panel.select_stale,
-        "tooltip": strings.mod_panel.select_stale_tooltip,
-    }
-    VALIDATE = {
-        "label": strings.mod_panel.validate,
-        "tooltip": strings.mod_panel.validate_tooltip,
-    }
 
 
-class ButtonType(EnumWithAttrs):
+class NotebookPage(Enum):
-    SERVERS = {
+    OFFLINE = NotebookMeta(strings.crumbs.offline, True)
-        "label": strings.buttons.servers_label,
+    CHANGELOG = NotebookMeta(strings.crumbs.changelog, True)
-        "tooltip": strings.buttons.servers_tooltip,
+    DEVELOPERS = NotebookMeta(strings.crumbs.developers, False)
-        "opens": NotebookPage.SERVERS,
+    HELP = NotebookMeta(strings.crumbs._help, True)
-    }
+    KEYS = NotebookMeta(strings.crumbs.keys, True)
-    MODS = {
+    LOG = NotebookMeta(strings.crumbs.log, True)
-        "label": strings.buttons.mods_label,
+    MODS = NotebookMeta(strings.crumbs.mods, True)
-        "tooltip": strings.buttons.mods_tooltip,
+    OPTIONS = NotebookMeta(strings.crumbs.options, False)
-        "opens": NotebookPage.MODS,
+    SERVERS = NotebookMeta(strings.crumbs.servers, True)
-    }
+    THANKS = NotebookMeta(strings.crumbs.thanks, True)
-    OPTIONS = {
+    CONNECTION = NotebookMeta(strings.crumbs.connect, True)
-        "label": strings.buttons.options_label,
+
-        "tooltip": strings.buttons.options_tooltip,
+    @property
-        "opens": NotebookPage.OPTIONS,
+    def crumbs(self) -> str:
-    }
+        return self.value.crumbs
-    HELP = {
+
-        "label": strings.buttons.help_label,
+    @property
-        "tooltip": strings.buttons.help_tooltip,
+    def has_statusbar(self) -> bool:
-        "opens": NotebookPage.HELP,
+        return self.value.has_statusbar
-    }
+
-    EXIT = {
+
-        "label": strings.buttons.exit_label,
+class RowType(Enum):
-        "tooltip": strings.buttons.exit_tooltip,
+    CHANGELOG = RowMeta(rows.changelog_label, rows.changelog_status)
-        "opens": None,
+    SHOW_LOG = RowMeta(rows.log_label, rows.log_status)
-    }
+    SEPARATOR = RowMeta(rows.separator_label, rows.separator_status)
+    DUMP_LOG = RowMeta(rows.system_log_label, rows.system_log_status)
+    DOCS = RowMeta(rows.docs_label, rows.docs_status)
+    DOCS_FALLBACK = RowMeta(rows.docs_fallback_label, rows.docs_fallback_status)
+    BUGS = RowMeta(rows.bugs_label, rows.bugs_status)
+    FORUM = RowMeta(rows.forum_label, rows.forum_status)
+    SPONSOR = RowMeta(rows.sponsor_label, rows.sponsor_status)
+    THANKS = RowMeta(rows.thanks_label, rows.thanks_status)
+
+    @property
+    def label(self) -> str:
+        return self.value.label
+
+    @property
+    def tooltip(self) -> str:
+        return self.value.tooltip
+
+
+class ModButton(Enum):
+    SELECT_ALL = ModButtonMeta(
+        strings.mod_panel.select_all, strings.mod_panel.select_all_tooltip
+    )
+    UNSELECT_ALL = ModButtonMeta(
+        strings.mod_panel.unselect_all, strings.mod_panel.unselect_all_tooltip
+    )
+    HIGHLIGHT_STALE = ModButtonMeta(
+        strings.mod_panel.highlight_stale, strings.mod_panel.highlight_stale_tooltip
+    )
+    UNHIGHLIGHT_STALE = ModButtonMeta(
+        strings.mod_panel.unhighlight_stale, strings.mod_panel.unhighlight_stale_tooltip
+    )
+    UNSUB_SELECTED = ModButtonMeta(
+        strings.mod_panel.unsub_selected,
+        strings.mod_panel.unsub_selected_tooltip,
+    )
+    SELECT_STALE = ModButtonMeta(
+        strings.mod_panel.select_stale,
+        strings.mod_panel.select_stale_tooltip,
+    )
+    VALIDATE = ModButtonMeta(
+        strings.mod_panel.validate,
+        strings.mod_panel.validate_tooltip,
+    )
+
+    @property
+    def label(self) -> str:
+        return self.value.label
+
+    @property
+    def tooltip(self) -> str:
+        return self.value.tooltip
+
+
+class ButtonType(Enum):
+    SERVERS = ButtonTypeMeta(
+        strings.buttons.servers_label,
+        strings.buttons.servers_tooltip,
+        NotebookPage.SERVERS,
+    )
+    MODS = ButtonTypeMeta(
+        strings.buttons.mods_label,
+        strings.buttons.mods_tooltip,
+        NotebookPage.MODS,
+    )
+    OPTIONS = ButtonTypeMeta(
+        strings.buttons.options_label,
+        strings.buttons.options_tooltip,
+        NotebookPage.OPTIONS,
+    )
+    HELP = ButtonTypeMeta(
+        strings.buttons.help_label,
+        strings.buttons.help_tooltip,
+        NotebookPage.HELP,
+    )
+    EXIT = ButtonTypeMeta(
+        strings.buttons.exit_label,
+        strings.buttons.exit_tooltip,
+        None,
+    )
+
+    @property
+    def label(self) -> str:
+        return self.value.label
+
+    @property
+    def tooltip(self) -> str:
+        return self.value.tooltip
+
+    @property
+    def opens(self) -> str:
+        return self.value.opens
 
 
 HELP_MENU_ROWS = (

dzgui/controllers/mc.py

@@ -8,7 +8,7 @@ import dzgui.util._json as JSON  # noqa
 
 from dzgui.const.enum import (
     ButtonType,
-    ContextMenu,
+    ContextMenuItem,
     FilterMode,
     NotebookPage,
     Preferences,
@@ -262,7 +262,7 @@ class Controller(GObject.GObject):
             logger.critical(e)
             return
 
-    def menu_action(self, action: ContextMenu, tree: "ServerTreeView") -> None:
+    def menu_action(self, action: ContextMenuItem, tree: "ServerTreeView") -> None:
         context_man = ContextMenuManager(tree, self)
         context_man.process(action)
 
@@ -274,7 +274,7 @@ class Controller(GObject.GObject):
         except Exception as e:
             dialog = ExceptionDialog(self, str(e))
             dialog.show_all()
-            dialog.run()
+            dialog.run()  # type: ignore[no-untyped-call]
 
     def select_colorized(self) -> None:
         mod_man = self.mediator.modtreeview.get_mod_man()
@@ -308,7 +308,7 @@ class Controller(GObject.GObject):
             except Exception as e:
                 dialog = ExceptionDialog(self, str(e))
                 dialog.show_all()
-                dialog.run()
+                dialog.run()  # type: ignore[no-untyped-call]
 
     def update_steam_api_key(self, text: str) -> None:
         self.config_man.update_steam_api_key(text)
@@ -365,12 +365,11 @@ class Controller(GObject.GObject):
         filter_man = self.get_filter_man()
         return filter_man.get_map_store()
 
-    def get_enabled_filters(self) -> dict:
+    def get_enabled_filters(self) -> dict[str, bool]:
         filter_man = self.get_filter_man()
         return filter_man.get_filters()
 
     # FIXME: wipe maps store when changing tabs if model is none
-
     def has_server_model(self) -> bool:
         treeview = self.get_active_treeview()
         proxy_man = treeview.get_proxy_man()

dzgui/managers/config.py

@@ -124,7 +124,7 @@ class ConfigManager:
         return False
 
     def enum_to_key(self, enum: Preferences) -> str:
-        return str(enum.dict["key"])
+        return str(enum.key)
 
     def toggle_config(self, key: Preferences) -> None:
         try:

dzgui/managers/contextmenu.py

@@ -2,7 +2,7 @@ import logging
 from typing import TYPE_CHECKING
 
 from dzgui.const.constants import APP_NAME
-from dzgui.const.enum import ContextMenu, Preferences
+from dzgui.const.enum import ContextMenuItem, Preferences
 from dzgui.util.clip import copy_clipboard
 from dzgui.util.open_links import open_workshop_page
 
@@ -34,7 +34,7 @@ class ContextMenuManager:
         self.controller = controller
         self.treeview = treeview
 
-    def process(self, action: ContextMenu) -> None:
+    def process(self, action: ContextMenuItem) -> None:
         if isinstance(self.treeview, ServerTreeView):
             record = self.treeview.get_record()
             if record is None:
@@ -42,14 +42,14 @@ class ContextMenuManager:
 
             match action:
                 # UNTHREADED
-                case ContextMenu.ADD_NOTE:
+                case ContextMenuItem.ADD_NOTE:
                     dialog = NoteDialog(self.controller)
-                    dialog.run()
+                    dialog.run()  # type: ignore[no-untyped-call]
-                case ContextMenu.COPY_SERVER_IP:
+                case ContextMenuItem.COPY_SERVER_IP:
                     self.copy_server_ip()
-                case ContextMenu.COPY_SERVER_NAME:
+                case ContextMenuItem.COPY_SERVER_NAME:
                     self.copy_server_name()
-                case ContextMenu.SET_FAV:
+                case ContextMenuItem.SET_FAV:
                     name = self.treeview.get_value_at_index(0)
                     # NOTE: fully qualified ip
                     fqip = self.treeview.get_record_string()
@@ -58,40 +58,40 @@ class ContextMenuManager:
                     self.controller.set_fav(name, fqip, simple)
 
                 # THREADED
-                case ContextMenu.ADD_SERVER:
+                case ContextMenuItem.ADD_SERVER:
                     self.controller.add_by_record(record)
-                case ContextMenu.CONNECT:
+                case ContextMenuItem.CONNECT:
                     self.controller.connect_by_record(record)
-                case ContextMenu.REFRESH_PLAYERS:
+                case ContextMenuItem.REFRESH_PLAYERS:
                     self.controller.refresh_players(record)
-                case ContextMenu.REMOVE_HISTORY:
+                case ContextMenuItem.REMOVE_HISTORY:
                     self.controller.remove_from_history(record)
-                case ContextMenu.REMOVE_SERVER:
+                case ContextMenuItem.REMOVE_SERVER:
                     self.controller.remove_by_record(record)
-                case ContextMenu.SHOW_DETAILS:
+                case ContextMenuItem.SHOW_DETAILS:
                     self.controller.get_details(record)
-                case ContextMenu.SHOW_MODS:
+                case ContextMenuItem.SHOW_MODS:
                     self.controller.get_modlist(record)
 
         if isinstance(self.treeview, (ModTreeView, OfflineModTreeView)):
             match action:
-                case ContextMenu.OPEN_WORKSHOP:
+                case ContextMenuItem.OPEN_WORKSHOP:
                     self.open_mod_page()
-                case ContextMenu.UNSUB_MOD:
+                case ContextMenuItem.UNSUB_MOD:
                     self.controller.unsub_mods(self.treeview)
-                case ContextMenu.VALIDATE_MOD:
+                case ContextMenuItem.VALIDATE_MOD:
                     self.controller.validate_mods(self.treeview)
                 case _:
                     pass
 
         if isinstance(self.treeview, LogTreeView):
             match action:
-                case ContextMenu.COPY_LOG_CLIPBOARD:
+                case ContextMenuItem.COPY_LOG_CLIPBOARD:
                     self.copy_log()
 
         if isinstance(self.treeview, ServerModTreeView):
             match action:
-                case ContextMenu.OPEN_WORKSHOP:
+                case ContextMenuItem.OPEN_WORKSHOP:
                     self.open_mod_page()
 
     def copy_server_ip(self) -> None:

dzgui/model/model_factory.py

@@ -147,7 +147,7 @@ class ModelFactory:
 
     def make_help_store(self) -> FastInsertListStore:
         store = self.new_model_from_class(MenuCols)
-        rows = [[row.dict["label"], row] for row in HELP_MENU_ROWS]
+        rows = [[row.label, row] for row in HELP_MENU_ROWS]
         store.extend(rows)
         return store
 

dzgui/util/strings.py

@@ -252,6 +252,7 @@ class Crumbs:
     developers: str
     default: str
     offline: str
+    connect: str
 
 
 @dataclass(slots=True, frozen=True)
@@ -439,6 +440,7 @@ crumbs = Crumbs(
     developers="Options > Developers",
     default="Servers > ",
     offline="Mods > Play offline",
+    connect="Connect",
 )
 
 no_mods = "No local mods found."

dzgui/views/components/buttonbox.py

@@ -51,9 +51,9 @@ class ButtonBox(Gtk.Box):
 
         for side_button in ButtonType:
             button = ContextualButton(
-                label=side_button.dict["label"],
+                label=side_button.label,
-                opens=side_button.dict["opens"],
+                opens=side_button.opens,
-                tooltip=side_button.dict["tooltip"],
+                tooltip=side_button.tooltip,
                 context=side_button,
             )
 

dzgui/views/components/crumbs.py

@@ -43,7 +43,7 @@ class Breadcrumbs(Gtk.Label):
             label = page.get_current_tab_text()
             self.set_server_crumbs(label)
         else:
-            crumbs = enum.dict["crumbs"]
+            crumbs = enum.crumbs
             self.set_crumbs(crumbs)
 
     def set_server_crumbs(self, suffix: str) -> None:

dzgui/views/components/mod_panel.py

@@ -20,8 +20,8 @@ class EnumeratedModButton(Gtk.Button):
         super().__init__(margin_start=10, margin_end=10, focus_on_click=False)
 
         self.enum = enum
-        self.set_label(enum.dict["label"])
+        self.set_label(enum.label)
-        self.set_tooltip_text(enum.dict["tooltip"])
+        self.set_tooltip_text(enum.tooltip)
 
 
 class ModPanelButton(EnumeratedModButton):

dzgui/views/components/statusbar.py

@@ -60,7 +60,7 @@ class Statusbar(Gtk.Grid):
             return
 
         enum = notebook.get_page_by_enum()
-        show_statusbar = enum.dict["statusbar"]
+        show_statusbar = enum.has_statusbar
 
         if show_statusbar is False:
             self.set_by_context(enum, "")
@@ -152,5 +152,5 @@ class Statusbar(Gtk.Grid):
         row = tree.get_value_at_index(1)
         if self.controller.loaded is False:
             return
-        tooltip = row.dict["tooltip"]
+        tooltip = row.tooltip
         self.set_by_context(NotebookPage.HELP, tooltip)

dzgui/views/mixins/context_mixin.py

@@ -1,7 +1,7 @@
 import logging
 
 from dzgui.const.constants import APP_NAME
-from dzgui.const.enum import ContextMenu
+from dzgui.const.enum import ContextMenuItem
 from dzgui.util.keys import is_ctrl_mask, is_navkey
 from dzgui.util.strings import edit_note
 from dzgui.views.trees.tree_base import TreeView
@@ -15,9 +15,7 @@ logger = logging.getLogger(APP_NAME)
 
 
 class ContextMixin(TreeView):
-    def present_menu(
+    def present_menu(self, widget: Gtk.Widget, event: Gdk.Event) -> bool:
-        self, widget: Gtk.Widget, event: Gdk.Event
-    ) -> bool:
 
         if self.menu is None:
             return False
@@ -60,17 +58,17 @@ class ContextMixin(TreeView):
         self.context_menu.select_first(False)
         return True
 
-    def _process_dynamic_row(self, row: ContextMenu) -> Gtk.MenuItem:
+    def _process_dynamic_row(self, row: ContextMenuItem) -> Gtk.MenuItem:
-        if row == ContextMenu.ADD_SERVER and self.is_in_favs():  # type: ignore
+        if row == ContextMenuItem.ADD_SERVER and self.is_in_favs():  # type: ignore
-            row = ContextMenu.REMOVE_SERVER
+            row = ContextMenuItem.REMOVE_SERVER
 
-        item = Gtk.MenuItem(label=row.dict["label"])
+        item = Gtk.MenuItem(label=row.label)
         item.connect("activate", self._on_menu_click, row)
 
-        if row == ContextMenu.SHOW_MODS:
+        if row == ContextMenuItem.SHOW_MODS:
             item.set_sensitive(self.is_modded())  # type: ignore
 
-        if row == ContextMenu.ADD_NOTE:
+        if row == ContextMenuItem.ADD_NOTE:
             if self.controller.has_note():
                 item.set_label(edit_note)
 
@@ -94,7 +92,7 @@ class ContextMixin(TreeView):
         except AttributeError:
             return False
 
-    def _on_menu_click(self, widget: Gtk.MenuItem, enum: ContextMenu) -> None:
+    def _on_menu_click(self, widget: Gtk.MenuItem, enum: ContextMenuItem) -> None:
         self.controller.menu_action(enum, self)  # type: ignore
 
     def _on_key(self, menu: Gtk.Menu, event: Gdk.EventKey) -> bool | None:

dzgui/views/trees/tree_menu.py

@@ -77,4 +77,4 @@ class MenuTreeView(TreeView):
             raise ValueError("Trying to call a method on non-existent model")
         _iter = self.get_focused_row_iter()
         rowtype = model.get_value(_iter, 1)
-        return str(rowtype.dict["tooltip"])
+        return str(rowtype.tooltip)

dzgui/views/trees/tree_servers.py

@@ -7,7 +7,7 @@ from warnings import deprecated
 
 from dzgui.api.servers import ping, Record
 from dzgui.const.constants import APP_NAME
-from dzgui.const.enum import ContextMenu, ContextMenuGroup, ServerTab
+from dzgui.const.enum import ContextMenuItem, ContextMenuGroup, ServerTab
 from dzgui.managers.filter import FilterManager
 from dzgui.model.proxy_model import ProxyModelManager
 from dzgui.util import strings
@@ -250,9 +250,9 @@ class ServerTreeView(ContextMixin, TreeView):  # type: ignore
                     if self.enum is ServerTab.LAN:
                         self.emitter.emit("request_custom_port_focus")
                 case Gdk.KEY_c:
-                    self.controller.menu_action(ContextMenu.COPY_SERVER_IP, self)
+                    self.controller.menu_action(ContextMenuItem.COPY_SERVER_IP, self)
                 case Gdk.KEY_r:
-                    self.controller.menu_action(ContextMenu.REFRESH_PLAYERS, self)
+                    self.controller.menu_action(ContextMenuItem.REFRESH_PLAYERS, self)
         else:
             match event.keyval:
                 case Gdk.KEY_l | Gdk.KEY_Right: