[Pkg-privacy-commits] [tails-installer] 57/70: Merge remote-tracking branch 'kurono/bug/12436-remember-iso'

Ulrike Uhlig ulrike at moszumanska.debian.org
Mon Nov 20 14:55:02 UTC 2017


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 5107c3eadb836e5f06418094b0d725265001ae0f
Merge: cd9b104 cc4b43a
Author: anonym <anonym at riseup.net>
Date:   Thu Sep 14 13:56:41 2017 +0200

    Merge remote-tracking branch 'kurono/bug/12436-remember-iso'

 data/tails-installer.ui | 7 +++++++
 1 file changed, 7 insertions(+)

diff --cc data/tails-installer.ui
index f09387b,a374eda..b5596db
--- a/data/tails-installer.ui
+++ b/data/tails-installer.ui
@@@ -159,75 -146,35 +165,76 @@@
              <property name="orientation">vertical</property>
              <property name="spacing">6</property>
              <child>
 -              <object class="GtkLabel" id="label_source_file">
 +              <object class="GtkRadioButton" id="radio_button_source_device">
 +                <property name="label" translatable="yes">Clone the current Tails</property>
                  <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>
 +                <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">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>
 -                <property name="filter">isofilter</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 a downloaded Tails ISO image</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="GtkLinkButton" id="help_install_link_question">
 +                     <property name="label"></property>
 +                     <property name="always_show_image">True</property>
 +                     <property name="visible">True</property>
 +                     <property name="image">image_question</property>
 +                     <property name="uri">https://tails.boum.org/install/os/index.en.html</property>
 +                   </object>
 +                 <packing>
 +                   <property name="expand">False</property>
 +                   <property name="fill">True</property>
 +                   <property name="position">1</property>
 +                 </packing>
 +                 </child>
 +                 <child>
 +                   <object class="GtkFileChooserButton" id="filechooserbutton_source_file">
 +                     <property name="visible">True</property>
 +                     <property name="sensitive">True</property>
 +                     <property name="can_focus">False</property>
 +                     <property name="width-chars">17</property>
++                     <property name="filter">isofilter</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">2</property>
 +                   </packing>
 +                 </child>
 +               </object>
 +               <packing>
 +                 <property name="expand">False</property>
 +                 <property name="fill">True</property>
 +                 <property name="position">1</property>
 +               </packing>
              </child>
            </object>
            <packing>

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



More information about the Pkg-privacy-commits mailing list