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

added PageSettings and PageSettingsServersList.

Browse Source 
- replaced PageLoader with PageType with stackView property.
- added error handling when installing a server/container
This commit is contained in:
vladimir.kuznetsov
2023-05-25 15:40:17 +08:00
parent ca6b7fbeb2
commit e00656d757
31 changed files with 486 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ui/controllers/pageController.cpp
+4 -4
View File
@@ -5,15 +5,15 @@ PageController::PageController(const QSharedPointer<ServersModel> &serversModel,
{
}
void PageController::setStartPage()
QString PageController::getInitialPage()
{
if (m_serversModel->getServersCount()) {
if (m_serversModel->getDefaultServerIndex() < 0) {
m_serversModel->setDefaultServerIndex(0);
}
emit goToPage(PageLoader::PageEnum::PageStart, false);
return getPagePath(PageLoader::PageEnum::PageStart);
} else {
emit goToPage(PageLoader::PageEnum::PageSetupWizardStart, false);
return getPagePath(PageLoader::PageEnum::PageSetupWizardStart);
}
}
@@ -21,5 +21,5 @@ QString PageController::getPagePath(PageLoader::PageEnum page)
{
QMetaEnum metaEnum = QMetaEnum::fromType<PageLoader::PageEnum>();
QString pageName = metaEnum.valueToKey(static_cast<int>(page));
return "Pages2/" + pageName + ".qml";
return "qrc:/ui/qml/Pages2/" + pageName + ".qml";
}