From a42c9d4389e918821fd33e39da2bc9f79c1f1ab0 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Mon, 9 Nov 2026 23:28:50 +0900 Subject: [PATCH] drop: abstracted constructor params --- dzgui/const/constants.py | 7 ------- dzgui/views/components/buttonbox.py | 4 ++-- dzgui/views/components/filter_panel.py | 13 ++++++------- dzgui/views/components/mod_panel.py | 7 +++---- dzgui/views/components/right_panel.py | 10 +++------- dzgui/views/dialogs/boot.py | 5 ++--- dzgui/views/dialogs/generic.py | 13 ++++++------- dzgui/views/dialogs/link_dialog.py | 3 +-- dzgui/views/pages/options.py | 7 ++----- 9 files changed, 25 insertions(+), 44 deletions(-) diff --git a/dzgui/const/constants.py b/dzgui/const/constants.py index aba522f..65442be 100644 --- a/dzgui/const/constants.py +++ b/dzgui/const/constants.py @@ -61,13 +61,6 @@ NIGHT_ICON = "weather-clear-night-symbolic" SEPARATOR = "SEPARATOR" -# TODO: drop -NO_PADDING = 0 -NO_EXPAND = False -NO_FILL = False -EXPAND = True -FILL = True - SCROLL_INCREMENT = 50 WINDOW_DEFAULT_X = 1400 WINDOW_DEFAULT_Y = 800 diff --git a/dzgui/views/components/buttonbox.py b/dzgui/views/components/buttonbox.py index 496f237..5fd1956 100644 --- a/dzgui/views/components/buttonbox.py +++ b/dzgui/views/components/buttonbox.py @@ -1,7 +1,7 @@ import logging from typing import TYPE_CHECKING -from dzgui.const.constants import APP_NAME, NO_EXPAND, NO_FILL, NO_PADDING +from dzgui.const.constants import APP_NAME from dzgui.const.enum import ButtonType import gi @@ -63,7 +63,7 @@ class ButtonBox(Gtk.Box): self.buttons.append(button) button.connect("clicked", self._on_selection_button_clicked) - self.pack_start(button, NO_EXPAND, NO_FILL, NO_PADDING) + self.pack_start(button, expand=False, fill=False, padding=0) def _focus_first_button(self, emitter: "Emitter") -> None: self.buttons[0].grab_focus() diff --git a/dzgui/views/components/filter_panel.py b/dzgui/views/components/filter_panel.py index 75c51e9..5d80c9d 100644 --- a/dzgui/views/components/filter_panel.py +++ b/dzgui/views/components/filter_panel.py @@ -3,10 +3,6 @@ from typing import Literal, TYPE_CHECKING from dzgui.const.constants import ( APP_NAME, - EXPAND, - NO_EXPAND, - NO_FILL, - NO_PADDING, SEARCH_ICON, ) from dzgui.util.format import format_exception @@ -42,7 +38,10 @@ class ButtonGrid(Gtk.Grid): self.checks: list[Gtk.CheckButton] = [] flowbox = Gtk.FlowBox( - halign=Gtk.Align.CENTER, min_children_per_line=3, max_children_per_line=3, selection_mode=Gtk.SelectionMode.NONE + halign=Gtk.Align.CENTER, + min_children_per_line=3, + max_children_per_line=3, + selection_mode=Gtk.SelectionMode.NONE, ) for check in defaults.keys(): @@ -201,7 +200,7 @@ class FilterPanel(Gtk.Box): self.maps_entry.connect("key-press-event", self._on_map_entry_keypress) self.maps_entry.connect("activate", self._on_maps_activated) - self.maps_combo.pack_start(renderer_text, EXPAND) + self.maps_combo.pack_start(renderer_text, expand=True) self.maps_combo.connect("changed", self._on_map_changed) self.maps_combo.connect("key-press-event", self._on_combo_keypress) @@ -211,7 +210,7 @@ class FilterPanel(Gtk.Box): self.maps_combo, self.button_grid, ): - self.pack_start(el, NO_EXPAND, NO_FILL, NO_PADDING) + self.pack_start(el, expand=False, fill=False, padding=0) def _on_maps_activated(self, entry: Gtk.Entry) -> None: text = entry.get_text() diff --git a/dzgui/views/components/mod_panel.py b/dzgui/views/components/mod_panel.py index 7c913c4..380f7ea 100644 --- a/dzgui/views/components/mod_panel.py +++ b/dzgui/views/components/mod_panel.py @@ -1,7 +1,6 @@ from typing import Self, TYPE_CHECKING from dzgui.const.enum import ModButton -from dzgui.const.constants import NO_EXPAND, FILL, NO_PADDING from dzgui.util.strings import mod_panel from dzgui.views.components.labels import BoldLabel @@ -55,7 +54,7 @@ class ModSelectionPanel(Gtk.Box): for button in buttons: b = EnumeratedModButton(button) b.connect("clicked", self._on_button_clicked) - self.main_panel.pack_start(b, NO_EXPAND, FILL, NO_PADDING) + self.main_panel.pack_start(b, expand=False, fill=True, padding=0) self.stale_panel = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) self.highlight_stale_button = ModPanelButton(ModButton.HIGHLIGHT_STALE) @@ -67,11 +66,11 @@ class ModSelectionPanel(Gtk.Box): self.unhighlight_stale_button, self.select_stale_button, ): - self.stale_panel.pack_start(b, NO_EXPAND, FILL, NO_PADDING) + self.stale_panel.pack_start(b, expand=False, fill=True, padding=0) b.connect("clicked", self._on_button_clicked) for el in header, self.main_panel, self.stale_panel: - self.pack_start(el, NO_EXPAND, FILL, NO_PADDING) + self.pack_start(el, expand=False, fill=True, padding=0) self.connect("map", self._reinit_button) diff --git a/dzgui/views/components/right_panel.py b/dzgui/views/components/right_panel.py index f38def4..a5efa3c 100644 --- a/dzgui/views/components/right_panel.py +++ b/dzgui/views/components/right_panel.py @@ -6,10 +6,6 @@ from typing import Literal, TYPE_CHECKING from dzgui.const.constants import ( APP_NAME, - NO_EXPAND, - NO_FILL, - FILL, - NO_PADDING, ) from dzgui.const.enum import ServerTab from dzgui.managers.update import UpdateManager @@ -73,9 +69,9 @@ class RightPanel(Gtk.Box): eb.connect("button-press-event", self._on_version_clicked) for el in self.button_vbox, self.keys, self.filters_vbox, self.refresh_button: - self.pack_start(el, NO_EXPAND, FILL, NO_PADDING) + self.pack_start(el, expand=False, fill=True, padding=0) - self.pack_start(self.sel_panel, NO_EXPAND, NO_FILL, NO_PADDING) + self.pack_start(self.sel_panel, expand=False, fill=True, padding=0) self.update_button = IconTextButton( "dialog-information-symbolic", label="Updates available" @@ -96,7 +92,7 @@ class RightPanel(Gtk.Box): "clicked", self._on_update_button_clicked, exe_path, update ) self.gutter_box.add(eb) - self.pack_start(self.gutter_box, NO_EXPAND, FILL, NO_PADDING) + self.pack_start(self.gutter_box, expand=False, fill=True, padding=0) def _on_update_button_clicked( self, button: Gtk.Button, exe_path: str, url: str diff --git a/dzgui/views/dialogs/boot.py b/dzgui/views/dialogs/boot.py index d4aa557..471e2ce 100644 --- a/dzgui/views/dialogs/boot.py +++ b/dzgui/views/dialogs/boot.py @@ -14,7 +14,6 @@ from dzgui.const.constants import HEX_GREEN, HEX_RED from dzgui.init.coords import get_local_coords from dzgui.init.dayz import is_dayz_installed from dzgui.init.update import check_updates -from dzgui.const.constants import EXPAND, FILL from dzgui.managers.threading import call_on_thread, StoredFunc, ThreadingManager from dzgui.strings import preboot, dialogs from dzgui.util.format import format_exception @@ -118,8 +117,8 @@ class BootDialog(ColorAwareApp, Gtk.Dialog): # type: ignore self.error_box.add(self.button_hbox) self.content = self.get_content_area() - self.content.pack_start(self.scrollable_tree, EXPAND, FILL, 0) - self.content.pack_start(self.error_box, EXPAND, FILL, 0) + self.content.pack_start(self.scrollable_tree, expand=True, fill=True, padding=0) + self.content.pack_start(self.error_box, expand=True, fill=True, padding=0) self.show_all() self.error_box.hide() diff --git a/dzgui/views/dialogs/generic.py b/dzgui/views/dialogs/generic.py index cff1e2a..dc57daf 100644 --- a/dzgui/views/dialogs/generic.py +++ b/dzgui/views/dialogs/generic.py @@ -1,6 +1,5 @@ from typing import Literal, Self, TYPE_CHECKING -from dzgui.const.constants import NO_EXPAND, NO_FILL, NO_PADDING, EXPAND, FILL from dzgui.strings import dialogs from dzgui.util import strings from dzgui.views.components.buttons import ClipboardButton @@ -46,7 +45,7 @@ class GenericDialog(Gtk.MessageDialog): def pack(self, widget: Gtk.Widget) -> None: content = self.get_content_area() - content.pack_start(widget, EXPAND, FILL, NO_PADDING) + content.pack_start(widget, expand=True, fill=True, padding=0) class ConfirmationDialog(GenericDialog): @@ -121,13 +120,13 @@ class WaitDialog(GenericDialog): spinner_box.add(spinner) if self.jobs > 1: - content.pack_start(self.prog, NO_EXPAND, NO_FILL, 0) + content.pack_start(self.prog, expand=False, fill=False, padding=0) else: - content.pack_start(spinner_box, NO_EXPAND, NO_FILL, 0) + content.pack_start(spinner_box, expand=False, fill=False, padding=0) spinner.start() if show_cancel is True: - content.pack_start(self.cancel, NO_EXPAND, NO_FILL, 0) + content.pack_start(self.cancel, expand=False, fill=False, padding=0) def update_text(self, msg: str) -> None: self.format_secondary_text(msg) @@ -272,7 +271,7 @@ class ExceptionDialog(TextBufferDialog): bottom_margin=10, ) textview.set_buffer(Gtk.TextBuffer(text=trace)) - box.pack_start(textview, EXPAND, FILL, 0) + box.pack_start(textview, expand=True, fill=True, padding=0) self.error_details = Gtk.ScrolledWindow( overlay_scrolling=False, @@ -296,7 +295,7 @@ class ExceptionDialog(TextBufferDialog): ) details_textview.set_buffer(self.details_buffer) - details_box.pack_start(details_textview, EXPAND, FILL, 10) + details_box.pack_start(details_textview, expand=True, fill=True, padding=10) self.error_details.add(details_box) self.error_notebook = Gtk.Notebook(show_tabs=False, margin_bottom=15) diff --git a/dzgui/views/dialogs/link_dialog.py b/dzgui/views/dialogs/link_dialog.py index 294765c..a2fbda2 100644 --- a/dzgui/views/dialogs/link_dialog.py +++ b/dzgui/views/dialogs/link_dialog.py @@ -1,7 +1,6 @@ import textwrap from typing import Self, TYPE_CHECKING -from dzgui.const.constants import NO_EXPAND, NO_FILL from dzgui.util.strings import notice from dzgui.views.dialogs.generic import GenericDialog from dzgui.views.components.buttons import SteamTextButton @@ -42,7 +41,7 @@ class WorkshopLinkDialog(GenericDialog): button.set_margin_start(60) button.set_margin_end(60) button.connect("clicked", self._on_button_clicked, uid) - self.dialogBox.pack_end(button, NO_EXPAND, NO_FILL, 0) + self.dialogBox.pack_end(button, expand=False, fill=False, padding=0) self.show_all() self.connect("response", self._on_dialog_response) diff --git a/dzgui/views/pages/options.py b/dzgui/views/pages/options.py index b5633ca..2fbf5b9 100644 --- a/dzgui/views/pages/options.py +++ b/dzgui/views/pages/options.py @@ -13,9 +13,6 @@ from dzgui.const.constants import ( FLATPAK_RUN_CMD, FLATPAK_SANDBOX, FLATPAK_STEAM_PATH, - NO_EXPAND, - NO_FILL, - NO_PADDING, VIEW_CONCEAL, VIEW_REVEAL, ) @@ -234,8 +231,8 @@ class ToggleField(Gtk.Box): self.radio1 = Gtk.RadioButton.new_with_label(None, first_option) self.radio2 = Gtk.RadioButton.new_from_widget(self.radio1) self.radio2.set_label(second_option) - self.pack_start(self.radio1, NO_EXPAND, NO_FILL, NO_PADDING) - self.pack_start(self.radio2, NO_EXPAND, NO_FILL, NO_PADDING) + self.pack_start(self.radio1, expand=False, fill=False, padding=0) + self.pack_start(self.radio2, expand=False, fill=False, padding=0) def set_suboption_active(self, state: bool) -> None: # NOTE: defer connection of signal until after state is set