Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'persistent_url_label_tooltip' of https://github.com/mig5/onionshare into mig5-persistent_url_label_tooltip

Browse Source
This commit is contained in:
Micah Lee 2018-02-10 10:46:03 -08:00
commit 72b3970405
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
onionshare_gui/onionshare_gui.py
View File

@ -140,16 +140,10 @@ class OnionShareGui(QtWidgets.QMainWindow):
# Status bar, zip progress bar
self._zip_progress_bar = None
# Persistent URL notification
self.persistent_url_label = QtWidgets.QLabel(strings._('persistent_url_in_use', True))
self.persistent_url_label.setStyleSheet('font-weight: bold; color: #333333;')
self.persistent_url_label.hide()
# Primary action layout
primary_action_layout = QtWidgets.QVBoxLayout()
primary_action_layout.addWidget(self.server_status)
primary_action_layout.addWidget(self.filesize_warning)
primary_action_layout.addWidget(self.persistent_url_label)
primary_action_layout.addWidget(self.downloads_container)
self.primary_action = QtWidgets.QWidget()
self.primary_action.setLayout(primary_action_layout)
@ -409,9 +403,6 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.stop_server()
self.start_server_error(strings._('gui_server_started_after_timeout'))
if self.settings.get('save_private_key'):
self.persistent_url_label.show()
def start_server_error(self, error):
"""
If there's an error when trying to start the onion service
@ -443,7 +434,6 @@ class OnionShareGui(QtWidgets.QMainWindow):
# Remove ephemeral service, but don't disconnect from Tor
self.onion.cleanup(stop_tor=False)
self.filesize_warning.hide()
self.persistent_url_label.hide()
self.stop_server_finished.emit()
self.set_server_active(False)

7
onionshare_gui/server_status.py
View File

@ -145,10 +145,15 @@ class ServerStatus(QtWidgets.QWidget):
if self.status == self.STATUS_STARTED:
self.url_description.show()
if self.settings.get('close_after_first_download'):
if self.settings.get('save_private_key'):
self.url_label.setText(strings._('gui_url_label_persistent', True))
self.url_label.setToolTip(strings._('gui_url_persistence_warning', True))
elif self.settings.get('close_after_first_download'):
self.url_label.setText(strings._('gui_url_label_one_time', True))
self.url_label.setToolTip('')
else:
self.url_label.setText(strings._('gui_url_label', True))
self.url_label.setToolTip('')
self.url_label.show()
self.url.setText('http://{0:s}/{1:s}'.format(self.app.onion_host, self.web.slug))

3
share/locale/en.json
View File

@ -133,10 +133,11 @@
"gui_server_timeout_expired": "The chosen timeout has already expired.\nPlease update the timeout and then you may start sharing.",
"share_via_onionshare": "Share via OnionShare",
"gui_save_private_key_checkbox": "Use a persistent address\n(unchecking will delete any saved address)",
"persistent_url_in_use": "This share is using a persistent address",
"gui_url_description": "<b>Anyone</b> with this link can <b>download</b> your files using <b>Tor Browser</b>:",
"gui_url_label": "Your Download Address",
"gui_url_label_persistent": "Your <strong>Persistent</strong> Download Address <em>(what's this?)</em>",
"gui_url_label_one_time": "Your One-Time Download Address",
"gui_url_persistence_warning": "Every share will have the same URL.<br><br>If you want to go back to using one-time URLs, turn off persistence in the Settings.",
"gui_status_indicator_stopped": "Ready to Share",
"gui_status_indicator_working": "Starting...",
"gui_status_indicator_started": "Sharing"