Alléger l'UI IDE et soumettre toutes les icônes SVG au thème

Author: raidos23

Core/IdeLikeGui/connections.py

@@ -28,7 +28,6 @@
     QToolButton,
     QStatusBar,
     QWidget,
-    QFrame,
     QSplitter,
 )
 
@@ -195,57 +194,11 @@ def _find(cls, name: str):
         self.status_hint = self.statusbar.findChild(QLabel, "status_hint") if self.statusbar else None
     except Exception:
         self.status_hint = None
-    try:
-        if self.log is not None:
-            self.log.setReadOnly(True)
-            self.log.setAcceptRichText(False)
-    except Exception:
-        pass
     _setup_status_bar(self)
 
 
 def _tune_ide_like_layout(self) -> None:
-    """Relax tight layout constraints in the IDE-like UI for better label fit."""
-    header = self.ui.findChild(QFrame, "header")
-    if header is not None:
-        try:
-            header.setMinimumHeight(48)
-            header.setMaximumHeight(56)
-        except Exception:
-            pass
-
-    for btn_name in ("compile_btn", "cancel_btn"):
-        btn = getattr(self, btn_name, None)
-        if btn is None:
-            continue
-        try:
-            btn.setMinimumSize(124, 34)
-        except Exception:
-            pass
-
-    workspace_panel = self.ui.findChild(QFrame, "workspace_panel")
-    if workspace_panel is not None:
-        try:
-            workspace_panel.setMinimumWidth(280)
-            workspace_panel.setMaximumWidth(400)
-        except Exception:
-            pass
-
-    tools_panel = self.ui.findChild(QFrame, "tools_panel")
-    if tools_panel is not None:
-        try:
-            tools_panel.setMinimumWidth(200)
-            tools_panel.setMaximumWidth(280)
-        except Exception:
-            pass
-
-    logs_panel = self.ui.findChild(QFrame, "logs_panel")
-    if logs_panel is not None:
-        try:
-            logs_panel.setMinimumHeight(190)
-            logs_panel.setMaximumHeight(320)
-        except Exception:
-            pass
+    """Apply runtime splitter ratios; static constraints live in the .ui file."""
 
     main_splitter = self.ui.findChild(QSplitter, "mainSplitter")
     if main_splitter is not None:
@@ -507,6 +460,36 @@ def _apply_activity_buttons_theme(self) -> None:
         "QToolButton::menu-indicator { image: none; width: 0px; }"
     )
 
+    # Keep IDE activity icons in sync with current theme-colored SVGs.
+    try:
+        from ..UiConnection import themed_svg_icon
+
+        base = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))
+        icons_dir = os.path.join(base, "icons")
+
+        more_btn = getattr(self, "toolButton_more", None)
+        if more_btn is not None:
+            more_icon = themed_svg_icon(
+                os.path.join(icons_dir, "more-horizontal.svg"), size=18
+            )
+            if more_icon is not None and not more_icon.isNull():
+                more_btn.setIcon(more_icon)
+                more_btn.setIconSize(more_btn.iconSize())
+                more_btn.setText("")
+
+        deps_btn = getattr(self, "activity_btn_deps", None)
+        src_btn = getattr(self, "btn_suggest_deps", None)
+        if deps_btn is not None:
+            if src_btn is not None and src_btn.icon() is not None and not src_btn.icon().isNull():
+                deps_btn.setIcon(src_btn.icon())
+                deps_btn.setIconSize(src_btn.iconSize())
+            else:
+                deps_icon = themed_svg_icon(os.path.join(icons_dir, "search.svg"), size=18)
+                if deps_icon is not None and not deps_icon.isNull():
+                    deps_btn.setIcon(deps_icon)
+    except Exception:
+        pass
+
     for attr in ("toolButton_more", "activity_btn_deps"):
         btn = getattr(self, attr, None)
         if btn is None:

Core/UiConnection.py

@@ -734,6 +734,78 @@ def _to_rgb(val: str):
         return False
 
 
+def _extract_accent_color_for_icons(css_text: str) -> str | None:
+    try:
+        import re
+
+        def _block(selector: str) -> str | None:
+            pattern = re.compile(rf"{re.escape(selector)}\\s*\\{{([^}}]+)\\}}", re.S)
+            match = pattern.search(css_text)
+            return match.group(1) if match else None
+
+        def _colors(text: str) -> list[str]:
+            return re.findall(r"#[0-9a-fA-F]{3,6}", text)
+
+        for selector in ("QPushButton#compile_btn", "#compile_btn"):
+            block = _block(selector)
+            if block:
+                colors = _colors(block)
+                if colors:
+                    return colors[0]
+
+        match = re.search(r"--accent[^:]*:\\s*(#[0-9a-fA-F]{3,6})", css_text)
+        if match:
+            return match.group(1)
+    except Exception:
+        return None
+    return None
+
+
+def _resolve_theme_icon_color(css: str | None = None) -> str:
+    if not css:
+        try:
+            from PySide6.QtWidgets import QApplication
+
+            app = QApplication.instance()
+            css = app.styleSheet() if app else ""
+        except Exception:
+            css = ""
+    if css:
+        accent = _extract_accent_color_for_icons(css)
+        if accent:
+            return accent
+        return "#FFFFFF" if _is_qss_dark(css) else "#111111"
+    return "#FFFFFF" if _detect_system_color_scheme() == "sombre" else "#111111"
+
+
+def themed_svg_icon(path: str, size: int = 18, css: str | None = None) -> QIcon | None:
+    """Render an SVG icon tinted according to current app theme."""
+    if not os.path.isfile(path):
+        return None
+    if QSvgRenderer is None:
+        return QIcon(path)
+    try:
+        with open(path, encoding="utf-8") as f:
+            svg = f.read()
+    except Exception:
+        return None
+
+    color = _resolve_theme_icon_color(css)
+    if "currentColor" in svg:
+        svg = svg.replace("currentColor", color)
+    else:
+        svg = svg.replace("<svg ", f'<svg color="{color}" ', 1)
+    renderer = QSvgRenderer(QByteArray(svg.encode("utf-8")))
+    if not renderer.isValid():
+        return None
+    pixmap = QPixmap(size, size)
+    pixmap.fill(Qt.transparent)
+    painter = QPainter(pixmap)
+    renderer.render(painter, QRectF(0, 0, size, size))
+    painter.end()
+    return QIcon(pixmap)
+
+
 def _refresh_log_palette(self, css: str | None = None) -> None:
     """Assure une couleur de texte lisible pour le journal, selon le thème."""
     if not getattr(self, "log", None):
@@ -813,6 +885,18 @@ def apply_theme(self, pref: str) -> None:
             _apply_button_icons(self)
         except Exception:
             pass
+        try:
+            # IDE-like activity-bar buttons are themed separately.
+            from .IdeLikeGui.connections import _apply_activity_buttons_theme
+
+            _apply_activity_buttons_theme(self)
+        except Exception:
+            pass
+        try:
+            if hasattr(self, "_refresh_entrypoint_marker"):
+                self._refresh_entrypoint_marker()
+        except Exception:
+            pass
         self.theme = pref or "System"
         # Met à jour le texte du bouton (ne pas recharger i18n)
         if hasattr(self, "select_theme") and self.select_theme:

Core/UiFeatures.py

@@ -35,7 +35,7 @@
 
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QIcon, QPixmap
-from PySide6.QtWidgets import QFileDialog, QMessageBox, QMenu
+from PySide6.QtWidgets import QApplication, QFileDialog, QMessageBox, QMenu
 
 
 class UiFeatures:
@@ -180,15 +180,31 @@ def _show_entrypoint_menu(self, pos) -> None:
     def _entrypoint_icon(self) -> QIcon | None:
         """Retourne l'icône utilisée pour marquer le point d'entrée."""
         icon = getattr(self, "_entrypoint_icon_cache", None)
