Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Starting to implement the new Uploads UI, but not done

Browse Source
This commit is contained in:
Micah Lee 2018-09-28 22:03:48 -07:00
parent e87263353f
commit 709eeeac5f
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
6 changed files with 157 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
onionshare_gui/receive_mode/__init__.py
View File

@ -127,6 +127,7 @@ class ReceiveMode(Mode):
Handle REQUEST_STARTED event.
"""
self.uploads.add(event["data"]["id"], event["data"]["content_length"])
self.info.update_indicator(True)
self.uploads_in_progress += 1
self.info.update_uploads_in_progress()

26
onionshare_gui/receive_mode/info.py
View File

@ -46,17 +46,39 @@ class ReceiveModeInfo(QtWidgets.QWidget):
self.toggle_button.setIcon( QtGui.QIcon(self.common.get_resource_path('images/uploads_toggle.png')) )
self.toggle_button.clicked.connect(self.toggle_uploads)
# Keep track of indicator
self.indicator_count = 0
self.indicator_label = QtWidgets.QLabel()
self.indicator_label.setStyleSheet(self.common.css['download_uploads_indicator'])
self.update_indicator()
# Layout
layout = QtWidgets.QHBoxLayout()
layout.addStretch()
layout.addWidget(self.in_progress_uploads_count)
layout.addWidget(self.completed_uploads_count)
layout.addWidget(self.indicator_label)
layout.addWidget(self.toggle_button)
self.setLayout(layout)
self.update_uploads_completed()
self.update_uploads_in_progress()
def update_indicator(self, increment=False):
"""
Update the display of the indicator count. If increment is True, then
only increment the counter if Uploads is hidden.
"""
if increment and not self.receive_mode.uploads.isVisible():
self.indicator_count += 1
self.indicator_label.setText("{}".format(self.indicator_count))
if self.indicator_count == 0:
self.indicator_label.hide()
else:
self.indicator_label.show()
def update_uploads_completed(self):
"""
Update the 'Uploads completed' info widget.
@ -94,6 +116,10 @@ class ReceiveModeInfo(QtWidgets.QWidget):
self.toggle_button.setIcon( QtGui.QIcon(self.common.get_resource_path('images/uploads_toggle_selected.png')) )
self.toggle_button.setFlat(False)
# Reset the indicator count
self.indicator_count = 0
self.update_indicator()
self.receive_mode.resize_window()
def show_less(self):

191
onionshare_gui/receive_mode/uploads.py
View File

