Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-04 07:25:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mig5-custom_config'

Browse source
This commit is contained in:
Micah Lee 2017-07-09 14:12:49 -07:00
commit 882ade94c7
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
8 changed files with 39 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
onionshare_gui/onionshare_gui.py
View file

@ -43,7 +43,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
starting_server_step3 = QtCore.pyqtSignal()
starting_server_error = QtCore.pyqtSignal(str)
def __init__(self, onion, qtapp, app, filenames):
def __init__(self, onion, qtapp, app, filenames, config=False):
super(OnionShareGui, self).__init__()
self._initSystemTray()
@ -58,7 +58,8 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.setWindowIcon(QtGui.QIcon(common.get_resource_path('images/logo.png')))
# Load settings
self.settings = Settings()
self.config = config
self.settings = Settings(self.config)
self.settings.load()
# File selection
@ -219,7 +220,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
common.log('OnionShareGui', 'open_settings', 'settings have changed, reloading')
self.settings.load()
d = SettingsDialog(self.onion, self.qtapp)
d = SettingsDialog(self.onion, self.qtapp, self.config)
d.settings_saved.connect(reload_settings)
d.exec_()
@ -351,7 +352,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
def update_available(update_url, installed_version, latest_version):
Alert(strings._("update_available", True).format(update_url, installed_version, latest_version))
self.update_thread = UpdateThread(self.onion)
self.update_thread = UpdateThread(self.onion, self.config)
self.update_thread.update_available.connect(update_available)
self.update_thread.start()