[Pkg-privacy-commits] [tails-installer] 27/70: Feature 9005: Add several changes to fix the execution inside tails.

[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 3413a2a30cea16c695809c0d5f56f4619acfc339
Author: Tails developers <amnesia at boum.org>
Date:   Fri May 13 18:04:02 2016 +0200

    Feature 9005: Add several changes to fix the execution inside tails.
---
 data/tails-installer.ui | 25 +++++++++++++++++++------
 tails_installer/gui.py  | 16 +++++++++-------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/data/tails-installer.ui b/data/tails-installer.ui
index f9a2f5a..26b3549 100644
--- a/data/tails-installer.ui
+++ b/data/tails-installer.ui
@@ -134,14 +134,14 @@
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
-          <object class="GtkBox" id="box_source_file">
+          <object class="GtkBox" id="box_source_select">
             <property name="visible">True</property>
             <property name="can_focus">False</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">Use an ISO:</property>
+                <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>
@@ -156,7 +156,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="radio_button_source_device">
-                <property name="label" translatable="yes">Use current device:</property>
+                <property name="label" translatable="yes">Clone from ISO</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
@@ -169,6 +169,19 @@
                 <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>
@@ -184,7 +197,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -196,14 +209,14 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">3</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>
+            <property name="position">1</property>
           </packing>
         </child>
         <child>
diff --git a/tails_installer/gui.py b/tails_installer/gui.py
index c16313e..edb32fe 100755
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@ -317,16 +317,14 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
         # Inside tails
         if is_running_from_tails():
             self.opts.clone = True
+            self.__box_source_file.set_visible(False)
+        # Outside
         else:
             self.opts.clone = False
-            # FIXME: better put those in box
-            self.__radio_button_source_iso.set_visible(False)
-            self.__radio_button_source_device.set_visible(False)
+            self.__box_source_select.set_visible(False)
 
         if self.opts.clone or config['download']['enabled']:
             self.source_available = True
-        if self.opts.clone:
-            self.__box_source.set_visible(False)
         if not config['download']['enabled']:
             self.__box_source_dl.set_visible(False)
         self.update_start_button()
@@ -384,6 +382,7 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
         self.__label_infobar_title = builder.get_object('label_infobar_title')
         self.__label_infobar_details = builder.get_object('label_infobar_details')
         self.__box_source = builder.get_object('box_source')
+        self.__box_source_select = builder.get_object('box_source_select')
         self.__box_source_file = builder.get_object('box_source_file')
         self.__filechooserbutton_source_file = builder.get_object('liststore_source')
         self.__box_source_dl = builder.get_object('box_source_dl')
@@ -419,10 +418,12 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
 
     def on_radio_changed(self, radio_button):
         active_radio = [r for r in radio_button.get_group() if r.get_active()][0]
-        if active_radio.get_label() == "Use current device:":
+        if active_radio.get_label() == "Clone from current device":
             self.opts.clone = True
-        elif active_radio.get_label() == "Use an ISO:":
+            self.__box_source_file.set_visible(False)
+        elif active_radio.get_label() == "Clone from ISO":
             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()
@@ -442,6 +443,7 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
         # Just crate a new installation from scratch
         if not self.live.device_can_be_upgraded(device):
             self.opts.partition = True
+            self.__button_start.set_label('Install Tails')
         # If there is valid Tails partition
         elif self.user_force_reinstall:
             self.opts.partition = True

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