Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-30 17:56:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mig5-url_label_tooltips' into ux-update

Browse Source
This commit is contained in:
Micah Lee 2018-02-13 17:59:15 -08:00
commit 41b1abdfaa
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/onionshare.nsi
View File

@ -203,6 +203,7 @@ Section "install"
SetOutPath "$INSTDIR\share\images" SetOutPath "$INSTDIR\share\images"
File "${BINPATH}\share\images\favicon.ico" File "${BINPATH}\share\images\favicon.ico"
File "${BINPATH}\share\images\file_delete.png" File "${BINPATH}\share\images\file_delete.png"
File "${BINPATH}\share\images\info.png"
File "${BINPATH}\share\images\logo.png" File "${BINPATH}\share\images\logo.png"
File "${BINPATH}\share\images\logo_transparent.png" File "${BINPATH}\share\images\logo_transparent.png"
File "${BINPATH}\share\images\logo_grayscale.png" File "${BINPATH}\share\images\logo_grayscale.png"
@ -384,6 +385,7 @@ FunctionEnd
Delete "$INSTDIR\share\html\index.html" Delete "$INSTDIR\share\html\index.html"
Delete "$INSTDIR\share\images\favicon.ico" Delete "$INSTDIR\share\images\favicon.ico"
Delete "$INSTDIR\share\images\file_delete.png" Delete "$INSTDIR\share\images\file_delete.png"
Delete "$INSTDIR\share\images\info.png"
Delete "$INSTDIR\share\images\logo.png" Delete "$INSTDIR\share\images\logo.png"
Delete "$INSTDIR\share\images\logo_transparent.png" Delete "$INSTDIR\share\images\logo_transparent.png"
Delete "$INSTDIR\share\images\logo_grayscale.png" Delete "$INSTDIR\share\images\logo_grayscale.png"

18
onionshare_gui/server_status.py
View File

@ -129,15 +129,19 @@ class ServerStatus(QtWidgets.QWidget):
if self.status == self.STATUS_STARTED: if self.status == self.STATUS_STARTED:
self.url_description.show() 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'): if self.settings.get('save_private_key'):
self.url_label.setText(strings._('gui_url_label_persistent', True)) if self.settings.get('close_after_first_download'):
self.url_label.setToolTip(strings._('gui_url_persistence_warning', True)) self.url_label.setToolTip(strings._('gui_url_label_onetime_and_persistent', True))
elif self.settings.get('close_after_first_download'): else:
self.url_label.setText(strings._('gui_url_label_one_time', True)) self.url_label.setToolTip(strings._('gui_url_label_persistent', True))
self.url_label.setToolTip('')
else: else:
self.url_label.setText(strings._('gui_url_label', True)) if self.settings.get('close_after_first_download'):
self.url_label.setToolTip('') self.url_label.setToolTip(strings._('gui_url_label_onetime', True))
else:
self.url_label.setToolTip(strings._('gui_url_label_stay_open', True))
self.url_label.show() self.url_label.show()
self.url.setText('http://{0:s}/{1:s}'.format(self.app.onion_host, self.web.slug)) self.url.setText('http://{0:s}/{1:s}'.format(self.app.onion_host, self.web.slug))

BIN
share/images/info.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 435 B

13
share/locale/en.json
View File

@ -44,8 +44,8 @@
"gui_copy_hidservauth": "Copy HidServAuth", "gui_copy_hidservauth": "Copy HidServAuth",
"gui_downloads": "Downloads:", "gui_downloads": "Downloads:",
"gui_canceled": "Canceled", "gui_canceled": "Canceled",
"gui_copied_url_title": "Copied Onion address", "gui_copied_url_title": "Copied OnionShare address",
"gui_copied_url": "The Onion address has been copied to clipboard", "gui_copied_url": "The OnionShare address has been copied to clipboard",
"gui_copied_hidservauth_title": "Copied HidServAuth", "gui_copied_hidservauth_title": "Copied HidServAuth",
"gui_copied_hidservauth": "The HidServAuth line has been copied to clipboard", "gui_copied_hidservauth": "The HidServAuth line has been copied to clipboard",
"gui_starting_server1": "Starting Tor onion service...", "gui_starting_server1": "Starting Tor onion service...",
@ -136,10 +136,11 @@
"share_via_onionshare": "Share via OnionShare", "share_via_onionshare": "Share via OnionShare",
"gui_save_private_key_checkbox": "Use a persistent address\n(unchecking will delete any saved address)", "gui_save_private_key_checkbox": "Use a persistent address\n(unchecking will delete any saved address)",
"gui_url_description": "<b>Anyone</b> with this link can <b>download</b> your files using <b>Tor Browser</b>:", "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": "Your Download Address <img src={} />",
"gui_url_label_persistent": "Your <strong>Persistent</strong> Download Address <em>(what's this?)</em>", "gui_url_label_persistent": "This share will not stop automatically<br><br>Every share will have the same address (to use one-time addresses, disable persistence in the Settings)",
"gui_url_label_one_time": "Your One-Time Download Address", "gui_url_label_stay_open": "This share will not stop automatically",
"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_url_label_onetime": "This share will stop after the first download",
"gui_url_label_onetime_and_persistent": "This share will stop after the first download<br><br>Every share will have the same address (to use one-time addresses, disable persistence in the Settings)",
"gui_status_indicator_stopped": "Ready to Share", "gui_status_indicator_stopped": "Ready to Share",
"gui_status_indicator_working": "Starting...", "gui_status_indicator_working": "Starting...",
"gui_status_indicator_started": "Sharing", "gui_status_indicator_started": "Sharing",