Commit 56233b71 authored by intrigeri's avatar intrigeri

Import kurono/bug/7904-change-link-upgrade-instructions as a quilt patch: link...

Import kurono/bug/7904-change-link-upgrade-instructions as a quilt patch: link to upgrade documentation when upgrading (Closes: Tails#7904).

Imported at commit 12f724f1.
parent 4c81c426
From: kurono <andres.gomez@cern.ch>
Date: Wed, 20 Jun 2018 19:37:31 +0200
Subject: Link to upgrade doc when upgrading (Closes: Tails#7904)
---
data/tails-installer.ui | 4 ++--
tails_installer/gui.py | 9 +++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/data/tails-installer.ui b/data/tails-installer.ui
index 62900da..b4b6d33 100644
--- a/data/tails-installer.ui
+++ b/data/tails-installer.ui
@@ -135,7 +135,7 @@
</packing>
</child>
<child>
- <object class="GtkLinkButton" id="help_install_link">
+ <object class="GtkLinkButton" id="help_link">
<property name="label" translatable="yes">Installation Instructions</property>
<property name="visible">True</property>
<property name="margin_right">18</property>
@@ -201,7 +201,7 @@
</packing>
</child>
<child>
- <object class="GtkLinkButton" id="help_install_link_question">
+ <object class="GtkLinkButton" id="help_link_question">
<property name="label"></property>
<property name="always_show_image">True</property>
<property name="visible">True</property>
diff --git a/tails_installer/gui.py b/tails_installer/gui.py
index 7cec7dc..a7b5a6b 100755
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@ -396,6 +396,7 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
self.__radio_button_source_iso = builder.get_object('radio_button_source_iso')
self.__radio_button_source_device = builder.get_object('radio_button_source_device')
self.__button_force_reinstall = builder.get_object('check_force_reinstall')
+ self.__help_link = builder.get_object('help_link')
self.add(self.__box_installer)
builder.connect_signals(self)
@@ -464,6 +465,10 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
self.opts.partition = False
self.force_reinstall = False
self.__button_start.set_label(_('Upgrade'))
+ self.__help_link.set_label(
+ _('Manual Upgrade Instructions'))
+ self.__help_link.set_uri(
+ _('https://tails.boum.org/upgrade/'))
if device['is_device_big_enough_for_reinstall']:
self.__button_force_reinstall.set_visible(True)
else:
@@ -473,6 +478,10 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
self.force_reinstall = True
self.__button_start.set_label(_('Install'))
self.__button_force_reinstall.set_visible(False)
+ self.__help_link.set_label(
+ _('Installation Instructions'))
+ self.__help_link.set_uri(
+ _('https://tails.boum.org/install/'))
def get_device_pretty_name(self, device):
size = _format_bytes_in_gb(device['parent_size']
0001-bugfix-15590-14849-14720-14810-installer-fixes-for-3.patch
0002-bug-7904-link-to-upgrade-doc-when-upgrading.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment