🐛 fix: Improvements to detection for the theme, jamesdsp, and correct keyboard for Cinnamon.

Author: talesam

biglinux-livecd/usr/share/biglinux/calamares/src/utils/constants.py

@@ -9,7 +9,7 @@
 # Application Information
 APP_NAME = "BigLinux Calamares Config"
 APP_ID = "com.biglinux.calamares-config"
-APP_VERSION = "1.0.2"
+APP_VERSION = "1.0.3"
 
 # Paths and Directories
 BASE_DIR = Path(__file__).parent.parent.parent

biglinux-livecd/usr/share/biglinux/livecd/services.py

@@ -39,7 +39,6 @@ def __init__(self, test_mode: bool = False):
         self.tmp_theme_file = "/tmp/big_desktop_theme"
         self.tmp_jamesdsp_file = "/tmp/big_enable_jamesdsp"
         self.tmp_display_profile_file = "/tmp/big_improve_display"
-        self.tmp_simple_theme_file = "/tmp/big_simple_theme"
 
     def _run_command(
         self,
@@ -144,9 +143,24 @@ def apply_keyboard_layout(self, layout: str):
         self._run_command(["setxkbmap", layout_cleaned])
 
         home = os.path.expanduser("~")
-        kxkbrc_path = os.path.join(home, ".config", "kxkbrc")
-        kxkbrc_content = f"[Layout]\nLayoutList={layout_cleaned}\nUse=true\n"
-        self._write_user_config_file(kxkbrc_path, kxkbrc_content)
+        desktop_env = self.get_desktop_environment()
+
+        if desktop_env == "Cinnamon":
+            # Configure keyboard layout via dconf settings file for Cinnamon
+            settings_file = self._get_settings_file_path(desktop_env)
+            if settings_file:
+                sources_value = f"[('xkb', '{layout_cleaned}')]"
+                self._modify_settings_file(settings_file, {
+                    "org/gnome/desktop/input-sources": {
+                        "sources": sources_value
+                    }
+                })
+                logger.info(f"Configured keyboard layout '{layout_cleaned}' in settings.cinnamon")
+        else:
+            # KDE/Plasma uses kxkbrc
+            kxkbrc_path = os.path.join(home, ".config", "kxkbrc")
+            kxkbrc_content = f"[Layout]\nLayoutList={layout_cleaned}\nUse=true\n"
+            self._write_user_config_file(kxkbrc_path, kxkbrc_content)
 
     def get_available_desktops(self) -> List[str]:
         """Returns a list of available desktop layout names."""
@@ -185,7 +199,7 @@ def apply_simple_theme(self, theme: str):
             theme: Either "light" or "dark"
         """
         logger.info(f"Applying simple theme: {theme}")
-        self._write_tmp_file(self.tmp_simple_theme_file, theme)
+        self._write_tmp_file(self.tmp_theme_file, theme)
 
         desktop_env = self.get_desktop_environment()
 

biglinux-livecd/usr/share/biglinux/livecd/ui/app_window.py

@@ -468,6 +468,9 @@ def _on_simple_theme_selected(self, view, theme):
                 self.config.enable_jamesdsp = jamesdsp
                 self.config.enable_enhanced_contrast = contrast
                 logger.info(f"JamesDSP: {jamesdsp}, Enhanced Contrast: {contrast}")
+
+                # Apply JamesDSP settings immediately when theme is selected
+                self.system_service.apply_jamesdsp_settings(jamesdsp)
             else:
                 logger.warning("Could not get theme_view from stack")