]> git.lizzy.rs Git - torbrowser-launcher.git/commitdiff
starting to make progress bar show progress during non-download steps
authorMicah Lee <micahflee@riseup.net>
Mon, 18 Feb 2013 01:01:54 +0000 (17:01 -0800)
committerMicah Lee <micahflee@riseup.net>
Mon, 18 Feb 2013 01:01:54 +0000 (17:01 -0800)
torbrowser-launcher

index 07094054cfa17590d5b6e9c676ca5313f66d9d43..692416daedd6a808976de9855a755ffeab7f94c4 100755 (executable)
@@ -159,6 +159,8 @@ class TorBrowserLauncher:
       # progress bar
       self.progressbar = gtk.ProgressBar(adjustment=None)
       self.progressbar.set_orientation(gtk.PROGRESS_LEFT_TO_RIGHT)
+      self.progressbar.set_pulse_step(0.1)
+      self.progressbar_is_pulsing = False
       self.box.pack_start(self.progressbar, True, True, 0)
 
       # button box
@@ -265,20 +267,46 @@ class TorBrowserLauncher:
 
     return True
 
+  def progressbar_pulse(self):
+    print 'pulse'
+    if self.progressbar_is_pulsing:
+      self.progressbar.pulse()
+      return True
+    else:
+      return False
+
   def verify(self):
+    # initialize the progress bar
+    self.progressbar.set_fraction(0) 
+    self.progressbar.set_text('Verifying Signature')
+    self.progressbar.show()
+    self.progressbar_is_pulsing = True
+    self.timer = gobject.timeout_add(1, self.progressbar_pulse)
+
     error = False
 
     verify_output = subprocess.check_output([self.paths['file']['verify'], self.paths['dir']['gpg'], self.paths['file']['tarball_sig']], stderr=subprocess.STDOUT)
     if 'Good signature' in verify_output:
+      self.progressbar_is_pulsing = False
       self.run_task();
     else:
       error = True
 
     if error:
+      self.progressbar_is_pulsing = False
       self.label = "Signature verification failed!"
 
   def extract(self):
+    # initialize the progress bar
+    self.progressbar.set_fraction(0) 
+    self.progressbar.set_text('Installing')
+    self.progressbar.show()
+    self.progressbar_is_pulsing = True
+    self.timer = gobject.timeout_add(1, self.progressbar_pulse)
+
     subprocess.call(['tar', '-xf', self.paths['file']['tarball'], '-C', self.paths['dir']['tbb']])
+
+    self.progressbar_is_pulsing = False
     self.run_task();
 
   def run(self, run_next_task = True):