Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-02-14 21:51:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't clear in-progress transfers from the History list

Browse Source
This commit is contained in:
Miguel Jacq 2019-02-17 14:07:38 +11:00
parent 38238fec40
commit 54f7e54c67
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
onionshare_gui/mode/history.py
View File

@ -237,6 +237,7 @@ class ReceiveHistoryItem(HistoryItem):
self.id = id self.id = id
self.content_length = content_length self.content_length = content_length
self.started = datetime.now() self.started = datetime.now()
self.status = 'started'
# Label # Label
self.label = QtWidgets.QLabel(strings._('gui_all_modes_transfer_started').format(self.started.strftime("%b %d, %I:%M%p"))) self.label = QtWidgets.QLabel(strings._('gui_all_modes_transfer_started').format(self.started.strftime("%b %d, %I:%M%p")))
@ -313,6 +314,9 @@ class ReceiveHistoryItem(HistoryItem):
self.files[data['filename']].set_dir(data['dir']) self.files[data['filename']].set_dir(data['dir'])
elif data['action'] == 'finished': elif data['action'] == 'finished':
# Change the status
self.status = 'finished'
# Hide the progress bar # Hide the progress bar
self.progress_bar.hide() self.progress_bar.hide()
@ -320,6 +324,9 @@ class ReceiveHistoryItem(HistoryItem):
self.label.setText(self.get_finished_label_text(self.started)) self.label.setText(self.get_finished_label_text(self.started))
elif data['action'] == 'canceled': elif data['action'] == 'canceled':
# Change the status
self.status = 'canceled'
# Hide the progress bar # Hide the progress bar
self.progress_bar.hide() self.progress_bar.hide()
@ -389,11 +396,11 @@ class HistoryItemList(QtWidgets.QScrollArea):
""" """
Reset all items, emptying the list. Override this method. Reset all items, emptying the list. Override this method.
""" """
for item in self.items.values(): for key, item in self.items.copy().items():
self.items_layout.removeWidget(item) if item.status != 'started':
item.close() self.items_layout.removeWidget(item)
self.items = {} item.close()
del self.items[key]
class History(QtWidgets.QWidget): class History(QtWidgets.QWidget):
""" """
@ -495,15 +502,17 @@ class History(QtWidgets.QWidget):
""" """
self.item_list.reset() self.item_list.reset()
# Hide not empty, show empty if not any(self.item_list.items):
self.not_empty.hide() # Hide not empty, show empty
self.empty.show() self.not_empty.hide()
self.empty.show()
# Reset in-progress counter
self.in_progress_count = 0
self.update_in_progress()
# Reset counters # Reset completed counter
self.completed_count = 0 self.completed_count = 0
self.in_progress_count = 0
self.update_completed() self.update_completed()
self.update_in_progress()
def update_completed(self): def update_completed(self):
""" """