[Pkg-privacy-commits] [tails-installer] 20/70: Fix feature 9005

[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 6be9019610b4dcd9d62346edb627aeceda2138fe
Author: kurono <andres.gomez at cern.ch>
Date:   Fri Feb 5 18:19:09 2016 +0100

    Fix feature 9005
    
    Redistribute initialization operations in the GUI window.
    Since we will not longer have tails-installer-launcher,
    the opts will be empty or by default. When the user selects
    a new device in the target combo box, then the opts will have
    an appropiate value.
---
 tails_installer/gui.py | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/tails_installer/gui.py b/tails_installer/gui.py
index b801439..faa197e 100755
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@ -301,30 +301,10 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
         self._build_ui()
 
         self.update_start_button()
-        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)
-        # FIXME: this may be useful when we'll support windows
-        #if sys.platform == 'win32':
-        #    self.driveBox.setGeometry(QtCore.QRect(10, 20, 145, 22))
-        #    self.refreshDevicesButton = QtGui.QPushButton(self.targetGroupBox)
-        #    self.refreshDevicesButton.setGeometry(QtCore.QRect(156, 16, 30, 26))
-        #    self.refreshDevicesButton.setText("")
-        #    icon = QtGui.QIcon()
-        #    icon.addPixmap(QtGui.QPixmap(":/refresh.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        #    self.refreshDevicesButton.setIcon(icon)
-        #    self.refreshDevicesButton.setFlat(True)
-        #    self.refreshDevicesButton.setObjectName("refreshDevicesButton")
         self.update_start_button()
         self.live = TailsInstallerCreator(opts=opts)
-        if self.opts.clone:
-            self.live.source = RunningLiveSystemSource(
-                path=config['running_liveos_mountpoint'])
-        if not self.opts.clone:
-            self.populate_releases()
         self.populate_devices()
         self.downloader = None
         self.progress_thread = ProgressThread(parent=self)
@@ -433,6 +413,7 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
             # upgrade or etc. hmm, check how difficult is to do it.
 
             # Upgrade without deleting persistence.
+        self.update_gui_components()
 
     def is_device_tails_intallation(self, device):
         # Check if the device has a valid Tails partition
@@ -480,6 +461,19 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
         else:
             return False
 
+    def update_gui_components(self):
+        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)
+        if self.opts.clone:
+            self.live.source = RunningLiveSystemSource(
+                path=config['running_liveos_mountpoint'])
+        if not self.opts.clone:
+            self.populate_releases()
+
     def on_start_clicked(self, button):
         self.begin()
 

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