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

Merge pull request #142 from amnezia-vpn/qt-migration-cleanup

Browse source 
Qt migration cleanup
This commit is contained in:
pokamest 2022-12-26 14:16:03 +00:00 • committed by GitHub
commit 131601d9d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
159 changed files with 8 additions and 11042 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ GeneralSettingsLogic::GeneralSettingsLogic(UiLogic *logic, QObject *parent):
void GeneralSettingsLogic::onUpdatePage()
{
uiLogic()->selectedServerIndex = m_settings->defaultServerIndex();
set_existsAnyServer(uiLogic()->selectedServerIndex >= 0);
set_existsAnyServer(uiLogic()->selectedServerIndex >= 0);
uiLogic()->selectedDockerContainer = m_settings->defaultContainer(m_settings->defaultServerIndex());
set_pushButtonGeneralSettingsShareConnectionEnable(m_settings->haveAuthData(m_settings->defaultServerIndex()));

2
client/ui/pages_logic/GeneralSettingsLogic.h
View file

@ -10,7 +10,7 @@ class GeneralSettingsLogic : public PageLogicBase
Q_OBJECT
AUTO_PROPERTY(bool, pushButtonGeneralSettingsShareConnectionEnable)
AUTO_PROPERTY(bool, existsAnyServer)
AUTO_PROPERTY(bool, existsAnyServer)
public:
Q_INVOKABLE void onUpdatePage() override;

1
client/ui/pages_logic/ShareConnectionLogic.cpp
View file

@ -3,7 +3,6 @@
#include <QDataStream>
#include <QMessageBox>
#include "qrcodegen.hpp"
#include "ShareConnectionLogic.h"

4
client/ui/pages_logic/StartPageLogic.cpp
View file

@ -184,10 +184,6 @@ bool StartPageLogic::importConnectionFromCode(QString code)
return importConnection(o);
}
o = QJsonDocument::fromJson(ba).object();
if (!o.isEmpty()) {
return importConnection(o);
}
return false;
}

1
client/ui/qml/Controls/SettingButtonType.qml
View file

@ -8,7 +8,6 @@ BasicButtonType {
background: Item {}
contentItem: Item {
// anchors.fill: parent
SvgImageType {
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter

1
client/ui/qml/Controls/ShareConnectionContent.qml
View file

@ -1,6 +1,5 @@
import QtQuick
import QtQuick.Controls
//import QtGraphicalEffects 1.12
import QtQuick.Shapes 1.4
Item {