diff --git a/modules/widgets/settingsapp/Appearance.qml b/modules/widgets/settingsapp/Appearance.qml index ae7e5c8..fa5eaa9 100644 --- a/modules/widgets/settingsapp/Appearance.qml +++ b/modules/widgets/settingsapp/Appearance.qml @@ -278,6 +278,38 @@ ClippingWrapperRectangle { } } } + ClippingWrapperRectangle { + id: schemeGeneratorWrapper + Layout.fillWidth: true + leftMargin: 10 + rightMargin: 15 + implicitHeight: 30 + bottomLeftRadius: 12 + bottomRightRadius: 12 + topRightRadius: 4 + topLeftRadius: 4 + color: Colors.surfaceContainerHigh + child: RowLayout { + id: schemeGeneratorLayout + spacing: 5 + CustomText { + id: schemeGeneratorText + text: "Scheme generator" + Layout.fillWidth: true + } + CustomButton { + implicitHeight: schemeGeneratorWrapper.implicitHeight - 10 + onClicked: { + if (Settings.config.schemeGenerator === "matugen") { + Settings.config.schemeGenerator = "wallust"; + } else { + Settings.config.schemeGenerator = "matugen"; + } + } + customText: Settings.config.schemeGenerator + } + } + } Item { id: spring Layout.fillHeight: true diff --git a/modules/widgets/wallswitcher/WallSwitcher.qml b/modules/widgets/wallswitcher/WallSwitcher.qml index 351be04..65aac2d 100644 --- a/modules/widgets/wallswitcher/WallSwitcher.qml +++ b/modules/widgets/wallswitcher/WallSwitcher.qml @@ -23,7 +23,7 @@ FloatingWindow { } Process { id: wallustRunner - property string cmd: "matugen image " + Settings.config.currentWall + property string cmd: Settings.config.schemeGenerator === "matugen" ? "matugen image " + Settings.config.currentWall : "wallust run " + Settings.config.currentWall command: ["sh", "-c", cmd] } GlobalShortcut { diff --git a/reusables/CustomSlider.qml b/reusables/CustomSlider.qml index b913556..ac4ae7c 100644 --- a/reusables/CustomSlider.qml +++ b/reusables/CustomSlider.qml @@ -20,6 +20,7 @@ Slider { height: parent.height color: Colors.primary radius: 2 + border.color: Colors.outline } } @@ -29,7 +30,7 @@ Slider { implicitWidth: control.implicitHeight - 2 implicitHeight: control.implicitHeight - 2 radius: 13 - color: control.pressed ? Colors.primary : Colors.surfaceContainerLow - border.color: Colors.outline + color: control.pressed ? Colors.primary : Colors.surfaceContainerLowest + border.color: control.pressed ? Colors.surfaceContainerLowest : Colors.primary } } diff --git a/settings/Settings.qml b/settings/Settings.qml index bad59aa..602b1c1 100644 --- a/settings/Settings.qml +++ b/settings/Settings.qml @@ -32,6 +32,7 @@ Singleton { property double translucency: 1 property bool blackScreenCorners: true property bool settingsShown: true + property string schemeGenerator: "matugen" } } }