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

NewServerSettings qml rework

Browse source
This commit is contained in:
Pokamest Nikak 2021-09-09 20:15:44 +03:00
parent 3175bc1e48
commit 40fa2d6779
34 changed files with 644 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

51
client/ui/models/all_containers_model.cpp Normal file
View file

@ -0,0 +1,51 @@
#include "all_containers_model.h"
AllContainersModel::AllContainersModel(QObject *parent) :
QAbstractListModel(parent)
{
}
int AllContainersModel::rowCount(const QModelIndex &parent) const
{
Q_UNUSED(parent);
return amnezia::allContainers().size();
}
QHash<int, QByteArray> AllContainersModel::roleNames() const {
QHash<int, QByteArray> roles;
roles[NameRole] = "name";
roles[DescRole] = "desc";
roles[TypeRole] = "is_vpn";
roles[InstalledRole] = "installed";
return roles;
}
QVariant AllContainersModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid() || index.row() < 0
|| index.row() >= amnezia::allContainers().size()) {
return QVariant();
}
DockerContainer c = amnezia::allContainers().at(index.row());
if (role == NameRole) {
return containerHumanNames().value(c);
}
if (role == DescRole) {
return containerDescriptions().value(c);
}
if (role == TypeRole) {
return isContainerVpnType(c);
}
return QVariant();
}
void AllContainersModel::setServerData(const QJsonObject &server)
{
beginResetModel();
m_serverData = server;
endResetModel();
}

36
client/ui/models/all_containers_model.h Normal file
View file

@ -0,0 +1,36 @@
#ifndef ALL_CONTAINERS_MODEL_H
#define ALL_CONTAINERS_MODEL_H
#include <QAbstractListModel>
#include <QJsonObject>
#include <vector>
#include <utility>
#include "containers/containers_defs.h"
class AllContainersModel : public QAbstractListModel
{
Q_OBJECT
public:
AllContainersModel(QObject *parent = nullptr);
public:
enum SiteRoles {
NameRole = Qt::UserRole + 1,
DescRole,
TypeRole,
InstalledRole
};
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
void setServerData(const QJsonObject &server);
protected:
QHash<int, QByteArray> roleNames() const override;
private:
QJsonObject m_serverData;
};
#endif // ALL_CONTAINERS_MODEL_H

2
client/ui/serversmodel.cpp → client/ui/models/servers_model.cpp
View file

@ -1,4 +1,4 @@
#include "serversmodel.h"
#include "servers_model.h"
ServersModel::ServersModel(QObject *parent) :
QAbstractListModel(parent)

0
client/ui/serversmodel.h → client/ui/models/servers_model.h
View file

0
client/ui/sites_model.cpp → client/ui/models/sites_model.cpp
View file

0
client/ui/sites_model.h → client/ui/models/sites_model.h
View file

2
client/ui/pages_logic/ServerListLogic.cpp
View file

@ -1,7 +1,7 @@
#include "ServerListLogic.h"
#include "vpnconnection.h"
#include "../serversmodel.h"
#include "../models/servers_model.h"
#include "../uilogic.h"
ServerListLogic::ServerListLogic(UiLogic *logic, QObject *parent):

2
client/ui/pages_logic/SitesLogic.cpp
View file

@ -10,7 +10,7 @@
#include <functional>
#include "../uilogic.h"
#include "../sites_model.h"
#include "../models/sites_model.h"
SitesLogic::SitesLogic(UiLogic *logic, QObject *parent):
PageLogicBase(logic, parent),

2
client/ui/pages_logic/VpnLogic.cpp
View file

@ -28,7 +28,7 @@
//#include "core/server_defs.h"
//#include "core/errorstrings.h"
//#include "protocols/protocols_defs.h"
//#include "containers/containers_defs.h"
//#include "protocols/shadowsocksvpnprotocol.h"

168
client/ui/qml/Pages/InstallSettings/SelectContainer.qml Normal file
View file

@ -0,0 +1,168 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import "./"
import "../../Controls"
import "../../Config"
Drawer {
id: root
signal containerSelected(int id)
property alias selectedIndex: tb.currentIndex
z: -3
y: 0
x: 0
edge: Qt.RightEdge
width: parent.width * 0.85
height: parent.height
modal: true
interactive: true
onClosed: {
tb.currentIndex = -1
}
Flickable {
clip: true
anchors.fill: parent
contentHeight: col.height
Column {
id: col
anchors {
left: parent.left;
right: parent.right;
}
topPadding: 20
spacing: 10
Caption {
id: cap1
text: qsTr("VPN containers")
font.pixelSize: 20
}
ListView {
id: tb
x: 10
width: parent.width - 40
height: contentItem.height
spacing: 1
clip: true
interactive: false
model: UiLogic.allContainersModel
delegate: Item {
implicitWidth: 170 * 2
implicitHeight: 30
Item {
width: parent.width
height: 30
anchors.left: parent.left
id: c1
Rectangle {
anchors.top: parent.top
width: parent.width
height: 1
color: "lightgray"
visible: index !== tb.currentIndex
}
Rectangle {
anchors.fill: parent
color: "#63B4FB"
visible: index === tb.currentIndex
}
Text {
id: text_name
text: name
font.pointSize: 12
anchors.fill: parent
leftPadding: 10
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap
}
}
MouseArea {
anchors.fill: parent
onClicked: {
tb.currentIndex = index
containerSelected(index)
root.close()
}
}
}
}
// Caption {
// id: cap2
// text: qsTr("Other containers")
// }
// ListView {
// id: tb_other
// x: 10
// //y: 20
// width: parent.width - 40
// height: contentItem.height
// spacing: 1
// clip: true
// interactive: false
// property int currentRow: -1
// model: UiLogic.allContainersModel
// delegate: Item {
// implicitWidth: 170 * 2
// implicitHeight: 30
// Item {
// width: parent.width
// height: 30
// anchors.left: parent.left
// id: c1_other
// Rectangle {
// anchors.top: parent.top
// width: parent.width
// height: 1
// color: "lightgray"
// visible: index !== tb_other.currentRow
// }
// Rectangle {
// anchors.fill: parent
// color: "#63B4FB"
// visible: index === tb_other.currentRow
// }
// Text {
// id: text_name_other
// text: name
// font.pointSize: 12
// anchors.fill: parent
// leftPadding: 10
// verticalAlignment: Text.AlignVCenter
// wrapMode: Text.WordWrap
// }
// }
// MouseArea {
// anchors.fill: parent
// onClicked: {
// tb_other.currentRow = index
// }
// }
// }
// }
}
}
}

404
client/ui/qml/Pages/PageNewServerProtocols.qml
View file

