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

Remove the menu bar, and replace it with a settings button owned by the OnionShareGui object

Browse source
This commit is contained in:
Micah Lee 2017-05-16 15:24:14 -07:00
parent b7a9574490
commit cc4ac170c7
4 changed files with 24 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

29
onionshare_gui/onionshare_gui.py
View file

@ -26,7 +26,6 @@ from onionshare.onion import *
from .tor_connection_dialog import TorConnectionDialog
from .settings_dialog import SettingsDialog
from .menu import Menu
from .file_selection import FileSelection
from .server_status import ServerStatus
from .downloads import Downloads
@ -66,9 +65,6 @@ class OnionShareGui(QtWidgets.QMainWindow):
tor_con.open_settings.connect(self._tor_connection_open_settings)
tor_con.start()
# Menu bar
self.setMenuBar(Menu(self.onion, self.qtapp))
# Check for updates in a new thread, if enabled
system = platform.system()
if system == 'Windows' or system == 'Darwin':
@ -121,8 +117,13 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.status_bar = QtWidgets.QStatusBar()
self.status_bar.setSizeGripEnabled(False)
version_label = QtWidgets.QLabel('v{0:s}'.format(common.get_version()))
version_label.setStyleSheet('color: #666666; padding: 0 10px;')
version_label.setStyleSheet('color: #666666')
settings_button = QtWidgets.QPushButton()
settings_button.setDefault(False)
settings_button.setIcon( QtGui.QIcon(common.get_resource_path('images/settings.png')) )
settings_button.clicked.connect(self.open_settings)
self.status_bar.addPermanentWidget(version_label)
self.status_bar.addPermanentWidget(settings_button)
self.setStatusBar(self.status_bar)
# Status bar, zip progress bar
@ -139,11 +140,14 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.setCentralWidget(central_widget)
self.show()
# check for requests frequently
# Check for requests frequently
self.timer = QtCore.QTimer()
self.timer.timeout.connect(self.check_for_requests)
self.timer.start(500)
# Always start with focus on file selection
self.file_selection.setFocus()
def _tor_connection_canceled(self):
"""
If the user cancels before Tor finishes connecting, ask if they want to
@ -161,7 +165,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
a.exec_()
if a.clickedButton() == settings_button:
SettingsDialog(self.onion, self.qtapp)
self.open_settings()
else:
self.qtapp.quit()
@ -174,11 +178,14 @@ class OnionShareGui(QtWidgets.QMainWindow):
"""
common.log('OnionShareGui', '_tor_connection_open_settings')
def open_settings():
SettingsDialog(self.onion, self.qtapp)
# Wait 1ms for the event loop to finish closing the TorConnectionDialog
QtCore.QTimer.singleShot(1, open_settings)
QtCore.QTimer.singleShot(1, self.open_settings)
def open_settings(self):
"""
Open the SettingsDialog.
"""
SettingsDialog(self.onion, self.qtapp)
def start_server(self):
"""