diff --git a/dzgui/util/format.py b/dzgui/util/format.py index 549fb01..ff24f9b 100644 --- a/dzgui/util/format.py +++ b/dzgui/util/format.py @@ -63,3 +63,7 @@ def format_player_count(model: Gtk.ListStore | None) -> str: suffix = distance_suffix status = f"Found {hits:n} {hits_pretty} with {players:n} {players_pretty}" return f"{status} | {suffix}" + + +def embolden(text: str) -> str: + return f"{text}" diff --git a/dzgui/views/base.py b/dzgui/views/base.py index aa79ee3..4f3c0c7 100644 --- a/dzgui/views/base.py +++ b/dzgui/views/base.py @@ -23,6 +23,7 @@ from dzgui.const.constants import NO_EXPAND, NO_FILL from dzgui.const.constants import APP_NAME, APP_NAME_LOWER from dzgui.controllers.mc import Controller from dzgui.util import css, strings +from dzgui.util.format import embolden # NOTEBOOK ITEMS # TODO: import notebook only and add components there? @@ -519,8 +520,8 @@ class Grid(Gtk.Grid): return self.breadcrumbs.get_text() def set_breadcrumbs(self, text: str) -> None: - # TODO: embolden func - self.breadcrumbs.set_markup(f"{text}") + crumbs = embolden(text) + self.breadcrumbs.set_markup(crumbs) class App(Gtk.Application): diff --git a/dzgui/views/components/connect_panel.py b/dzgui/views/components/connect_panel.py index a462a08..660dc67 100644 --- a/dzgui/views/components/connect_panel.py +++ b/dzgui/views/components/connect_panel.py @@ -1,3 +1,4 @@ +from dzgui.util.format import embolden from dzgui.views.components.web_button import WebButton import gi @@ -12,10 +13,9 @@ class ConnectPanel(Gtk.Frame): self.label = Gtk.Label(label="Add/connect") self.label2 = Gtk.Label(label="Favorite server") - # TODO: embold function - #self.label2.set_markup("Favorite server") - - self.label2.set_markup("Favorite server") + # TODO: strings + text = embolden("Favorite server") + self.label2.set_markup(text) self.entry1 = Gtk.Entry(placeholder_text="Enter IP or Battlemetrics ID", hexpand=False) self.entry2 = Gtk.Entry() self.fav = Gtk.Label(label="MY favorite server very long title") diff --git a/dzgui/views/components/mod_panel.py b/dzgui/views/components/mod_panel.py index 599daba..bff00da 100644 --- a/dzgui/views/components/mod_panel.py +++ b/dzgui/views/components/mod_panel.py @@ -2,7 +2,8 @@ from typing import TYPE_CHECKING from dzgui.const.enum import ModButton from dzgui.const.constants import NO_EXPAND, FILL -from dzgui.util import strings +from dzgui.util.strings import mod_panel +from dzgui.util.format import embolden import gi gi.require_version("Gtk", "3.0") @@ -34,7 +35,8 @@ class ModSelectionPanel(Gtk.Box): ) self.header = Gtk.Label() - self.header.set_markup(f"{strings.mod_panel.header}") + text = embolden(mod_panel.header) + self.header.set_markup(text) self.main_panel = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) for button in buttons: diff --git a/dzgui/views/pages/devs.py b/dzgui/views/pages/devs.py index 7938178..40ff46b 100644 --- a/dzgui/views/pages/devs.py +++ b/dzgui/views/pages/devs.py @@ -2,8 +2,9 @@ from dataclasses import fields from typing import Union, TYPE_CHECKING from dzgui.const.enum import NotebookPage -from dzgui.util.strings import developers from dzgui.util.css import add_class +from dzgui.util.format import embolden +from dzgui.util.strings import developers import gi # noqa E402 gi.require_version("Gtk", "3.0") @@ -35,10 +36,12 @@ class Developers(Gtk.Box): back_button = Gtk.Button(label="Back", halign=Gtk.Align.START) back_button.connect("clicked", self._on_back_clicked) paths_label = Gtk.Label() - paths_label.set_markup(f"{developers.paths_label}") + text = embolden(developers.paths_label) + paths_label.set_markup(text) prefs_label = Gtk.Label() - prefs_label.set_markup(f"{developers.prefs_label}") + text = embolden(developers.prefs_label) + prefs_label.set_markup(text) paths_tree = self._make_tree(self.controller.prefs.paths) prefs_tree = self._make_tree(self.controller.prefs) @@ -64,7 +67,8 @@ class Developers(Gtk.Box): self.controller.open_page(NotebookPage.OPTIONS) def _make_tree(self, prefs: Union["Xdg", "UserPrefs"]) -> Gtk.TreeView: - view = Gtk.TreeView() + from dzgui.views.trees.tree_base import TreeView + view = TreeView(self.controller) renderer = Gtk.CellRendererText() for i, col in enumerate(developers.columns): column = Gtk.TreeViewColumn(col, renderer, text=i)