diff --git a/resources/manager_window.ui b/resources/manager_window.ui index 3b8fd0e..cc6b19f 100644 --- a/resources/manager_window.ui +++ b/resources/manager_window.ui @@ -889,6 +889,7 @@ True False + end 6 start diff --git a/resources/progress_box.ui b/resources/progress_box.ui index c9579c9..cd33090 100644 --- a/resources/progress_box.ui +++ b/resources/progress_box.ui @@ -6,7 +6,7 @@ True False vertical - 6 + 3 True diff --git a/resources/updater_window.ui b/resources/updater_window.ui index d711bb4..616b2e3 100644 --- a/resources/updater_window.ui +++ b/resources/updater_window.ui @@ -109,7 +109,7 @@ False - 600 + 750 True True @@ -161,7 +161,7 @@ True fixed - 150 + 250 20 Version @@ -218,7 +218,7 @@ - 600 + 750 True True @@ -271,7 +271,7 @@ True fixed - 200 + 250 20 Version @@ -305,99 +305,73 @@ - + True False - 6 - 6 - 6 - vertical - 6 + 6 + 12 - - True - False - center - - - False - True - 0 - + - + True False - 12 + end + 6 + start - - - - + + Details True - False - 6 - start - - - Details - True - True - True - - - - True - True - 0 - - - - - _Apply - True - True - True - True - True - False - True - - - - True - True - 1 - - - - - _Cancel - True - True - True - True - - - - True - True - 2 - - + True + True + - False + True + True + 0 + + + + + _Apply + True + True + True + True + True + False + True + + + + True True - end 1 + + + _Cancel + True + True + True + True + + + + True + True + 2 + + False True + end 1 diff --git a/src/updater_window.vala b/src/updater_window.vala index 6512a02..6988cc5 100644 --- a/src/updater_window.vala +++ b/src/updater_window.vala @@ -45,8 +45,6 @@ namespace Pamac { [GtkChild] Gtk.CellRendererToggle aur_select_update; [GtkChild] - Gtk.Label bottom_label; - [GtkChild] Gtk.Box transaction_infobox; [GtkChild] Gtk.Button details_button; @@ -67,7 +65,6 @@ namespace Pamac { Object (application: application); button_back.visible = false; - bottom_label.visible = false; apply_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION); apply_button.sensitive = false; stackswitcher.visible = false; @@ -264,7 +261,6 @@ namespace Pamac { repos_scrolledwindow.visible = true; aur_updates_list.clear (); aur_scrolledwindow.visible = false; - bottom_label.visible = false; uint64 dsize = 0; uint repos_updates_nb = 0; uint aur_updates_nb = 0; @@ -296,10 +292,9 @@ namespace Pamac { } set_transaction_infobox_visible (); if (dsize != 0) { - bottom_label.set_markup("%s: %s".printf (dgettext (null, "Total download size"), format_size(dsize))); - bottom_label.visible = true; + transaction.progress_box.action_label.set_markup("%s: %s".printf (dgettext (null, "Total download size"), format_size(dsize))); } else { - bottom_label.visible = false; + transaction.progress_box.action_label.label = ""; } if (aur_updates_nb != 0) { aur_scrolledwindow.visible = true;