diff --git a/client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp b/client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp index 98354ec6..6c5a4315 100644 --- a/client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp +++ b/client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp @@ -85,7 +85,7 @@ void OtherProtocolsLogic::onPushButtonSftpMountDriveClicked() } }); -// QString cmd = QString("net use \\\\sshfs\\%1@51.77.32.168!%2 /USER:%1 %3") +// QString cmd = QString("net use \\\\sshfs\\%1@x.x.x.x!%2 /USER:%1 %3") // .arg(labelTftpUserNameText()) // .arg(labelTftpPortText()) // .arg(labelTftpPasswordText()); diff --git a/client/ui/qml/Pages/PageSites.qml b/client/ui/qml/Pages/PageSites.qml index f5a03ef5..f558586b 100644 --- a/client/ui/qml/Pages/PageSites.qml +++ b/client/ui/qml/Pages/PageSites.qml @@ -120,6 +120,11 @@ PageBase { delegateModelGroup.remove(0,count); } } + function selectAll(){ + for(var i = 0; i < visualModel.count; i++){ + visualModel.items.get(i).inMultiSelect = true + } + } } ] delegate: Rectangle { @@ -213,35 +218,6 @@ PageBase { } } - Keys.onPressed: { - if (event.key == Qt.Key_PageUp) { - let idx = tb.indexAt(1, tb.contentY) - tb.positionViewAtIndex(idx-20, ListView.Beginning) - event.accepted = true - } - else if (event.key == Qt.Key_PageDown) { - let idx = tb.indexAt(1, tb.contentY) - tb.positionViewAtIndex(idx+20, ListView.Beginning) - event.accepted = true - } - else if (event.key == Qt.Key_Home) { - tb.positionViewAtBeginning() - event.accepted = true - } - else if (event.key == Qt.Key_End) { - tb.positionViewAtEnd() - event.accepted = true - } - else if (event.key == Qt.Key_Delete) { - let items = [] - for(let i = 0; i < visualModel.count; i++){ - if (visualModel.items.get(i).inMultiSelect) items.push(i) - } - SitesLogic.onPushButtonSitesDeleteClicked(items) - event.accepted = true - } - } - ListView { id: tb x: 20 @@ -256,9 +232,41 @@ PageBase { activeFocusOnTab: true keyNavigationEnabled: true property int currentRow: -1 - //model: SitesLogic.tableViewSitesModel model: visualModel + Keys.onPressed: { + if (event.key === Qt.Key_PageUp) { + let idx = tb.indexAt(1, tb.contentY) + tb.positionViewAtIndex(idx-20, ListView.Beginning) + event.accepted = true + } + else if (event.key === Qt.Key_PageDown) { + let idx = tb.indexAt(1, tb.contentY) + tb.positionViewAtIndex(idx+20, ListView.Beginning) + event.accepted = true + } + else if (event.key === Qt.Key_Home) { + tb.positionViewAtBeginning() + event.accepted = true + } + else if (event.key === Qt.Key_End) { + tb.positionViewAtEnd() + event.accepted = true + } + else if (event.key === Qt.Key_Delete) { + let items = [] + for(let i = 0; i < visualModel.count; i++){ + if (visualModel.items.get(i).inMultiSelect) items.push(i) + } + SitesLogic.onPushButtonSitesDeleteClicked(items) + event.accepted = true + } + else if (event.key === Qt.Key_A) { + delegateModelGroup.selectAll() + event.accepted = true + } + } + } BlueButtonType { @@ -288,9 +296,7 @@ PageBase { font.pixelSize: 16 text: qsTr("Select all") onClicked: { - for(var i = 0; i < visualModel.count; i++){ - visualModel.items.get(i).inMultiSelect = true - } + delegateModelGroup.selectAll() } } diff --git a/client/ui/qml/Pages/Protocols/PageProtoSftp.qml b/client/ui/qml/Pages/Protocols/PageProtoSftp.qml index 04b60e26..b8b7fedc 100644 --- a/client/ui/qml/Pages/Protocols/PageProtoSftp.qml +++ b/client/ui/qml/Pages/Protocols/PageProtoSftp.qml @@ -96,11 +96,23 @@ PageProtocolBase { //- Install the latest version of SSHFS-Win. Choose the x64 or x86 installer according to your computer's architecture [https://github.com/billziss-gh/sshfs-win/releases]" onLinkActivated: Qt.openUrlExternally(link) - text:"In order to mount remote SFTP folder as local drive, perform following steps: + readonly property string windows_text: "In order to mount remote SFTP folder as local drive, perform following steps: