Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-07 22:02:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qml app improved trusted nodes exchange

Browse source 
AddTrustedNode.qml support for plain certificate and node link import/export
Move clipboard wrapper to it's own singleton ClipboardWrapper.qml with
  improved clipboard API
This commit is contained in:
Gioacchino Mazzurco 2017-04-20 21:39:59 +02:00
parent 5c1ad36d2b
commit 7b070e482d
9 changed files with 141 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

21
retroshare-qml-app/src/main-app.qml
View file

@ -20,7 +20,7 @@ import QtQuick 2.7
import QtQuick.Controls 2.0
import org.retroshare.qml_components.LibresapiLocalClient 1.0
import "URI.js" as UriJs
import "." //Needed for TokensManager singleton
import "." //Needed for TokensManager and ClipboardWrapper singleton
ApplicationWindow
{
@ -30,7 +30,7 @@ ApplicationWindow
width: 400
height: 400
property string pgp_name
property string user_name
property bool coreReady: stackView.state === "running_ok" ||
stackView.state === "running_ok_no_full_control"
@ -115,11 +115,8 @@ ApplicationWindow
{
text: "Paste Link"
onTriggered:
{
clipboardWrap.selectAll()
clipboardWrap.paste()
handleIntentUri(clipboardWrap.text)
}
handleIntentUri(ClipboardWrapper.getFromClipBoard())
enabled: mainWindow.coreReady
}
MenuItem
@ -368,17 +365,16 @@ ApplicationWindow
{
text: qsTr("%1 key imported").arg(
contactImportPopup.expectedName)
horizontalAlignment: parent.horizontalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
Text
{
text: qsTr("Link malformed!")
color: "red"
visible: contactImportPopup.visible &&
!contactImportPopup.idMatch()
horizontalAlignment: parent.horizontalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
Text
@ -387,10 +383,9 @@ ApplicationWindow
qsTr("Expected id and real one differs:") +
"<br/><pre>" + contactImportPopup.expectedGxsId +
"<br/>" + contactImportPopup.realGxsId + "</pre>"
visible: contactImportPopup.visible &&
!contactImportPopup.idMatch()
horizontalAlignment: parent.horizontalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
}
@ -427,6 +422,4 @@ ApplicationWindow
onTriggered: linkCopiedPopup.close()
}
}
TextField { id: clipboardWrap; visible: false }
}