now, when onUpdateAllPages is called, the ClientInfoLogic and ClientManagementLogic pages will not be updated
- moved the Client Management button to the Advanced Settings page -
This commit is contained in:
parent
af29637163
commit
0ae2a1f177
4 changed files with 14 additions and 12 deletions
|
@ -88,6 +88,15 @@ PageBase {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BlueButtonType {
|
||||||
|
Layout.topMargin: 10
|
||||||
|
Layout.fillWidth: true
|
||||||
|
text: qsTr("Clients Management")
|
||||||
|
onClicked: {
|
||||||
|
UiLogic.goToPage(PageEnum.ClientManagement)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
PopupWithQuestion {
|
PopupWithQuestion {
|
||||||
id: popupClearServer
|
id: popupClearServer
|
||||||
questionText: "Attention! All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted. Continue?"
|
questionText: "Attention! All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted. Continue?"
|
||||||
|
|
|
@ -62,8 +62,7 @@ PageBase {
|
||||||
implicitHeight: contentHeight + 20
|
implicitHeight: contentHeight + 20
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.leftMargin: 10
|
anchors.rightMargin: 20
|
||||||
anchors.rightMargin: 10
|
|
||||||
topMargin: 10
|
topMargin: 10
|
||||||
spacing: 10
|
spacing: 10
|
||||||
clip: true
|
clip: true
|
||||||
|
|
|
@ -90,23 +90,14 @@ PageBase {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.topMargin: 10
|
Layout.topMargin: 10
|
||||||
text: qsTr("Advanced server settings")
|
text: qsTr("Advanced server settings")
|
||||||
visible: ServerSettingsLogic.pushButtonShareFullVisible //todo
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
UiLogic.goToPage(PageEnum.AdvancedServerSettings)
|
UiLogic.goToPage(PageEnum.AdvancedServerSettings)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BlueButtonType {
|
BlueButtonType {
|
||||||
|
Layout.fillWidth: true
|
||||||
Layout.topMargin: 60
|
Layout.topMargin: 60
|
||||||
Layout.fillWidth: true
|
|
||||||
text: qsTr("Clients Management")
|
|
||||||
onClicked: {
|
|
||||||
UiLogic.goToPage(PageEnum.ClientManagement)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
BlueButtonType {
|
|
||||||
Layout.fillWidth: true
|
|
||||||
Layout.topMargin: 10
|
|
||||||
text: ServerSettingsLogic.pushButtonClearClientCacheText
|
text: ServerSettingsLogic.pushButtonClearClientCacheText
|
||||||
visible: ServerSettingsLogic.pushButtonClearClientCacheVisible
|
visible: ServerSettingsLogic.pushButtonClearClientCacheVisible
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
|
|
@ -181,6 +181,9 @@ void UiLogic::showOnStartup()
|
||||||
void UiLogic::onUpdateAllPages()
|
void UiLogic::onUpdateAllPages()
|
||||||
{
|
{
|
||||||
for (auto logic : m_logicMap) {
|
for (auto logic : m_logicMap) {
|
||||||
|
if (dynamic_cast<ClientInfoLogic*>(logic) || dynamic_cast<ClientManagementLogic*>(logic)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
logic->onUpdatePage();
|
logic->onUpdatePage();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue