added page transition effects
- added functionality for buttons on PageSettingsServerData page
This commit is contained in:
parent
1e180489a4
commit
de0cd976de
38 changed files with 656 additions and 335 deletions
|
@ -74,4 +74,3 @@ bool ConnectionController::closeVpnConnection()
|
|||
emit disconnectFromVpn();
|
||||
m_isConnected = false;
|
||||
}
|
||||
|
||||
|
|
|
@ -49,8 +49,9 @@ void InstallController::installServer(DockerContainer container, QJsonObject& co
|
|||
server.insert(config_key::containers, QJsonArray{ config });
|
||||
server.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
|
||||
|
||||
m_settings->addServer(server);
|
||||
m_settings->setDefaultServer(m_settings->serversCount() - 1);
|
||||
m_serversModel->addServer(server);
|
||||
auto newServerIndex = m_serversModel->index(m_serversModel->getServersCount() - 1);
|
||||
m_serversModel->setData(newServerIndex, true, ServersModel::ServersModelRoles::IsDefaultRole);
|
||||
|
||||
emit installServerFinished();
|
||||
return;
|
||||
|
|
|
@ -9,7 +9,8 @@ QString PageController::getInitialPage()
|
|||
{
|
||||
if (m_serversModel->getServersCount()) {
|
||||
if (m_serversModel->getDefaultServerIndex() < 0) {
|
||||
m_serversModel->setDefaultServerIndex(0);
|
||||
auto defaultServerIndex = m_serversModel->index(0);
|
||||
m_serversModel->setData(defaultServerIndex, true, ServersModel::ServersModelRoles::IsDefaultRole);
|
||||
}
|
||||
return getPagePath(PageLoader::PageEnum::PageStart);
|
||||
} else {
|
||||
|
|
|
@ -9,7 +9,10 @@
|
|||
namespace PageLoader
|
||||
{
|
||||
Q_NAMESPACE
|
||||
enum class PageEnum { PageStart = 0, PageHome, PageSettings, PageShare,
|
||||
enum class PageEnum { PageStart = 0, PageHome, PageShare,
|
||||
|
||||
PageSettingsServersList, PageSettings, PageSettingsServerData, PageSettingsServerInfo,
|
||||
PageSettingsServerProtocols, PageSettingsServerServices,
|
||||
|
||||
PageSetupWizardStart, PageTest, PageSetupWizardCredentials, PageSetupWizardProtocols, PageSetupWizardEasy,
|
||||
PageSetupWizardProtocolSettings, PageSetupWizardInstalling, PageSetupWizardConfigSource,
|
||||
|
@ -41,6 +44,8 @@ public slots:
|
|||
|
||||
signals:
|
||||
void goToPageHome();
|
||||
void restorePageHomeState(bool isContainerInstalled = false);
|
||||
void replaceStartPage();
|
||||
void showErrorMessage(QString errorMessage);
|
||||
|
||||
private:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue