From 9d12b34d60c37970139ea11d019a95a04433e8b8 Mon Sep 17 00:00:00 2001 From: heliguy4599 Date: Tue, 12 Sep 2023 16:01:48 -0400 Subject: [PATCH] Rearrange buttons Swap the search and refresh buttons, as well as swap the properties and trash button --- src/window.blp | 12 ++++++------ src/window.py | 12 +++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/window.blp b/src/window.blp index b98ca06..469b4c6 100644 --- a/src/window.blp +++ b/src/window.blp @@ -8,17 +8,17 @@ template FlattoolGuiWindow : Adw.ApplicationWindow { Adw.ToolbarView main_toolbar_view { [top] HeaderBar header_bar { - [start] - ToggleButton search_button { - icon-name: "system-search-symbolic"; - tooltip-text: _("Search for an Installed App"); - } - [start] Button refresh_button { icon-name: "view-refresh-symbolic"; tooltip-text: _("Refresh the List of Installed Apps"); } + + [start] + ToggleButton search_button { + icon-name: "system-search-symbolic"; + tooltip-text: _("Search for an Installed App"); + } [end] MenuButton { diff --git a/src/window.py b/src/window.py index 590a26c..22c4579 100644 --- a/src/window.py +++ b/src/window.py @@ -515,17 +515,19 @@ class FlattoolGuiWindow(Adw.ApplicationWindow): if (not self.show_runtimes) and "runtime" in self.host_flatpaks[index][12]: continue - trash_button = Gtk.Button(icon_name="user-trash-symbolic", valign=Gtk.Align.CENTER, tooltip_text=_("Uninstall {}").format(app_name)) - trash_button.add_css_class("flat") - trash_button.connect("clicked", self.uninstall_button_handler, index) - flatpak_row.add_suffix(trash_button) - properties_button = Gtk.Button(icon_name="info-symbolic", valign=Gtk.Align.CENTER, tooltip_text=_("View Properties")) properties_button.add_css_class("flat") properties_button.connect("clicked", show_properties_window, index, self) flatpak_row.add_suffix(properties_button) + trash_button = Gtk.Button(icon_name="user-trash-symbolic", valign=Gtk.Align.CENTER, tooltip_text=_("Uninstall {}").format(app_name)) + trash_button.add_css_class("flat") + trash_button.connect("clicked", self.uninstall_button_handler, index) + flatpak_row.add_suffix(trash_button) + select_flatpak_tickbox = Gtk.CheckButton(halign=Gtk.Align.CENTER) + select_flatpak_tickbox.set_margin_start(4) + select_flatpak_tickbox.set_margin_end(4) select_flatpak_tickbox.add_css_class("flat") select_flatpak_tickbox.connect("toggled", self.flatpak_row_select_handler, index) flatpak_row.add_suffix(select_flatpak_tickbox)