From d95147712b1e02e160d5196cf2fd83c441ea4f09 Mon Sep 17 00:00:00 2001 From: darksignal7 Date: Sun, 5 Oct 2025 21:36:42 +0300 Subject: [PATCH 1/3] readd visible's correctly --- .../quickshell/ii/modules/settings/InterfaceConfig.qml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.config/quickshell/ii/modules/settings/InterfaceConfig.qml b/.config/quickshell/ii/modules/settings/InterfaceConfig.qml index d7c6468d3..aaf0ee522 100644 --- a/.config/quickshell/ii/modules/settings/InterfaceConfig.qml +++ b/.config/quickshell/ii/modules/settings/InterfaceConfig.qml @@ -71,6 +71,7 @@ ContentPage { ConfigRow{ + visible: Config.options.background.clock.style === "cookie" ContentSubsection { enabled: Config.options.background.clock.style === "cookie" title: Translation.tr("Dial number style") @@ -122,6 +123,7 @@ ContentPage { ContentSubsection { enabled: Config.options.background.clock.style === "cookie" + visible: enabled title: Translation.tr("Hour hand style") ConfigSelectionArray { currentValue: Config.options.background.clock.cookie.hourHandStyle @@ -155,6 +157,7 @@ ContentPage { ContentSubsection { enabled: Config.options.background.clock.style === "cookie" + visible: enabled title: Translation.tr("Minute hand style") ConfigSelectionArray { currentValue: Config.options.background.clock.cookie.minuteHandStyle @@ -192,6 +195,7 @@ ContentPage { } ContentSubsection { enabled: Config.options.background.clock.style === "cookie" + visible: enabled title: Translation.tr("Seconds hand style") ConfigSelectionArray { currentValue: Config.options.background.clock.cookie.secondHandStyle @@ -229,6 +233,7 @@ ContentPage { ContentSubsection { enabled: Config.options.background.clock.style === "cookie" + visible: enabled title: Translation.tr("Date style") ConfigSelectionArray { currentValue: Config.options.background.clock.cookie.dateStyle @@ -265,6 +270,7 @@ ContentPage { } } StyledText { + visible: Config.options.background.clock.style === "cookie" Layout.leftMargin: 10 color: Appearance.colors.colSubtext font.pixelSize: Appearance.font.pixelSize.smallie @@ -274,6 +280,7 @@ ContentPage { ConfigSpinBox { enabled: Config.options.background.clock.style === "cookie" + visible: enabled icon: "support" text: Translation.tr("Clock sides") value: Config.options.background.clock.clockSides @@ -287,6 +294,7 @@ ContentPage { ConfigSwitch { enabled: Config.options.background.clock.style === "cookie" + visible: enabled buttonIcon: "waves" text: Translation.tr("Constantly rotate") checked: Config.options.background.clock.cookie.constantlyRotate @@ -300,6 +308,7 @@ ContentPage { ConfigRow{ enabled: Config.options.background.clock.style === "cookie" + visible: enabled ConfigSwitch { enabled: Config.options.background.clock.style === "cookie" && Config.options.background.clock.cookie.dialNumberStyle === "dots" || Config.options.background.clock.cookie.dialNumberStyle === "full" buttonIcon: "brightness_7" @@ -318,6 +327,7 @@ ContentPage { ConfigSwitch { enabled: Config.options.background.clock.style === "cookie" && Config.options.background.clock.cookie.dialNumberStyle !== "numbers" + visible: Config.options.background.clock.style === "cookie" buttonIcon: "farsight_digital" text: Translation.tr("Clock indicator") checked: Config.options.background.clock.cookie.timeIndicators From 94fb563a1547ed38f11bf00e8fe60f8e8374d852 Mon Sep 17 00:00:00 2001 From: darksignal7 Date: Sun, 5 Oct 2025 21:39:51 +0300 Subject: [PATCH 2/3] fix weird gaps and indents in InterfaceConfig --- .../ii/modules/settings/InterfaceConfig.qml | 292 +++++++++--------- 1 file changed, 141 insertions(+), 151 deletions(-) diff --git a/.config/quickshell/ii/modules/settings/InterfaceConfig.qml b/.config/quickshell/ii/modules/settings/InterfaceConfig.qml index aaf0ee522..470774e26 100644 --- a/.config/quickshell/ii/modules/settings/InterfaceConfig.qml +++ b/.config/quickshell/ii/modules/settings/InterfaceConfig.qml @@ -43,10 +43,6 @@ ContentPage { } } - - - - ContentSubsection { title: Translation.tr("Clock style") ConfigSelectionArray { @@ -69,7 +65,6 @@ ContentPage { } } - ConfigRow{ visible: Config.options.background.clock.style === "cookie" ContentSubsection { @@ -120,162 +115,157 @@ ContentPage { } - - ContentSubsection { - enabled: Config.options.background.clock.style === "cookie" - visible: enabled - title: Translation.tr("Hour hand style") - ConfigSelectionArray { - currentValue: Config.options.background.clock.cookie.hourHandStyle - onSelected: newValue => { - Config.options.background.clock.cookie.hourHandStyle = newValue; - } - options: [ - { - displayName: Translation.tr("Classic"), - icon: "radio", - value: "classic" - }, - { - displayName: Translation.tr("Stroke"), - icon: "stroke_partial", - value: "stroke" - }, - { - displayName: Translation.tr("Fill"), - icon: "stroke_full", - value: "fill" - }, - { - displayName: Translation.tr("Hide"), - icon: "deselect", - value: "hide" - } - ] + ContentSubsection { + enabled: Config.options.background.clock.style === "cookie" + visible: enabled + title: Translation.tr("Hour hand style") + ConfigSelectionArray { + currentValue: Config.options.background.clock.cookie.hourHandStyle + onSelected: newValue => { + Config.options.background.clock.cookie.hourHandStyle = newValue; } + options: [ + { + displayName: Translation.tr("Classic"), + icon: "radio", + value: "classic" + }, + { + displayName: Translation.tr("Stroke"), + icon: "stroke_partial", + value: "stroke" + }, + { + displayName: Translation.tr("Fill"), + icon: "stroke_full", + value: "fill" + }, + { + displayName: Translation.tr("Hide"), + icon: "deselect", + value: "hide" + } + ] } + } - ContentSubsection { - enabled: Config.options.background.clock.style === "cookie" - visible: enabled - title: Translation.tr("Minute hand style") - ConfigSelectionArray { - currentValue: Config.options.background.clock.cookie.minuteHandStyle - onSelected: newValue => { - Config.options.background.clock.cookie.minuteHandStyle = newValue; - } - options: [ - { - displayName: Translation.tr("Classic"), - icon: "radio", - value: "classic" - }, - { - displayName: Translation.tr("Thin"), - icon: "pen_size_1", - value: "thin" - }, - { - displayName: Translation.tr("Medium"), - icon: "pen_size_3", - value: "medium" - }, - { - displayName: Translation.tr("Bold"), - icon: "pen_size_5", - value: "bold" - }, - { - displayName: Translation.tr("Hide"), - icon: "deselect", - value: "hide" - } - ] + ContentSubsection { + enabled: Config.options.background.clock.style === "cookie" + visible: enabled + title: Translation.tr("Minute hand style") + ConfigSelectionArray { + currentValue: Config.options.background.clock.cookie.minuteHandStyle + onSelected: newValue => { + Config.options.background.clock.cookie.minuteHandStyle = newValue; } - } - ContentSubsection { - enabled: Config.options.background.clock.style === "cookie" - visible: enabled - title: Translation.tr("Seconds hand style") - ConfigSelectionArray { - currentValue: Config.options.background.clock.cookie.secondHandStyle - onSelected: newValue => { - Config.options.background.clock.cookie.secondHandStyle = newValue; + options: [ + { + displayName: Translation.tr("Classic"), + icon: "radio", + value: "classic" + }, + { + displayName: Translation.tr("Thin"), + icon: "pen_size_1", + value: "thin" + }, + { + displayName: Translation.tr("Medium"), + icon: "pen_size_3", + value: "medium" + }, + { + displayName: Translation.tr("Bold"), + icon: "pen_size_5", + value: "bold" + }, + { + displayName: Translation.tr("Hide"), + icon: "deselect", + value: "hide" } - options: [ - { - displayName: Translation.tr("Classic"), - icon: "radio", - value: "classic" - }, - { - displayName: Translation.tr("Line"), - icon: "line_end", - value: "line" - }, - { - displayName: Translation.tr("Dot"), - icon: "adjust", - value: "dot" - }, - { - displayName: Translation.tr("Hide"), - icon: "deselect", - value: "hide" - } - - ] - } + ] } + } + ContentSubsection { + enabled: Config.options.background.clock.style === "cookie" + visible: enabled + title: Translation.tr("Seconds hand style") + ConfigSelectionArray { + currentValue: Config.options.background.clock.cookie.secondHandStyle + onSelected: newValue => { + Config.options.background.clock.cookie.secondHandStyle = newValue; + } + options: [ + { + displayName: Translation.tr("Classic"), + icon: "radio", + value: "classic" + }, + { + displayName: Translation.tr("Line"), + icon: "line_end", + value: "line" + }, + { + displayName: Translation.tr("Dot"), + icon: "adjust", + value: "dot" + }, + { + displayName: Translation.tr("Hide"), + icon: "deselect", + value: "hide" + } + ] + } + } - - - - ContentSubsection { - enabled: Config.options.background.clock.style === "cookie" - visible: enabled - title: Translation.tr("Date style") - ConfigSelectionArray { - currentValue: Config.options.background.clock.cookie.dateStyle - onSelected: newValue => { - if (newValue !== "bubble" && Config.options.background.clock.cookie.dialNumberStyle === "none"){ - Config.options.background.clock.cookie.dateStyle = newValue; - } - if (newValue === "bubble" || newValue === "none"){ - Config.options.background.clock.cookie.dateStyle = newValue; - } + ContentSubsection { + enabled: Config.options.background.clock.style === "cookie" + visible: enabled + title: Translation.tr("Date style") + ConfigSelectionArray { + currentValue: Config.options.background.clock.cookie.dateStyle + onSelected: newValue => { + if (newValue !== "bubble" && Config.options.background.clock.cookie.dialNumberStyle === "none"){ + Config.options.background.clock.cookie.dateStyle = newValue; + } + if (newValue === "bubble" || newValue === "none"){ + Config.options.background.clock.cookie.dateStyle = newValue; } - options: [ - { - displayName: Translation.tr("None"), - icon: "deselect", - value: "none" - }, - { - displayName: Translation.tr("Bubble"), - icon: "bubble_chart", - value: "bubble" - }, - { - displayName: Translation.tr("Rotating"), - icon: "rotate_right", - value: "rotating" - }, - { - displayName: Translation.tr("Square"), - icon: "square", - value: "square" - } - ] } + options: [ + { + displayName: Translation.tr("None"), + icon: "deselect", + value: "none" + }, + { + displayName: Translation.tr("Bubble"), + icon: "bubble_chart", + value: "bubble" + }, + { + displayName: Translation.tr("Rotating"), + icon: "rotate_right", + value: "rotating" + }, + { + displayName: Translation.tr("Square"), + icon: "square", + value: "square" + } + ] } - StyledText { - visible: Config.options.background.clock.style === "cookie" - Layout.leftMargin: 10 - color: Appearance.colors.colSubtext - font.pixelSize: Appearance.font.pixelSize.smallie - text: Translation.tr("'Rotating' and 'Square' styles are not compatible with dial styles for aesthetic reasons") - } + } + StyledText { + visible: Config.options.background.clock.style === "cookie" + Layout.leftMargin: 10 + color: Appearance.colors.colSubtext + font.pixelSize: Appearance.font.pixelSize.smallie + text: Translation.tr("'Rotating' and 'Square' styles are not compatible with dial styles for aesthetic reasons") + } ConfigSpinBox { From 5af0fe35dfba0ef877ff6511dfd651a59feb8548 Mon Sep 17 00:00:00 2001 From: darksignal7 Date: Sun, 5 Oct 2025 21:40:56 +0300 Subject: [PATCH 3/3] change the place of the showQuote --- .../ii/modules/settings/InterfaceConfig.qml | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.config/quickshell/ii/modules/settings/InterfaceConfig.qml b/.config/quickshell/ii/modules/settings/InterfaceConfig.qml index 470774e26..e1786dcaa 100644 --- a/.config/quickshell/ii/modules/settings/InterfaceConfig.qml +++ b/.config/quickshell/ii/modules/settings/InterfaceConfig.qml @@ -12,24 +12,15 @@ ContentPage { icon: "wallpaper" title: Translation.tr("Background") - ConfigRow{ - ConfigSwitch { - buttonIcon: "nest_clock_farsight_analog" - text: Translation.tr("Show clock") - checked: Config.options.background.clock.show - onCheckedChanged: { - Config.options.background.clock.show = checked; - } - } - ConfigSwitch { - buttonIcon: "format_quote" - text: Translation.tr("Show quote") - checked: Config.options.background.showQuote - onCheckedChanged: { - Config.options.background.showQuote = checked; - } + ConfigSwitch { + buttonIcon: "nest_clock_farsight_analog" + text: Translation.tr("Show clock") + checked: Config.options.background.clock.show + onCheckedChanged: { + Config.options.background.clock.show = checked; } } + ConfigSpinBox { icon: "loupe" @@ -337,6 +328,14 @@ ContentPage { ContentSubsection { title: Translation.tr("Quote settings") + ConfigSwitch { + buttonIcon: "format_quote" + text: Translation.tr("Show quote") + checked: Config.options.background.showQuote + onCheckedChanged: { + Config.options.background.showQuote = checked; + } + } MaterialTextArea { Layout.fillWidth: true placeholderText: Translation.tr("Quote")