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

Use just one share status QLabel widget and update the text accordingly

Browse Source
This commit is contained in:
Miguel Jacq 2018-02-11 09:54:22 +11:00
parent 3e5d51a858
commit ef994ea012
No known key found for this signature in database
GPG Key ID: EEA4341C6D97A0B6
1 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
onionshare_gui/onionshare_gui.py
View File

@ -93,6 +93,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
# Filesize warning # Filesize warning
self.filesize_warning = QtWidgets.QLabel() self.filesize_warning = QtWidgets.QLabel()
self.filesize_warning.setWordWrap(True)
self.filesize_warning.setStyleSheet('padding: 10px 0; font-weight: bold; color: #333333;') self.filesize_warning.setStyleSheet('padding: 10px 0; font-weight: bold; color: #333333;')
self.filesize_warning.hide() self.filesize_warning.hide()
@ -149,10 +150,11 @@ class OnionShareGui(QtWidgets.QMainWindow):
# Status bar, zip progress bar # Status bar, zip progress bar
self._zip_progress_bar = None self._zip_progress_bar = None
# Status bar, other larger messages # Status bar, sharing messages
self._close_on_timeout_label = None self.server_share_status_label = QtWidgets.QLabel('')
self._closing_automatically_label = None self.server_share_status_label.setWordWrap(True)
self._timeout_download_still_running_label = None self.server_share_status_label.setStyleSheet('QLabel { font-style: italic; color: #666666; padding: 2px; }')
self.status_bar.insertWidget(0, self.server_share_status_label)
# Persistent URL notification # Persistent URL notification
self.persistent_url_label = QtWidgets.QLabel(strings._('persistent_url_in_use', True)) self.persistent_url_label = QtWidgets.QLabel(strings._('persistent_url_in_use', True))
@ -329,16 +331,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.downloads_container.hide() self.downloads_container.hide()
self.downloads.reset_downloads() self.downloads.reset_downloads()
self.status_bar.clearMessage() self.status_bar.clearMessage()
# Remove any other widgets from the statusBar self.server_share_status_label.setText('')
if self._close_on_timeout_label is not None:
self.status_bar.removeWidget(self._close_on_timeout_label)
self._close_on_timeout_label = None
if self._closing_automatically_label is not None:
self.status_bar.removeWidget(self._closing_automatically_label)
self._closing_automatically_label = None
if self._timeout_download_still_running_label is not None:
self.status_bar.removeWidget(self._timeout_download_still_running_label)
self._timeout_download_still_running_label = None
# Reset web counters # Reset web counters
web.download_count = 0 web.download_count = 0
@ -553,11 +546,8 @@ class OnionShareGui(QtWidgets.QMainWindow):
# close on finish? # close on finish?
if not web.get_stay_open(): if not web.get_stay_open():
self.server_status.stop_server() self.server_status.stop_server()
self._closing_automatically_label = QtWidgets.QLabel(strings._('closing_automatically', True))
self._closing_automatically_label.setWordWrap(True)
self._closing_automatically_label.setStyleSheet('QLabel { font-style: italic; color: #666666; padding: 2px; }')
self.status_bar.clearMessage() self.status_bar.clearMessage()
self.status_bar.insertWidget(0, self._closing_automatically_label) self.server_share_status_label.setText(strings._('closing_automatically', True))
else: else:
if self.server_status.status == self.server_status.STATUS_STOPPED: if self.server_status.status == self.server_status.STATUS_STOPPED:
self.downloads.cancel_download(event["data"]["id"]) self.downloads.cancel_download(event["data"]["id"])
@ -578,18 +568,12 @@ class OnionShareGui(QtWidgets.QMainWindow):
# If there were no attempts to download the share, or all downloads are done, we can stop # If there were no attempts to download the share, or all downloads are done, we can stop
if web.download_count == 0 or web.done: if web.download_count == 0 or web.done:
self.server_status.stop_server() self.server_status.stop_server()
self._close_on_timeout_label = QtWidgets.QLabel(strings._('close_on_timeout', True))
self._close_on_timeout_label.setStyleSheet('QLabel { font-style: italic; color: #666666; padding: 2px; }')
self._close_on_timeout_label.setWordWrap(True)
self.status_bar.clearMessage() self.status_bar.clearMessage()
self.status_bar.insertWidget(0, self._close_on_timeout_label) self.server_share_status_label.setText(strings._('close_on_timeout', True))
# A download is probably still running - hold off on stopping the share # A download is probably still running - hold off on stopping the share
else: else:
self._timeout_download_still_running_label = QtWidgets.QLabel(strings._('timeout_download_still_running', True))
self._timeout_download_still_running_label.setStyleSheet('QLabel { font-style: italic; color: #666666; padding: 2px; }')
self._timeout_download_still_running_label.setWordWrap(True)
self.status_bar.clearMessage() self.status_bar.clearMessage()
self.status_bar.insertWidget(0, self._timeout_download_still_running_label) self.server_share_status_label.setText(strings._('timeout_download_still_running', True))
def copy_url(self): def copy_url(self):
""" """