Merge branch 'main' into refactor-shell

Author: tfuxu

build-aux/flatpak/com.github.GradienceTeam.Gradience.Devel.json

@@ -50,8 +50,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/lxml/lxml/releases/download/lxml-4.9.2/lxml-4.9.2.tar.gz",
-                    "sha256": "d3fe33ffef3637e053cce7aa0bf26ad0943911c808e27962ba1202198e21a212"
+                    "url": "https://github.com/lxml/lxml/releases/download/lxml-4.9.3/lxml-4.9.3.tar.gz",
+                    "sha256": "48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c"
                 }
             ]
         },

build-aux/flatpak/com.github.GradienceTeam.Gradience.json

@@ -51,8 +51,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/lxml/lxml/releases/download/lxml-4.9.2/lxml-4.9.2.tar.gz",
-                    "sha256": "d3fe33ffef3637e053cce7aa0bf26ad0943911c808e27962ba1202198e21a212"
+                    "url": "https://github.com/lxml/lxml/releases/download/lxml-4.9.3/lxml-4.9.3.tar.gz",
+                    "sha256": "48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c"
                 }
             ]
         },

build-aux/flatpak/pypi-dependencies.json

@@ -36,8 +36,8 @@
                 },
                 {
                     "type": "file",
-                    "url": "https://files.pythonhosted.org/packages/18/df/401fd39ffd50062ff1e0344f95f8e2c141de4fd1eca1677d2f29609e5389/regex-2023.6.3.tar.gz",
-                    "sha256": "72d1a25bf36d2050ceb35b517afe13864865268dfb45910e2e17a84be6cbfeb0"
+                    "url": "https://files.pythonhosted.org/packages/4f/1d/6998ba539616a4c8f58b07fd7c9b90c6b0f0c0ecbe8db69095a6079537a7/regex-2023.8.8.tar.gz",
+                    "sha256": "fcbdc5f2b0f1cd0f6a56cdb46fe41d2cce1e644e3b68832f3eeebc5fb0f7712e"
                 }
             ]
         },

data/submodules

@@ -26,17 +26,25 @@
 from gradience.backend.models.preset import Preset
 
 from gradience.backend.utils.theming import generate_gtk_css
-from gradience.backend.globals import user_config_dir, presets_dir, get_gtk_theme_dir
+from gradience.backend.globals import user_config_dir, presets_dir, get_gtk_theme_dir, is_sandboxed
+from gradience.backend.utils.gsettings import GSettingsSetting, FlatpakGSettings, GSettingsMissingError
 
 from gradience.backend.logger import Logger
 
 logging = Logger()
 
 
 class PresetUtils:
+    THEME_GSETTINGS_SCHEMA_ID = "org.gnome.desktop.interface"
+    
     def __init__(self):
         pass
 
+    def set_gtk3_theme(self):
+        settings_retriever = FlatpakGSettings if is_sandboxed() else GSettingsSetting
+        self.settings = settings_retriever(self.THEME_GSETTINGS_SCHEMA_ID, schema_dir=None)
+        self.settings.set("gtk-theme", "adw-gtk3")
+
     def get_presets_list(self, repo=None, full_list=False) -> dict:
         presets_list = {}
 
@@ -108,6 +116,9 @@ def apply_preset(self, app_type: str, preset: Preset) -> None:
         theme_dir = get_gtk_theme_dir(app_type)
         gtk_css_path = os.path.join(theme_dir, "gtk.css")
 
+        if app_type == "gtk3":
+            self.set_gtk3_theme()
+
         if not os.path.exists(theme_dir):
             os.makedirs(theme_dir)
 

gradience/backend/theming/preset.py

@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: Atrophaneura@proton.me\n"
 "POT-Creation-Date: 2023-06-27 13:11+0000\n"
-"PO-Revision-Date: 2023-07-13 02:27+0000\n"
-"Last-Translator: yangyangdaji <1504305527@qq.com>\n"
+"PO-Revision-Date: 2023-08-16 07:53+0000\n"
+"Last-Translator: Philip Goto <philip.goto@gmail.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/GradienceTeam/"
 "gradience/nl/>\n"
 "Language: nl\n"
@@ -461,14 +461,8 @@ msgid "Reset and Restore Presets"
 msgstr "Voorinstellingen resetten en herstellen"
 
 #: data/ui/reset_preset_group.blp:6
-#, fuzzy
-#| msgid ""
-#| "This section allows you to reset an currently applied preset or restore "
-#| "the previous one."
 msgid "Reset a currently applied preset or restore the previous one."
-msgstr ""
-"In deze sectie kunt u een momenteel toegepaste voorinstelling resetten of de "
-"vorige herstellen."
+msgstr "Reset een momenteel toegepaste voorinstelling of herstel de vorige."
 
 #: data/ui/reset_preset_group.blp:14 data/ui/reset_preset_group.blp:34
 msgid "Restore Previous Preset"