chore: revert IconButton alignment changes

This commit is contained in:
aclist committed 2026-06-10 08:27:24 +09:00
1 parent 978edc5f5f
commit 4506a0cfda
3 files changed
+20 -12

No files matched your search

+2 -1
View File
@@ -29,12 +29,13 @@ class OfflineManager:
self.custom_mods: list[str] | None self.custom_mods: list[str] | None
# TODO: strings # TODO: strings
@call_on_thread("parsing") #@call_on_thread("parsing")
def parse_custom_mods(self, folder: str) -> "FastInsertListStore": def parse_custom_mods(self, folder: str) -> "FastInsertListStore":
mods = get_custom_mods(Path(folder)) mods = get_custom_mods(Path(folder))
store = ModelFactory().make_mod_store() store = ModelFactory().make_mod_store()
store.extend(mods) store.extend(mods)
# TODO: manipulate tree columns to only show name and size # TODO: manipulate tree columns to only show name and size
# TODO: return store from cleanup function
return store return store
def setup( def setup(
+4 -8
View File
@@ -48,10 +48,8 @@ class LargeIcon(Gtk.Image):
class IconButton(Gtk.Button): class IconButton(Gtk.Button):
def __init__( def __init__(self, icon: str, margin: int = 0) -> None:
self, icon: str, margin: int = 0, halign: Gtk.Align = Gtk.Align.START super().__init__()
) -> None:
super().__init__(halign=halign)
self.icon = Icon(icon, l_margin=margin) self.icon = Icon(icon, l_margin=margin)
self.set_image(self.icon) self.set_image(self.icon)
self.set_image_position(Gtk.PositionType.RIGHT) self.set_image_position(Gtk.PositionType.RIGHT)
@@ -59,10 +57,8 @@ class IconButton(Gtk.Button):
class IconTextButton(IconButton): class IconTextButton(IconButton):
def __init__( def __init__(self, icon: str, label: str) -> None:
self, icon: str, label: str, halign: Gtk.Align = Gtk.Align.START super().__init__(icon, margin=5)
) -> None:
super().__init__(icon, margin=5, halign=halign)
self.set_label(label) self.set_label(label)
+14 -3
View File
@@ -12,7 +12,7 @@ from dzgui.const.constants import (
) )
from dzgui.const.enum import NotebookPage, Preferences from dzgui.const.enum import NotebookPage, Preferences
from dzgui.managers.offline import OfflineManager from dzgui.managers.offline import OfflineManager
from dzgui.strings import offline from dzgui.strings import generic, offline
from dzgui.views.components.buttons import IconTextButton from dzgui.views.components.buttons import IconTextButton
from dzgui.views.components.frame import HeadingFrame from dzgui.views.components.frame import HeadingFrame
from dzgui.views.components.scrollable import NoOverlayScrolledWindow from dzgui.views.components.scrollable import NoOverlayScrolledWindow
@@ -64,7 +64,9 @@ class FolderHBox(HBox):
# TODO: alternate class for left-aligned icons # TODO: alternate class for left-aligned icons
self.button = IconTextButton(FOLDER, btn_label) self.button = IconTextButton(FOLDER, btn_label)
self.button.set_halign(Gtk.Align.START)
self.button.set_image_position(Gtk.PositionType.LEFT) self.button.set_image_position(Gtk.PositionType.LEFT)
self.label = Gtk.Label() self.label = Gtk.Label()
self.extend([self.button, self.label]) self.extend([self.button, self.label])
@@ -119,8 +121,7 @@ class ModFrame(HeadingFrame):
def _on_selection_changed(self, sel: Gtk.TreeSelection) -> None: def _on_selection_changed(self, sel: Gtk.TreeSelection) -> None:
model, rows = sel.get_selected_rows() model, rows = sel.get_selected_rows()
if len(rows) == 0: if len(rows) == 0:
# TODO recycle (util.format) status = generic.selectable_tree
status = "Ctrl-click to select multiple; Shift-click to select a range."
else: else:
status = f"Mods selected: {len(rows)}" status = f"Mods selected: {len(rows)}"
self.status.set_label(status) self.status.set_label(status)
@@ -148,6 +149,16 @@ class CustomModFrame(ModFrame):
folder = self.controller.set_custom_folder() folder = self.controller.set_custom_folder()
if folder is not None: if folder is not None:
self.custom_hbox.set_label(str(folder)) self.custom_hbox.set_label(str(folder))
# TODO:
# self.controller.get_custom_mods()
from dzgui.managers.offline import OfflineManager
om = OfflineManager(self.controller)
store = om.parse_custom_mods(folder)
# FIXME: button should appear before tree vbox
self.tree.set_model(store)
self.tree_vbox.show()
def get_mods(self) -> list[str]: def get_mods(self) -> list[str]:
rows = self.tree.get_selection().get_selected_rows() rows = self.tree.get_selection().get_selected_rows()