Compare commits

...

2 Commits

Author SHA1 Message Date
Andrey Zaharow
6572b83a97 Revert minor fixes 2024-02-26 17:33:27 +01:00
Andrey Zaharow
7aa4b54196 UI fixes 2024-02-24 23:42:38 +01:00
4 changed files with 66 additions and 2 deletions

View File

@@ -227,5 +227,6 @@
<file>ui/qml/Components/HomeSplitTunnelingDrawer.qml</file>
<file>images/controls/split-tunneling.svg</file>
<file>ui/qml/Controls2/DrawerType2.qml</file>
<file>ui/qml/Components/FadeBehavior.qml</file>
</qresource>
</RCC>

View File

@@ -61,7 +61,7 @@ void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
m_state = state;
m_isConnected = false;
m_connectionStateText = tr("Connection...");
m_connectionStateText = tr("Connecting...");
switch (state) {
case Vpn::ConnectionState::Connected: {
m_isConnectionInProgress = false;

View File

@@ -0,0 +1,35 @@
import QtQuick 2.15
import QtQml 2.15
Behavior {
id: root
property QtObject fadeTarget: targetProperty.object
property string fadeProperty: "opacity"
property int fadeDuration: 200
property int fadeValue: 0
property string easingType: "Quad"
property alias exitAnimation: exitAnimation
property alias enterAnimation: enterAnimation
SequentialAnimation {
NumberAnimation {
id: exitAnimation
target: root.fadeTarget
property: root.fadeProperty
duration: root.fadeDuration
to: root.fadeValue
easing.type: root.easingType === "Linear" ? Easing.Linear : Easing["In"+root.easingType]
}
PropertyAction { }
NumberAnimation {
id: enterAnimation
target: root.fadeTarget
property: root.fadeProperty
duration: root.fadeDuration
to: target[property]
easing.type: root.easingType === "Linear" ? Easing.Linear : Easing["Out"+root.easingType]
}
}
}

View File

@@ -159,6 +159,20 @@ PageType {
Layout.bottomMargin: 44
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
text: ServersModel.defaultServerDescriptionCollapsed
FadeBehavior on text { }
Connections {
target: drawer
function onOpen() {
collapsedServerMenuDescription.text = ServersModel.defaultServerDescriptionExpanded
}
function onClose() {
collapsedServerMenuDescription.text = ServersModel.defaultServerDescriptionCollapsed
}
}
}
}
@@ -197,7 +211,21 @@ PageType {
Layout.fillWidth: true
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter
text: ServersModel.defaultServerDescriptionExpanded
text: ServersModel.defaultServerDescriptionCollapsed
FadeBehavior on text { }
Connections {
target: drawer
function onOpen() {
expandedServersMenuDescription.text = ServersModel.defaultServerDescriptionExpanded
}
function onClose() {
expandedServersMenuDescription.text = ServersModel.defaultServerDescriptionCollapsed
}
}
}
RowLayout {