-        if isinstance(icon, QIcon) and not icon.isNull():
+        token = getattr(self, "_entrypoint_icon_theme_token", None)
+        try:
+            app = QApplication.instance()
+            css = app.styleSheet() if app else ""
+        except Exception:
+            css = ""
+        current_token = hash(css or "")
+        if token == current_token and isinstance(icon, QIcon) and not icon.isNull():
             return icon
         try:
             base = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
             path = os.path.join(base, "icons", "check-circle.svg")
             if os.path.isfile(path):
-                icon = QIcon(path)
+                icon = None
+                try:
+                    from .UiConnection import themed_svg_icon
+
+                    icon = themed_svg_icon(path, size=16, css=css)
+                except Exception:
+                    icon = None
+                if icon is None or icon.isNull():
+                    icon = QIcon(path)
                 if not icon.isNull():
                     self._entrypoint_icon_cache = icon
+                    self._entrypoint_icon_theme_token = current_token
                     return icon
         except Exception:
             pass

ui/ui_ide_design2.ui

@@ -91,13 +91,13 @@ QProgressBar::chunk { background: #0e639c; }</string>
       <property name="minimumSize">
        <size>
         <width>0</width>
-        <height>36</height>
+        <height>48</height>
        </size>
       </property>
       <property name="maximumSize">
        <size>
         <width>16777215</width>
-        <height>36</height>
+        <height>56</height>
        </size>
       </property>
       <property name="frameShape">
@@ -146,8 +146,8 @@ QProgressBar::chunk { background: #0e639c; }</string>
         <widget class="QPushButton" name="compile_btn">
          <property name="minimumSize">
           <size>
-           <width>90</width>
-           <height>28</height>
+           <width>124</width>
+           <height>34</height>
           </size>
          </property>
          <property name="text">
@@ -159,8 +159,8 @@ QProgressBar::chunk { background: #0e639c; }</string>
         <widget class="QPushButton" name="cancel_btn">
          <property name="minimumSize">
           <size>
-           <width>90</width>
-           <height>28</height>
+           <width>124</width>
+           <height>34</height>
           </size>
          </property>
          <property name="text">
@@ -264,13 +264,13 @@ QProgressBar::chunk { background: #0e639c; }</string>
       <widget class="QFrame" name="workspace_panel">
        <property name="minimumSize">
         <size>
-         <width>260</width>
+         <width>280</width>
          <height>0</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
-         <width>420</width>
+         <width>400</width>
          <height>16777215</height>
         </size>
        </property>
@@ -408,13 +408,13 @@ QProgressBar::chunk { background: #0e639c; }</string>
         <widget class="QFrame" name="tools_panel">
          <property name="minimumSize">
           <size>
-           <width>180</width>
+           <width>200</width>
            <height>0</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>300</width>
+           <width>280</width>
            <height>16777215</height>
           </size>
          </property>
@@ -537,13 +537,13 @@ QProgressBar::chunk { background: #0e639c; }</string>
         <property name="minimumSize">
          <size>
           <width>0</width>
-          <height>160</height>
+          <height>190</height>
          </size>
         </property>
         <property name="maximumSize">
          <size>
           <width>16777215</width>
-          <height>240</height>
+          <height>320</height>
          </size>
         </property>
         <property name="frameShape">
@@ -576,7 +576,14 @@ QProgressBar::chunk { background: #0e639c; }</string>
           </widget>
          </item>
          <item>
-          <widget class="QTextEdit" name="log"/>
+          <widget class="QTextEdit" name="log">
+           <property name="acceptRichText">
+            <bool>false</bool>
+           </property>
+           <property name="readOnly">
+            <bool>true</bool>
+           </property>
+          </widget>
          </item>
          <item>
           <layout class="QHBoxLayout" name="progressRowLayout">