summaryrefslogtreecommitdiff
path: root/onionshare_gui
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2018-02-13 17:31:25 -0800
committerMicah Lee <micah@micahflee.com>2018-02-13 17:31:25 -0800
commita32778397aa8cbc4af9667c68b169105d01fe138 (patch)
tree1e46d7edb9efe3285a825efaff06952824ac2e9f /onionshare_gui
parent7a1ab4fdbed5f4e56702ceb300beacf694e54e08 (diff)
parent779ca765530944863b40d8dc5a0ec78e37d2827c (diff)
downloadonionshare-a32778397aa8cbc4af9667c68b169105d01fe138.tar.gz
onionshare-a32778397aa8cbc4af9667c68b169105d01fe138.zip
Merge branch 'url_label_tooltips' of https://github.com/mig5/onionshare into mig5-url_label_tooltips
Diffstat (limited to 'onionshare_gui')
-rw-r--r--onionshare_gui/server_status.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/onionshare_gui/server_status.py b/onionshare_gui/server_status.py
index dc7a34bb..654c4c28 100644
--- a/onionshare_gui/server_status.py
+++ b/onionshare_gui/server_status.py
@@ -129,15 +129,18 @@ class ServerStatus(QtWidgets.QWidget):
if self.status == self.STATUS_STARTED:
self.url_description.show()
+ info_image = common.get_resource_path('images/info.png')
+ self.url_label.setText(strings._('gui_url_label', True).format(info_image))
+ # Show a Tool Tip explaining the lifecycle of this URL
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('')
+ if self.settings.get('close_after_first_download'):
+ self.url_label.setToolTip(strings._('gui_url_label_onetime_and_persistent', True))
+ else:
+ self.url_label.setToolTip(strings._('gui_url_label_persistent', True))
+ if self.settings.get('close_after_first_download'):
+ self.url_label.setToolTip(strings._('gui_url_label_onetime', True))
else:
- self.url_label.setText(strings._('gui_url_label', True))
- self.url_label.setToolTip('')
+ self.url_label.setToolTip(strings._('gui_url_label_stay_open', True))
self.url_label.show()
self.url.setText('http://{0:s}/{1:s}'.format(self.app.onion_host, self.web.slug))