From 3422cf6ea89ec50895f19a3c4a067372ad3788d4 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Sun, 8 Sep 2019 17:27:24 -0700 Subject: [PATCH] Rename images from share_ to history_, because they are used in all modes --- onionshare_gui/mode/history.py | 12 ++++++------ .../{share_completed.png => history_completed.png} | Bin ...ompleted_none.png => history_completed_none.png} | Bin ...hare_in_progress.png => history_in_progress.png} | Bin ...ogress_none.png => history_in_progress_none.png} | Bin .../{share_requests.png => history_requests.png} | Bin ..._requests_none.png => history_requests_none.png} | Bin 7 files changed, 6 insertions(+), 6 deletions(-) rename share/images/{share_completed.png => history_completed.png} (100%) rename share/images/{share_completed_none.png => history_completed_none.png} (100%) rename share/images/{share_in_progress.png => history_in_progress.png} (100%) rename share/images/{share_in_progress_none.png => history_in_progress_none.png} (100%) rename share/images/{share_requests.png => history_requests.png} (100%) rename share/images/{share_requests_none.png => history_requests_none.png} (100%) diff --git a/onionshare_gui/mode/history.py b/onionshare_gui/mode/history.py index 650e57be..568bda7b 100644 --- a/onionshare_gui/mode/history.py +++ b/onionshare_gui/mode/history.py @@ -636,9 +636,9 @@ class History(QtWidgets.QWidget): Update the 'completed' widget. """ if self.completed_count == 0: - image = self.common.get_resource_path('images/share_completed_none.png') + image = self.common.get_resource_path('images/history_completed_none.png') else: - image = self.common.get_resource_path('images/share_completed.png') + image = self.common.get_resource_path('images/history_completed.png') self.completed_label.setText(' {1:d}'.format(image, self.completed_count)) self.completed_label.setToolTip(strings._('history_completed_tooltip').format(self.completed_count)) @@ -647,9 +647,9 @@ class History(QtWidgets.QWidget): Update the 'in progress' widget. """ if self.in_progress_count == 0: - image = self.common.get_resource_path('images/share_in_progress_none.png') + image = self.common.get_resource_path('images/history_in_progress_none.png') else: - image = self.common.get_resource_path('images/share_in_progress.png') + image = self.common.get_resource_path('images/history_in_progress.png') self.in_progress_label.setText(' {1:d}'.format(image, self.in_progress_count)) self.in_progress_label.setToolTip(strings._('history_in_progress_tooltip').format(self.in_progress_count)) @@ -659,9 +659,9 @@ class History(QtWidgets.QWidget): Update the 'web requests' widget. """ if self.requests_count == 0: - image = self.common.get_resource_path('images/share_requests_none.png') + image = self.common.get_resource_path('images/history_requests_none.png') else: - image = self.common.get_resource_path('images/share_requests.png') + image = self.common.get_resource_path('images/history_requests.png') self.requests_label.setText(' {1:d}'.format(image, self.in_progress_count)) self.requests_label.setToolTip(strings._('history_requests_tooltip').format(self.in_progress_count)) diff --git a/share/images/share_completed.png b/share/images/history_completed.png similarity index 100% rename from share/images/share_completed.png rename to share/images/history_completed.png diff --git a/share/images/share_completed_none.png b/share/images/history_completed_none.png similarity index 100% rename from share/images/share_completed_none.png rename to share/images/history_completed_none.png diff --git a/share/images/share_in_progress.png b/share/images/history_in_progress.png similarity index 100% rename from share/images/share_in_progress.png rename to share/images/history_in_progress.png diff --git a/share/images/share_in_progress_none.png b/share/images/history_in_progress_none.png similarity index 100% rename from share/images/share_in_progress_none.png rename to share/images/history_in_progress_none.png diff --git a/share/images/share_requests.png b/share/images/history_requests.png similarity index 100% rename from share/images/share_requests.png rename to share/images/history_requests.png diff --git a/share/images/share_requests_none.png b/share/images/history_requests_none.png similarity index 100% rename from share/images/share_requests_none.png rename to share/images/history_requests_none.png