🔨 refactor: Includes option for light and dark themes for Cinnamon, Gnome, and XFCE

talesam · talesam · commit c8fc233d1dfa · 2025-12-31T00:32:10.000-03:00
diff --git a/.gitignore b/.gitignore
@@ -161,3 +161,7 @@ cython_debug/
 
 # PyPI configuration file
 .pypirc
+
+# Claude Code
+.claude
+CLAUDE.md
diff --git a/biglinux-livecd/locale/biglinux-livecd.pot b/biglinux-livecd/locale/biglinux-livecd.pot
@@ -123,3 +123,18 @@ msgstr  ""
 # File: biglinux-livecd/biglinux-livecd/usr/share/biglinux/livecd/ui/theme_view.py, line: 201
 msgid   "Choose a System Theme"
 msgstr  ""
+
+#
+# File: biglinux-livecd/biglinux-livecd/usr/share/biglinux/livecd/ui/simple_theme_view.py, line: 51
+msgid   "Choose a Theme Style"
+msgstr  ""
+
+#
+# File: biglinux-livecd/biglinux-livecd/usr/share/biglinux/livecd/ui/simple_theme_view.py, line: 70
+msgid   "Light Theme"
+msgstr  ""
+
+#
+# File: biglinux-livecd/biglinux-livecd/usr/share/biglinux/livecd/ui/simple_theme_view.py, line: 76
+msgid   "Dark Theme"
+msgstr  ""
diff --git a/biglinux-livecd/locale/en.po b/biglinux-livecd/locale/en.po
@@ -130,3 +130,18 @@ msgstr "Enable enhanced contrast"
 # File: biglinux-livecd/biglinux-livecd/usr/share/biglinux/livecd/ui/theme_view.py, line: 201
 msgid "Choose a System Theme"
 msgstr "Choose a System Theme"
+
+#
+# File: biglinux-livecd/biglinux-livecd/usr/share/biglinux/livecd/ui/simple_theme_view.py, line: 51
+msgid "Choose a Theme Style"
+msgstr "Choose a Theme Style"
+
+#
+# File: biglinux-livecd/biglinux-livecd/usr/share/biglinux/livecd/ui/simple_theme_view.py, line: 70
+msgid "Light Theme"
+msgstr "Light Theme"
+
+#
+# File: biglinux-livecd/biglinux-livecd/usr/share/biglinux/livecd/ui/simple_theme_view.py, line: 76
+msgid "Dark Theme"
+msgstr "Dark Theme"
diff --git a/biglinux-livecd/locale/pt.po b/biglinux-livecd/locale/pt.po
@@ -92,3 +92,18 @@ msgstr "Ativar contraste aprimorado"
 # File: biglinux-livecd/biglinux-livecd/usr/share/biglinux/livecd/ui/theme_view.py, line: 166
 msgid "Choose a System Theme"
 msgstr "Escolha um Tema do Sistema"
+
+#
+# File: biglinux-livecd/biglinux-livecd/usr/share/biglinux/livecd/ui/simple_theme_view.py, line: 51
+msgid "Choose a Theme Style"
+msgstr "Escolha um Estilo de Tema"
+
+#
+# File: biglinux-livecd/biglinux-livecd/usr/share/biglinux/livecd/ui/simple_theme_view.py, line: 70
+msgid "Light Theme"
+msgstr "Tema Claro"
+
+#
+# File: biglinux-livecd/biglinux-livecd/usr/share/biglinux/livecd/ui/simple_theme_view.py, line: 76
+msgid "Dark Theme"
+msgstr "Tema Escuro"
diff --git a/biglinux-livecd/usr/share/biglinux/livecd/config.py b/biglinux-livecd/usr/share/biglinux/livecd/config.py
@@ -15,5 +15,6 @@ class SetupConfig:
     keyboard_layout: Optional[str] = None
     desktop_layout: Optional[str] = None
     theme: Optional[str] = None
+    simple_theme: Optional[str] = None  # "light" or "dark" for simplified environments
     enable_jamesdsp: bool = False
     enable_enhanced_contrast: bool = False
