diff --git a/dzgui/controllers/mc.py b/dzgui/controllers/mc.py index 0c7547a..b4f158b 100644 --- a/dzgui/controllers/mc.py +++ b/dzgui/controllers/mc.py @@ -99,7 +99,7 @@ class Controller: def terminate_process(self) -> None: # TODO: only used by server table multiprocessing queue - self.mediator.notebook.servers.terminate_process() + self.mediator.notebook.servers.browser.terminate_process() def get_prefs(self) -> UserPrefs: return self.prefs diff --git a/dzgui/util/strings.py b/dzgui/util/strings.py index 2129746..3bab098 100644 --- a/dzgui/util/strings.py +++ b/dzgui/util/strings.py @@ -63,10 +63,10 @@ log_cols = ["Timestamp", "Flag", "Traceback", "Message"] browser_cols = [ "Name", "Map", - "Perspective", + "View", "Gametime", "Players", - "Maximum", + "Max", "Queue", "IP", "Qport", diff --git a/dzgui/views/base.py b/dzgui/views/base.py index 24f23f2..2847449 100644 --- a/dzgui/views/base.py +++ b/dzgui/views/base.py @@ -247,7 +247,7 @@ class OuterWindow(Gtk.Window): AppNav.treeview = self.grid.notebook.scrollable_treelist.treeview css.load_css() - AppNav.grid.notebook.set_page_by_enum(NotebookPage.MAIN) + AppNav.grid.notebook.set_page_by_enum(NotebookPage.SERVERS) def _on_keypress(self, widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.state is Gdk.ModifierType.CONTROL_MASK \ @@ -344,9 +344,11 @@ class Notebook(ScrollableMixin, Gtk.Notebook): # add all treeviews as page and register them to AppNav and self.indexes # when switching to a treeview, update relevant view and just pop that page # instead of loading/unloading the model each time - self.ssu = Gtk.ScrolledWindow() - self.servers = ServerTreeView(MainController) - self.ssu.add(self.servers) + from dzgui.views.pages.servers import ServerNotebook + self.servers = ServerNotebook(MainController) + #self.ssu = Gtk.ScrolledWindow() + #self.servers = ServerTreeView(MainController) + #self.ssu.add(self.servers) self.quad = Gtk.ScrolledWindow() @@ -373,7 +375,7 @@ class Notebook(ScrollableMixin, Gtk.Notebook): self.clog: NotebookPage.CHANGELOG, self.keys: NotebookPage.KEYS, self.settings: NotebookPage.OPTIONS, - self.ssu: NotebookPage.SERVERS, + self.servers: NotebookPage.SERVERS, self.scroll_mod: NotebookPage.MODS, self.scroll_log: NotebookPage.LOG, self.thanks: NotebookPage.THANKS, diff --git a/dzgui/views/trees/tree_servers.py b/dzgui/views/trees/tree_servers.py index e6436f0..53f643c 100644 --- a/dzgui/views/trees/tree_servers.py +++ b/dzgui/views/trees/tree_servers.py @@ -81,13 +81,12 @@ class ServerTreeView(TreeView): self.append_column(column) # TODO: do not load model on initial init - # TODO: row_store = self.controller.get_row_store() # TODO: test values: see below - r = Gtk.ListStore( - str, str, str, str, int, int, int, str, int, int, str, bool - ) - r.append(["TEST", "a", "a", "a", 0, 0, 0, "a", 0, 0, "a", False]) - self.set_model(r) + #r = Gtk.ListStore( + # str, str, str, str, int, int, int, str, int, int, str, bool + #) + #r.append(["TEST", "a", "a", "a", 0, 0, 0, "a", 0, 0, "a", False]) + #self.set_model(r) self.connect("on_distcalc_started", self._on_calclat_started)