Merge branch 'feature/new-gui' of github.com:amnezia-vpn/amnezia-client into HEAD
This commit is contained in:
commit
e38fe871b2
8 changed files with 133 additions and 1 deletions
|
@ -115,3 +115,33 @@ void PageController::showOnStartup()
|
|||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
void PageController::updateDrawerRootPage(PageLoader::PageEnum page)
|
||||
{
|
||||
m_drawerLayer = 0;
|
||||
m_currentRootPage = page;
|
||||
}
|
||||
|
||||
void PageController::goToDrawerRootPage()
|
||||
{
|
||||
|
||||
m_drawerLayer = 0;
|
||||
|
||||
emit showTopCloseButton(false);
|
||||
emit forceCloseDrawer();
|
||||
}
|
||||
|
||||
void PageController::drawerOpen()
|
||||
{
|
||||
m_drawerLayer = m_drawerLayer + 1;
|
||||
emit showTopCloseButton(true);
|
||||
}
|
||||
|
||||
void PageController::drawerClose()
|
||||
{
|
||||
m_drawerLayer = m_drawerLayer -1;
|
||||
if (m_drawerLayer <= 0) {
|
||||
emit showTopCloseButton(false);
|
||||
m_drawerLayer = 0;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -79,6 +79,11 @@ public slots:
|
|||
|
||||
void showOnStartup();
|
||||
|
||||
void updateDrawerRootPage(PageLoader::PageEnum page);
|
||||
void goToDrawerRootPage();
|
||||
void drawerOpen();
|
||||
void drawerClose();
|
||||
|
||||
signals:
|
||||
void goToPage(PageLoader::PageEnum page, bool slide = true);
|
||||
void goToStartPage();
|
||||
|
@ -105,10 +110,16 @@ signals:
|
|||
void showPassphraseRequestDrawer();
|
||||
void passphraseRequestDrawerClosed(QString passphrase);
|
||||
|
||||
void showTopCloseButton(bool visible);
|
||||
void forceCloseDrawer();
|
||||
|
||||
private:
|
||||
QSharedPointer<ServersModel> m_serversModel;
|
||||
|
||||
std::shared_ptr<Settings> m_settings;
|
||||
|
||||
PageLoader::PageEnum m_currentRootPage;
|
||||
int m_drawerLayer;
|
||||
};
|
||||
|
||||
#endif // PAGECONTROLLER_H
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue