diff --git a/src/install_page/file_install_dialog.blp b/src/install_page/file_install_dialog.blp index 71cf506..847b496 100644 --- a/src/install_page/file_install_dialog.blp +++ b/src/install_page/file_install_dialog.blp @@ -25,11 +25,12 @@ template $FileInstallDialog : Adw.Dialog { margin-start: 12; margin-end: 12; margin-bottom: 12; - margin-top: 3; + margin-top: 6; Box { orientation: vertical; spacing: 12; Adw.PreferencesGroup packages_group { + title: _("Review Selection"); } $InstallationChooser installation_chooser { } diff --git a/src/install_page/file_install_dialog.py b/src/install_page/file_install_dialog.py index 11f5003..c18d257 100644 --- a/src/install_page/file_install_dialog.py +++ b/src/install_page/file_install_dialog.py @@ -36,12 +36,12 @@ class FileInstallDialog(Adw.Dialog): if len(files) > 1: self.set_title(_("Install Packages")) # self.packages_group.set_title(_("Review Packages")) - self.packages_group.set_title(_("The following packages will be installed")) + self.packages_group.set_description(_("The following packages will be installed")) self.installation_chooser.set_content_strings(_("Packages"), True) else: self.set_title(_("Install a Package")) # self.packages_group.set_title(_("Review Package")) - self.packages_group.set_title(_("The following package will be installed")) + self.packages_group.set_description(_("The following package will be installed")) self.installation_chooser.set_content_strings(_("package"), False) # Connections diff --git a/src/install_page/install_page.blp b/src/install_page/install_page.blp index 1f3f0cb..844b9a5 100644 --- a/src/install_page/install_page.blp +++ b/src/install_page/install_page.blp @@ -68,10 +68,19 @@ template $InstallPage : Adw.BreakpointBin { id: "pending_page"; } [bottom-bar] - Label { - label: _("Pending Packages"); + Box { margin-top: 12; - margin-bottom: 12; + margin-bottom: 14; + spacing: 6; + halign: center; + Image { + icon-name: "flatpak-symbolic"; + icon-size: normal; + } + Label { + label: _("Pending Packages"); + styles ["heading"] + } } } } diff --git a/src/install_page/select_page.blp b/src/install_page/select_page.blp index d1f5d50..119ac22 100644 --- a/src/install_page/select_page.blp +++ b/src/install_page/select_page.blp @@ -34,16 +34,11 @@ template $SelectPage : Adw.NavigationPage { } } Adw.PreferencesGroup local_group { - title: _("Add a File"); - description: _("Install a package from a file on your system"); - Adw.ActionRow open_row { - title: _("Open"); - subtitle: _("Add the file you want to install"); - activatable: true; - [suffix] - Image { - icon-name: "folder-open-symbolic"; - } + title: _("Add Packages"); + description: _("Install packages from files on your system"); + Adw.ButtonRow open_row { + title: _("Open Files"); + start-icon-name: "folder-open-symbolic"; } } }