Merge branch 'end-4:main' into parallax

This commit is contained in:
Ivan Rosinskii
2026-03-27 16:40:41 +01:00
committed by GitHub
3 changed files with 767 additions and 13 deletions
@@ -240,7 +240,7 @@ Item {
}
}
z: Drag.active ? root.windowDraggingZ : (root.windowZ + windowData?.floating)
z: Drag.active ? root.windowDraggingZ : (root.windowZ + windowData?.floating + windowData?.fullscreen * 2)
Drag.hotSpot.x: width / 2
Drag.hotSpot.y: height / 2
MouseArea {
@@ -1,4 +1,5 @@
import qs.modules.common
import qs.modules.common.functions
import qs.modules.common.widgets
import qs.services
import QtQuick
@@ -82,6 +83,22 @@ DialogListItem {
Item {
Layout.fillWidth: true
}
ActionButton {
readonly property bool p: root.device?.paired ?? false
colBackground: p ? Appearance.colors.colError : ColorUtils.transparentize(Appearance.colors.colLayer3, 1)
colBackgroundHover: p ? Appearance.colors.colErrorHover : ColorUtils.transparentize(Appearance.colors.colLayer3, 1)
colRipple: p ? Appearance.colors.colErrorActive : Appearance.colors.colLayer3Hover
colText: p ? Appearance.colors.colOnError : Appearance.colors.colPrimary
buttonText: p ? Translation.tr("Forget") : Translation.tr("Always connect")
onClicked: {
if (root.device?.paired) {
root.device?.forget();
} else {
root.device?.pair();
}
}
}
ActionButton {
buttonText: root.device?.connected ? Translation.tr("Disconnect") : Translation.tr("Connect")
@@ -93,18 +110,6 @@ DialogListItem {
}
}
}
ActionButton {
visible: root.device?.paired ?? false
colBackground: Appearance.colors.colError
colBackgroundHover: Appearance.colors.colErrorHover
colRipple: Appearance.colors.colErrorActive
colText: Appearance.colors.colOnError
buttonText: Translation.tr("Forget")
onClicked: {
root.device?.forget();
}
}
}
Item {
Layout.fillHeight: true