andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-24 02:00:24 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

qml ui fixes

Browse Source
This commit is contained in:
pokamest
2021-09-06 12:29:56 +03:00
parent d90211ef48
commit d9ae10f5bc
5 changed files with 14 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ui/pages_logic/StartPageLogic.cpp
+2 -31
View File
@@ -1,45 +1,16 @@
//#include <QApplication>
//#include <QClipboard>
//#include <QDebug>
//#include <QDesktopServices>
//#include <QFileDialog>
//#include <QHBoxLayout>
//#include <QHostInfo>
//#include <QItemSelectionModel>
//#include <QJsonDocument>
//#include <QJsonObject>
//#include <QKeyEvent>
//#include <QMenu>
//#include <QMessageBox>
//#include <QMetaEnum>
//#include <QSysInfo>
//#include <QThread>
//#include <QTimer>
//#include <QRegularExpression>
//#include <QSaveFile>
//#include "debug.h"
//#include "defines.h"
#include "StartPageLogic.h"
#include "core/errorstrings.h"
//#include "utils.h"
//#include "vpnconnection.h"
//#include <functional>
#include "configurators/ssh_configurator.h"
#include "../uilogic.h"
using namespace amnezia;
using namespace PageEnumNS;
#include "../uilogic.h"
StartPageLogic::StartPageLogic(UiLogic *uiLogic, QObject *parent):
QObject(parent),
m_uiLogic(uiLogic),
m_pushButtonNewServerConnectEnabled{},
m_pushButtonNewServerConnectEnabled{true},
m_pushButtonNewServerConnectText{tr("Connect")},
m_pushButtonNewServerConnectKeyChecked{false},
m_lineEditStartExistingCodeText{},
client/ui/qml/Pages/PageSetupWizard.qml
+6 -6
View File
@@ -89,9 +89,9 @@ Item {
width: 331
height: 25
text: qsTr("High censorship level")
checked: UiLogic.radioButtonSetupWizardHighChecked
checked: WizardLogic.radioButtonSetupWizardHighChecked
onCheckedChanged: {
UiLogic.radioButtonSetupWizardHighChecked = checked
WizardLogic.radioButtonSetupWizardHighChecked = checked
}
}
RadioButtonType {
@@ -101,9 +101,9 @@ Item {
width: 331
height: 25
text: qsTr("Low censorship level")
checked: UiLogic.radioButtonSetupWizardLowChecked
checked: WizardLogic.radioButtonSetupWizardLowChecked
onCheckedChanged: {
UiLogic.radioButtonSetupWizardLowChecked = checked
WizardLogic.radioButtonSetupWizardLowChecked = checked
}
}
RadioButtonType {
@@ -113,9 +113,9 @@ Item {
width: 331
height: 25
text: qsTr("Medium censorship level")
checked: UiLogic.radioButtonSetupWizardMediumChecked
checked: WizardLogic.radioButtonSetupWizardMediumChecked
onCheckedChanged: {
UiLogic.radioButtonSetupWizardMediumChecked = checked
WizardLogic.radioButtonSetupWizardMediumChecked = checked
}
}
}
client/ui/qml/Pages/PageSetupWizardHighLevel.qml
+2 -2
View File
@@ -63,7 +63,7 @@ Item {
y: 360
width: 301
height: 41
text: UiLogic.lineEditSetupWizardHighWebsiteMaskingText
text: WizardLogic.lineEditSetupWizardHighWebsiteMaskingText
onEditingFinished: {
let _text = website_masking.text
_text.replace("http://", "");
@@ -72,7 +72,7 @@ Item {
return
}
_text = _text.split("/").first();
UiLogic.lineEditSetupWizardHighWebsiteMaskingText = _text
WizardLogic.lineEditSetupWizardHighWebsiteMaskingText = _text
}
onAccepted: {
next_button.clicked()
client/ui/qml/Pages/PageSetupWizardLowLevel.qml
+1 -1
View File
@@ -59,7 +59,7 @@ Item {
height: 40
text: qsTr("Start configuring")
onClicked: {
UiLogic.onPushButtonSetupWizardLowFinishClicked()
WizardLogic.onPushButtonSetupWizardLowFinishClicked()
}
}
}
client/ui/qml/Pages/PageSetupWizardVPNMode.qml
+3 -3
View File
@@ -41,9 +41,9 @@ Item {
width: 301
height: 71
text: qsTr('Turn on mode "VPN for selected sites"')
checked: UiLogic.checkBoxSetupWizardVpnModeChecked
checked: WizardLogic.checkBoxSetupWizardVpnModeChecked
onCheckedChanged: {
UiLogic.checkBoxSetupWizardVpnModeChecked = checked
WizardLogic.checkBoxSetupWizardVpnModeChecked = checked
}
}
LabelType {
@@ -61,7 +61,7 @@ Item {
height: 40
text: qsTr("Start configuring")
onClicked: {
UiLogic.onPushButtonSetupWizardVpnModeFinishClicked()
WizardLogic.onPushButtonSetupWizardVpnModeFinishClicked()
}
}
}