Skip to content

Commit 6f5d565

Browse files
committed
Bump to v3.8.1
Also: - improved GTK layout - improved a message about imported configuration
1 parent 36d4c9e commit 6f5d565

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
project('savedesktop',
2-
version: '3.8',
2+
version: '3.8.1',
33
meson_version: '>= 1.0.0',
44
default_options: [ 'warning_level=2', 'werror=false', ],
55
)

po/savedesktop.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ msgstr ""
255255

256256
#: src/gui/window.py
257257
msgid ""
258-
"<big><b>{}</b></big>\nYou can log out of the system for the changes to take effect, or go back to the previous page and log out later.\n"
258+
"<big><b>{}</b></big>\nYou can log out of the system for the changes to take effect, or go back to the previous page and log out later.\n\n<i>If your archive contains Flatpak apps, they will start installing after the next login.</i>"
259259
msgstr ""
260260

261261
#: src/gui/window.py

src/gui/window.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,18 @@ def __init__(self, *args, **kwargs):
4949
self.headerbar.pack_end(child=self.menu_button)
5050

5151
# primary layout
52+
self.scrolled = Gtk.ScrolledWindow()
53+
self.scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
54+
self.scrolled.set_vexpand(True)
55+
self.scrolled.set_hexpand(True)
56+
self.toolbarview.set_content(self.scrolled)
57+
5258
self.headapp = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=10)
53-
self.headapp.set_valign(Gtk.Align.CENTER)
54-
self.headapp.set_halign(Gtk.Align.CENTER)
55-
self.toolbarview.set_content(self.headapp)
59+
self.headapp.set_valign(Gtk.Align.FILL)
60+
self.headapp.set_halign(Gtk.Align.FILL)
61+
self.headapp.set_vexpand(True)
62+
self.headapp.set_hexpand(True)
63+
self.scrolled.set_child(self.headapp)
5664

5765
# A view container for the menu switcher
5866
self.stack = Adw.ViewStack(vexpand=True)
@@ -543,7 +551,7 @@ def import_config(self):
543551
self.status_title = _("<big><b>Importing configuration …</b></big>\nImporting configuration from:\n<i>{}</i>\n").split('</b>')[0].split('<b>')[-1]
544552
self.status_desc = _("<big><b>Importing configuration …</b></big>\nImporting configuration from:\n<i>{}</i>\n").format(self.archive_name)
545553
self.done_title = _("The configuration has been applied!")
546-
self.done_desc = _("<big><b>{}</b></big>\nYou can log out of the system for the changes to take effect, or go back to the previous page and log out later.\n").format(_("The configuration has been applied!"))
554+
self.done_desc = _("<big><b>{}</b></big>\nYou can log out of the system for the changes to take effect, or go back to the previous page and log out later.\n\n<i>If your archive contains Flatpak apps, they will start installing after the next login.</i>").format(_("The configuration has been applied!"))
547555

548556
self.please_wait()
549557
import_thread = Thread(target=self._call_archive_command)
@@ -576,10 +584,10 @@ def please_wait(self):
576584

577585
# Create box widget for this page
578586
self.status_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=10)
579-
self.status_box.set_halign(Gtk.Align.CENTER)
580-
self.status_box.set_valign(Gtk.Align.CENTER)
587+
self.status_box.set_vexpand(True)
588+
self.status_box.set_hexpand(True)
581589
self.status_box.set_size_request(350, 100)
582-
self.toolbarview.set_content(self.status_box)
590+
self.scrolled.set_child(self.status_box)
583591

584592
# Set bold title
585593
self.set_title(self.status_title)
@@ -684,7 +692,7 @@ def _back_to_main(self, w):
684692
self.status_box.remove(widget)
685693

686694
def _set_default_widgets_state(self):
687-
self.toolbarview.set_content(self.headapp)
695+
self.scrolled.set_child(self.headapp)
688696
self.headerbar.set_title_widget(self.switcher_title)
689697
self.set_title("Save Desktop")
690698
self.apply_handler = self.break_point.connect("apply", self.__on_break_point_apply)

0 commit comments

Comments
 (0)