diff --git a/desktop/onionshare/main_window.py b/desktop/onionshare/main_window.py index 09dd53fa..d6f0d914 100644 --- a/desktop/onionshare/main_window.py +++ b/desktop/onionshare/main_window.py @@ -81,13 +81,13 @@ class MainWindow(QtWidgets.QMainWindow): # Server status indicator icons self.status_bar.server_status_image_stopped = QtGui.QImage( - GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_server_stopped.png") + GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_server_stopped.svg") ) self.status_bar.server_status_image_working = QtGui.QImage( - GuiCommon.get_resource_path("images/server_working.png") + GuiCommon.get_resource_path("images/server_working.svg") ) self.status_bar.server_status_image_started = QtGui.QImage( - GuiCommon.get_resource_path("images/server_started.png") + GuiCommon.get_resource_path("images/server_started.svg") ) # Server status indicator on the status bar diff --git a/desktop/onionshare/resources/images/dark_history_completed_none.png b/desktop/onionshare/resources/images/dark_history_completed_none.png deleted file mode 100644 index 4f23952a..00000000 Binary files a/desktop/onionshare/resources/images/dark_history_completed_none.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/dark_history_completed_none.svg b/desktop/onionshare/resources/images/dark_history_completed_none.svg new file mode 100644 index 00000000..6a0a1435 --- /dev/null +++ b/desktop/onionshare/resources/images/dark_history_completed_none.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/dark_history_icon_toggle.png b/desktop/onionshare/resources/images/dark_history_icon_toggle.png deleted file mode 100644 index 07d749ab..00000000 Binary files a/desktop/onionshare/resources/images/dark_history_icon_toggle.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/dark_history_icon_toggle.svg b/desktop/onionshare/resources/images/dark_history_icon_toggle.svg new file mode 100644 index 00000000..9166e984 --- /dev/null +++ b/desktop/onionshare/resources/images/dark_history_icon_toggle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/dark_history_icon_toggle_selected.png b/desktop/onionshare/resources/images/dark_history_icon_toggle_selected.png deleted file mode 100644 index 99359210..00000000 Binary files a/desktop/onionshare/resources/images/dark_history_icon_toggle_selected.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/dark_history_icon_toggle_selected.svg b/desktop/onionshare/resources/images/dark_history_icon_toggle_selected.svg new file mode 100644 index 00000000..f5f6231a --- /dev/null +++ b/desktop/onionshare/resources/images/dark_history_icon_toggle_selected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/dark_history_in_progress_none.png b/desktop/onionshare/resources/images/dark_history_in_progress_none.png deleted file mode 100644 index a795fb2f..00000000 Binary files a/desktop/onionshare/resources/images/dark_history_in_progress_none.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/dark_history_in_progress_none.svg b/desktop/onionshare/resources/images/dark_history_in_progress_none.svg new file mode 100644 index 00000000..d72f4a6a --- /dev/null +++ b/desktop/onionshare/resources/images/dark_history_in_progress_none.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/dark_history_requests_none.png b/desktop/onionshare/resources/images/dark_history_requests_none.png deleted file mode 100644 index ae859041..00000000 Binary files a/desktop/onionshare/resources/images/dark_history_requests_none.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/dark_history_requests_none.svg b/desktop/onionshare/resources/images/dark_history_requests_none.svg new file mode 100644 index 00000000..d5453b75 --- /dev/null +++ b/desktop/onionshare/resources/images/dark_history_requests_none.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/dark_persistent_enabled.png b/desktop/onionshare/resources/images/dark_persistent_enabled.png deleted file mode 100644 index e3e98154..00000000 Binary files a/desktop/onionshare/resources/images/dark_persistent_enabled.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/dark_persistent_enabled.svg b/desktop/onionshare/resources/images/dark_persistent_enabled.svg new file mode 100644 index 00000000..239d6431 --- /dev/null +++ b/desktop/onionshare/resources/images/dark_persistent_enabled.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/dark_server_stopped.png b/desktop/onionshare/resources/images/dark_server_stopped.png deleted file mode 100644 index 4d2b91cc..00000000 Binary files a/desktop/onionshare/resources/images/dark_server_stopped.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/dark_server_stopped.svg b/desktop/onionshare/resources/images/dark_server_stopped.svg new file mode 100644 index 00000000..0f315177 --- /dev/null +++ b/desktop/onionshare/resources/images/dark_server_stopped.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/history_completed.png b/desktop/onionshare/resources/images/history_completed.png deleted file mode 100644 index a84593d7..00000000 Binary files a/desktop/onionshare/resources/images/history_completed.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/history_completed.svg b/desktop/onionshare/resources/images/history_completed.svg new file mode 100644 index 00000000..b59e8f08 --- /dev/null +++ b/desktop/onionshare/resources/images/history_completed.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/history_in_progress.png b/desktop/onionshare/resources/images/history_in_progress.png deleted file mode 100644 index b0cdac9e..00000000 Binary files a/desktop/onionshare/resources/images/history_in_progress.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/history_in_progress.svg b/desktop/onionshare/resources/images/history_in_progress.svg new file mode 100644 index 00000000..137e0533 --- /dev/null +++ b/desktop/onionshare/resources/images/history_in_progress.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/history_requests.png b/desktop/onionshare/resources/images/history_requests.png deleted file mode 100644 index 18027c6e..00000000 Binary files a/desktop/onionshare/resources/images/history_requests.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/history_requests.svg b/desktop/onionshare/resources/images/history_requests.svg new file mode 100644 index 00000000..c19698a3 --- /dev/null +++ b/desktop/onionshare/resources/images/history_requests.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/light_history_completed_none.png b/desktop/onionshare/resources/images/light_history_completed_none.png deleted file mode 100644 index 56532671..00000000 Binary files a/desktop/onionshare/resources/images/light_history_completed_none.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/light_history_completed_none.svg b/desktop/onionshare/resources/images/light_history_completed_none.svg new file mode 100644 index 00000000..8ef9d629 --- /dev/null +++ b/desktop/onionshare/resources/images/light_history_completed_none.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/light_history_icon_toggle.png b/desktop/onionshare/resources/images/light_history_icon_toggle.png deleted file mode 100644 index 392cef0b..00000000 Binary files a/desktop/onionshare/resources/images/light_history_icon_toggle.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/light_history_icon_toggle.svg b/desktop/onionshare/resources/images/light_history_icon_toggle.svg new file mode 100644 index 00000000..ecdb8bb8 --- /dev/null +++ b/desktop/onionshare/resources/images/light_history_icon_toggle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/light_history_icon_toggle_selected.png b/desktop/onionshare/resources/images/light_history_icon_toggle_selected.png deleted file mode 100644 index b2dc4d52..00000000 Binary files a/desktop/onionshare/resources/images/light_history_icon_toggle_selected.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/light_history_icon_toggle_selected.svg b/desktop/onionshare/resources/images/light_history_icon_toggle_selected.svg new file mode 100644 index 00000000..18d9db26 --- /dev/null +++ b/desktop/onionshare/resources/images/light_history_icon_toggle_selected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/light_history_in_progress_none.png b/desktop/onionshare/resources/images/light_history_in_progress_none.png deleted file mode 100644 index 4cc338a0..00000000 Binary files a/desktop/onionshare/resources/images/light_history_in_progress_none.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/light_history_in_progress_none.svg b/desktop/onionshare/resources/images/light_history_in_progress_none.svg new file mode 100644 index 00000000..f489d5e7 --- /dev/null +++ b/desktop/onionshare/resources/images/light_history_in_progress_none.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/light_history_requests_none.png b/desktop/onionshare/resources/images/light_history_requests_none.png deleted file mode 100644 index 3e45e5e9..00000000 Binary files a/desktop/onionshare/resources/images/light_history_requests_none.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/light_history_requests_none.svg b/desktop/onionshare/resources/images/light_history_requests_none.svg new file mode 100644 index 00000000..e89e77fa --- /dev/null +++ b/desktop/onionshare/resources/images/light_history_requests_none.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/light_persistent_enabled.png b/desktop/onionshare/resources/images/light_persistent_enabled.png deleted file mode 100644 index dc5e23ff..00000000 Binary files a/desktop/onionshare/resources/images/light_persistent_enabled.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/light_persistent_enabled.svg b/desktop/onionshare/resources/images/light_persistent_enabled.svg new file mode 100644 index 00000000..77fc5f48 --- /dev/null +++ b/desktop/onionshare/resources/images/light_persistent_enabled.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/light_server_stopped.png b/desktop/onionshare/resources/images/light_server_stopped.png deleted file mode 100644 index f4123b47..00000000 Binary files a/desktop/onionshare/resources/images/light_server_stopped.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/light_server_stopped.svg b/desktop/onionshare/resources/images/light_server_stopped.svg new file mode 100644 index 00000000..8023ea72 --- /dev/null +++ b/desktop/onionshare/resources/images/light_server_stopped.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/open_folder.png b/desktop/onionshare/resources/images/open_folder.png deleted file mode 100644 index e37fe8d6..00000000 Binary files a/desktop/onionshare/resources/images/open_folder.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/open_folder.svg b/desktop/onionshare/resources/images/open_folder.svg new file mode 100644 index 00000000..5981597a --- /dev/null +++ b/desktop/onionshare/resources/images/open_folder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/server_started.png b/desktop/onionshare/resources/images/server_started.png deleted file mode 100644 index 971da6d8..00000000 Binary files a/desktop/onionshare/resources/images/server_started.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/server_started.svg b/desktop/onionshare/resources/images/server_started.svg new file mode 100644 index 00000000..8358e726 --- /dev/null +++ b/desktop/onionshare/resources/images/server_started.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/resources/images/server_working.png b/desktop/onionshare/resources/images/server_working.png deleted file mode 100644 index d45ff296..00000000 Binary files a/desktop/onionshare/resources/images/server_working.png and /dev/null differ diff --git a/desktop/onionshare/resources/images/server_working.svg b/desktop/onionshare/resources/images/server_working.svg new file mode 100644 index 00000000..3717cbff --- /dev/null +++ b/desktop/onionshare/resources/images/server_working.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/desktop/onionshare/tab/mode/history.py b/desktop/onionshare/tab/mode/history.py index 48943967..5e4b0304 100644 --- a/desktop/onionshare/tab/mode/history.py +++ b/desktop/onionshare/tab/mode/history.py @@ -201,7 +201,7 @@ class ReceiveHistoryItemFile(QtWidgets.QWidget): self.filesize_label.hide() # Folder button - image = QtGui.QImage(GuiCommon.get_resource_path("images/open_folder.png")) + image = QtGui.QImage(GuiCommon.get_resource_path("images/open_folder.svg")) scaled_image = image.scaledToHeight(15, QtCore.Qt.SmoothTransformation) folder_pixmap = QtGui.QPixmap.fromImage(scaled_image) folder_icon = QtGui.QIcon(folder_pixmap) @@ -788,9 +788,9 @@ class History(QtWidgets.QWidget): Update the 'completed' widget. """ if self.completed_count == 0: - image = GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_completed_none.png") + image = GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_completed_none.svg") else: - image = GuiCommon.get_resource_path("images/history_completed.png") + image = GuiCommon.get_resource_path("images/history_completed.svg") self.completed_label.setText(f' {self.completed_count}') self.completed_label.setToolTip( strings._("history_completed_tooltip").format(self.completed_count) @@ -801,9 +801,9 @@ class History(QtWidgets.QWidget): Update the 'in progress' widget. """ if self.in_progress_count == 0: - image = GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_in_progress_none.png") + image = GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_in_progress_none.svg") else: - image = GuiCommon.get_resource_path("images/history_in_progress.png") + image = GuiCommon.get_resource_path("images/history_in_progress.svg") self.in_progress_label.setText( f' {self.in_progress_count}' @@ -817,9 +817,9 @@ class History(QtWidgets.QWidget): Update the 'web requests' widget. """ if self.requests_count == 0: - image = GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_requests_none.png") + image = GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_requests_none.svg") else: - image = GuiCommon.get_resource_path("images/history_requests.png") + image = GuiCommon.get_resource_path("images/history_requests.svg") self.requests_label.setText(f' {self.requests_count}') self.requests_label.setToolTip( diff --git a/desktop/onionshare/tab/mode/receive_mode/__init__.py b/desktop/onionshare/tab/mode/receive_mode/__init__.py index f44b022e..45b20c70 100644 --- a/desktop/onionshare/tab/mode/receive_mode/__init__.py +++ b/desktop/onionshare/tab/mode/receive_mode/__init__.py @@ -160,9 +160,9 @@ class ReceiveMode(Mode): self.common, self, self.history, - QtGui.QIcon(GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle.png")), + QtGui.QIcon(GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle.svg")), QtGui.QIcon( - GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle_selected.png") + GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle_selected.svg") ), ) diff --git a/desktop/onionshare/tab/mode/share_mode/__init__.py b/desktop/onionshare/tab/mode/share_mode/__init__.py index c190fbe7..d8a515dd 100644 --- a/desktop/onionshare/tab/mode/share_mode/__init__.py +++ b/desktop/onionshare/tab/mode/share_mode/__init__.py @@ -135,9 +135,9 @@ class ShareMode(Mode): self.common, self, self.history, - QtGui.QIcon(GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle.png")), + QtGui.QIcon(GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle.svg")), QtGui.QIcon( - GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle_selected.png") + GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle_selected.svg") ), ) diff --git a/desktop/onionshare/tab/mode/website_mode/__init__.py b/desktop/onionshare/tab/mode/website_mode/__init__.py index d5e237f6..3faab913 100644 --- a/desktop/onionshare/tab/mode/website_mode/__init__.py +++ b/desktop/onionshare/tab/mode/website_mode/__init__.py @@ -157,9 +157,9 @@ class WebsiteMode(Mode): self.common, self, self.history, - QtGui.QIcon(GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle.png")), + QtGui.QIcon(GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle.svg")), QtGui.QIcon( - GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle_selected.png") + GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle_selected.svg") ), ) diff --git a/desktop/onionshare/tab/tab.py b/desktop/onionshare/tab/tab.py index 34f567b5..9e5dda20 100644 --- a/desktop/onionshare/tab/tab.py +++ b/desktop/onionshare/tab/tab.py @@ -219,7 +219,7 @@ class Tab(QtWidgets.QWidget): self.persistent_image_label = QtWidgets.QLabel() image = QtGui.QImage( GuiCommon.get_resource_path( - f"images/{self.common.gui.color_mode}_persistent_enabled.png" + f"images/{self.common.gui.color_mode}_persistent_enabled.svg" ) ) scaled_image = image.scaledToHeight(15, QtCore.Qt.SmoothTransformation) @@ -480,7 +480,7 @@ class Tab(QtWidgets.QWidget): def set_server_status_indicator_stopped(self, label_text): self.change_icon.emit( - self.tab_id, f"images/{self.common.gui.color_mode}_server_stopped.png" + self.tab_id, f"images/{self.common.gui.color_mode}_server_stopped.svg" ) image = self.status_bar.server_status_image_stopped scaled_image = image.scaledToHeight(15, QtCore.Qt.SmoothTransformation) @@ -490,7 +490,7 @@ class Tab(QtWidgets.QWidget): self.status_bar.server_status_label.setText(label_text) def set_server_status_indicator_working(self, label_text): - self.change_icon.emit(self.tab_id, "images/server_working.png") + self.change_icon.emit(self.tab_id, "images/server_working.svg") image = self.status_bar.server_status_image_working scaled_image = image.scaledToHeight(15, QtCore.Qt.SmoothTransformation) self.status_bar.server_status_image_label.setPixmap( @@ -499,7 +499,7 @@ class Tab(QtWidgets.QWidget): self.status_bar.server_status_label.setText(label_text) def set_server_status_indicator_started(self, label_text): - self.change_icon.emit(self.tab_id, "images/server_started.png") + self.change_icon.emit(self.tab_id, "images/server_started.svg") image = self.status_bar.server_status_image_started scaled_image = image.scaledToHeight(15, QtCore.Qt.SmoothTransformation) self.status_bar.server_status_image_label.setPixmap( diff --git a/licenses/readme.md b/licenses/readme.md index b1504fea..44facf69 100644 --- a/licenses/readme.md +++ b/licenses/readme.md @@ -30,4 +30,4 @@ The Meek-lite tool is a Tor 'pluggable transport', which allows the use of meek- ## Font Awesome -Some icons used in the desktop version of the OnionShare application are from the 'free' edition of Font Awesome. In some cases they have been converted from SVG to PNG, and had their colors inverted for the 'dark mode' theme. +Some icons used in the desktop version of the OnionShare application are from the 'free' edition of Font Awesome.