Settings: cleanup, almost there!
This commit is contained in:
parent
f3123ba5b1
commit
c108e7707a
9 changed files with 63 additions and 57 deletions
|
|
@ -12,7 +12,7 @@ ColumnLayout {
|
||||||
|
|
||||||
NHeader {
|
NHeader {
|
||||||
label: "Volumes"
|
label: "Volumes"
|
||||||
description: "Configure system audio, devices, and media player preferences."
|
description: "Configure volume controls and audio levels."
|
||||||
}
|
}
|
||||||
|
|
||||||
property real localVolume: AudioService.volume
|
property real localVolume: AudioService.volume
|
||||||
|
|
@ -25,9 +25,9 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Master Volume
|
// Master Volume
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
spacing: Style.marginXXS * scaling
|
spacing: Style.marginXXS * scaling
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
||||||
NLabel {
|
NLabel {
|
||||||
label: "Output Volume"
|
label: "Output Volume"
|
||||||
|
|
@ -162,6 +162,7 @@ ColumnLayout {
|
||||||
|
|
||||||
NHeader {
|
NHeader {
|
||||||
label: "Audio Devices"
|
label: "Audio Devices"
|
||||||
|
description: "Configure audio input and output devices."
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------------
|
// -------------------------------
|
||||||
|
|
@ -233,6 +234,7 @@ ColumnLayout {
|
||||||
|
|
||||||
NHeader {
|
NHeader {
|
||||||
label: "Media Player"
|
label: "Media Player"
|
||||||
|
description: "Configure your favorite media players."
|
||||||
}
|
}
|
||||||
|
|
||||||
// Preferred player
|
// Preferred player
|
||||||
|
|
@ -355,6 +357,7 @@ ColumnLayout {
|
||||||
|
|
||||||
NHeader {
|
NHeader {
|
||||||
label: "Audio Visualizer"
|
label: "Audio Visualizer"
|
||||||
|
description: "Customize visual effects that respond to audio playback."
|
||||||
}
|
}
|
||||||
|
|
||||||
// AudioService Visualizer section
|
// AudioService Visualizer section
|
||||||
|
|
|
||||||
|
|
@ -9,11 +9,8 @@ import qs.Modules.SettingsPanel.Bar
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: root
|
id: root
|
||||||
|
spacing: Style.marginL * scaling
|
||||||
|
|
||||||
NHeader {
|
|
||||||
label: "Appearance"
|
|
||||||
description: "Configure bar appearance and positioning."
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper functions to update arrays immutably
|
// Helper functions to update arrays immutably
|
||||||
function addMonitor(list, name) {
|
function addMonitor(list, name) {
|
||||||
|
|
@ -43,9 +40,12 @@ ColumnLayout {
|
||||||
panel.enableBackgroundClick()
|
panel.enableBackgroundClick()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NHeader {
|
||||||
|
label: "Appearance"
|
||||||
|
description: "Configure bar appearance and positioning."
|
||||||
|
}
|
||||||
|
|
||||||
ColumnLayout {
|
|
||||||
spacing: Style.marginL * scaling
|
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
NComboBox {
|
NComboBox {
|
||||||
|
|
@ -75,34 +75,34 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
spacing: Style.marginXXS * scaling
|
spacing: Style.marginXXS * scaling
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
||||||
NLabel {
|
NLabel {
|
||||||
label: "Background Opacity"
|
label: "Background Opacity"
|
||||||
description: "Adjust the background opacity of the bar."
|
description: "Adjust the background opacity of the bar."
|
||||||
}
|
|
||||||
|
|
||||||
RowLayout {
|
|
||||||
NSlider {
|
|
||||||
Layout.fillWidth: true
|
|
||||||
from: 0
|
|
||||||
to: 1
|
|
||||||
stepSize: 0.01
|
|
||||||
value: Settings.data.bar.backgroundOpacity
|
|
||||||
onMoved: Settings.data.bar.backgroundOpacity = value
|
|
||||||
cutoutColor: Color.mSurface
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NText {
|
RowLayout {
|
||||||
text: Math.floor(Settings.data.bar.backgroundOpacity * 100) + "%"
|
NSlider {
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.fillWidth: true
|
||||||
Layout.leftMargin: Style.marginS * scaling
|
from: 0
|
||||||
color: Color.mOnSurface
|
to: 1
|
||||||
}
|
stepSize: 0.01
|
||||||
}
|
value: Settings.data.bar.backgroundOpacity
|
||||||
|
onMoved: Settings.data.bar.backgroundOpacity = value
|
||||||
|
cutoutColor: Color.mSurface
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NText {
|
||||||
|
text: Math.floor(Settings.data.bar.backgroundOpacity * 100) + "%"
|
||||||
|
Layout.alignment: Qt.AlignVCenter
|
||||||
|
Layout.leftMargin: Style.marginS * scaling
|
||||||
|
color: Color.mOnSurface
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
NToggle {
|
NToggle {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
label: "Floating Bar"
|
label: "Floating Bar"
|
||||||
|
|
@ -189,7 +189,7 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
NDivider {
|
NDivider {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,9 @@ import qs.Widgets
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: root
|
id: root
|
||||||
spacing: 0
|
spacing: Style.marginL * scaling
|
||||||
|
|
||||||
|
|
||||||
NHeader {
|
|
||||||
label: "Behavior"
|
|
||||||
description: "Main settings for Noctalia's colors."
|
|
||||||
}
|
|
||||||
|
|
||||||
// Cache for scheme JSON (can be flat or {dark, light})
|
// Cache for scheme JSON (can be flat or {dark, light})
|
||||||
property var schemeColorsCache: ({})
|
property var schemeColorsCache: ({})
|
||||||
|
|
@ -109,10 +106,12 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Main Toggles - Dark Mode / Matugen
|
// Main Toggles - Dark Mode / Matugen
|
||||||
ColumnLayout {
|
NHeader {
|
||||||
spacing: Style.marginL * scaling
|
label: "Behavior"
|
||||||
Layout.fillWidth: true
|
description: "Main settings for Noctalia's colors."
|
||||||
|
}
|
||||||
|
|
||||||
// Dark Mode Toggle (affects both Matugen and predefined schemes that provide variants)
|
// Dark Mode Toggle (affects both Matugen and predefined schemes that provide variants)
|
||||||
NToggle {
|
NToggle {
|
||||||
|
|
@ -143,7 +142,7 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
NDivider {
|
NDivider {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
|
||||||
|
|
@ -220,6 +220,7 @@ ColumnLayout {
|
||||||
|
|
||||||
NHeader {
|
NHeader {
|
||||||
label: "Brightness"
|
label: "Brightness"
|
||||||
|
description: "Adjust brightness related settings."
|
||||||
}
|
}
|
||||||
|
|
||||||
// Brightness Step Section
|
// Brightness Step Section
|
||||||
|
|
@ -230,7 +231,7 @@ ColumnLayout {
|
||||||
NSpinBox {
|
NSpinBox {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
label: "Brightness Step Size"
|
label: "Brightness Step Size"
|
||||||
description: "Adjust the step size for brightness changes (scroll wheel, keyboard shortcuts)."
|
description: "Adjust the step size for brightness changes (scroll wheel and keyboard shortcuts)."
|
||||||
minimum: 1
|
minimum: 1
|
||||||
maximum: 50
|
maximum: 50
|
||||||
value: Settings.data.brightness.brightnessStep
|
value: Settings.data.brightness.brightnessStep
|
||||||
|
|
|
||||||
|
|
@ -10,10 +10,7 @@ ColumnLayout {
|
||||||
id: root
|
id: root
|
||||||
spacing: Style.marginL * scaling
|
spacing: Style.marginL * scaling
|
||||||
|
|
||||||
NHeader {
|
|
||||||
label: "Appearance"
|
|
||||||
description: "Configure dock behavior and appearance."
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper functions to update arrays immutably
|
// Helper functions to update arrays immutably
|
||||||
function addMonitor(list, name) {
|
function addMonitor(list, name) {
|
||||||
|
|
@ -28,6 +25,11 @@ ColumnLayout {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NHeader {
|
||||||
|
label: "Appearance"
|
||||||
|
description: "Configure dock behavior and appearance."
|
||||||
|
}
|
||||||
|
|
||||||
NToggle {
|
NToggle {
|
||||||
label: "Auto-hide"
|
label: "Auto-hide"
|
||||||
description: "Automatically hide when not in use."
|
description: "Automatically hide when not in use."
|
||||||
|
|
|
||||||
|
|
@ -7,15 +7,13 @@ import qs.Widgets
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: root
|
id: root
|
||||||
|
spacing: Style.marginL * scaling
|
||||||
|
|
||||||
NHeader {
|
NHeader {
|
||||||
label: "Appearance"
|
label: "Appearance"
|
||||||
description: "Configure the launcher behavior and appearance."
|
description: "Configure the launcher behavior and appearance."
|
||||||
}
|
}
|
||||||
|
|
||||||
ColumnLayout {
|
|
||||||
spacing: Style.marginL * scaling
|
|
||||||
|
|
||||||
NComboBox {
|
NComboBox {
|
||||||
id: launcherPosition
|
id: launcherPosition
|
||||||
label: "Position"
|
label: "Position"
|
||||||
|
|
@ -110,7 +108,7 @@ ColumnLayout {
|
||||||
checked: Settings.data.appLauncher.useApp2Unit
|
checked: Settings.data.appLauncher.useApp2Unit
|
||||||
onToggled: checked => Settings.data.appLauncher.useApp2Unit = checked
|
onToggled: checked => Settings.data.appLauncher.useApp2Unit = checked
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
NDivider {
|
NDivider {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@ ColumnLayout {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
spacing: Style.marginL * scaling
|
spacing: Style.marginL * scaling
|
||||||
|
|
||||||
|
|
||||||
property list<string> wallpapersList: []
|
property list<string> wallpapersList: []
|
||||||
property string currentWallpaper: ""
|
property string currentWallpaper: ""
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,11 @@ import qs.Widgets
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: root
|
id: root
|
||||||
|
spacing: Style.marginL * scaling
|
||||||
|
|
||||||
NHeader {
|
NHeader {
|
||||||
label: "Wallpaper Management"
|
label: "Wallpaper Settings"
|
||||||
description: "Configure wallpaper settings, automation, and appearance options."
|
description: "Control how wallpapers are managed and displayed."
|
||||||
}
|
}
|
||||||
|
|
||||||
NToggle {
|
NToggle {
|
||||||
|
|
@ -27,6 +28,7 @@ ColumnLayout {
|
||||||
visible: Settings.data.wallpaper.enabled
|
visible: Settings.data.wallpaper.enabled
|
||||||
spacing: Style.marginL * scaling
|
spacing: Style.marginL * scaling
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
||||||
NTextInput {
|
NTextInput {
|
||||||
label: "Wallpaper Directory"
|
label: "Wallpaper Directory"
|
||||||
description: "Path to your common wallpaper directory."
|
description: "Path to your common wallpaper directory."
|
||||||
|
|
@ -66,7 +68,7 @@ ColumnLayout {
|
||||||
delegate: RowLayout {
|
delegate: RowLayout {
|
||||||
NText {
|
NText {
|
||||||
text: (modelData.name || "Unknown")
|
text: (modelData.name || "Unknown")
|
||||||
color: Color.mSecondary
|
color: Color.mPrimary
|
||||||
font.weight: Style.fontWeightBold
|
font.weight: Style.fontWeightBold
|
||||||
Layout.preferredWidth: 90 * scaling
|
Layout.preferredWidth: 90 * scaling
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,11 @@ import qs.Widgets
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: root
|
id: root
|
||||||
|
spacing: Style.marginL * scaling
|
||||||
|
|
||||||
NHeader {
|
NHeader {
|
||||||
label: "Your Location"
|
label: "Your Location"
|
||||||
description: "Set your location for weather, time zones, and scheduling."
|
description: "Set your location for weather, time zones, and scheduling."
|
||||||
}
|
}
|
||||||
|
|
||||||
// Location section
|
// Location section
|
||||||
|
|
@ -64,6 +65,7 @@ ColumnLayout {
|
||||||
|
|
||||||
NHeader {
|
NHeader {
|
||||||
label: "Weather"
|
label: "Weather"
|
||||||
|
description: "Configure weather display preferences and temperature units."
|
||||||
}
|
}
|
||||||
|
|
||||||
NToggle {
|
NToggle {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue