mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-23 02:00:20 +07:00
refactor: remove serverConfig struct (#2595)
* refactor: remove serverConfig struct * refactor: add warnings for api v1 configs * refactor: moved the server type definition to a separate namespace * refactor: simplified gateway stacks * fix: fixed server description * fix: fixed postAsync reply usage * fix: fixed validateConfig call * fix: fixed server name in notifications * fix: fixed initPrepareConfigHandler for lagacy configs
This commit is contained in:
@@ -19,8 +19,7 @@
|
||||
#include "ui/utils/macosUtil.h"
|
||||
#endif
|
||||
|
||||
PageController::PageController(ServersController* serversController,
|
||||
SettingsController* settingsController,
|
||||
PageController::PageController(ServersController* serversController, SettingsController* settingsController,
|
||||
QObject *parent)
|
||||
: QObject(parent), m_serversController(serversController), m_settingsController(settingsController)
|
||||
{
|
||||
@@ -57,14 +56,7 @@ PageController::PageController(ServersController* serversController,
|
||||
|
||||
bool PageController::isStartPageVisible()
|
||||
{
|
||||
if (m_serversController->getServersCount()) {
|
||||
if (m_serversController->getDefaultServerIndex() < 0) {
|
||||
m_serversController->setDefaultServerIndex(0);
|
||||
}
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
return m_serversController->getServersCount() == 0;
|
||||
}
|
||||
|
||||
QString PageController::getPagePath(PageLoader::PageEnum page)
|
||||
|
||||
@@ -94,8 +94,7 @@ class PageController : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit PageController(ServersController* serversController,
|
||||
SettingsController* settingsController,
|
||||
explicit PageController(ServersController* serversController, SettingsController* settingsController,
|
||||
QObject *parent = nullptr);
|
||||
|
||||
Q_PROPERTY(int safeAreaTopMargin READ getSafeAreaTopMargin NOTIFY safeAreaTopMarginChanged)
|
||||
@@ -164,6 +163,8 @@ signals:
|
||||
void showPassphraseRequestDrawer();
|
||||
void passphraseRequestDrawerClosed(QString passphrase);
|
||||
|
||||
void unsupportedConnectDrawerRequested();
|
||||
|
||||
void escapePressed();
|
||||
void closeTopDrawer();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user