moved handling of connection states from qml in connectionController
- added a check for already installed containers before installing the server/container - added a button to scan the server for installed containers - added separation for read/write and readonly servers for pageHome
This commit is contained in:
vladimir.kuznetsov
parent
3a264e6baf
commit
249be451f7
21 changed files with 466 additions and 245 deletions
|
|
@ -21,8 +21,8 @@ PageType {
|
|||
|
||||
property string borderColor: "#2C2D30"
|
||||
|
||||
property string currentServerName: serversMenuContent.currentItem.delegateData.name
|
||||
property string currentServerHostName: serversMenuContent.currentItem.delegateData.hostName
|
||||
property string currentServerName
|
||||
property string currentServerHostName
|
||||
property string currentContainerName
|
||||
|
||||
ConnectButton {
|
||||
|
|
@ -93,7 +93,15 @@ PageType {
|
|||
Layout.bottomMargin: 44
|
||||
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
||||
|
||||
text: root.currentContainerName + " | " + root.currentServerHostName
|
||||
text: {
|
||||
var string = ""
|
||||
if (SettingsController.isAmneziaDnsEnabled()) {
|
||||
string += "Amnezia DNS | "
|
||||
}
|
||||
|
||||
string += root.currentContainerName + " | " + root.currentServerHostName
|
||||
return string
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -153,6 +161,8 @@ PageType {
|
|||
headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
|
||||
|
||||
rootButtonClickedFunction: function() {
|
||||
// todo check if server index changed before set Currently processed
|
||||
// todo make signal slot for change server index in containersModel
|
||||
ServersModel.setCurrentlyProcessedServerIndex(serversMenuContent.currentIndex)
|
||||
ContainersModel.setCurrentlyProcessedServerIndex(serversMenuContent.currentIndex)
|
||||
containersDropDown.menuVisible = true
|
||||
|
|
@ -161,20 +171,45 @@ PageType {
|
|||
listView: HomeContainersListView {
|
||||
rootWidth: root.width
|
||||
|
||||
Connections {
|
||||
target: ServersModel
|
||||
|
||||
function onCurrentlyProcessedServerIndexChanged() {
|
||||
updateContainersModelFilters()
|
||||
}
|
||||
|
||||
function updateContainersModelFilters() {
|
||||
if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
|
||||
proxyContainersModel.filters = [serviceTypeFilter, supportedFilter]
|
||||
} else {
|
||||
proxyContainersModel.filters = installedFilter
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ValueFilter {
|
||||
id: serviceTypeFilter
|
||||
roleName: "serviceType"
|
||||
value: ProtocolEnum.Vpn
|
||||
}
|
||||
ValueFilter {
|
||||
id: supportedFilter
|
||||
roleName: "isSupported"
|
||||
value: true
|
||||
}
|
||||
ValueFilter {
|
||||
id: installedFilter
|
||||
roleName: "isInstalled"
|
||||
value: true
|
||||
}
|
||||
|
||||
model: SortFilterProxyModel {
|
||||
id: proxyContainersModel
|
||||
sourceModel: ContainersModel
|
||||
filters: [
|
||||
ValueFilter {
|
||||
roleName: "serviceType"
|
||||
value: ProtocolEnum.Vpn
|
||||
},
|
||||
ValueFilter {
|
||||
roleName: "isSupported"
|
||||
value: true
|
||||
}
|
||||
]
|
||||
|
||||
Component.onCompleted: updateContainersModelFilters()
|
||||
}
|
||||
|
||||
currentIndex: ContainersModel.getDefaultContainer()
|
||||
}
|
||||
}
|
||||
|
|
@ -272,6 +307,9 @@ PageType {
|
|||
|
||||
isDefault = true
|
||||
ContainersModel.setCurrentlyProcessedServerIndex(index)
|
||||
|
||||
root.currentServerName = name
|
||||
root.currentServerHostName = hostName
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
|
|
@ -302,6 +340,13 @@ PageType {
|
|||
Layout.fillWidth: true
|
||||
}
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
if (serversMenuContent.currentIndex === index) {
|
||||
root.currentServerName = name
|
||||
root.currentServerHostName = hostName
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,21 @@ import "../Components"
|
|||
PageType {
|
||||
id: root
|
||||
|
||||
Connections {
|
||||
target: InstallController
|
||||
|
||||
function onScanServerFinished(isInstalledContainerFound) {
|
||||
var message = ""
|
||||
if (isInstalledContainerFound) {
|
||||
message = qsTr("All installed containers have been added to the application")
|
||||
} else {
|
||||
message = qsTr("Не найдено установленных контейнеров")
|
||||
}
|
||||
|
||||
PageController.showErrorMessage(message)
|
||||
}
|
||||
}
|
||||
|
||||
FlickableType {
|
||||
id: fl
|
||||
anchors.top: parent.top
|
||||
|
|
@ -30,8 +45,8 @@ PageType {
|
|||
LabelWithButtonType {
|
||||
Layout.fillWidth: true
|
||||
|
||||
text: "Clear Amnezia cache"
|
||||
descriptionText: "May be needed when changing other settings"
|
||||
text: qsTr("Clear Amnezia cache")
|
||||
descriptionText: qsTr("May be needed when changing other settings")
|
||||
|
||||
clickedFunction: function() {
|
||||
questionDrawer.headerText = qsTr("Clear cached profiles?")
|
||||
|
|
@ -52,6 +67,19 @@ PageType {
|
|||
|
||||
DividerType {}
|
||||
|
||||
LabelWithButtonType {
|
||||
Layout.fillWidth: true
|
||||
|
||||
text: qsTr("Проверить сервер на наличие ранее установленных сервисов Amnezia")
|
||||
descriptionText: qsTr("Добавим их в приложение, если они не отображались")
|
||||
|
||||
clickedFunction: function() {
|
||||
InstallController.scanServerForInstalledContainers()
|
||||
}
|
||||
}
|
||||
|
||||
DividerType {}
|
||||
|
||||
LabelWithButtonType {
|
||||
Layout.fillWidth: true
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import PageEnum 1.0
|
|||
import "./"
|
||||
import "../Controls2"
|
||||
import "../Config"
|
||||
import "../Controls2/TextTypes"
|
||||
|
||||
PageType {
|
||||
id: root
|
||||
|
|
@ -42,28 +43,32 @@ PageType {
|
|||
HeaderType {
|
||||
Layout.fillWidth: true
|
||||
|
||||
headerText: "Подключение к серверу"
|
||||
headerText: qsTr("Server connection")
|
||||
}
|
||||
|
||||
TextFieldWithHeaderType {
|
||||
id: hostname
|
||||
|
||||
Layout.fillWidth: true
|
||||
headerText: "Server IP address [:port]"
|
||||
headerText: qsTr("Server IP address [:port]")
|
||||
textFieldPlaceholderText: qsTr("Enter the address in the format 255.255.255.255:88")
|
||||
textField.validator: RegularExpressionValidator {
|
||||
regularExpression: InstallController.ipAddressPortRegExp()
|
||||
}
|
||||
}
|
||||
|
||||
TextFieldWithHeaderType {
|
||||
id: username
|
||||
|
||||
Layout.fillWidth: true
|
||||
headerText: "Login to connect via SSH"
|
||||
headerText: qsTr("Login to connect via SSH")
|
||||
}
|
||||
|
||||
TextFieldWithHeaderType {
|
||||
id: secretData
|
||||
|
||||
Layout.fillWidth: true
|
||||
headerText: "Password / Private key"
|
||||
headerText: qsTr("Password / Private key")
|
||||
textField.echoMode: TextInput.Password
|
||||
}
|
||||
|
||||
|
|
@ -71,7 +76,7 @@ PageType {
|
|||
Layout.fillWidth: true
|
||||
Layout.topMargin: 24
|
||||
|
||||
text: qsTr("Настроить сервер простым образом")
|
||||
text: qsTr("Set up a server the easy way")
|
||||
|
||||
onClicked: function() {
|
||||
InstallController.setShouldCreateServer(true)
|
||||
|
|
@ -92,7 +97,7 @@ PageType {
|
|||
textColor: "#D7D8DB"
|
||||
borderWidth: 1
|
||||
|
||||
text: qsTr("Выбрать протокол для установки")
|
||||
text: qsTr("Select protocol to install")
|
||||
|
||||
onClicked: function() {
|
||||
InstallController.setShouldCreateServer(true)
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ PageType {
|
|||
PageController.showErrorMessage(errorMessage)
|
||||
}
|
||||
|
||||
function onInstallContainerFinished() {
|
||||
function onInstallContainerFinished(isInstalledContainerFound) {
|
||||
goToStartPage()
|
||||
if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
|
||||
PageController.restorePageHomeState(true)
|
||||
|
|
@ -34,9 +34,15 @@ PageType {
|
|||
} else {
|
||||
goToPage(PageEnum.PageHome)
|
||||
}
|
||||
|
||||
if (isInstalledContainerFound) {
|
||||
//todo change to info message
|
||||
PageController.showErrorMessage(qsTr("The container you are trying to install is already installed on the server. " +
|
||||
"All installed containers have been added to the application"))
|
||||
}
|
||||
}
|
||||
|
||||
function onInstallServerFinished() {
|
||||
function onInstallServerFinished(isInstalledContainerFound) {
|
||||
goToStartPage()
|
||||
if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
|
||||
PageController.restorePageHomeState()
|
||||
|
|
@ -46,6 +52,19 @@ PageType {
|
|||
var pagePath = PageController.getPagePath(PageEnum.PageStart)
|
||||
stackView.replace(pagePath, { "objectName" : pagePath })
|
||||
}
|
||||
|
||||
if (isInstalledContainerFound) {
|
||||
PageController.showErrorMessage(qsTr("The container you are trying to install is already installed on the server. " +
|
||||
"All installed containers have been added to the application"))
|
||||
}
|
||||
}
|
||||
|
||||
function onServerAlreadyExists(serverIndex) {
|
||||
goToStartPage()
|
||||
ServersModel.setCurrentlyProcessedServerIndex(serverIndex)
|
||||
goToPage(PageEnum.PageSettingsServerInfo, false)
|
||||
|
||||
PageController.showErrorMessage(qsTr("The server has already been added to the application"))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,11 @@ PageType {
|
|||
tabBarStackView.goToTabBarPage(PageController.getPagePath(PageEnum.PageHome))
|
||||
}
|
||||
|
||||
function onGoToPageSettings() {
|
||||
tabBar.currentIndex = 2
|
||||
tabBarStackView.goToTabBarPage(PageController.getPagePath(PageEnum.PageSettings))
|
||||
}
|
||||
|
||||
function onShowErrorMessage(errorMessage) {
|
||||
popupErrorMessage.popupErrorMessageText = errorMessage
|
||||
popupErrorMessage.open()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue