From 3554f0e20576f7e715c2c958eae1ed7034bd2003 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 5 Apr 2022 12:10:08 +0100 Subject: [PATCH] Clear designer settings when resetting theme --- daemon.py | 8 ++++---- epicyon.py | 2 +- theme.py | 6 +++--- theme/purple/icons/qrcode.png | Bin 5133 -> 5305 bytes 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/daemon.py b/daemon.py index cc6277b8c..a94ce4032 100644 --- a/daemon.py +++ b/daemon.py @@ -2511,7 +2511,7 @@ class PubServer(BaseHTTPRequestHandler): system_language) set_theme(base_dir, theme_name, domain, allow_local_network_access, system_language, - dyslexic_font) + dyslexic_font, True) if calling_domain.endswith('.onion') and onion_domain: origin_path_str = \ @@ -5590,7 +5590,7 @@ class PubServer(BaseHTTPRequestHandler): set_theme(base_dir, self.server.theme_name, domain, allow_local_network_access, system_language, - self.server.dyslexic_font) + self.server.dyslexic_font, True) self.server.text_mode_banner = \ get_text_mode_banner(self.server.base_dir) self.server.iconsCache = {} @@ -6545,7 +6545,7 @@ class PubServer(BaseHTTPRequestHandler): set_theme(base_dir, curr_theme, domain, allow_local_network_access, system_language, - self.server.dyslexic_font) + self.server.dyslexic_font, False) self.server.text_mode_banner = \ get_text_mode_banner(base_dir) self.server.iconsCache = {} @@ -6842,7 +6842,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.domain, self.server.allow_local_network_access, self.server.system_language, - self.server.dyslexic_font) + self.server.dyslexic_font, False) # low bandwidth images checkbox if path.startswith('/users/' + admin_nickname + '/') or \ diff --git a/epicyon.py b/epicyon.py index ea96d7330..1c87324bd 100644 --- a/epicyon.py +++ b/epicyon.py @@ -3399,7 +3399,7 @@ if twitter_domain: if set_theme(base_dir, theme_name, domain, args.allow_local_network_access, args.language, - args.dyslexic_font): + args.dyslexic_font, False): print('Theme set to ' + theme_name) # whether new registrations are open or closed diff --git a/theme.py b/theme.py index 0d9fc584b..3b6aac549 100644 --- a/theme.py +++ b/theme.py @@ -528,7 +528,7 @@ def set_theme_from_designer(base_dir: str, theme_name: str, domain: str, save_json(theme_params, custom_theme_filename) set_theme(base_dir, theme_name, domain, allow_local_network_access, system_language, - dyslexic_font) + dyslexic_font, False) def reset_theme_designer_settings(base_dir: str, theme_name: str, domain: str, @@ -846,7 +846,7 @@ def _set_clear_cache_flag(base_dir: str) -> None: def set_theme(base_dir: str, name: str, domain: str, allow_local_network_access: bool, system_language: str, - dyslexic_font: bool) -> bool: + dyslexic_font: bool, designer_reset: bool) -> bool: """Sets the theme with the given name as the current theme """ result = False @@ -854,7 +854,7 @@ def set_theme(base_dir: str, name: str, domain: str, prev_theme_name = get_theme(base_dir) # if the theme has changed then remove any custom settings - if prev_theme_name != name: + if prev_theme_name != name or designer_reset: reset_theme_designer_settings(base_dir, name, domain, allow_local_network_access, system_language) diff --git a/theme/purple/icons/qrcode.png b/theme/purple/icons/qrcode.png index 91b85e79627028ee7d921f7ee8ce4b2ece0a1a05..6d9e03129b687543511a765f00e4bf537b630039 100644 GIT binary patch delta 1280 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 a`3K+tj-2k;|55+|002ovPDBK*LSTa6@#4b(