Merge pull request #1268 from SaptakS/macos-dark

MacOS dark mode implementations

6 files changed, 22 insertions, 13 deletions

diff --git a/desktop/src/onionshare/tab/mode/chat_mode/__init__.py b/desktop/src/onionshare/tab/mode/chat_mode/__init__.py
index a7c2929b..440a97c5 100644
--- a/desktop/src/onionshare/tab/mode/chat_mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/chat_mode/__init__.py
@@ -53,7 +53,11 @@ class ChatMode(Mode):
         self.image_label = QtWidgets.QLabel()
         self.image_label.setPixmap(
             QtGui.QPixmap.fromImage(
-                QtGui.QImage(GuiCommon.get_resource_path("images/mode_chat.png"))
+                QtGui.QImage(
+                    GuiCommon.get_resource_path(
+                        "images/{}_mode_chat.png".format(self.common.gui.color_mode)
+                    )
+                )
             )
         )
         self.image_label.setFixedSize(300, 300)
diff --git a/desktop/src/onionshare/tab/mode/receive_mode/__init__.py b/desktop/src/onionshare/tab/mode/receive_mode/__init__.py
index 95a68dcb..b54c1168 100644
--- a/desktop/src/onionshare/tab/mode/receive_mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/receive_mode/__init__.py
@@ -46,7 +46,11 @@ class ReceiveMode(Mode):
         self.image_label = QtWidgets.QLabel()
         self.image_label.setPixmap(
             QtGui.QPixmap.fromImage(
-                QtGui.QImage(GuiCommon.get_resource_path("images/mode_receive.png"))
+                QtGui.QImage(
+                    GuiCommon.get_resource_path(
+                        "images/{}_mode_receive.png".format(self.common.gui.color_mode)
+                    )
+                )
             )
         )
         self.image_label.setFixedSize(250, 250)
diff --git a/desktop/src/onionshare/tab/mode/share_mode/__init__.py b/desktop/src/onionshare/tab/mode/share_mode/__init__.py
index bf1498d5..b9e01f5d 100644
--- a/desktop/src/onionshare/tab/mode/share_mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/share_mode/__init__.py
@@ -69,7 +69,7 @@ class ShareMode(Mode):
         # File selection
         self.file_selection = FileSelection(
             self.common,
-            "images/mode_share.png",
+            "images/{}_mode_share.png".format(self.common.gui.color_mode),
             strings._("gui_new_tab_share_button"),
             self,
         )
diff --git a/desktop/src/onionshare/tab/mode/website_mode/__init__.py b/desktop/src/onionshare/tab/mode/website_mode/__init__.py
index 6df6ff02..0c323b1c 100644
--- a/desktop/src/onionshare/tab/mode/website_mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/website_mode/__init__.py
@@ -69,7 +69,7 @@ class WebsiteMode(Mode):
         # File selection
         self.file_selection = FileSelection(
             self.common,
-            "images/mode_website.png",
+            "images/{}_mode_website.png".format(self.common.gui.color_mode),
             strings._("gui_new_tab_website_button"),
             self,
         )
diff --git a/desktop/src/onionshare/tab/server_status.py b/desktop/src/onionshare/tab/server_status.py
index 2e8dc4f0..42f60cd3 100644
--- a/desktop/src/onionshare/tab/server_status.py
+++ b/desktop/src/onionshare/tab/server_status.py
@@ -93,7 +93,6 @@ class ServerStatus(QtWidgets.QWidget):
         )
 
         self.copy_url_button = QtWidgets.QPushButton(strings._("gui_copy_url"))
-        self.copy_url_button.setFlat(True)
         self.copy_url_button.setStyleSheet(
             self.common.gui.css["server_status_url_buttons"]
         )
@@ -108,12 +107,10 @@ class ServerStatus(QtWidgets.QWidget):
         self.show_url_qr_code_button.clicked.connect(
             self.show_url_qr_code_button_clicked
         )
-        self.show_url_qr_code_button.setFlat(True)
         self.show_url_qr_code_button.setStyleSheet(
             self.common.gui.css["server_status_url_buttons"]
         )
 
-        self.copy_hidservauth_button.setFlat(True)
         self.copy_hidservauth_button.setStyleSheet(
             self.common.gui.css["server_status_url_buttons"]
         )
diff --git a/desktop/src/onionshare/tab/tab.py b/desktop/src/onionshare/tab/tab.py
index 8cbddfed..aea81e82 100644
--- a/desktop/src/onionshare/tab/tab.py
+++ b/desktop/src/onionshare/tab/tab.py
@@ -121,10 +121,14 @@ class Tab(QtWidgets.QWidget):
         self.image_label = QtWidgets.QLabel()
         self.image_label.setPixmap(
             QtGui.QPixmap.fromImage(
-                QtGui.QImage(GuiCommon.get_resource_path("images/logo_text.png"))
+                QtGui.QImage(
+                    GuiCommon.get_resource_path(
+                        "images/{}_logo_text.png".format(self.common.gui.color_mode)
+                    )
+                )
             )
         )
-        self.image_label.setFixedSize(160, 40)
+        self.image_label.setFixedSize(180, 40)
         image_layout = QtWidgets.QVBoxLayout()
         image_layout.addWidget(self.image_label)
         image_layout.addStretch()
@@ -134,7 +138,7 @@ class Tab(QtWidgets.QWidget):
         # New tab buttons
         self.share_button = NewTabButton(
             self.common,
-            "images/mode_new_tab_share.png",
+            "images/{}_mode_new_tab_share.png".format(self.common.gui.color_mode),
             strings._("gui_new_tab_share_button"),
             strings._("gui_main_page_share_button"),
         )
@@ -142,7 +146,7 @@ class Tab(QtWidgets.QWidget):
 
         self.receive_button = NewTabButton(
             self.common,
-            "images/mode_new_tab_receive.png",
+            "images/{}_mode_new_tab_receive.png".format(self.common.gui.color_mode),
             strings._("gui_new_tab_receive_button"),
             strings._("gui_main_page_receive_button"),
         )
@@ -150,7 +154,7 @@ class Tab(QtWidgets.QWidget):
 
         self.website_button = NewTabButton(
             self.common,
-            "images/mode_new_tab_website.png",
+            "images/{}_mode_new_tab_website.png".format(self.common.gui.color_mode),
             strings._("gui_new_tab_website_button"),
             strings._("gui_main_page_website_button"),
         )
@@ -158,7 +162,7 @@ class Tab(QtWidgets.QWidget):
 
         self.chat_button = NewTabButton(
             self.common,
-            "images/mode_new_tab_chat.png",
+            "images/{}_mode_new_tab_chat.png".format(self.common.gui.color_mode),
             strings._("gui_new_tab_chat_button"),
             strings._("gui_main_page_chat_button"),
         )