diff --git a/biglinux-livecd/usr/share/biglinux/livecd/services.py b/biglinux-livecd/usr/share/biglinux/livecd/services.py
@@ -38,6 +38,7 @@ 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,
@@ -174,6 +175,167 @@ def apply_theme(self, theme: str):
         self._write_tmp_file(self.tmp_theme_file, theme)
         self._run_command([self.theme_apply_script, theme])
 
+    def apply_simple_theme(self, theme: str):
+        """
+        Applies light or dark theme for simplified environments (GNOME/XFCE/Cinnamon).
+
+        Args:
+            theme: Either "light" or "dark"
+        """
+        logger.info(f"Applying simple theme: {theme}")
+        self._write_tmp_file(self.tmp_simple_theme_file, theme)
+
+        desktop_env = self.get_desktop_environment()
+
+        if theme == "dark":
+            self._apply_dark_theme(desktop_env)
+        else:
+            self._apply_light_theme(desktop_env)
+
+    def _apply_dark_theme(self, desktop_env: str):
+        """Applies dark theme configuration."""
+        logger.info("Applying dark theme configuration")
+
+        # Set GTK4 color scheme for GNOME/Cinnamon
+        if desktop_env in ["GNOME", "Cinnamon"]:
+            self._run_command([
+                "dconf", "write",
+                "/org/gnome/desktop/interface/color-scheme",
+                "'prefer-dark'"
+            ])
+
+        # Configure Kvantum theme
+        home = os.path.expanduser("~")
+        kvantum_dir = os.path.join(home, ".config", "Kvantum")
+        kvantum_conf = os.path.join(kvantum_dir, "kvantum.kvconfig")
+
+        kvantum_content = "[General]\ntheme=BigAdwaitaRoundGtkDark\n"
+        self._write_user_config_file(kvantum_conf, kvantum_content)
+
+        # Copy kdeglobals for dark theme
+        kdeglobals_source = "/usr/share/sync-kde-and-gtk-places/biglinux-dark"
+        kdeglobals_dest = os.path.join(home, ".config", "kdeglobals")
+        if os.path.exists(kdeglobals_source):
+            self._run_command(["cp", "-f", kdeglobals_source, kdeglobals_dest])
+        else:
+            logger.warning(f"Dark theme kdeglobals not found at {kdeglobals_source}")
+
+        # Apply dark icon theme
+        self._apply_icon_theme_variant(desktop_env, dark=True)
+
+    def _apply_light_theme(self, desktop_env: str):
+        """Applies light theme configuration."""
+        logger.info("Applying light theme configuration")
+
+        # Set GTK4 color scheme for GNOME/Cinnamon
+        if desktop_env in ["GNOME", "Cinnamon"]:
+            self._run_command([
+                "dconf", "write",
+                "/org/gnome/desktop/interface/color-scheme",
+                "'default'"
+            ])
+
+        # Configure Kvantum theme
+        home = os.path.expanduser("~")
+        kvantum_dir = os.path.join(home, ".config", "Kvantum")
+        kvantum_conf = os.path.join(kvantum_dir, "kvantum.kvconfig")
+
+        kvantum_content = "[General]\ntheme=BigAdwaitaRoundGtk\n"
+        self._write_user_config_file(kvantum_conf, kvantum_content)
+
+        # Copy kdeglobals for light theme
+        kdeglobals_source = "/usr/share/sync-kde-and-gtk-places/biglinux"
+        kdeglobals_dest = os.path.join(home, ".config", "kdeglobals")
+        if os.path.exists(kdeglobals_source):
+            self._run_command(["cp", "-f", kdeglobals_source, kdeglobals_dest])
+        else:
+            logger.warning(f"Light theme kdeglobals not found at {kdeglobals_source}")
+
+        # Apply light icon theme
+        self._apply_icon_theme_variant(desktop_env, dark=False)
+
+    def _apply_icon_theme_variant(self, desktop_env: str, dark: bool):
+        """Applies appropriate icon theme variant (dark or light)."""
+        logger.debug(f"Applying {'dark' if dark else 'light'} icon theme variant")
+
+        # Get current icon theme
+        icon_theme = ""
+        if desktop_env == "XFCE":
+            success, icon_theme = self._run_command([
+                "xfconf-query", "-c", "xsettings",
+                "-p", "/Net/IconThemeName"
+            ], read_only=True)
+            if success:
+                icon_theme = icon_theme.strip()
+        else:
+            # GNOME or Cinnamon
+            if desktop_env == "Cinnamon":
+                success, icon_theme = self._run_command([
+                    "dconf", "read",
+                    "/org/cinnamon/desktop/interface/icon-theme"
+                ], read_only=True)
+            else:
+                success, icon_theme = self._run_command([
+                    "dconf", "read",
+                    "/org/gnome/desktop/interface/icon-theme"
+                ], read_only=True)
+
+            if success:
+                icon_theme = icon_theme.strip("'\"")
+
+        if not icon_theme:
+            logger.warning("Could not detect current icon theme")
+            return
+
+        # Find appropriate variant
+        home = os.path.expanduser("~")
+        search_paths = [
+            "/usr/share/icons",
+            os.path.join(home, ".local/share/icons")
+        ]
+
+        new_theme = icon_theme
+        if dark:
+            # Look for dark variant
+            for base_path in search_paths:
+                if os.path.exists(base_path):
+                    # Try adding -dark suffix
+                    dark_icon_path = os.path.join(base_path, f"{icon_theme}-dark")
+                    if os.path.isdir(dark_icon_path):
+                        new_theme = f"{icon_theme}-dark"
+                        logger.debug(f"Found dark icon theme: {new_theme}")
+                        break
+        else:
+            # Remove -dark suffix if present
+            new_theme = icon_theme.replace("-dark", "").replace("-Dark", "")
+            logger.debug(f"Using light icon theme: {new_theme}")
+
+        # Apply the icon theme
+        self._set_icon_theme(desktop_env, new_theme)
+
+    def _set_icon_theme(self, desktop_env: str, theme_name: str):
+        """Sets the icon theme for the desktop environment."""
+        logger.info(f"Setting icon theme to: {theme_name}")
+
+        if desktop_env == "Cinnamon":
+            self._run_command([
+                "dconf", "write",
+                "/org/cinnamon/desktop/interface/icon-theme",
+                f"'{theme_name}'"
+            ])
+        elif desktop_env == "XFCE":
+            self._run_command([
+                "xfconf-query", "-c", "xsettings",
+                "-p", "/Net/IconThemeName",
+                "-s", theme_name
+            ])
+        else:  # GNOME
+            self._run_command([
+                "dconf", "write",
+                "/org/gnome/desktop/interface/icon-theme",
+                f"'{theme_name}'"
+            ])
+
     def finalize_setup(self, config: SetupConfig):
         """
         Performs final setup steps, including creating flag files.
diff --git a/biglinux-livecd/usr/share/biglinux/livecd/style.css b/biglinux-livecd/usr/share/biglinux/livecd/style.css
@@ -114,3 +114,27 @@ gridview child:selected {
     outline-color: alpha(@theme_selected_bg_color, 0.5);
     background-color:  alpha(@theme_selected_bg_color, 0.05);
 }
+
+/* Simple Theme View Cards */
+.theme-card {
+    background-color: @headerbar_bg_color;
+    border-radius: 14px;
+    padding: 20px;
+    outline: 2px solid transparent;
+    outline-offset: -2px;
+    transition: all 0.2s ease;
+}
+
+.theme-card:hover,
+.theme-card-hover {
+    outline-color: alpha(@theme_selected_bg_color, 0.5);
+    background-color: alpha(@theme_selected_bg_color, 0.05);
+    transform: translateY(-3px);
+    box-shadow: 0px 6px 12px rgba(0, 0, 0, 0.3);
+}
+
+.theme-card picture {
+    border-radius: 10px;
+    background-image: linear-gradient(to bottom, #202020 0%, #222222 90%, #191919 100%);
+    box-shadow: 0px 3px 0px #2a2a2a, 0px 4px 10px rgba(0, 0, 0, 0.6);
+}
diff --git a/biglinux-livecd/usr/share/biglinux/livecd/ui/app_window.py b/biglinux-livecd/usr/share/biglinux/livecd/ui/app_window.py
@@ -11,6 +11,7 @@
 from ui.keyboard_view import KeyboardView
 from ui.desktop_view import DesktopView
 from ui.theme_view import ThemeView
+from ui.simple_theme_view import SimpleThemeView
 from logging_config import get_logger
 import os
 
@@ -132,6 +133,7 @@ def _build_ui(self):
             self.steps = [
                 {"name": "language", "file": "headerbar-locale.svg"},
                 {"name": "keyboard", "file": "headerbar-keyboard.svg"},
+                {"name": "theme", "file": "headerbar-theme.svg"},
             ]
         else:
             self.steps = [
@@ -143,7 +145,7 @@ def _build_ui(self):
 
         # Build header layout based on environment
         if self.is_simplified_env:
-            # Simplified layout: [Language] [comm-logo.png] [Keyboard]
+            # Simplified layout: [Language] [comm-logo.png] [Keyboard] [Theme]
             self._add_step_button(header_content_box, self.steps[0])
 
             # Use comm-logo.png for simplified environments (XivaStudio override if exists)
@@ -154,8 +156,9 @@ def _build_ui(self):
                 logo.set_margin_start(20)
                 logo.set_margin_end(20)
                 header_content_box.append(logo)
-            
+
             self._add_step_button(header_content_box, self.steps[1])
+            self._add_step_button(header_content_box, self.steps[2])
         else:
             # Full layout: [Language] [Keyboard] [logo.png] [Desktop] [Theme]
             self._add_step_button(header_content_box, self.steps[0])
@@ -215,6 +218,8 @@ def _retranslate_ui(self):
                 page.set_title(_("Desktop Layout"))
             elif view_name == "theme":
                 page.set_title(_("Theme"))
+            elif view_name == "simple_theme":
+                page.set_title(_("Theme"))
 
             # Trigger re-translation within the view itself
             if hasattr(view, "_retranslate_ui"):
@@ -229,6 +234,8 @@ def _ensure_view(self, view_name: str, *args):
                 self._add_desktop_view()
             elif view_name == "theme":
                 self._add_theme_view()
+            elif view_name == "simple_theme":
+                self._add_simple_theme_view()
 
     def _add_step_button(self, box, step_info):
         button = Gtk.Button()
@@ -366,9 +373,9 @@ def _on_keyboard_selected(self, view, layout):
         self.completed_steps.add("keyboard")
 
         if self.is_simplified_env:
-            # Skip desktop and theme for simplified environments (GNOME/XFCE/Cinnamon)
-            self.system_service.finalize_setup(self.config)
-            self.close()
+            # Navigate to simple theme view for simplified environments (GNOME/XFCE/Cinnamon)
+            self._ensure_view("simple_theme")
+            self.stack.set_visible_child_name("simple_theme")
         else:
             # LAZY LOADING: Ensure desktop view exists before showing it
             self._ensure_view("desktop")
@@ -415,6 +422,29 @@ def _on_theme_selected(self, view, theme):
         self.system_service.finalize_setup(self.config)
         self.close()
 
+    def _add_simple_theme_view(self):
+        """Creates and adds the simplified theme view for GNOME/XFCE/Cinnamon."""
+        view = SimpleThemeView(system_service=self.system_service)
+        view.connect("theme-selected", self._on_simple_theme_selected)
+        self.stack.add_titled(view, "simple_theme", _("Theme"))
+
+    def _on_simple_theme_selected(self, view, theme):
+        """Handle theme selection from simplified theme view."""
+        logger.info(f"Simple theme selected: {theme}")
+
+        # Mark theme step as completed
+        self.completed_steps.add("theme")
+
+        # Save to config
+        self.config.simple_theme = theme
+
+        # Apply theme via SystemService
+        self.system_service.apply_simple_theme(theme)
+
+        # Finalize and close
+        self.system_service.finalize_setup(self.config)
+        self.close()
+
     def _on_key_press_event(self, controller, keyval, keycode, state):
         current_view = self.stack.get_visible_child()
         if isinstance(current_view, LanguageView):
diff --git a/biglinux-livecd/usr/share/biglinux/livecd/ui/simple_theme_view.py b/biglinux-livecd/usr/share/biglinux/livecd/ui/simple_theme_view.py
