[Pkg-privacy-commits] [tails-installer] 47/70: Add several improvements to the GUI interaction with the user.

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

ulrike pushed a commit to annotated tag tails-installer_4.20
in repository tails-installer.

commit 0c8f3fc8c9e3beb153c98ceafc682644c7380099
Author: Tails Developers <tails at boum.org>
Date:   Sat Apr 15 11:07:47 2017 +0200

    Add several improvements to the GUI interaction with the user.
---
 data/tails-installer.ui |  1 +
 tails_installer/gui.py  | 23 ++++++++++-------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/data/tails-installer.ui b/data/tails-installer.ui
index 410470d..889b6a4 100644
--- a/data/tails-installer.ui
+++ b/data/tails-installer.ui
@@ -213,6 +213,7 @@
                      <property name="visible">True</property>
                      <property name="sensitive">True</property>
                      <property name="can_focus">False</property>
+                     <property name="width-chars">15</property>
                      <signal name="file-set" handler="on_source_file_set" swapped="no"/>
                    </object>
                    <packing>
diff --git a/tails_installer/gui.py b/tails_installer/gui.py
index fea2e01..d0b5f8d 100755
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@ -466,17 +466,11 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
         size = _format_bytes_in_gb(device['parent_size']
                                     if device['parent_size']
                                     else device['size'])
-        details = (_("%(size)s %(label)s") % {
-                    'label': device['label'],
-                    'size': size
-        }
-                if device['label']
-                else size)
-        pretty_name = _("%(vendor)s %(model)s (%(details)s) - %(device)s") % {
-                    'device':  device['device'],
+        pretty_name = _("%(size)s %(vendor)s %(model)s device (%(device)s)") % {
+                    'size'  :  size,
                     'vendor':  device['vendor'],
-                    'model':   device['model'],
-                    'details': details
+                    'model' :  device['model'],
+                    'device':  device['device']
         }
         return pretty_name
 
@@ -716,12 +710,15 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
                 # let's go on
                 self.confirmed = False
         else:
-            msg = (_("%(vendor)s %(model)s device (%(device)s)\n\n"
-                     "The persistent storage on this USB stick will be preserved.") % {
+            persistence_message = " "
+            if self.device_with_persistence:
+                persistence_message = "The persistent storage on this USB stick will be preserved."
+            msg = (_("%(vendor)s %(model)s device (%(device)s)\n\n(%(persistence_message)s)") % {
                          'vendor': self.live.drive['vendor'],
                          'model':  self.live.drive['model'],
                          'device': self.live.drive['device'],
-                         'parent_size': _format_bytes_in_gb(self.live.drive['parent_size'])
+                         'parent_size': _format_bytes_in_gb(self.live.drive['parent_size']),
+                         'persistence_message': persistence_message
                      }
                   )
             if self.show_confirmation_dialog(_("Confirm the target USB stick"), msg, False):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git