torproject/torbrowser-launcher
1
0
Fork 0
mirror of https://github.com/torproject/torbrowser-launcher.git synced 2024-11-23 09:29:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

made it play an modem sound before opening Tor Browser, because Tor is notoriously slow :)

Browse Source
This commit is contained in:
Micah Lee 2013-11-09 18:57:14 -08:00
parent 749f5283b3
commit 09c1549013
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
modem.ogg Normal file
View File

Binary file not shown.

2
setup.py
View File

@ -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

2
stdeb.cfg
View File

@ -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

21
torbrowser-launcher
View File

@ -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()