From 3cbe55916bdd2ace57b4603764c97cea7a864d2e Mon Sep 17 00:00:00 2001 From: SIDDHANT DIXIT Date: Mon, 19 Jul 2021 18:27:02 +0530 Subject: [PATCH 1/7] Added user theme preference option in Settings Added an option to choose theme in settings dialog like auto, light and dark. Fixed Dark Mode Dark Text. --- cli/onionshare_cli/settings.py | 1 + desktop/src/onionshare/__init__.py | 19 ++++++++++++--- desktop/src/onionshare/gui_common.py | 2 +- .../src/onionshare/resources/locale/en.json | 4 ++++ desktop/src/onionshare/settings_dialog.py | 23 +++++++++++++++++++ 5 files changed, 45 insertions(+), 4 deletions(-) diff --git a/cli/onionshare_cli/settings.py b/cli/onionshare_cli/settings.py index 54a0fcd9..665c41c9 100644 --- a/cli/onionshare_cli/settings.py +++ b/cli/onionshare_cli/settings.py @@ -110,6 +110,7 @@ class Settings(object): "tor_bridges_use_custom_bridges": "", "persistent_tabs": [], "locale": None, # this gets defined in fill_in_defaults() + "theme": 0 } self._settings = {} self.fill_in_defaults() diff --git a/desktop/src/onionshare/__init__.py b/desktop/src/onionshare/__init__.py index 8276dae4..815dff0b 100644 --- a/desktop/src/onionshare/__init__.py +++ b/desktop/src/onionshare/__init__.py @@ -29,6 +29,7 @@ import getpass from PySide2 import QtCore, QtWidgets, QtGui from onionshare_cli.common import Common +from onionshare_cli.settings import Settings from .gui_common import GuiCommon from .widgets import Alert @@ -47,7 +48,8 @@ class Application(QtWidgets.QApplication): QtWidgets.QApplication.__init__(self, sys.argv) # Check color mode on starting the app - self.color_mode = self.get_color_mode() + # self.color_mode = self.get_color_mode() + self.color_mode = self.get_color_mode(common) self.installEventFilter(self) def eventFilter(self, obj, event): @@ -65,9 +67,20 @@ class Application(QtWidgets.QApplication): return False return True - def get_color_mode(self): - return "dark" if self.is_dark_mode() else "light" + def get_color_mode(self, common): + # return "dark" if self.is_dark_mode() else "light" + curr_settings = Settings(common) + curr_settings.load() + current_theme = curr_settings.get("theme") + if current_theme == 0: + return "dark" if self.is_dark_mode() else "light" + elif current_theme == 1: + return "light" + elif current_theme == 2: + return "dark" + else: + return "light" def main(): """ diff --git a/desktop/src/onionshare/gui_common.py b/desktop/src/onionshare/gui_common.py index 441aff25..3cc353cf 100644 --- a/desktop/src/onionshare/gui_common.py +++ b/desktop/src/onionshare/gui_common.py @@ -89,7 +89,7 @@ class GuiCommon: new_tab_button_text_color = "#4e0d4e" if color_mode == "dark": header_color = "#F2F2F2" - title_color = "#F2F2F2" + # title_color = "#F2F2F2" stop_button_color = "#C32F2F" new_tab_button_background = "#5F5F5F" new_tab_button_border = "#878787" diff --git a/desktop/src/onionshare/resources/locale/en.json b/desktop/src/onionshare/resources/locale/en.json index 0eacc618..3a5c2ecd 100644 --- a/desktop/src/onionshare/resources/locale/en.json +++ b/desktop/src/onionshare/resources/locale/en.json @@ -115,6 +115,10 @@ "gui_receive_mode_warning": "Receive mode lets people upload files to your computer.

