Compare commits

..

No commits in common. "a0614afc4cddec23b4bd01748cd972fa108520aa" and "e699dae499afd13e99be3a553ccce0194a4a8f08" have entirely different histories.

5 changed files with 6 additions and 37 deletions

View File

@ -42,6 +42,8 @@ Rectangle {
anchors.centerIn: parent anchors.centerIn: parent
CustomText { CustomText {
id: volumeText id: volumeText
Layout.topMargin: 2
PwObjectTracker { PwObjectTracker {
objects: Pipewire.ready ? Pipewire.defaultAudioSink : [] objects: Pipewire.ready ? Pipewire.defaultAudioSink : []
} }
@ -50,6 +52,7 @@ Rectangle {
} }
CustomIcon { CustomIcon {
id: volumeIcon id: volumeIcon
Layout.topMargin: 2
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
opacity: Pipewire.ready ? root.sink.audio.muted ? 0.5 : 1 : 0 opacity: Pipewire.ready ? root.sink.audio.muted ? 0.5 : 1 : 0
text: Pipewire.ready ? root.getVolumeIcon() : null text: Pipewire.ready ? root.getVolumeIcon() : null

View File

@ -278,38 +278,6 @@ 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 { Item {
id: spring id: spring
Layout.fillHeight: true Layout.fillHeight: true

View File

@ -23,7 +23,7 @@ FloatingWindow {
} }
Process { Process {
id: wallustRunner id: wallustRunner
property string cmd: Settings.config.schemeGenerator === "matugen" ? "matugen image " + Settings.config.currentWall : "wallust run " + Settings.config.currentWall property string cmd: "matugen image " + Settings.config.currentWall
command: ["sh", "-c", cmd] command: ["sh", "-c", cmd]
} }
GlobalShortcut { GlobalShortcut {

View File

@ -20,7 +20,6 @@ Slider {
height: parent.height height: parent.height
color: Colors.primary color: Colors.primary
radius: 2 radius: 2
border.color: Colors.outline
} }
} }
@ -30,7 +29,7 @@ Slider {
implicitWidth: control.implicitHeight - 2 implicitWidth: control.implicitHeight - 2
implicitHeight: control.implicitHeight - 2 implicitHeight: control.implicitHeight - 2
radius: 13 radius: 13
color: control.pressed ? Colors.primary : Colors.surfaceContainerLowest color: control.pressed ? Colors.primary : Colors.surfaceContainerLow
border.color: control.pressed ? Colors.surfaceContainerLowest : Colors.primary border.color: Colors.outline
} }
} }

View File

@ -32,7 +32,6 @@ Singleton {
property double translucency: 1 property double translucency: 1
property bool blackScreenCorners: true property bool blackScreenCorners: true
property bool settingsShown: true property bool settingsShown: true
property string schemeGenerator: "matugen"
} }
} }
} }