diff --git a/dzgui/controllers/mc.py b/dzgui/controllers/mc.py index b555fb3..c9874fd 100644 --- a/dzgui/controllers/mc.py +++ b/dzgui/controllers/mc.py @@ -62,7 +62,7 @@ logger = logging.getLogger(__name__) if TYPE_CHECKING: from dzgui.const.enum import ServerTab - from dzgui.model.map_model import MapManager + from dzgui.managers.filter_man import FilterManager from dzgui.util.dist import Haversine from dzgui.views.base import Notebook, Grid, OuterWindow from dzgui.views.components.buttonbox import ContextualButton @@ -492,8 +492,8 @@ class Controller(GObject.GObject): model[path][4] = None self.mediator.modtreeview.set_cursor(0) - def get_map_man(self) -> "MapManager": - return self.get_active_treeview().get_map_man() + def get_filter_man(self) -> "FilterManager": + return self.get_active_treeview().get_filter_man() def highlight_stale_cleanup(self, stale_mods: list) -> None: """Manipulates attached ListStore in the main event loop""" @@ -628,26 +628,26 @@ class Controller(GObject.GObject): return proxy_man.get_keyword_filter() def get_map_store(self) -> Gtk.ListStore: - map_man = self.get_map_man() - return map_man.get_map_store() + filter_man = self.get_filter_man() + return filter_man.get_map_store() def get_selected_map(self) -> str: - map_man = self.get_map_man() - return map_man.get_selected_map() + filter_man = self.get_filter_man() + return filter_man.get_selected_map() def get_enabled_filters(self) -> dict: - map_man = self.get_map_man() - return map_man.get_filters() + filter_man = self.get_filter_man() + return filter_man.get_filters() def get_prior_map(self) -> str: - map_man = self.get_map_man() - return map_man.get_prior_map() + filter_man = self.get_filter_man() + return filter_man.get_prior_map() def get_active_map(self) -> None: - return self.get_map_man().get_active_map() + return self.get_filter_man().get_active_map() def set_active_map(self, ind: int) -> None: - self.get_map_man().set_active_map(ind) + self.get_filter_man().set_active_map(ind) def _on_servers_loaded_init(self, emitter: "Emitter") -> None: # FIXME: wipe maps store when changing tabs if model is none @@ -663,8 +663,8 @@ class Controller(GObject.GObject): # TODO: this could be internal to filter panel now def _on_check_toggled(self, emitter: Emitter, label: str, state: bool) -> None: - map_man = self.get_map_man() - map_man.set_filter(label, state) + filter_man = self.get_filter_man() + filter_man.set_filter(label, state) if state: mode = FilterMode.TOGGLE_ON @@ -674,8 +674,8 @@ class Controller(GObject.GObject): # TODO: map man should be consolidated into filter man def _on_map_selection_changed(self, emitter: Emitter, selection: str) -> None: - map_man = self.get_map_man() - map_man.set_selected_map(selection) + filter_man = self.get_filter_man() + filter_man.set_selected_map(selection) # FIXME: label should not be mandatory ServerModelManager(self, self.get_active_treeview()).refilter(FilterMode.MAP, selection) diff --git a/dzgui/model/map_model.py b/dzgui/managers/filter_man.py similarity index 98% rename from dzgui/model/map_model.py rename to dzgui/managers/filter_man.py index 42739cb..101f9e1 100644 --- a/dzgui/model/map_model.py +++ b/dzgui/managers/filter_man.py @@ -8,8 +8,7 @@ if TYPE_CHECKING: from dzgui.model.model_factory import FastInsertListStore -# TODO: rename class to MetaManager -class MapManager: +class FilterManager: def __init__(self) -> None: self.map_store = ModelFactory().make_map_store() diff --git a/dzgui/model/servers.py b/dzgui/model/servers.py index c9887c5..ed28ad6 100644 --- a/dzgui/model/servers.py +++ b/dzgui/model/servers.py @@ -259,8 +259,8 @@ class ServerModelManager: self._update_maps() def _update_maps(self) -> None: - map_man = self.tv.get_map_man() - map_man.set_unique_maps(self._get_new_maps()) + filter_man = self.tv.get_filter_man() + filter_man.set_unique_maps(self._get_new_maps()) self.emitter.emit("servers_loaded_init") self.first_iteration = False @@ -289,8 +289,8 @@ class ServerModelManager: # NOTE: used by refresh action if not self.preserve_on_fail: self.tv.set_model(None) - map_man = self.tv.get_map_man() - map_man.set_unique_maps(None) + filter_man = self.tv.get_filter_man() + filter_man.set_unique_maps(None) # TODO: emit signal to not disable widget sensitivity # TODO: distinguish signals, e.g. "servers_failed_to_load", "servers_loaded_empty" diff --git a/dzgui/views/components/filter_panel.py b/dzgui/views/components/filter_panel.py index 5ec8678..700074e 100644 --- a/dzgui/views/components/filter_panel.py +++ b/dzgui/views/components/filter_panel.py @@ -150,9 +150,9 @@ class FilterPanel(Gtk.Box): # self.set_orientation(Gtk.Orientation.VERTICAL) # TODO: initialize to empty - map_man = self.controller.get_map_man() - defaults = map_man.get_default_filters() - self.map_store = map_man.get_map_store() + filter_man = self.controller.get_filter_man() + defaults = filter_man.get_default_filters() + self.map_store = filter_man.get_map_store() self.enabled_filters = defaults self.keyword_entry = KeywordEntry(self.controller) diff --git a/dzgui/views/trees/tree_servers.py b/dzgui/views/trees/tree_servers.py index 79f79b3..427df2e 100644 --- a/dzgui/views/trees/tree_servers.py +++ b/dzgui/views/trees/tree_servers.py @@ -8,7 +8,7 @@ from warnings import deprecated from dzgui.views.mixins.context_mixin import ContextMixin from dzgui.const.enum import ContextMenu, ContextMenuGroup, ServerTab from dzgui.api.servers import Record -from dzgui.model.map_model import MapManager +from dzgui.managers.filter_man import FilterManager from dzgui.model.proxy_model import ProxyModelManager from dzgui.util.dist import CalcDist from dzgui.util import strings @@ -49,8 +49,7 @@ class ServerTreeView(ContextMixin, TreeView): model = self.proxy_man.get_proxy_model() self.set_model(model) - # NOTE: each tab context has its own unique maps - self.map_man = MapManager() + self.filter_man = FilterManager() self.set_fixed_height_mode(True) # NOTE: headers become visible on model load @@ -129,8 +128,8 @@ class ServerTreeView(ContextMixin, TreeView): def start_timeout(self) -> None: self.queue_id = GLib.timeout_add(QUEUE_CHECK_DELAY, self._check_result_queue) - def get_map_man(self) -> MapManager: - return self.map_man + def get_filter_man(self) -> FilterManager: + return self.filter_man def get_proxy_man(self) -> ProxyModelManager: return self.proxy_man @@ -165,7 +164,7 @@ class ServerTreeView(ContextMixin, TreeView): if self.get_enum() is ServerTab.LAN: self.emitter.emit("lan_tab_toggled", True) - store = self.map_man.get_map_store() + store = self.filter_man.get_map_store() # FIXME: if model is none, wipe maps self.emitter.emit("load_maps", store) self.handler_id = self.emitter.connect("statusbar_loaded", self.start_distcalc)