[Pkg-privacy-commits] [torbrowser-launcher] 169/476: made it play an modem sound before opening Tor Browser, because Tor is notoriously slow :)

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository torbrowser-launcher.

commit 09c1549013283a04c3768a78f47d61665bcd4b2b
Author: Micah Lee <micah at micahflee.com>
Date:   Sat Nov 9 18:57:14 2013 -0800

    made it play an modem sound before opening Tor Browser, because Tor is notoriously slow :)
---
 modem.ogg           | Bin 0 -> 163622 bytes
 setup.py            |   2 +-
 stdeb.cfg           |   2 +-
 torbrowser-launcher |  21 +++++++++++++++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/modem.ogg b/modem.ogg
new file mode 100644
index 0000000..9b44a09
Binary files /dev/null and b/modem.ogg differ
diff --git a/setup.py b/setup.py
index a78fec0..c5bbe86 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ Tor Browser Launcher will get updated each time a new version of TBB is released
       scripts=['torbrowser-launcher'],
       data_files=[('/usr/share/applications', ['torbrowser.desktop', 'torbrowser-settings.desktop']),
                   ('/usr/share/pixmaps', ['img/torbrowser32.xpm', 'img/torbrowser80.xpm']),
-                  ('/usr/share/torbrowser-launcher', ['keys/erinn.asc', 'keys/sebastian.asc', 'keys/alexandre.asc', 'keys/mike.asc', 'keys/mike-2013-09.asc', 'torproject.pem', 'mirrors.txt']),
+                  ('/usr/share/torbrowser-launcher', ['keys/erinn.asc', 'keys/sebastian.asc', 'keys/alexandre.asc', 'keys/mike.asc', 'keys/mike-2013-09.asc', 'torproject.pem', 'mirrors.txt', 'modem.ogg']),
                   ('/usr/share/torbrowser-launcher/locale/en', ['locale/en/messages.pot']),
 
                   # unpackaged third party libraries
diff --git a/stdeb.cfg b/stdeb.cfg
index 2a1076f..f2ab688 100644
--- a/stdeb.cfg
+++ b/stdeb.cfg
@@ -1,4 +1,4 @@
 [DEFAULT]
 Package: torbrowser-launcher
-Depends: python-gtk2, python-psutil, python-twisted, python-lzma, gnupg, wmctrl
+Depends: python-gtk2, python-psutil, python-twisted, python-lzma, python-pygame, gnupg, wmctrl
 Suite: saucy
diff --git a/torbrowser-launcher b/torbrowser-launcher
index 03f15b1..eec0bda 100755
--- a/torbrowser-launcher
+++ b/torbrowser-launcher
@@ -186,6 +186,7 @@ class TBLCommon:
                 'alexandre_key': '/usr/share/torbrowser-launcher/alexandre.asc',
                 'mike_key': '/usr/share/torbrowser-launcher/mike-2013-09.asc',
                 'mirrors_txt': '/usr/share/torbrowser-launcher/mirrors.txt',
+                'modem_sound': '/usr/share/torbrowser-launcher/modem.ogg',
                 'data_dir': tbb_data,
                 'download_dir': tbb_data+'/download',
                 'gnupg_homedir': tbb_data+'/gnupg_homedir',
@@ -259,6 +260,7 @@ class TBLCommon:
             },
             'update_over_tor': True,
             'check_for_updates': False,
+            'modem_sound': False,
             'last_update_check_timestamp': 0,
             'mirror': self.default_mirror
         }
@@ -418,6 +420,15 @@ class TBLSettings:
             self.update_checkbox.set_active(False)
         self.update_checkbox.show()
 
+        # modem sound
+        self.modem_checkbox = gtk.CheckButton(_("Play modem sound, because Tor is slow :]"))
+        self.settings_box.pack_start(self.modem_checkbox, True, True, 0)
+        if self.common.settings['modem_sound']:
+            self.modem_checkbox.set_active(True)
+        else:
+            self.modem_checkbox.set_active(False)
+        self.modem_checkbox.show()
+
         # labels
         if(self.common.settings['installed_version'][self.common.settings['preferred']]):
             self.label1 = gtk.Label(_('Installed version:\n{0}').format(self.common.settings['installed_version'][self.common.settings['preferred']]))
@@ -519,6 +530,7 @@ class TBLSettings:
         # checkbox options
         #self.common.settings['update_over_tor'] = self.tor_update_checkbox.get_active()
         self.common.settings['check_for_updates'] = self.update_checkbox.get_active()
+        self.common.settings['modem_sound'] = self.modem_checkbox.get_active()
 
         # figure out the selected mirror
         self.common.settings['mirror'] = self.common.mirrors[self.mirrors.get_active()]
@@ -1098,6 +1110,15 @@ class TBLLauncher:
 
     def run(self, run_next_task = True):
         subprocess.Popen([self.common.paths['tbb'][self.common.settings['preferred']]['start']])
+
+        # play modem sound?
+        if self.common.settings['modem_sound']:
+            import pygame
+            pygame.mixer.init()
+            sound = pygame.mixer.Sound(self.common.paths['modem_sound'])
+            sound.play()
+            time.sleep(10)
+
         if run_next_task:
             self.run_task()
 

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