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

Add settings button on PageStart

Browse source 
Disable some items when no Server has been set
This commit is contained in:
Hamza ARBI 2022-10-30 02:06:20 +01:00
parent ab39802512
commit e6a4d79b86
4 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

4
client/ui/qml/Pages/PageGeneralSettings.qml
View file

@ -85,6 +85,7 @@ PageBase {
Layout.preferredHeight: 30 Layout.preferredHeight: 30
icon.source: "qrc:/images/svg/vpn_key_black_24dp.svg" icon.source: "qrc:/images/svg/vpn_key_black_24dp.svg"
text: qsTr("Server Settings") text: qsTr("Server Settings")
enabled: GeneralSettingsLogic.existsAnyServer
onClicked: { onClicked: {
GeneralSettingsLogic.onPushButtonGeneralSettingsServerSettingsClicked() GeneralSettingsLogic.onPushButtonGeneralSettingsServerSettingsClicked()
} }
@ -101,7 +102,8 @@ PageBase {
Layout.preferredHeight: 30 Layout.preferredHeight: 30
icon.source: "qrc:/images/svg/share_black_24dp.svg" icon.source: "qrc:/images/svg/share_black_24dp.svg"
text: qsTr("Share connection") text: qsTr("Share connection")
enabled: GeneralSettingsLogic.pushButtonGeneralSettingsShareConnectionEnable enabled: GeneralSettingsLogic.pushButtonGeneralSettingsShareConnectionEnable &&
GeneralSettingsLogic.existsAnyServer
onClicked: { onClicked: {
GeneralSettingsLogic.onPushButtonGeneralSettingsShareConnectionClicked() GeneralSettingsLogic.onPushButtonGeneralSettingsShareConnectionClicked()
} }

17
client/ui/qml/Pages/PageStart.qml
View file

@ -15,6 +15,23 @@ PageBase {
visible: pageLoader.depth > 1 visible: pageLoader.depth > 1
} }
ImageButtonType {
anchors {
right: parent.right
top: parent.top
}
width: 41
height: 41
imgMarginHover: 8
imgMargin: 9
icon.source: "qrc:/images/settings_grey.png"
visible: !GeneralSettingsLogic.existsAnyServer
onClicked: {
UiLogic.goToPage(PageEnum.GeneralSettings)
}
}
Caption { Caption {
id: caption id: caption
text: start_switch_page.checked ? text: start_switch_page.checked ?