@ -27,195 +27,253 @@ Item {
}
}
// RoundButton {
// id: pb_add_container
// anchors.horizontalCenter: parent.horizontalCenter
// anchors.top: labelCaption.bottom
// anchors.topMargin: 10
// width: parent.width - 40
// height: 40
// text: qsTr("Add protocol")
// onClicked: drawer_menu.visible ? drawer_menu.close() : drawer_menu.open()
// }
// Drawer {
// id: drawer_menu
// z: -3
// y: 0
// x: 0
// edge: Qt.RightEdge
// width: parent.width * 0.75
// height: parent.height
// modal: true
// interactive: true
// Label {
// text: "Content goes here!"
// anchors.centerIn: parent
// }
// }
ScrollView {
id: scrollView
width: parent.width - 40
RoundButton {
id: pb_add_container
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: caption.bottom
anchors.topMargin: 10
anchors.bottom: pushButtonConfigure.top
anchors.bottomMargin: 10
width: parent.width - 40
height: 40
text: qsTr("Add protocol")
font.pointSize: 12
onClicked: drawer_menu.visible ? drawer_menu.close() : drawer_menu.open()
clip: true
Column {
width: scrollView.width
anchors.horizontalCenter: parent.horizontalCenter
}
SelectContainer {
id: drawer_menu
}
Rectangle {
id: frame_settings
width: parent.width
anchors.top: pb_add_container.bottom
anchors.bottom: parent.bottom
anchors.topMargin: 10
border.width: 1
border.color: "lightgray"
anchors.bottomMargin: 5
anchors.horizontalCenter: parent.horizontalCenter
visible: false
radius: 2
Grid {
id: container
anchors.fill: parent
columns: 2
horizontalItemAlignment: Grid.AlignHCenter
verticalItemAlignment: Grid.AlignVCenter
topPadding: 5
leftPadding: 10
spacing: 5
InstallSettingsBase {
containerDescription: qsTr("OpenVPN and ShadowSocks\n with masking using Cloak plugin")
onContainerChecked: NewServerProtocolsLogic.checkBoxCloakChecked = checked
LabelType {
width: 130
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
text: qsTr("Port (TCP)")
}
TextFieldType {
width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
text: NewServerProtocolsLogic.lineEditCloakPortText
onEditingFinished: {
NewServerProtocolsLogic.lineEditCloakPortText = text
}
}
LabelType {
width: 130
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
text: qsTr("Fake Web Site")
}
TextFieldType {
width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
text: NewServerProtocolsLogic.lineEditCloakSiteText
onEditingFinished: {
NewServerProtocolsLogic.lineEditCloakSiteText = text
}
}
LabelType {
width: 130
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
text: qsTr("Port (TCP/UDP)")
}
InstallSettingsBase {
containerDescription: qsTr("ShadowSocks")
onContainerChecked: NewServerProtocolsLogic.checkBoxSsChecked = checked
LabelType {
width: 130
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
text: qsTr("Port (TCP)")
TextFieldType {
width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
text: NewServerProtocolsLogic.lineEditOpenvpnPortText
onEditingFinished: {
NewServerProtocolsLogic.lineEditOpenvpnPortText = text
}
TextFieldType {
width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
text: NewServerProtocolsLogic.lineEditSsPortText
onEditingFinished: {
NewServerProtocolsLogic.lineEditSsPortText = text
}
}
LabelType {
width: 130
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
text: qsTr("Encryption")
}
ComboBoxType {
width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
model: [
qsTr("chacha20-ietf-poly1305"),
qsTr("xchacha20-ietf-poly1305"),
qsTr("aes-256-gcm"),
qsTr("aes-192-gcm"),
qsTr("aes-128-gcm")
]
currentIndex: {
for (let i = 0; i < model.length; ++i) {
if (NewServerProtocolsLogic.comboBoxSsCipherText === model[i]) {
return i
}
}
LabelType {
width: 130
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
text: qsTr("Protocol")
}
ComboBoxType {
width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
model: [
qsTr("udp"),
qsTr("tcp"),
]
currentIndex: {
for (let i = 0; i < model.length; ++i) {
if (NewServerProtocolsLogic.comboBoxOpenvpnProtoText === model[i]) {
return i
}
return -1
}
onCurrentTextChanged: {
NewServerProtocolsLogic.comboBoxSsCipherText = currentText
}
return -1
}
}
InstallSettingsBase {
containerDescription: qsTr("OpenVPN")
onContainerChecked: NewServerProtocolsLogic.checkBoxOpenVpnChecked = checked
LabelType {
width: 130
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
text: qsTr("Port (TCP/UDP)")
}
TextFieldType {
width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
text: NewServerProtocolsLogic.lineEditOpenvpnPortText
onEditingFinished: {
NewServerProtocolsLogic.lineEditOpenvpnPortText = text
}
}
LabelType {
width: 130
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
text: qsTr("Protocol")
}
ComboBoxType {
width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
model: [
qsTr("udp"),
qsTr("tcp"),
]
currentIndex: {
for (let i = 0; i < model.length; ++i) {
if (NewServerProtocolsLogic.comboBoxOpenvpnProtoText === model[i]) {
return i
}
}
return -1
}
onCurrentTextChanged: {
NewServerProtocolsLogic.comboBoxOpenvpnProtoText = currentText
}
}
}
InstallSettingsBase {
visible: false
containerDescription: qsTr("WireGuard")
onContainerChecked: NewServerProtocolsLogic.checkBoxWireGuardChecked = checked
LabelType {
width: 130
height: (parent.height - parent.spacing - parent.topPadding * 2)
text: qsTr("Port (UDP)")
}
TextFieldType {
width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
height: (parent.height - parent.spacing - parent.topPadding * 2)
text: "32767"
onCurrentTextChanged: {
NewServerProtocolsLogic.comboBoxOpenvpnProtoText = currentText
}
}
}
}
// ScrollView {
// id: scrollView
// width: parent.width - 40
// anchors.horizontalCenter: parent.horizontalCenter
// anchors.top: pb_add_container.bottom
// anchors.topMargin: 10
// anchors.bottom: pushButtonConfigure.top
// anchors.bottomMargin: 10
// clip: true
// Column {
// width: scrollView.width
// anchors.horizontalCenter: parent.horizontalCenter
// spacing: 5
// InstallSettingsBase {
// containerDescription: qsTr("OpenVPN and ShadowSocks\n with masking using Cloak plugin")
// onContainerChecked: NewServerProtocolsLogic.checkBoxCloakChecked = checked
// LabelType {
// width: 130
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: qsTr("Port (TCP)")
// }
// TextFieldType {
// width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: NewServerProtocolsLogic.lineEditCloakPortText
// onEditingFinished: {
// NewServerProtocolsLogic.lineEditCloakPortText = text
// }
// }
// LabelType {
// width: 130
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: qsTr("Fake Web Site")
// }
// TextFieldType {
// width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: NewServerProtocolsLogic.lineEditCloakSiteText
// onEditingFinished: {
// NewServerProtocolsLogic.lineEditCloakSiteText = text
// }
// }
// }
// InstallSettingsBase {
// containerDescription: qsTr("ShadowSocks")
// onContainerChecked: NewServerProtocolsLogic.checkBoxSsChecked = checked
// LabelType {
// width: 130
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: qsTr("Port (TCP)")
// }
// TextFieldType {
// width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: NewServerProtocolsLogic.lineEditSsPortText
// onEditingFinished: {
// NewServerProtocolsLogic.lineEditSsPortText = text
// }
// }
// LabelType {
// width: 130
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: qsTr("Encryption")
// }
// ComboBoxType {
// width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// model: [
// qsTr("chacha20-ietf-poly1305"),
// qsTr("xchacha20-ietf-poly1305"),
// qsTr("aes-256-gcm"),
// qsTr("aes-192-gcm"),
// qsTr("aes-128-gcm")
// ]
// currentIndex: {
// for (let i = 0; i < model.length; ++i) {
// if (NewServerProtocolsLogic.comboBoxSsCipherText === model[i]) {
// return i
// }
// }
// return -1
// }
// onCurrentTextChanged: {
// NewServerProtocolsLogic.comboBoxSsCipherText = currentText
// }
// }
// }
// InstallSettingsBase {
// containerDescription: qsTr("OpenVPN")
// onContainerChecked: NewServerProtocolsLogic.checkBoxOpenVpnChecked = checked
// LabelType {
// width: 130
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: qsTr("Port (TCP/UDP)")
// }
// TextFieldType {
// width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: NewServerProtocolsLogic.lineEditOpenvpnPortText
// onEditingFinished: {
// NewServerProtocolsLogic.lineEditOpenvpnPortText = text
// }
// }
// LabelType {
// width: 130
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: qsTr("Protocol")
// }
// ComboBoxType {
// width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// model: [
// qsTr("udp"),
// qsTr("tcp"),
// ]
// currentIndex: {
// for (let i = 0; i < model.length; ++i) {
// if (NewServerProtocolsLogic.comboBoxOpenvpnProtoText === model[i]) {
// return i
// }
// }
// return -1
// }
// onCurrentTextChanged: {
// NewServerProtocolsLogic.comboBoxOpenvpnProtoText = currentText
// }
// }
// }
// InstallSettingsBase {
// visible: false
// containerDescription: qsTr("WireGuard")
// onContainerChecked: NewServerProtocolsLogic.checkBoxWireGuardChecked = checked
// LabelType {
// width: 130
// height: (parent.height - parent.spacing - parent.topPadding * 2)
// text: qsTr("Port (UDP)")
// }
// TextFieldType {
// width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
// height: (parent.height - parent.spacing - parent.topPadding * 2)
// text: "32767"
// }
// }
// }
// }
}

6
client/ui/uilogic.cpp
View file

@ -28,7 +28,7 @@
#include "core/server_defs.h"
#include "core/errorstrings.h"
#include "protocols/protocols_defs.h"
#include "containers/containers_defs.h"
#include "protocols/shadowsocksvpnprotocol.h"
#include "ui/qautostart.h"
@ -72,9 +72,9 @@ UiLogic::UiLogic(QObject *parent) :
m_trayIconUrl{},
m_trayActionDisconnectEnabled{true},
m_trayActionConnectEnabled{true},
m_dialogConnectErrorText{},
m_vpnConnection(nullptr)
m_dialogConnectErrorText{}
{
m_allContainersModel = new AllContainersModel(this);
m_vpnConnection = new VpnConnection(this);
m_appSettingsLogic = new AppSettingsLogic(this);

5
client/ui/uilogic.h
View file

@ -5,8 +5,11 @@
#include <QQmlEngine>
#include <functional>
#include "property_helper.h"
#include "pages.h"
#include "protocols/vpnprotocol.h"
#include "containers/containers_defs.h"
#include "models/all_containers_model.h"
#include "settings.h"
@ -35,6 +38,8 @@ class UiLogic : public QObject
{
Q_OBJECT
READONLY_PROPERTY(QObject *, allContainersModel)
Q_PROPERTY(int currentPageValue READ getCurrentPageValue WRITE setCurrentPageValue NOTIFY currentPageValueChanged)
Q_PROPERTY(QString trayIconUrl READ getTrayIconUrl WRITE setTrayIconUrl NOTIFY trayIconUrlChanged)
Q_PROPERTY(bool trayActionDisconnectEnabled READ getTrayActionDisconnectEnabled WRITE setTrayActionDisconnectEnabled NOTIFY trayActionDisconnectEnabledChanged)