From ea22af05d1589329169a050422225607d1b3b93a Mon Sep 17 00:00:00 2001 From: Ly-sec Date: Mon, 11 Aug 2025 16:07:04 +0200 Subject: [PATCH] Fix small warning with NTextBox --- Modules/Settings/SettingsWindow.qml | 3 +-- Modules/Settings/Tabs/About.qml | 3 +++ Modules/Settings/Tabs/Bar.qml | 4 ++++ Modules/Settings/Tabs/Display.qml | 3 +++ Modules/Settings/Tabs/General.qml | 4 ++++ Modules/Settings/Tabs/Misc.qml | 3 +++ Modules/Settings/Tabs/Network.qml | 3 +++ Modules/Settings/Tabs/ScreenRecorder.qml | 3 +++ Modules/Settings/Tabs/TimeWeather.qml | 3 +++ Modules/Settings/Tabs/Wallpaper.qml | 3 +++ Widgets/NTextBox.qml | 4 ++-- 11 files changed, 32 insertions(+), 4 deletions(-) diff --git a/Modules/Settings/SettingsWindow.qml b/Modules/Settings/SettingsWindow.qml index a779353..5f55b2a 100644 --- a/Modules/Settings/SettingsWindow.qml +++ b/Modules/Settings/SettingsWindow.qml @@ -19,8 +19,7 @@ NLoader { readonly property real scaling: Scaling.scale(screen) // Active tab index unified for sidebar, header, and content stack property int currentTabIndex: 0 - // Single source of truth for tabs - // Each tab points to a QML file path. The content stack simply loads the file via Loader.source. + // Single source of truth for tabs (explicit icon/label here) property var tabsModel: [ { icon: "tune", label: "General", source: "Tabs/General.qml" }, { icon: "web_asset", label: "Bar", source: "Tabs/Bar.qml" }, diff --git a/Modules/Settings/Tabs/About.qml b/Modules/Settings/Tabs/About.qml index 18142c3..676ec93 100644 --- a/Modules/Settings/Tabs/About.qml +++ b/Modules/Settings/Tabs/About.qml @@ -5,6 +5,9 @@ import qs.Widgets Item { property real scaling: 1 + readonly property string tabIcon: "info" + readonly property string tabLabel: "About" + readonly property int tabIndex: 8 anchors.fill: parent ColumnLayout { diff --git a/Modules/Settings/Tabs/Bar.qml b/Modules/Settings/Tabs/Bar.qml index da8669f..73b46e2 100644 --- a/Modules/Settings/Tabs/Bar.qml +++ b/Modules/Settings/Tabs/Bar.qml @@ -6,6 +6,10 @@ import qs.Widgets Item { // Optional scaling prop to match other tabs property real scaling: 1 + // Tab metadata + readonly property string tabIcon: "web_asset" + readonly property string tabLabel: "Bar" + readonly property int tabIndex: 1 anchors.fill: parent ColumnLayout { diff --git a/Modules/Settings/Tabs/Display.qml b/Modules/Settings/Tabs/Display.qml index ac2f8e1..d473471 100644 --- a/Modules/Settings/Tabs/Display.qml +++ b/Modules/Settings/Tabs/Display.qml @@ -5,6 +5,9 @@ import qs.Widgets Item { property real scaling: 1 + readonly property string tabIcon: "monitor" + readonly property string tabLabel: "Display" + readonly property int tabIndex: 5 anchors.fill: parent ColumnLayout { diff --git a/Modules/Settings/Tabs/General.qml b/Modules/Settings/Tabs/General.qml index e0800db..729fe09 100644 --- a/Modules/Settings/Tabs/General.qml +++ b/Modules/Settings/Tabs/General.qml @@ -9,6 +9,10 @@ Item { // Public API // Scaling factor provided by the parent settings window property real scaling: 1 + // Tab metadata + readonly property string tabIcon: "tune" + readonly property string tabLabel: "General" + readonly property int tabIndex: 0 anchors.fill: parent implicitWidth: parent ? parent.width : 0 diff --git a/Modules/Settings/Tabs/Misc.qml b/Modules/Settings/Tabs/Misc.qml index 9d26a4c..866c73f 100644 --- a/Modules/Settings/Tabs/Misc.qml +++ b/Modules/Settings/Tabs/Misc.qml @@ -5,6 +5,9 @@ import qs.Widgets Item { property real scaling: 1 + readonly property string tabIcon: "more_horiz" + readonly property string tabLabel: "Misc" + readonly property int tabIndex: 7 anchors.fill: parent ColumnLayout { diff --git a/Modules/Settings/Tabs/Network.qml b/Modules/Settings/Tabs/Network.qml index 408922d..e15423f 100644 --- a/Modules/Settings/Tabs/Network.qml +++ b/Modules/Settings/Tabs/Network.qml @@ -5,6 +5,9 @@ import qs.Widgets Item { property real scaling: 1 + readonly property string tabIcon: "wifi" + readonly property string tabLabel: "Network" + readonly property int tabIndex: 4 anchors.fill: parent ColumnLayout { diff --git a/Modules/Settings/Tabs/ScreenRecorder.qml b/Modules/Settings/Tabs/ScreenRecorder.qml index ea70889..f882f03 100644 --- a/Modules/Settings/Tabs/ScreenRecorder.qml +++ b/Modules/Settings/Tabs/ScreenRecorder.qml @@ -5,6 +5,9 @@ import qs.Widgets Item { property real scaling: 1 + readonly property string tabIcon: "videocam" + readonly property string tabLabel: "Screen Recorder" + readonly property int tabIndex: 3 anchors.fill: parent ColumnLayout { diff --git a/Modules/Settings/Tabs/TimeWeather.qml b/Modules/Settings/Tabs/TimeWeather.qml index 57bece5..2a425aa 100644 --- a/Modules/Settings/Tabs/TimeWeather.qml +++ b/Modules/Settings/Tabs/TimeWeather.qml @@ -5,6 +5,9 @@ import qs.Widgets Item { property real scaling: 1 + readonly property string tabIcon: "schedule" + readonly property string tabLabel: "Time & Weather" + readonly property int tabIndex: 2 anchors.fill: parent ColumnLayout { diff --git a/Modules/Settings/Tabs/Wallpaper.qml b/Modules/Settings/Tabs/Wallpaper.qml index c495075..8b880b8 100644 --- a/Modules/Settings/Tabs/Wallpaper.qml +++ b/Modules/Settings/Tabs/Wallpaper.qml @@ -5,6 +5,9 @@ import qs.Widgets Item { property real scaling: 1 + readonly property string tabIcon: "image" + readonly property string tabLabel: "Wallpaper" + readonly property int tabIndex: 6 anchors.fill: parent ColumnLayout { diff --git a/Widgets/NTextBox.qml b/Widgets/NTextBox.qml index 85b89f7..53ec72f 100644 --- a/Widgets/NTextBox.qml +++ b/Widgets/NTextBox.qml @@ -14,7 +14,6 @@ Item { property bool readOnly: false property bool enabled: true property var onEditingFinished: function () {} - property var onTextChanged: function (value) {} // Sizing implicitHeight: Style.baseWidgetSize * 1.25 * scaling @@ -58,7 +57,8 @@ Item { background: null font.pointSize: Colors.fontSizeSmall * scaling onEditingFinished: root.onEditingFinished() - onTextChanged: root.onTextChanged(text) + // Text changes are observable via the aliased 'text' property (root.text) and its 'textChanged' signal. + // No additional callback is invoked here to avoid conflicts with QML's onTextChanged handler semantics. } } }