Some files can potentially take control of your computer if you open them. Only open things from people you trust, or if you know what you are doing.", "gui_open_folder_error": "Failed to open folder with xdg-open. The file is here: {}", "gui_settings_language_label": "Preferred language", + "gui_settings_theme_label": "Theme", + "gui_settings_theme_auto": "Auto", + "gui_settings_theme_light": "Light", + "gui_settings_theme_dark": "Dark", "gui_settings_language_changed_notice": "Restart OnionShare for the new language to be applied.", "gui_color_mode_changed_notice": "Restart OnionShare for the new color mode to be applied.", "systray_menu_exit": "Quit", diff --git a/desktop/src/onionshare/settings_dialog.py b/desktop/src/onionshare/settings_dialog.py index 190ae35d..72cc7fab 100644 --- a/desktop/src/onionshare/settings_dialog.py +++ b/desktop/src/onionshare/settings_dialog.py @@ -123,6 +123,20 @@ class SettingsDialog(QtWidgets.QDialog): language_layout.addWidget(self.language_combobox) language_layout.addStretch() + #Theme Settings + theme_label = QtWidgets.QLabel(strings._("gui_settings_theme_label")) + self.theme_combobox = QtWidgets.QComboBox() + theme_choices = [ + strings._("gui_settings_theme_auto"), + strings._("gui_settings_theme_light"), + strings._("gui_settings_theme_dark") + ] + self.theme_combobox.addItems(theme_choices) + theme_layout = QtWidgets.QHBoxLayout() + theme_layout.addWidget(theme_label) + theme_layout.addWidget(self.theme_combobox) + theme_layout.addStretch() + # Connection type: either automatic, control port, or socket file # Bundled Tor @@ -451,6 +465,8 @@ class SettingsDialog(QtWidgets.QDialog): layout.addSpacing(20) layout.addLayout(language_layout) layout.addSpacing(20) + layout.addLayout(theme_layout) + layout.addSpacing(20) layout.addStretch() layout.addLayout(buttons_layout) @@ -477,6 +493,9 @@ class SettingsDialog(QtWidgets.QDialog): locale_index = self.language_combobox.findData(locale) self.language_combobox.setCurrentIndex(locale_index) + theme_choice = self.old_settings.get("theme") + self.theme_combobox.setCurrentIndex(theme_choice) + connection_type = self.old_settings.get("connection_type") if connection_type == "bundled": if self.connection_type_bundled_radio.isEnabled(): @@ -931,6 +950,10 @@ class SettingsDialog(QtWidgets.QDialog): settings = Settings(self.common) settings.load() # To get the last update timestamp + # Theme + theme_index = self.theme_combobox.currentIndex() + settings.set("theme",theme_index) + # Language locale_index = self.language_combobox.currentIndex() locale = self.language_combobox.itemData(locale_index) From 58e16e29b0210caf6a5dc4c697eabbaee0a21c27 Mon Sep 17 00:00:00 2001 From: SIDDHANT DIXIT Date: Thu, 22 Jul 2021 02:37:24 +0530 Subject: [PATCH 2/7] Updated test cli settings Added theme key in test_cli_settings.py. --- cli/tests/test_cli_settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cli/tests/test_cli_settings.py b/cli/tests/test_cli_settings.py index 62f97267..4c012901 100644 --- a/cli/tests/test_cli_settings.py +++ b/cli/tests/test_cli_settings.py @@ -34,6 +34,7 @@ class TestSettings: "tor_bridges_use_meek_lite_azure": False, "tor_bridges_use_custom_bridges": "", "persistent_tabs": [], + "theme":0 } for key in settings_obj._settings: # Skip locale, it will not always default to the same thing From 610b37413e950686b61abc0adb588d7e87ff9b36 Mon Sep 17 00:00:00 2001 From: SIDDHANT DIXIT Date: Fri, 23 Jul 2021 22:42:43 +0530 Subject: [PATCH 3/7] Updated Dark Mode Added fusion dark palette. --- desktop/src/onionshare/__init__.py | 29 +++++++++++++++++++++-- desktop/src/onionshare/gui_common.py | 2 +- desktop/src/onionshare/settings_dialog.py | 2 ++ 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/desktop/src/onionshare/__init__.py b/desktop/src/onionshare/__init__.py index 815dff0b..b97ca0fc 100644 --- a/desktop/src/onionshare/__init__.py +++ b/desktop/src/onionshare/__init__.py @@ -28,6 +28,9 @@ import psutil import getpass from PySide2 import QtCore, QtWidgets, QtGui +from PySide2.QtCore import Slot,Qt +from PySide2.QtGui import QPalette, QColor + from onionshare_cli.common import Common from onionshare_cli.settings import Settings @@ -48,8 +51,12 @@ class Application(QtWidgets.QApplication): QtWidgets.QApplication.__init__(self, sys.argv) # Check color mode on starting the app - # self.color_mode = self.get_color_mode() self.color_mode = self.get_color_mode(common) + + # Enable Dark Theme + if self.color_mode == "dark": + self.setDarkMode() + self.installEventFilter(self) def eventFilter(self, obj, event): @@ -67,8 +74,26 @@ class Application(QtWidgets.QApplication): return False return True + def setDarkMode(self): + self.setStyle("Fusion") + dark_palette = QPalette() + dark_palette.setColor(QPalette.Window, QColor(53, 53, 53)) + dark_palette.setColor(QPalette.WindowText, Qt.white) + dark_palette.setColor(QPalette.Base, QColor(25, 25, 25)) + dark_palette.setColor(QPalette.AlternateBase, QColor(53, 53, 53)) + dark_palette.setColor(QPalette.ToolTipBase, Qt.white) + dark_palette.setColor(QPalette.ToolTipText, Qt.white) + dark_palette.setColor(QPalette.Text, Qt.white) + dark_palette.setColor(QPalette.Button, QColor(53, 53, 53)) + dark_palette.setColor(QPalette.ButtonText, Qt.white) + dark_palette.setColor(QPalette.BrightText, Qt.red) + dark_palette.setColor(QPalette.Link, QColor(42, 130, 218)) + dark_palette.setColor(QPalette.Highlight, QColor(42, 130, 218)) + dark_palette.setColor(QPalette.HighlightedText, Qt.black) + self.setPalette(dark_palette) + self.setStyleSheet("QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }") + def get_color_mode(self, common): - # return "dark" if self.is_dark_mode() else "light" curr_settings = Settings(common) curr_settings.load() current_theme = curr_settings.get("theme") diff --git a/desktop/src/onionshare/gui_common.py b/desktop/src/onionshare/gui_common.py index 3cc353cf..441aff25 100644 --- a/desktop/src/onionshare/gui_common.py +++ b/desktop/src/onionshare/gui_common.py @@ -89,7 +89,7 @@ class GuiCommon: new_tab_button_text_color = "#4e0d4e" if color_mode == "dark": header_color = "#F2F2F2" - # title_color = "#F2F2F2" + title_color = "#F2F2F2" stop_button_color = "#C32F2F" new_tab_button_background = "#5F5F5F" new_tab_button_border = "#878787" diff --git a/desktop/src/onionshare/settings_dialog.py b/desktop/src/onionshare/settings_dialog.py index 72cc7fab..a29c4ee8 100644 --- a/desktop/src/onionshare/settings_dialog.py +++ b/desktop/src/onionshare/settings_dialog.py @@ -19,6 +19,8 @@ along with this program. If not, see . """ from PySide2 import QtCore, QtWidgets, QtGui +from PySide2.QtCore import Slot,Qt +from PySide2.QtGui import QPalette, QColor import sys import platform import datetime From aef4ba9bedb5fce4eea169c543664cb86707c71d Mon Sep 17 00:00:00 2001 From: SIDDHANT DIXIT Date: Sat, 24 Jul 2021 01:48:04 +0530 Subject: [PATCH 4/7] Update __init__.py --- desktop/src/onionshare/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/desktop/src/onionshare/__init__.py b/desktop/src/onionshare/__init__.py index b97ca0fc..9d8d8981 100644 --- a/desktop/src/onionshare/__init__.py +++ b/desktop/src/onionshare/__init__.py @@ -98,14 +98,12 @@ class Application(QtWidgets.QApplication): curr_settings.load() current_theme = curr_settings.get("theme") - if current_theme == 0: - return "dark" if self.is_dark_mode() else "light" - elif current_theme == 1: + if current_theme == 1: return "light" elif current_theme == 2: return "dark" else: - return "light" + return "dark" if self.is_dark_mode() else "light" def main(): """ From b6315c6bcf701347ff86de146f7a4206d9bb17bd Mon Sep 17 00:00:00 2001 From: Saptak S Date: Sat, 14 Aug 2021 13:37:44 +0530 Subject: [PATCH 5/7] Adds alert asking user to restart OnionShare to apply color mode change after changing it in settings --- desktop/src/onionshare/settings_dialog.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/desktop/src/onionshare/settings_dialog.py b/desktop/src/onionshare/settings_dialog.py index a29c4ee8..e8d2752c 100644 --- a/desktop/src/onionshare/settings_dialog.py +++ b/desktop/src/onionshare/settings_dialog.py @@ -843,6 +843,12 @@ class SettingsDialog(QtWidgets.QDialog): notice = strings._("gui_settings_language_changed_notice") Alert(self.common, notice, QtWidgets.QMessageBox.Information) + + # If color mode changed, inform user they need to restart OnionShare + if changed(settings, self.old_settings, ["theme"]): + notice = strings._("gui_color_mode_changed_notice") + Alert(self.common, notice, QtWidgets.QMessageBox.Information) + # Save the new settings settings.save() From 251012f5597aa1f7811a3bf220ea7a129023c2ff Mon Sep 17 00:00:00 2001 From: SIDDHANT DIXIT Date: Sun, 15 Aug 2021 19:25:58 +0530 Subject: [PATCH 6/7] Adds color palette in History Tab with Dark Mode --- desktop/src/onionshare/gui_common.py | 17 +++++++++++++---- desktop/src/onionshare/tab/mode/history.py | 3 +++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/desktop/src/onionshare/gui_common.py b/desktop/src/onionshare/gui_common.py index 441aff25..8457f51d 100644 --- a/desktop/src/onionshare/gui_common.py +++ b/desktop/src/onionshare/gui_common.py @@ -87,6 +87,10 @@ class GuiCommon: new_tab_button_background = "#ffffff" new_tab_button_border = "#efeff0" new_tab_button_text_color = "#4e0d4e" + downloads_uploads_progress_bar_border_color = "#4E064F" + downloads_uploads_progress_bar_chunk_color = "#4E064F" + share_zip_progess_bar_border_color = "#4E064F" + share_zip_progess_bar_chunk_color = "#4E064F" if color_mode == "dark": header_color = "#F2F2F2" title_color = "#F2F2F2" @@ -94,6 +98,7 @@ class GuiCommon: new_tab_button_background = "#5F5F5F" new_tab_button_border = "#878787" new_tab_button_text_color = "#FFFFFF" + share_zip_progess_bar_border_color = "#F2F2F2" return { # OnionShareGui styles @@ -233,7 +238,7 @@ class GuiCommon: "downloads_uploads_progress_bar": """ QProgressBar { border: 1px solid """ - + header_color + + downloads_uploads_progress_bar_border_color + """; background-color: #ffffff !important; text-align: center; @@ -242,10 +247,14 @@ class GuiCommon: } QProgressBar::chunk { background-color: """ - + header_color + + downloads_uploads_progress_bar_chunk_color + """; width: 10px; }""", + "history_default_label" : """ + QLabel { + color: black; + }""", "history_individual_file_timestamp_label": """ QLabel { color: #666666; @@ -298,7 +307,7 @@ class GuiCommon: "share_zip_progess_bar": """ QProgressBar { border: 1px solid """ - + header_color + + share_zip_progess_bar_border_color + """; background-color: #ffffff !important; text-align: center; @@ -307,7 +316,7 @@ class GuiCommon: QProgressBar::chunk { border: 0px; background-color: """ - + header_color + + share_zip_progess_bar_chunk_color + """; width: 10px; }""", diff --git a/desktop/src/onionshare/tab/mode/history.py b/desktop/src/onionshare/tab/mode/history.py index 795b0cd9..53f50c0f 100644 --- a/desktop/src/onionshare/tab/mode/history.py +++ b/desktop/src/onionshare/tab/mode/history.py @@ -148,6 +148,7 @@ class ShareHistoryItem(HistoryItem): # Change the label self.label.setText(self.get_finished_label_text(self.started_dt)) + self.label.setStyleSheet(self.common.gui.css["history_default_label"]) self.status = HistoryItem.STATUS_FINISHED else: @@ -439,6 +440,7 @@ class ReceiveHistoryItem(HistoryItem): # Change the label self.label.setText(self.get_finished_label_text(self.started)) + self.label.setStyleSheet(self.common.gui.css["history_default_label"]) elif data["action"] == "canceled": # Change the status @@ -479,6 +481,7 @@ class IndividualFileHistoryItem(HistoryItem): self.common.gui.css["history_individual_file_timestamp_label"] ) self.path_label = QtWidgets.QLabel(self.path) + self.path_label.setStyleSheet(self.common.gui.css["history_default_label"]) self.status_code_label = QtWidgets.QLabel() # Progress bar From 95c7156f69d0e82b87c283df6135bf70e5b60046 Mon Sep 17 00:00:00 2001 From: SIDDHANT DIXIT Date: Sun, 15 Aug 2021 23:09:16 +0530 Subject: [PATCH 7/7] Adds Dark Background in History Window --- desktop/src/onionshare/gui_common.py | 18 ++++++++++++++++-- desktop/src/onionshare/tab/mode/history.py | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/desktop/src/onionshare/gui_common.py b/desktop/src/onionshare/gui_common.py index 8457f51d..182d63f2 100644 --- a/desktop/src/onionshare/gui_common.py +++ b/desktop/src/onionshare/gui_common.py @@ -91,6 +91,8 @@ class GuiCommon: downloads_uploads_progress_bar_chunk_color = "#4E064F" share_zip_progess_bar_border_color = "#4E064F" share_zip_progess_bar_chunk_color = "#4E064F" + history_background_color = "#ffffff" + history_label_color = "#000000" if color_mode == "dark": header_color = "#F2F2F2" title_color = "#F2F2F2" @@ -99,6 +101,8 @@ class GuiCommon: new_tab_button_border = "#878787" new_tab_button_text_color = "#FFFFFF" share_zip_progess_bar_border_color = "#F2F2F2" + history_background_color = "#191919" + history_label_color = "#ffffff" return { # OnionShareGui styles @@ -198,9 +202,17 @@ class GuiCommon: border: 0; border-radius: 5px; }""", + "downloads_uploads_not_empty": """ + QWidget{ + background-color: """ + + history_background_color + +"""; + }""", "downloads_uploads_empty": """ QWidget { - background-color: #ffffff; + background-color: """ + + history_background_color + +"""; border: 1px solid #999999; } QWidget QLabel { @@ -253,7 +265,9 @@ class GuiCommon: }""", "history_default_label" : """ QLabel { - color: black; + color: """ + + history_label_color + + """; }""", "history_individual_file_timestamp_label": """ QLabel { diff --git a/desktop/src/onionshare/tab/mode/history.py b/desktop/src/onionshare/tab/mode/history.py index 53f50c0f..091905f7 100644 --- a/desktop/src/onionshare/tab/mode/history.py +++ b/desktop/src/onionshare/tab/mode/history.py @@ -714,6 +714,7 @@ class History(QtWidgets.QWidget): self.not_empty_layout.addLayout(header_layout) self.not_empty_layout.addWidget(self.item_list) self.not_empty = QtWidgets.QWidget() + self.not_empty.setStyleSheet(self.common.gui.css["downloads_uploads_not_empty"]) self.not_empty.setLayout(self.not_empty_layout) # Layout