Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/qt6-client-management-panel
This commit is contained in:
commit
b000eda126
41 changed files with 630 additions and 275 deletions
|
|
@ -252,6 +252,10 @@ Window {
|
|||
function onToggleLogPanel() {
|
||||
drawer_log.visible = !drawer_log.visible
|
||||
}
|
||||
function onShowWarningMessage(message) {
|
||||
popupWarning.popupWarningText = message
|
||||
popupWarning.open()
|
||||
}
|
||||
}
|
||||
|
||||
MessageDialog {
|
||||
|
|
@ -260,12 +264,6 @@ Window {
|
|||
text: qsTr("It's public key. Private key required")
|
||||
visible: false
|
||||
}
|
||||
MessageDialog {
|
||||
id: connectErrorDialog
|
||||
title: "AmneziaVPN"
|
||||
text: UiLogic.dialogConnectErrorText
|
||||
visible: false
|
||||
}
|
||||
|
||||
Drawer {
|
||||
id: drawer_log
|
||||
|
|
@ -375,4 +373,8 @@ Window {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
PopupWarning {
|
||||
id: popupWarning
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue