[Pkg-privacy-commits] [tails-installer] 31/70: Feature 9005: Change the GUI according to UX team sugestions.

[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 55723950d5217a0f39a36e9bfb0564b0e8c177df
Author: Tails developers <amnesia at boum.org>
Date:   Mon Jun 13 20:41:24 2016 +0200

    Feature 9005: Change the GUI according to UX team sugestions.
---
 data/tails-installer.ui | 115 +++++++++++++++++++++---------------------------
 tails_installer/gui.py  |  10 ++---
 2 files changed, 54 insertions(+), 71 deletions(-)

diff --git a/data/tails-installer.ui b/data/tails-installer.ui
index c13cbd1..711be44 100644
--- a/data/tails-installer.ui
+++ b/data/tails-installer.ui
@@ -137,86 +137,69 @@
           <object class="GtkBox" id="box_source_select">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="orientation">horizontal</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkRadioButton" id="radio_button_source_iso">
-                <property name="label" translatable="yes">Clone from current device</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="on_radio_changed" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkRadioButton" id="radio_button_source_device">
-                <property name="label" translatable="yes">Clone from ISO</property>
+                <property name="label" translatable="yes">Clone current Tails</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">radio_button_source_iso</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box_source_file">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="label_source_file">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Use existing Live system ISO:</property>
-                <property name="justify">fill</property>
-                <property name="ellipsize">end</property>
-                <property name="xalign">0</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
+                 <property name="position">0</property>
+               </packing>
             </child>
             <child>
-              <object class="GtkFileChooserButton" id="filechooserbutton_source_file">
+              <object class="GtkBox" id="box_source_file">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <signal name="file-set" handler="on_source_file_set" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
+                <property name="orientation">horizontal</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkRadioButton" id="radio_button_source_iso">
+                    <property name="label" translatable="yes">Use existing Live system ISO</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <signal name="toggled" handler="on_radio_changed" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkFileChooserButton" id="filechooserbutton_source_file">
+                     <property name="visible">True</property>
+                     <property name="sensitive">False</property>
+                     <property name="can_focus">False</property>
+                     <signal name="file-set" handler="on_source_file_set" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+                     <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+                 <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -357,7 +340,7 @@
       </packing>
     </child>
     <child>
-      <object class="GtkCheckButton" id="check_force_reinstall">
+      <object class="GtkLinkButton" id="check_force_reinstall">
         <property name="label" translatable="yes">Force reinstall</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
@@ -365,8 +348,8 @@
         <property name="margin_left">18</property>
         <property name="margin_right">18</property>
         <property name="margin_bottom">18</property>
-        <property name="draw_indicator">True</property>
-        <signal name="toggled" handler="on_check_force_reinstall_toggled" swapped="no"/>
+        <property name="xalign">0</property>
+        <signal name="clicked" handler="on_force_reinstall_clicked" swapped="no"/>
       </object>
       <packing>
         <property name="expand">False</property>
diff --git a/tails_installer/gui.py b/tails_installer/gui.py
index edb32fe..407c6c7 100755
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@ -425,9 +425,9 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
             self.opts.clone = False
             self.__box_source_file.set_visible(True)
 
-    def on_check_force_reinstall_toggled(self, check_button):
-        self.user_force_reinstall = check_button.get_active()
-        self.on_target_changed(None)
+    def on_force_reinstall_clicked(self, button):
+        self.user_force_reinstall = True
+        self.on_start_clicked(button)
 
     def on_source_file_set(self, filechooserbutton):
         self.select_source_iso(filechooserbutton.get_filename())
@@ -448,12 +448,12 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
         elif self.user_force_reinstall:
             self.opts.partition = True
             self.force_reinstall = True
-            self.__button_start.set_label('Upgrade Tails device (Force reinstall)')
+            self.__button_start.set_label('Upgrade')
         # elif device['parent'] in self.device_with_persistence:
         else:
             self.opts.partition = False
             self.force_reinstall = False
-            self.__button_start.set_label('Upgrade Tails device (Keep data)')
+            self.__button_start.set_label('Upgrade')
 
     def get_device_pretty_name(self, device):
         size = _format_bytes_in_gb(device['parent_size']

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