@ -206,69 +206,30 @@ class Upload(QtWidgets.QWidget):
self.label.setText(text)
class Uploads(QtWidgets.QScrollArea):
class UploadList(QtWidgets.QListWidget):
"""
The uploads chunk of the GUI. This lists all of the active upload
progress bars, as well as information about each upload.
List of upload progess bars.
"""
def __init__(self, common):
super(Uploads, self).__init__()
super(UploadList, self).__init__()
self.common = common
self.common.log('Uploads', '__init__')
self.resizeEvent = None
self.uploads = {}
self.setWindowTitle(strings._('gui_uploads', True))
self.setWidgetResizable(True)
self.setMinimumHeight(150)
self.setMinimumWidth(350)
self.setWindowIcon(QtGui.QIcon(common.get_resource_path('images/logo.png')))
self.setWindowFlags(QtCore.Qt.Sheet | QtCore.Qt.WindowTitleHint | QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.CustomizeWindowHint)
self.vbar = self.verticalScrollBar()
self.vbar.rangeChanged.connect(self.resizeScroll)
uploads_label = QtWidgets.QLabel(strings._('gui_uploads', True))
uploads_label.setStyleSheet(self.common.css['downloads_uploads_label'])
self.no_uploads_label = QtWidgets.QLabel(strings._('gui_no_uploads', True))
self.clear_history_button = QtWidgets.QPushButton(strings._('gui_clear_history', True))
self.clear_history_button.clicked.connect(self.reset)
self.clear_history_button.hide()
self.uploads_layout = QtWidgets.QVBoxLayout()
widget = QtWidgets.QWidget()
layout = QtWidgets.QVBoxLayout()
layout.addWidget(uploads_label)
layout.addWidget(self.no_uploads_label)
layout.addWidget(self.clear_history_button)
layout.addLayout(self.uploads_layout)
layout.addStretch()
widget.setLayout(layout)
self.setWidget(widget)
def resizeScroll(self, minimum, maximum):
"""
Scroll to the bottom of the window when the range changes.
"""
self.vbar.setValue(maximum)
self.setMinimumHeight(205)
self.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
def add(self, upload_id, content_length):
"""
Add a new upload.
Add a new upload progress bar.
"""
self.common.log('Uploads', 'add', 'upload_id: {}, content_length: {}'.format(upload_id, content_length))
# Hide the no_uploads_label
self.no_uploads_label.hide()
# Show the clear_history_button
self.clear_history_button.show()
# Add it to the list
upload = Upload(self.common, upload_id, content_length)
self.uploads[upload_id] = upload
self.uploads_layout.addWidget(upload)
item = QtWidgets.QListWidgetItem()
self.addItem(item)
self.setItemWidget(item, upload)
def update(self, upload_id, progress):
"""
@ -299,22 +260,122 @@ class Uploads(QtWidgets.QScrollArea):
"""
Reset the uploads back to zero
"""
self.common.log('Uploads', 'reset')
# Remove all items from list
while True:
item = self.takeItem(0)
if not item:
break
# Close all progress bars
for upload in self.uploads.values():
upload.close()
self.uploads_layout.removeWidget(upload)
upload.progress_bar.close()
self.uploads = {}
self.no_uploads_label.show()
self.clear_history_button.hide()
self.resize(self.sizeHint())
def resizeEvent(self, event):
width = self.frameGeometry().width()
try:
for upload in self.uploads.values():
for item in upload.files.values():
item.filename_label.setText(textwrap.fill(item.filename, 30))
item.adjustSize()
except:
pass
class Uploads(QtWidgets.QWidget):
"""
The uploads chunk of the GUI. This lists all of the active upload
progress bars, as well as information about each upload.
"""
def __init__(self, common):
super(Uploads, self).__init__()
self.common = common
self.common.log('Uploads', '__init__')
self.setMinimumWidth(350)
# When there are no uploads
empty_image = QtWidgets.QLabel()
empty_image.setAlignment(QtCore.Qt.AlignCenter)
empty_image.setPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(self.common.get_resource_path('images/uploads_transparent.png'))))
empty_text = QtWidgets.QLabel(strings._('gui_no_uploads', True))
empty_text.setAlignment(QtCore.Qt.AlignCenter)
empty_text.setStyleSheet(self.common.css['downloads_uploads_empty_text'])
empty_layout = QtWidgets.QVBoxLayout()
empty_layout.addStretch()
empty_layout.addWidget(empty_image)
empty_layout.addWidget(empty_text)
empty_layout.addStretch()
self.empty = QtWidgets.QWidget()
self.empty.setStyleSheet(self.common.css['downloads_uploads_empty'])
self.empty.setLayout(empty_layout)
# When there are uploads
self.upload_list = UploadList(self.common)
# Upload header
uploads_label = QtWidgets.QLabel(strings._('gui_uploads', True))
uploads_label.setStyleSheet(self.common.css['downloads_uploads_label'])
clear_button = QtWidgets.QPushButton(strings._('gui_clear_history', True))
clear_button.setStyleSheet(self.common.css['downloads_uploads_clear'])
clear_button.setFlat(True)
clear_button.clicked.connect(self.reset)
upload_header = QtWidgets.QHBoxLayout()
upload_header.addWidget(uploads_label)
upload_header.addStretch()
upload_header.addWidget(clear_button)
# Upload layout
not_empty_layout = QtWidgets.QVBoxLayout()
not_empty_layout.addLayout(upload_header)
not_empty_layout.addWidget(self.upload_list)
self.not_empty = QtWidgets.QWidget()
self.not_empty.setLayout(not_empty_layout)
# Layout
layout = QtWidgets.QVBoxLayout()
layout.setContentsMargins(0, 0, 0, 0)
layout.addWidget(self.empty)
layout.addWidget(self.not_empty)
self.setLayout(layout)
# Reset once at the beginning
self.reset()
def add(self, upload_id, content_length):
"""
Add a new upload.
"""
self.common.log('Uploads', 'add', 'upload_id: {}, content_length: {}'.format(upload_id, content_length))
# Hide empty, show not empty
self.empty.hide()
self.not_empty.show()
# Add it to the list
self.upload_list.add(upload_id, content_length)
def update(self, upload_id, progress):
"""
Update the progress of an upload.
"""
self.upload_list.update(upload_id, progress)
def rename(self, upload_id, old_filename, new_filename):
"""
Rename a file, which happens if the filename already exists in downloads_dir.
"""
self.upload_list.rename(upload_id, old_filename, new_filename)
def finished(self, upload_id):
"""
An upload has finished.
"""
self.upload_list.finished(upload_id)
def cancel(self, upload_id):
"""
Update an upload progress bar to show that it has been canceled.
"""
self.common.log('Uploads', 'cancel', 'upload_id: {}'.format(upload_id))
self.upload_list.cancel(upload_id)
def reset(self):
"""
Reset the uploads back to zero
"""
self.upload_list.reset()
# Hide not empty, show empty
self.not_empty.hide()
self.empty.show()

2
onionshare_gui/share_mode/downloads.py
View File

@ -194,6 +194,8 @@ class Downloads(QtWidgets.QWidget):
"""
Add a new download progress bar.
"""
self.common.log('Downloads', 'add', 'download_id: {}, content_length: {}'.format(download_id, content_length))
# Hide empty, show not empty
self.empty.hide()
self.not_empty.show()

2
onionshare_gui/share_mode/info.py
View File

@ -57,7 +57,7 @@ class ShareModeInfo(QtWidgets.QWidget):
self.indicator_label.setStyleSheet(self.common.css['download_uploads_indicator'])
self.update_indicator()
# Info layout
# Layout
layout = QtWidgets.QHBoxLayout()
layout.addWidget(self.label)
layout.addStretch()

2
share/locale/en.json
View File

@ -175,7 +175,7 @@
"systray_download_page_loaded_message": "A user loaded the download page",
"systray_upload_page_loaded_message": "A user loaded the upload page",
"gui_uploads": "Upload History",
"gui_no_uploads": "No uploads yet.",
"gui_no_uploads": "No Uploads Yet",
"gui_clear_history": "Clear All",
"gui_upload_in_progress": "Upload Started {}",
"gui_upload_finished_range": "Uploaded {} to {}",