Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-15 17:27:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

reorganize, add comment

Browse Source
This commit is contained in:
choltz95 2016-08-02 16:43:40 +00:00
parent b1dd45a94b
commit d0f085f756
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
onionshare_gui/downloads.py
View File

@ -56,7 +56,7 @@ class Download(object):
elapsed = time.time() - self.started
if elapsed < 10:
# Wait a couple of seconds for the download rate to stabilize.
# This prevents an "Windows copy dialog"-esque experience at
# This prevents a "Windows copy dialog"-esque experience at
# the beginning of the download.
pb_fmt = strings._('gui_download_progress_starting').format(
helpers.human_readable_filesize(downloaded_bytes))

21
onionshare_gui/onionshare_gui.py
View File

@ -98,6 +98,13 @@ class OnionShareGui(QtWidgets.QMainWindow):
# downloads
self.downloads = Downloads()
self.downloads_layout = QtWidgets.QGroupBox()
self.downloads_layout.setLayout(self.downloads)
self.downloads_layout_container = QtWidgets.QScrollArea()
self.downloads_layout_container.setWidget(self.downloads_layout)
self.downloads_layout_container.setWidgetResizable(True)
self.downloads_layout_container.setFixedHeight(80)
self.vbar = self.downloads_layout_container.verticalScrollBar()
# options
self.options = Options(web, self.app)
@ -108,19 +115,10 @@ class OnionShareGui(QtWidgets.QMainWindow):
version_label = QtWidgets.QLabel('v{0:s}'.format(helpers.get_version()))
version_label.setStyleSheet('color: #666666; padding: 0 10px;')
self.status_bar.addPermanentWidget(version_label)
self.setStatusBar(self.status_bar)
self.setStatusBar(self.status_bar)
# main layout
self.layout = QtWidgets.QVBoxLayout()
self.downloads_layout = QtWidgets.QGroupBox()
self.downloads_layout.setLayout(self.downloads)
self.downloads_layout_container = QtWidgets.QScrollArea()
self.downloads_layout_container.setWidget(self.downloads_layout)
self.downloads_layout_container.setWidgetResizable(True)
self.downloads_layout_container.setFixedHeight(80)
self.vbar = self.downloads_layout_container.verticalScrollBar()
self.layout.addLayout(self.file_selection)
self.layout.addLayout(self.server_status)
self.layout.addWidget(self.filesize_warning)
@ -219,7 +217,10 @@ class OnionShareGui(QtWidgets.QMainWindow):
events.append(r)
except web.queue.Empty:
done = True
# scroll to the bottom of the dl progress bar log pane
self.vbar.setValue(self.vbar.maximum())
for event in events:
if event["type"] == web.REQUEST_LOAD:
self.status_bar.showMessage(strings._('download_page_loaded', True))