From ff42244c6de2e346ee6a6f1f8aa3a70dce3e75f7 Mon Sep 17 00:00:00 2001 From: Ly-sec Date: Fri, 12 Sep 2025 22:20:46 +0200 Subject: [PATCH] Revert hardcoded font change --- Commons/Settings.qml | 20 +---- Modules/SettingsPanel/Tabs/GeneralTab.qml | 9 -- Services/FontService.qml | 100 ---------------------- 3 files changed, 3 insertions(+), 126 deletions(-) diff --git a/Commons/Settings.qml b/Commons/Settings.qml index 0b4abaa..eb124bf 100644 --- a/Commons/Settings.qml +++ b/Commons/Settings.qml @@ -203,17 +203,6 @@ Singleton { BluetoothService.init() } - // ----------------------------------------------------- - // Update font defaults when system fonts are detected - function updateFontDefaults() { - if (FontService.systemFontsDetected) { - Logger.log("Settings", "Updating font defaults with detected system fonts") - adapter.ui.fontDefault = FontService.getSystemSansFont() - adapter.ui.fontFixed = FontService.getSystemMonospaceFont() - adapter.ui.fontBillboard = FontService.getSystemDisplayFont() - } - } - // ----------------------------------------------------- // Ensure directories exist before FileView tries to read files Component.onCompleted: { @@ -224,9 +213,6 @@ Singleton { // Mark directories as created and trigger file loading directoriesCreated = true - - // Connect to font service signal to update defaults when system fonts are detected - FontService.systemFontsDetected.connect(updateFontDefaults) } // Don't write settings to disk immediately @@ -429,9 +415,9 @@ Singleton { // ui property JsonObject ui: JsonObject { - property string fontDefault: FontService.getSystemSansFont() - property string fontFixed: FontService.getSystemMonospaceFont() - property string fontBillboard: FontService.getSystemDisplayFont() + property string fontDefault: "Roboto" + property string fontFixed: "DejaVu Sans Mono" + property string fontBillboard: "Inter" property list monitorsScaling: [] property bool idleInhibitorEnabled: false } diff --git a/Modules/SettingsPanel/Tabs/GeneralTab.qml b/Modules/SettingsPanel/Tabs/GeneralTab.qml index 5c9c577..aed5758 100644 --- a/Modules/SettingsPanel/Tabs/GeneralTab.qml +++ b/Modules/SettingsPanel/Tabs/GeneralTab.qml @@ -195,15 +195,6 @@ ColumnLayout { Layout.bottomMargin: Style.marginS * scaling } - NText { - text: "Fonts are automatically detected from your system. Inter/Roboto are used as fallbacks when system fonts cannot be detected." - font.pointSize: Style.fontSizeS * scaling - color: Color.mOnSurfaceVariant - wrapMode: Text.WordWrap - Layout.fillWidth: true - Layout.bottomMargin: Style.marginM * scaling - } - // Font configuration section ColumnLayout { spacing: Style.marginL * scaling diff --git a/Services/FontService.qml b/Services/FontService.qml index 2c25534..ebf03e3 100644 --- a/Services/FontService.qml +++ b/Services/FontService.qml @@ -3,7 +3,6 @@ pragma Singleton import QtQuick import QtQuick.Controls import Quickshell -import Quickshell.Io import qs.Commons Singleton { @@ -14,29 +13,12 @@ Singleton { property ListModel displayFonts: ListModel {} property bool fontsLoaded: false - // System font detection - property string systemSansFont: "" - property string systemMonospaceFont: "" - property string systemDisplayFont: "" - property bool systemFontsDetected: false - - // Signal emitted when system font detection is complete - signal systemFontsDetected - // ------------------------------------------- function init() { Logger.log("Font", "Service started") - detectSystemFonts() loadSystemFonts() } - function detectSystemFonts() { - Logger.log("Font", "Detecting system fonts...") - - // Start detecting sans-serif font - sansFontProcess.running = true - } - function loadSystemFonts() { Logger.log("Font", "Loading system fonts...") @@ -176,86 +158,4 @@ Singleton { return results } - - // Get system font with fallback - function getSystemSansFont() { - if (systemSansFont && systemSansFont !== "") { - return systemSansFont - } - return "Roboto" // Fallback - } - - function getSystemMonospaceFont() { - if (systemMonospaceFont && systemMonospaceFont !== "") { - return systemMonospaceFont - } - return "DejaVu Sans Mono" // Fallback - } - - function getSystemDisplayFont() { - if (systemDisplayFont && systemDisplayFont !== "") { - return systemDisplayFont - } - return "Inter" // Fallback - } - - // Process for detecting sans fonts - Process { - id: sansFontProcess - command: ["fc-match", "-f", "%{family[0]}\n", "sans"] - onExited: function (exitCode) { - if (exitCode === 0) { - var fontName = stdout.text.trim() - if (fontName !== "") { - systemSansFont = fontName - Logger.log("Font", "Detected system sans font:", systemSansFont) - } else { - Logger.warn("Font", "Empty result for system sans font, will use fallback") - } - } else { - Logger.warn("Font", "Failed to detect system sans font, will use fallback") - } - // Start detecting monospace font - monoFontProcess.running = true - } - stdout: StdioCollector {} - stderr: StdioCollector {} - } - - // Process for detecting mono fonts - Process { - id: monoFontProcess - command: ["fc-match", "-f", "%{family[0]}\n", "monospace"] - onExited: function (exitCode) { - if (exitCode === 0) { - var fontName = stdout.text.trim() - if (fontName !== "") { - systemMonospaceFont = fontName - Logger.log("Font", "Detected system monospace font:", systemMonospaceFont) - } else { - Logger.warn("Font", "Empty result for system monospace font, will use fallback") - } - } else { - Logger.warn("Font", "Failed to detect system monospace font, will use fallback") - } - // for now we'll use the same font for display as sans - systemDisplayFont = systemSansFont - - // Log the final font choices after all detection is complete - Logger.log("Font", "=== FONT DETECTION RESULTS ===") - Logger.log("Font", "System Sans Font:", systemSansFont || "NOT DETECTED") - Logger.log("Font", "System Monospace Font:", systemMonospaceFont || "NOT DETECTED") - Logger.log("Font", "System Display Font:", systemDisplayFont || "NOT DETECTED") - Logger.log("Font", "=== FINAL FONT DEFAULTS ===") - Logger.log("Font", "Default Font (getSystemSansFont):", getSystemSansFont()) - Logger.log("Font", "Fixed Font (getSystemMonospaceFont):", getSystemMonospaceFont()) - Logger.log("Font", "Billboard Font (getSystemDisplayFont):", getSystemDisplayFont()) - - // Mark detection as complete and emit signal - systemFontsDetected = true - systemFontsDetected() - } - stdout: StdioCollector {} - stderr: StdioCollector {} - } }