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

Merge branch 'mig5-433_reset_downloads_on_fresh_share'

Browse Source
This commit is contained in:
Micah Lee 2017-07-09 13:19:26 -07:00
commit dee616e8cb
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
onionshare_gui/downloads.py
View File

@ -45,6 +45,7 @@ class Download(object):
}""" }"""
self.progress_bar = QtWidgets.QProgressBar() self.progress_bar = QtWidgets.QProgressBar()
self.progress_bar.setTextVisible(True) self.progress_bar.setTextVisible(True)
self.progress_bar.setAttribute(QtCore.Qt.WA_DeleteOnClose)
self.progress_bar.setAlignment(QtCore.Qt.AlignHCenter) self.progress_bar.setAlignment(QtCore.Qt.AlignHCenter)
self.progress_bar.setMinimum(0) self.progress_bar.setMinimum(0)
self.progress_bar.setMaximum(total_bytes) self.progress_bar.setMaximum(total_bytes)
@ -120,3 +121,12 @@ class Downloads(QtWidgets.QWidget):
Update a download progress bar to show that it has been canceled. Update a download progress bar to show that it has been canceled.
""" """
self.downloads[download_id].cancel() self.downloads[download_id].cancel()
def reset_downloads(self):
"""
Reset the downloads back to zero
"""
for download in self.downloads.values():
self.layout.removeWidget(download.progress_bar)
download.progress_bar.close()
self.downloads = {}

5
onionshare_gui/onionshare_gui.py
View File

@ -94,6 +94,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.downloads_container.setWidget(self.downloads) self.downloads_container.setWidget(self.downloads)
self.downloads_container.setWidgetResizable(True) self.downloads_container.setWidgetResizable(True)
self.downloads_container.setMaximumHeight(200) self.downloads_container.setMaximumHeight(200)
self.downloads_container.setMinimumHeight(75)
self.vbar = self.downloads_container.verticalScrollBar() self.vbar = self.downloads_container.verticalScrollBar()
self.downloads_container.hide() # downloads start out hidden self.downloads_container.hide() # downloads start out hidden
self.new_download = False self.new_download = False
@ -233,6 +234,10 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.app.set_stealth(self.settings.get('use_stealth')) self.app.set_stealth(self.settings.get('use_stealth'))
# Hide and reset the downloads if we have previously shared
self.downloads_container.hide()
self.downloads.reset_downloads()
# Reset web counters # Reset web counters
web.download_count = 0 web.download_count = 0
web.error404_count = 0 web.error404_count = 0