AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into fix/drawerTypePositioning

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-10-03 19:00:58 +05:00
commit 52124b15e8
9 changed files with 138 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/ui/models/containers_model.cpp
View file

@ -214,6 +214,20 @@ bool ContainersModel::isAmneziaDnsContainerInstalled(const int serverIndex)
return containers.contains(DockerContainer::Dns);
}
bool ContainersModel::isAnyContainerInstalled()
{
for (int row=0; row < rowCount(); row++) {
QModelIndex idx = this->index(row, 0);
if (this->data(idx, IsInstalledRole).toBool() &&
this->data(idx, ServiceTypeRole).toInt() == ServiceType::Vpn) {
return true;
}
}
return false;
}
QHash<int, QByteArray> ContainersModel::roleNames() const
{
QHash<int, QByteArray> roles;

2
client/ui/models/containers_model.h
View file

@ -63,7 +63,7 @@ public slots:
bool isAmneziaDnsContainerInstalled();
bool isAmneziaDnsContainerInstalled(const int serverIndex);
// bool isOnlyServicesInstalled(const int serverIndex);
bool isAnyContainerInstalled();
protected:
QHash<int, QByteArray> roleNames() const override;

8
client/ui/qml/Components/ConnectButton.qml
View file

@ -5,6 +5,7 @@ import QtQuick.Shapes
import Qt5Compat.GraphicalEffects
import ConnectionState 1.0
import PageEnum 1.0
Button {
id: root
@ -137,6 +138,13 @@ Button {
}
onClicked: {
if (!ContainersModel.isAnyContainerInstalled()) {
ServersModel.currentlyProcessedIndex = ServersModel.getDefaultServerIndex()
PageController.goToPage(PageEnum.PageSetupWizardEasy)
return
}
if (ConnectionController.isConnectionInProgress) {
ConnectionController.closeConnection()
} else if (ConnectionController.isConnected) {

7
client/ui/qml/Controls2/CardType.qml
View file

@ -123,4 +123,11 @@ RadioButton {
Layout.bottomMargin: 16
}
}
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
enabled: false
}
}

4
client/ui/qml/Controls2/DrawerType.qml
View file

@ -52,16 +52,12 @@ Drawer {
}
onOpened: {
isOpened = true
if (needCloseButton) {
PageController.drawerOpen()
}
}
onClosed: {
isOpened = false
if (needCloseButton) {
PageController.drawerClose()
}

9
client/ui/qml/Controls2/ImageButtonType.qml
View file

@ -15,8 +15,11 @@ Button {
property string imageColor: "#878B91"
property string disableImageColor: "#2C2D30"
implicitWidth: 40
implicitHeight: 40
property int backGroudRadius: 12
property int implicitSize: 40
implicitWidth: implicitSize
implicitHeight: implicitSize
hoverEnabled: true
@ -31,7 +34,7 @@ Button {
id: background
anchors.fill: parent
radius: 12
radius: backGroudRadius
color: {
if (root.enabled) {
if(root.pressed) {

122
client/ui/qml/Controls2/TextAreaType.qml
View file

@ -9,71 +9,99 @@ Rectangle {
property alias textArea: textArea
property alias textAreaText: textArea.text
property string borderHoveredColor: "#494B50"
property string borderNormalColor: "#2C2D30"
property string borderFocusedColor: "#d7d8db"
height: 148
color: "#1C1D21"
border.width: 1
border.color: "#2C2D30"
border.color: getBorderColor(borderNormalColor)
radius: 16
FlickableType {
id: fl
interactive: false
MouseArea {
id: parentMouse
anchors.fill: parent
cursorShape: Qt.IBeamCursor
onClicked: textArea.forceActiveFocus()
hoverEnabled: true
anchors.top: parent.top
anchors.bottom: parent.bottom
contentHeight: textArea.implicitHeight
TextArea {
id: textArea
FlickableType {
id: fl
interactive: false
width: parent.width
anchors.top: parent.top
anchors.bottom: parent.bottom
contentHeight: textArea.implicitHeight
TextArea {
id: textArea
topPadding: 16
leftPadding: 16
anchors.topMargin: 16
anchors.bottomMargin: 16
width: parent.width
color: "#D7D8DB"
selectionColor: "#633303"
selectedTextColor: "#D7D8DB"
placeholderTextColor: "#878B91"
topPadding: 16
leftPadding: 16
anchors.topMargin: 16
anchors.bottomMargin: 16
font.pixelSize: 16
font.weight: Font.Medium
font.family: "PT Root UI VF"
color: "#D7D8DB"
selectionColor: "#633303"
selectedTextColor: "#D7D8DB"
placeholderTextColor: "#878B91"
placeholderText: root.placeholderText
text: root.text
font.pixelSize: 16
font.weight: Font.Medium
font.family: "PT Root UI VF"
onCursorVisibleChanged: {
if (textArea.cursorVisible) {
fl.interactive = true
} else {
fl.interactive = false
placeholderText: root.placeholderText
text: root.text
onCursorVisibleChanged: {
if (textArea.cursorVisible) {
fl.interactive = true
} else {
fl.interactive = false
}
}
wrapMode: Text.Wrap
MouseArea {
id: textAreaMouse
anchors.fill: parent
acceptedButtons: Qt.RightButton
hoverEnabled: true
onClicked: {
fl.interactive = true
contextMenu.open()
}
}
onFocusChanged: {
root.border.color = getBorderColor(borderNormalColor)
}
ContextMenuType {
id: contextMenu
textObj: textArea
}
}
}
wrapMode: Text.Wrap
onPressed: {
root.border.color = getBorderColor(borderFocusedColor)
}
MouseArea {
anchors.fill: parent
acceptedButtons: Qt.RightButton
onClicked: {
fl.interactive = true
contextMenu.open()
}
}
onExited: {
root.border.color = getBorderColor(borderNormalColor)
}
ContextMenuType {
id: contextMenu
textObj: textArea
}
onEntered: {
root.border.color = getBorderColor(borderHoveredColor)
}
}
//todo make whole background clickable, with code below we lose ability to select text by mouse
// MouseArea {
// anchors.fill: parent
// cursorShape: Qt.IBeamCursor
// onClicked: textArea.forceActiveFocus()
// }
function getBorderColor(noneFocusedColor) {
return textArea.focus ? root.borderFocusedColor : noneFocusedColor
}
}

27
client/ui/qml/Controls2/TextFieldWithHeaderType.qml
View file

@ -30,6 +30,7 @@ Item {
property string backgroundColor: "#1c1d21"
property string backgroundDisabledColor: "transparent"
property string bgBorderHoveredColor: "#494B50"
implicitWidth: content.implicitWidth
implicitHeight: content.implicitHeight
@ -44,7 +45,7 @@ Item {
Layout.preferredHeight: input.implicitHeight
color: root.enabled ? root.backgroundColor : root.backgroundDisabledColor
radius: 16
border.color: textField.focus ? root.borderFocusedColor : root.borderColor
border.color: getBackgroundBorderColor(root.borderColor)
border.width: 1
Behavior on border.color {
@ -102,12 +103,17 @@ Item {
anchors.fill: parent
acceptedButtons: Qt.RightButton
onClicked: contextMenu.open()
enabled: true
}
ContextMenuType {
id: contextMenu
textObj: textField
}
onFocusChanged: {
backgroud.border.color = getBackgroundBorderColor(root.borderColor)
}
}
}
@ -149,11 +155,28 @@ Item {
MouseArea {
anchors.fill: root
cursorShape: Qt.PointingHandCursor
cursorShape: Qt.IBeamCursor
hoverEnabled: true
onPressed: function(mouse) {
textField.forceActiveFocus()
mouse.accepted = false
backgroud.border.color = getBackgroundBorderColor(root.borderColor)
}
onEntered: {
backgroud.border.color = getBackgroundBorderColor(bgBorderHoveredColor)
}
onExited: {
backgroud.border.color = getBackgroundBorderColor(root.borderColor)
}
}
function getBackgroundBorderColor(noneFocusedColor) {
return textField.focus ? root.borderFocusedColor : noneFocusedColor
}
}

2
client/ui/qml/Pages2/PageSetupWizardEasy.qml
View file

@ -183,6 +183,8 @@ PageType {
textColor: "#D7D8DB"
borderWidth: 1
visible: ContainersModel.isAnyContainerInstalled()
text: qsTr("Set up later")
onClicked: function() {