refactor: Remove and replace StatusSwitch from ui/shared/status
This commit is contained in:
parent
e97f1c5e37
commit
d12aaec87e
|
@ -12,6 +12,7 @@ import "../../Onboarding/shared" as OnboardingComponents
|
||||||
import StatusQ.Core 0.1
|
import StatusQ.Core 0.1
|
||||||
import StatusQ.Core.Theme 0.1
|
import StatusQ.Core.Theme 0.1
|
||||||
import StatusQ.Components 0.1
|
import StatusQ.Components 0.1
|
||||||
|
import StatusQ.Controls 0.1 as StatusQControls
|
||||||
|
|
||||||
import "../popups"
|
import "../popups"
|
||||||
|
|
||||||
|
@ -162,7 +163,7 @@ Item {
|
||||||
title: qsTrId("display-all-profile-pictures--not-only-contacts-")
|
title: qsTrId("display-all-profile-pictures--not-only-contacts-")
|
||||||
implicitHeight: 52
|
implicitHeight: 52
|
||||||
components: [
|
components: [
|
||||||
StatusSwitch {
|
StatusQControls.StatusSwitch {
|
||||||
id: switch1
|
id: switch1
|
||||||
checked: !appSettings.onlyShowContactsProfilePics
|
checked: !appSettings.onlyShowContactsProfilePics
|
||||||
}
|
}
|
||||||
|
@ -181,7 +182,7 @@ Item {
|
||||||
title: qsTrId("display-images-in-chat-automatically")
|
title: qsTrId("display-images-in-chat-automatically")
|
||||||
implicitHeight: 52
|
implicitHeight: 52
|
||||||
components: [
|
components: [
|
||||||
StatusSwitch {
|
StatusQControls.StatusSwitch {
|
||||||
id: switch2
|
id: switch2
|
||||||
checked: appSettings.displayChatImages
|
checked: appSettings.displayChatImages
|
||||||
}
|
}
|
||||||
|
@ -259,7 +260,7 @@ Item {
|
||||||
title: qsTrId("allow-new-contact-requests")
|
title: qsTrId("allow-new-contact-requests")
|
||||||
implicitHeight: 52
|
implicitHeight: 52
|
||||||
components: [
|
components: [
|
||||||
StatusSwitch {
|
StatusQControls.StatusSwitch {
|
||||||
id: switch3
|
id: switch3
|
||||||
checked: !root.store.messagesFromContactsOnly
|
checked: !root.store.messagesFromContactsOnly
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,8 @@ import utils 1.0
|
||||||
import ".."
|
import ".."
|
||||||
import "../panels"
|
import "../panels"
|
||||||
|
|
||||||
|
import StatusQ.Controls 0.1 as StatusQControls
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
property string text
|
property string text
|
||||||
property bool isSwitch: false
|
property bool isSwitch: false
|
||||||
|
@ -70,7 +72,7 @@ Rectangle {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
StatusSwitch {
|
StatusQControls.StatusSwitch {
|
||||||
id: switchItem
|
id: switchItem
|
||||||
enabled: root.isEnabled
|
enabled: root.isEnabled
|
||||||
visible: root.isSwitch
|
visible: root.isSwitch
|
||||||
|
|
|
@ -1,66 +0,0 @@
|
||||||
import QtQuick 2.12
|
|
||||||
import QtQuick.Controls 2.12
|
|
||||||
import QtGraphicalEffects 1.13
|
|
||||||
|
|
||||||
import utils 1.0
|
|
||||||
import "../../shared"
|
|
||||||
import "../../shared/panels"
|
|
||||||
|
|
||||||
Switch {
|
|
||||||
id: control
|
|
||||||
|
|
||||||
indicator: Rectangle {
|
|
||||||
id: oval
|
|
||||||
implicitWidth: 52
|
|
||||||
implicitHeight: 28
|
|
||||||
x: control.leftPadding
|
|
||||||
y: parent.height / 2 - height / 2
|
|
||||||
radius: 14
|
|
||||||
color: control.checked ? Style.current.primary : Style.current.inputBackground
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
id: circle
|
|
||||||
y: 4
|
|
||||||
width: 20
|
|
||||||
height: 20
|
|
||||||
radius: 10
|
|
||||||
color: Style.current.white
|
|
||||||
layer.enabled: true
|
|
||||||
layer.effect: DropShadow {
|
|
||||||
width: parent.width
|
|
||||||
height: parent.height
|
|
||||||
visible: true
|
|
||||||
verticalOffset: 1
|
|
||||||
fast: true
|
|
||||||
cached: true
|
|
||||||
color: "#22000000"
|
|
||||||
}
|
|
||||||
|
|
||||||
states: [
|
|
||||||
State {
|
|
||||||
name: "on"
|
|
||||||
when: control.checked
|
|
||||||
PropertyChanges { target: circle; x: oval.width - circle.width - 4 }
|
|
||||||
},
|
|
||||||
State {
|
|
||||||
name: "off"
|
|
||||||
when: !control.checked
|
|
||||||
PropertyChanges { target: circle; x: 4 }
|
|
||||||
}
|
|
||||||
]
|
|
||||||
|
|
||||||
transitions: Transition {
|
|
||||||
reversible: true
|
|
||||||
NumberAnimation { properties: "x"; easing.type: Easing.Linear; duration: 120; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
contentItem: StyledText {
|
|
||||||
text: control.text
|
|
||||||
opacity: enabled ? 1.0 : 0.3
|
|
||||||
verticalAlignment: Text.AlignVCenter
|
|
||||||
leftPadding: !!control.text ? control.indicator.width + control.spacing : control.indicator.width
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue