zach/z-bar-qt
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge settings window to main #23

Merged
Zacharias-Brohn merged 48 commits from settingsWindow into main 2026-03-18 16:27:50 +01:00
Conversation 0 Commits 48 Files Changed 136
+335 -32
9 changed files with 335 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 31df6a6cdf - Show all commits
Components/CustomSplitButtonRow.qml
+7 -7
View File
@@ -4,7 +4,7 @@ import QtQuick
import QtQuick.Layouts
import qs.Config
CustomRect {
Item {
id: root
property alias active: splitButton.active
@@ -18,23 +18,23 @@ CustomRect {
signal selected(item: MenuItem)
Layout.fillWidth: true
Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2
clip: false
color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainer, 2)
implicitHeight: row.implicitHeight + Appearance.padding.large * 2
opacity: enabled ? 1.0 : 0.5
radius: Appearance.rounding.normal
z: splitButton.menu.implicitHeight > 0 ? expandedZ : 1
RowLayout {
id: row
anchors.fill: parent
anchors.margins: Appearance.padding.large
anchors.left: parent.left
anchors.margins: Appearance.padding.small
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
spacing: Appearance.spacing.normal
CustomText {
Layout.fillWidth: true
color: root.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3onSurfaceVariant
font.pointSize: Appearance.font.size.larger
text: root.label
}
Modules/Settings/Categories.qml
+1 -1
View File
@@ -148,7 +148,7 @@ Item {
Layout.fillHeight: true
Layout.preferredWidth: icon.contentWidth
color: categoryItem.index === clayout.currentIndex ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
font.pointSize: 22
font.pointSize: Appearance.font.size.small * 2
text: categoryItem.icon
verticalAlignment: Text.AlignVCenter
}
Modules/Settings/Categories/Appearance.qml
+57 -7
View File
@@ -19,7 +19,7 @@ CustomRect {
CustomRect {
Layout.fillWidth: true
Layout.preferredHeight: colorLayout.implicitHeight
Layout.preferredHeight: colorLayout.implicitHeight + Appearance.padding.normal * 2
color: DynamicColors.tPalette.m3surfaceContainer
ColumnLayout {
@@ -28,15 +28,46 @@ CustomRect {
anchors.left: parent.left
anchors.margins: Appearance.padding.large
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
Settings {
name: "smth"
name: "Color"
}
SettingSwitch {
name: "wallust"
name: "Automatic color scheme"
object: Config.general.color
setting: "wallust"
setting: "schemeGeneration"
}
Separator {
}
SettingSwitch {
name: "Smart color scheme"
object: Config.general.color
setting: "smart"
}
Separator {
}
SettingInput {
name: "Schedule dark mode start"
object: Config.general.color
setting: "scheduleDarkStart"
}
Separator {
}
SettingInput {
name: "Schedule dark mode end"
object: Config.general.color
setting: "scheduleDarkEnd"
}
Separator {
}
CustomSplitButtonRow {
@@ -71,6 +102,25 @@ CustomRect {
}
}
}
CustomRect {
Layout.fillWidth: true
Layout.preferredHeight: idleLayout.implicitHeight + Appearance.padding.normal * 2
color: DynamicColors.tPalette.m3surfaceContainer
ColumnLayout {
id: idleLayout
anchors.left: parent.left
anchors.margins: Appearance.padding.large
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
Settings {
name: "Idle"
}
}
}
}
component Settings: CustomRect {
@@ -78,7 +128,7 @@ CustomRect {
required property string name
Layout.preferredHeight: 42
Layout.preferredHeight: 60
Layout.preferredWidth: 200
radius: 4
@@ -86,10 +136,10 @@ CustomRect {
id: text
anchors.left: parent.left
anchors.margins: Appearance.padding.smaller
anchors.right: parent.right
anchors.top: parent.top
font.bold: true
font.pointSize: 32
font.pointSize: Appearance.font.size.large * 2
text: settingsItem.name
verticalAlignment: Text.AlignVCenter
}
Modules/Settings/Content.qml
+1 -1
View File
@@ -13,7 +13,7 @@ Item {
property string currentCategory: "general"
readonly property real nonAnimHeight: view.implicitHeight + viewWrapper.anchors.margins * 2
readonly property real nonAnimWidth: view.implicitWidth + 500 + viewWrapper.anchors.margins * 2
readonly property real nonAnimWidth: view.implicitWidth + 700 + viewWrapper.anchors.margins * 2
required property PersistentProperties visibilities
implicitHeight: nonAnimHeight
Modules/Settings/Controls/Separator.qml
+12
View File
@@ -0,0 +1,12 @@
import QtQuick
import QtQuick.Layouts
import qs.Components
import qs.Config
CustomRect {
id: root
Layout.fillWidth: true
Layout.preferredHeight: 1
color: DynamicColors.tPalette.m3outlineVariant
}
Modules/Settings/Controls/SettingInput.qml
+65
View File
@@ -0,0 +1,65 @@
import QtQuick
import QtQuick.Layouts
import qs.Components
import qs.Config
Item {
id: root
required property string name
required property var object
required property string setting
function formattedValue(): string {
const value = root.object[root.setting];
console.log(value);
if (value === null || value === undefined)
return "";
return String(value);
}
Layout.fillWidth: true
Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2
RowLayout {
id: row
anchors.left: parent.left
anchors.margins: Appearance.padding.small
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
CustomText {
id: text
Layout.alignment: Qt.AlignLeft
Layout.fillWidth: true
font.pointSize: Appearance.font.size.larger
text: root.name
}
CustomRect {
id: rect
Layout.preferredHeight: 33
Layout.preferredWidth: Math.max(Math.min(textField.contentWidth + Appearance.padding.normal * 3, 200), 50)
color: DynamicColors.tPalette.m3surface
radius: Appearance.rounding.small
CustomTextField {
id: textField
anchors.centerIn: parent
horizontalAlignment: Text.AlignHCenter
text: root.formattedValue()
onEditingFinished: {
root.object[root.setting] = textField.text;
Config.save();
}
}
}
}
}
Modules/Settings/Controls/SettingList.qml
+155
View File
@@ -0,0 +1,155 @@
import QtQuick
import QtQuick.Layouts
import qs.Components
import qs.Config
Item {
id: root
required property list<var> modelData
required property string name
Layout.fillWidth: true
Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2
RowLayout {
id: row
anchors.left: parent.left
anchors.margins: Appearance.padding.small
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
CustomText {
id: text
Layout.alignment: Qt.AlignLeft
Layout.fillWidth: true
font.pointSize: Appearance.font.size.larger
text: root.name
}
VSeparator {
}
ColumnLayout {
id: cLayout
RowLayout {
id: timeLayout
Layout.fillWidth: true
CustomText {
id: timeText
Layout.fillWidth: true
text: root.modelData.name
}
CustomRect {
id: timeRect
Layout.preferredHeight: 33
Layout.preferredWidth: Math.max(Math.min(timeField.contentWidth + Appearance.padding.normal * 3, 200), 50)
color: DynamicColors.tPalette.m3surface
radius: Appearance.rounding.small
CustomTextField {
id: timeField
anchors.centerIn: parent
horizontalAlignment: Text.AlignHCenter
text: root.modelData.timeout
onEditingFinished: {
root.modelData.timeout = timeField.text;
Config.save();
}
}
}
}
Separator {
}
RowLayout {
id: idleLayout
Layout.fillWidth: true
CustomText {
id: idleText
Layout.fillWidth: true
text: root.modelData.name
}
CustomRect {
id: idleRect
Layout.preferredHeight: 33
Layout.preferredWidth: Math.max(Math.min(idleField.contentWidth + Appearance.padding.normal * 3, 200), 50)
color: DynamicColors.tPalette.m3surface
radius: Appearance.rounding.small
CustomTextField {
id: idleField
anchors.centerIn: parent
horizontalAlignment: Text.AlignHCenter
text: root.modelData.idleAction
onEditingFinished: {
root.modelData.idleAction = idleField.text;
Config.save();
}
}
}
}
Separator {
}
Loader {
id: loader
Layout.fillWidth: true
active: root.modelData.activeAction ?? false
RowLayout {
id: actionLayout
CustomText {
id: actionText
Layout.fillWidth: true
text: root.modelData.name
}
CustomRect {
id: actionRect
Layout.preferredHeight: 33
Layout.preferredWidth: Math.max(Math.min(actionField.contentWidth + Appearance.padding.normal * 3, 200), 50)
color: DynamicColors.tPalette.m3surface
radius: Appearance.rounding.small
CustomTextField {
id: actionField
anchors.centerIn: parent
horizontalAlignment: Text.AlignHCenter
text: root.modelData.activeAction
onEditingFinished: {
root.modelData.activeAction = actionField.text;
Config.save();
}
}
}
}
}
}
}
}
Modules/Settings/Controls/SettingSwitch.qml
+14 -5
View File
@@ -3,7 +3,7 @@ import QtQuick.Layouts
import qs.Components
import qs.Config
RowLayout {
Item {
id: root
required property string name
@@ -11,21 +11,29 @@ RowLayout {
required property string setting
Layout.fillWidth: true
Layout.preferredHeight: 42
Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2
RowLayout {
id: row
anchors.left: parent.left
anchors.margins: Appearance.padding.small
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
CustomText {
id: text
Layout.alignment: Qt.AlignLeft
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
Layout.fillWidth: true
font.pointSize: 16
font.pointSize: Appearance.font.size.larger
text: root.name
}
CustomSwitch {
id: cswitch
Layout.alignment: Qt.AlignRight
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
checked: root.object[root.setting]
onToggled: {
@@ -33,4 +41,5 @@ RowLayout {
Config.save();
}
}
}
}
Modules/Settings/Controls/VSeparator.qml
+12
View File
@@ -0,0 +1,12 @@
import QtQuick
import QtQuick.Layouts
import qs.Components
import qs.Config
CustomRect {
id: root
Layout.fillHeight: true
Layout.preferredWidth: 1
color: DynamicColors.tPalette.m3outlineVariant
}