mirror of
https://github.com/QRouland/UTPass.git
synced 2026-01-08 10:46:58 +00:00
Foramtting
This commit is contained in:
@@ -51,22 +51,26 @@ Page {
|
||||
});
|
||||
Pass.onShowFailed.connect(function(code, message) {
|
||||
switch (code) {
|
||||
case 1: // UnexceptedError -> use the default (not translate) rnp error
|
||||
__text_error_description = message;
|
||||
break;
|
||||
case 2: // BadPassphrase
|
||||
__text_error_description = i18n.tr("Bad passphrase");
|
||||
break;
|
||||
case 3: // NoKeyFound
|
||||
__text_error_description = i18n.tr("No valid key found");
|
||||
break;
|
||||
case 3: // DecryptFailed
|
||||
__text_error_description = i18n.tr("Decryption failed");
|
||||
break;
|
||||
default:
|
||||
console.warn("Unhandled error code");
|
||||
__text_error_description = message;
|
||||
break;
|
||||
case 1:
|
||||
// UnexceptedError -> use the default (not translate) rnp error
|
||||
__text_error_description = message;
|
||||
break;
|
||||
case 2:
|
||||
// BadPassphrase
|
||||
__text_error_description = i18n.tr("Bad passphrase");
|
||||
break;
|
||||
case 3:
|
||||
// NoKeyFound
|
||||
__text_error_description = i18n.tr("No valid key found");
|
||||
break;
|
||||
case 3:
|
||||
// DecryptFailed
|
||||
__text_error_description = i18n.tr("Decryption failed");
|
||||
break;
|
||||
default:
|
||||
console.warn("Unhandled error code");
|
||||
__text_error_description = message;
|
||||
break;
|
||||
}
|
||||
PopupUtils.open(passwordPageDecryptError);
|
||||
});
|
||||
@@ -195,10 +199,9 @@ Page {
|
||||
textError: i18n.tr("Decryption failed !")
|
||||
textErrorDescription: __text_error_description
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Timer {
|
||||
id: searchTimer
|
||||
|
||||
|
||||
@@ -9,34 +9,35 @@ import Lomiri.Components.Popups 1.3
|
||||
import Pass 1.0
|
||||
import QtQuick 2.4
|
||||
import Utils 1.0
|
||||
Page {
|
||||
id: importGitClonePage
|
||||
|
||||
property int __gitModeHTTP : 0
|
||||
property int __gitModeHTTP_AUTH : 1
|
||||
Page {
|
||||
// property int __gitModeSSH_KEY : 2
|
||||
|
||||
property int __gitCloneErrorCodeSuccessful : 0
|
||||
property int __gitCloneErrorCodeUnexpectedError : 1
|
||||
property int __gitCloneErrorCodeInvalidUrl : 2
|
||||
property int __gitCloneErrorCodeNoUsername : 3
|
||||
property int __gitCloneErrorCodeAuthentificationError : 4
|
||||
property int __gitCloneErrorCodeUrlTypeDoNotMatchCreds : 5
|
||||
id: importGitClonePage
|
||||
|
||||
property int __gitModeHTTP: 0
|
||||
property int __gitModeHTTP_AUTH: 1
|
||||
property int __gitCloneErrorCodeSuccessful: 0
|
||||
property int __gitCloneErrorCodeUnexpectedError: 1
|
||||
property int __gitCloneErrorCodeInvalidUrl: 2
|
||||
property int __gitCloneErrorCodeNoUsername: 3
|
||||
property int __gitCloneErrorCodeAuthentificationError: 4
|
||||
property int __gitCloneErrorCodeUrlTypeDoNotMatchCreds: 5
|
||||
property string __repoUrl
|
||||
property string __err_message : null
|
||||
property string __err_message: null
|
||||
|
||||
function __loadForm() {
|
||||
// case __gitModeSSH_KEY:
|
||||
// importGitCloneForm.source = Qt.resolvedUrl("../../components/GitCloneSshKey.qml");
|
||||
// break;
|
||||
|
||||
switch (combo.selectedIndex) {
|
||||
case __gitModeHTTP:
|
||||
importGitCloneForm.source = Qt.resolvedUrl("../../components/GitCloneHttp.qml");
|
||||
break;
|
||||
case __gitModeHTTP_AUTH:
|
||||
importGitCloneForm.source = Qt.resolvedUrl("../../components/GitCloneHttpAuth.qml");
|
||||
break;
|
||||
// case __gitModeSSH_KEY:
|
||||
// importGitCloneForm.source = Qt.resolvedUrl("../../components/GitCloneSshKey.qml");
|
||||
// break;
|
||||
case __gitModeHTTP:
|
||||
importGitCloneForm.source = Qt.resolvedUrl("../../components/GitCloneHttp.qml");
|
||||
break;
|
||||
case __gitModeHTTP_AUTH:
|
||||
importGitCloneForm.source = Qt.resolvedUrl("../../components/GitCloneHttpAuth.qml");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,7 +45,8 @@ Page {
|
||||
Git.cloneSucceed.connect(function() {
|
||||
GitSettings.type = combo.selectedIndex;
|
||||
GitSettings.repoUrl = importGitClonePage.__repoUrl;
|
||||
if(GitSettings.type != __gitModeSSH_KEY) { // ensure there no ssh key is kept if swicthing to another git mode
|
||||
if (GitSettings.type != __gitModeSSH_KEY) {
|
||||
// ensure there no ssh key is kept if swicthing to another git mode
|
||||
Utils.rmFile(Git.privKey);
|
||||
Utils.rmFile(Git.pubKey);
|
||||
}
|
||||
@@ -52,24 +54,24 @@ Page {
|
||||
});
|
||||
Git.cloneFailed.connect(function(err_code, msg) {
|
||||
switch (err_code) {
|
||||
case __gitCloneErrorCodeUnexpectedError:
|
||||
__err_message = i18n.tr("An error occurred during the clone operation.");
|
||||
break;
|
||||
case __gitCloneErrorCodeInvalidUrl:
|
||||
__err_message = i18n.tr("Invalid URL for the current clone operation.");
|
||||
break;
|
||||
case __gitCloneErrorCodeNoUsername:
|
||||
__err_message = i18n.tr("Username is missing in the URL.");
|
||||
break;
|
||||
case __gitCloneErrorCodeAuthentificationError:
|
||||
__err_message = i18n.tr("Authentication error, credentials may be invalid.");
|
||||
break;
|
||||
case __gitCloneErrorCodeUrlTypeDoNotMatchCreds:
|
||||
__err_message = i18n.tr("Credentials type does not match the URL for the current clone operation.");
|
||||
break;
|
||||
default:
|
||||
__err_message = msg;
|
||||
break;
|
||||
case __gitCloneErrorCodeUnexpectedError:
|
||||
__err_message = i18n.tr("An error occurred during the clone operation.");
|
||||
break;
|
||||
case __gitCloneErrorCodeInvalidUrl:
|
||||
__err_message = i18n.tr("Invalid URL for the current clone operation.");
|
||||
break;
|
||||
case __gitCloneErrorCodeNoUsername:
|
||||
__err_message = i18n.tr("Username is missing in the URL.");
|
||||
break;
|
||||
case __gitCloneErrorCodeAuthentificationError:
|
||||
__err_message = i18n.tr("Authentication error, credentials may be invalid.");
|
||||
break;
|
||||
case __gitCloneErrorCodeUrlTypeDoNotMatchCreds:
|
||||
__err_message = i18n.tr("Credentials type does not match the URL for the current clone operation.");
|
||||
break;
|
||||
default:
|
||||
__err_message = msg;
|
||||
break;
|
||||
}
|
||||
PopupUtils.open(dialogGitCloneError, importGitClonePage);
|
||||
});
|
||||
@@ -103,7 +105,7 @@ Page {
|
||||
id: combo
|
||||
|
||||
width: parent.width
|
||||
model: ["HTTP", "HTTP AUTH" ] //, "SSH KEY"]
|
||||
model: ["HTTP", "HTTP AUTH"] //, "SSH KEY"]
|
||||
onDelegateClicked: function(i) {
|
||||
timer.setTimeout(function() {
|
||||
__loadForm();
|
||||
@@ -133,28 +135,28 @@ Page {
|
||||
|
||||
width: parent.width
|
||||
onLoaded: {
|
||||
// case __gitModeSSH_KEY:
|
||||
// importGitCloneForm.item.importSshPrivKeyButton.clicked.connect(function() {
|
||||
// pageStack.push(Qt.resolvedUrl("ImportSSHkey.qml"), {
|
||||
// "isPrivateKey": true
|
||||
// });
|
||||
// });
|
||||
// importGitCloneForm.item.importSshPubKeyButton.clicked.connect(function() {
|
||||
// pageStack.push(Qt.resolvedUrl("ImportSSHkey.qml"), {
|
||||
// "isPrivateKey": false
|
||||
// });
|
||||
// });
|
||||
// break;
|
||||
|
||||
importGitCloneForm.item.repoUrlChanged.connect(function(url) {
|
||||
importGitClonePage.__repoUrl = url;
|
||||
});
|
||||
importGitCloneForm.item.setRepoUrl(importGitClonePage.__repoUrl);
|
||||
|
||||
switch (combo.selectedIndex) {
|
||||
case __gitModeHTTP:
|
||||
break;
|
||||
case __gitModeHTTP_AUTH:
|
||||
break;
|
||||
// case __gitModeSSH_KEY:
|
||||
// importGitCloneForm.item.importSshPrivKeyButton.clicked.connect(function() {
|
||||
// pageStack.push(Qt.resolvedUrl("ImportSSHkey.qml"), {
|
||||
// "isPrivateKey": true
|
||||
// });
|
||||
// });
|
||||
// importGitCloneForm.item.importSshPubKeyButton.clicked.connect(function() {
|
||||
// pageStack.push(Qt.resolvedUrl("ImportSSHkey.qml"), {
|
||||
// "isPrivateKey": false
|
||||
// });
|
||||
// });
|
||||
// break;
|
||||
case __gitModeHTTP:
|
||||
break;
|
||||
case __gitModeHTTP_AUTH:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,19 +7,16 @@ import Pass 1.0
|
||||
import QtQuick 2.4
|
||||
import Utils 1.0
|
||||
|
||||
|
||||
|
||||
Page {
|
||||
id: importKeyFilePage
|
||||
|
||||
property var activeTransfer
|
||||
property alias contentPicker : contentPicker
|
||||
|
||||
property string __text_error_description : null
|
||||
|
||||
property alias contentPicker: contentPicker
|
||||
property string __text_error_description: null
|
||||
|
||||
ContentPeerPicker {
|
||||
id: contentPicker
|
||||
|
||||
anchors.top: importKeyHeader.bottom
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.topMargin: importKeyFilePage.header.height
|
||||
@@ -28,43 +25,43 @@ Page {
|
||||
showTitle: false
|
||||
contentType: ContentType.Text
|
||||
handler: ContentHandler.Source
|
||||
|
||||
onPeerSelected: {
|
||||
{
|
||||
importKeyFilePage.contentPicker.peer.selectionType = ContentTransfer.Single;
|
||||
importKeyFilePage.activeTransfer = importKeyFilePage.contentPicker.peer.request();
|
||||
importKeyFilePage.activeTransfer.stateChanged.connect(function() {
|
||||
if (importKeyFilePage.activeTransfer.state === ContentTransfer.Charged) {
|
||||
console.log("Charged");
|
||||
console.log(importKeyFilePage.activeTransfer.items[0].url);
|
||||
Pass.importGPGKey(importKeyFilePage.activeTransfer.items[0].url);
|
||||
Pass.importGPGKeySucceed.connect(function() {
|
||||
Utils.rmFile(importKeyFilePage.activeTransfer.items[0].url);
|
||||
importKeyFilePage.activeTransfer = null;
|
||||
PopupUtils.open(dialogImportKeyPageSucess);
|
||||
});
|
||||
Pass.importGPGKeyFailed.connect(function(err, message) {
|
||||
Utils.rmFile(importKeyFilePage.activeTransfer.items[0].url);
|
||||
importKeyFilePage.activeTransfer = null;
|
||||
switch (code) {
|
||||
case 1: // UnexceptedError -> use the default (not translate) rnp error
|
||||
__text_error_description = message;
|
||||
break;
|
||||
case 2: // BadFormat
|
||||
__text_error_description = i18n.tr("The file is not in a valid key format");
|
||||
break;
|
||||
default:
|
||||
console.warn("Unhandled error code");
|
||||
__text_error_description = message;
|
||||
break;
|
||||
}
|
||||
PopupUtils.open(dialogImportKeyPageError);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
{
|
||||
importKeyFilePage.contentPicker.peer.selectionType = ContentTransfer.Single;
|
||||
importKeyFilePage.activeTransfer = importKeyFilePage.contentPicker.peer.request();
|
||||
importKeyFilePage.activeTransfer.stateChanged.connect(function() {
|
||||
if (importKeyFilePage.activeTransfer.state === ContentTransfer.Charged) {
|
||||
console.log("Charged");
|
||||
console.log(importKeyFilePage.activeTransfer.items[0].url);
|
||||
Pass.importGPGKey(importKeyFilePage.activeTransfer.items[0].url);
|
||||
Pass.importGPGKeySucceed.connect(function() {
|
||||
Utils.rmFile(importKeyFilePage.activeTransfer.items[0].url);
|
||||
importKeyFilePage.activeTransfer = null;
|
||||
PopupUtils.open(dialogImportKeyPageSucess);
|
||||
});
|
||||
Pass.importGPGKeyFailed.connect(function(err, message) {
|
||||
Utils.rmFile(importKeyFilePage.activeTransfer.items[0].url);
|
||||
importKeyFilePage.activeTransfer = null;
|
||||
switch (code) {
|
||||
case 1:
|
||||
// UnexceptedError -> use the default (not translate) rnp error
|
||||
__text_error_description = message;
|
||||
break;
|
||||
case 2:
|
||||
// BadFormat
|
||||
__text_error_description = i18n.tr("The file is not in a valid key format");
|
||||
break;
|
||||
default:
|
||||
console.warn("Unhandled error code");
|
||||
__text_error_description = message;
|
||||
break;
|
||||
}
|
||||
PopupUtils.open(dialogImportKeyPageError);
|
||||
});
|
||||
}
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
onCancelPressed: {
|
||||
pageStack.pop();
|
||||
}
|
||||
@@ -77,13 +74,6 @@ Page {
|
||||
activeTransfer: importKeyFilePage.activeTransfer
|
||||
}
|
||||
|
||||
|
||||
header: StackHeader {
|
||||
id: importKeyHeader
|
||||
|
||||
title: i18n.tr("GPG Key Import")
|
||||
}
|
||||
|
||||
Component {
|
||||
id: dialogImportKeyPageError
|
||||
|
||||
@@ -105,4 +95,11 @@ Page {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
header: StackHeader {
|
||||
id: importKeyHeader
|
||||
|
||||
title: i18n.tr("GPG Key Import")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
import "../../components"
|
||||
import Utils 1.0
|
||||
import Git 1.0
|
||||
|
||||
import Lomiri.Components 1.3
|
||||
import Lomiri.Components.Popups 1.3
|
||||
import Lomiri.Content 1.3
|
||||
import Utils 1.0
|
||||
|
||||
ImportFile {
|
||||
id: importSSHKeyPage
|
||||
@@ -12,27 +11,25 @@ ImportFile {
|
||||
property bool isPrivateKey
|
||||
|
||||
headerTitle: i18n.tr("SSH Key Import")
|
||||
dialogSuccessTxt : i18n.tr("SSH Key successfully imported !")
|
||||
dialogErrorTxt : i18n.tr("SSH Key import failed !")
|
||||
|
||||
dialogSuccessTxt: i18n.tr("SSH Key successfully imported !")
|
||||
dialogErrorTxt: i18n.tr("SSH Key import failed !")
|
||||
contentPicker.onPeerSelected: {
|
||||
{
|
||||
importSSHKeyPage.contentPicker.peer.selectionType = ContentTransfer.Single;
|
||||
importSSHKeyPage.activeTransfer = importSSHKeyPage.contentPicker.peer.request();
|
||||
importSSHKeyPage.activeTransfer.stateChanged.connect(function() {
|
||||
if (importSSHKeyPage.activeTransfer.state === ContentTransfer.Charged) {
|
||||
console.log("Charged");
|
||||
console.log(importSSHKeyPage.activeTransfer.items[0].url);
|
||||
var ret = Git.importSshKey(importSSHKeyPage.activeTransfer.items[0].url, isPrivateKey);
|
||||
Utils.rmFile(importSSHKeyPage.activeTransfer.items[0].url);
|
||||
importSSHKeyPage.activeTransfer = null;
|
||||
if(ret) {
|
||||
PopupUtils.open(importSSHKeyPage.dialogImportKeyPageSucess);
|
||||
} else {
|
||||
PopupUtils.open(importSSHKeyPage.dialogImportKeyPageError);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
{
|
||||
importSSHKeyPage.contentPicker.peer.selectionType = ContentTransfer.Single;
|
||||
importSSHKeyPage.activeTransfer = importSSHKeyPage.contentPicker.peer.request();
|
||||
importSSHKeyPage.activeTransfer.stateChanged.connect(function() {
|
||||
if (importSSHKeyPage.activeTransfer.state === ContentTransfer.Charged) {
|
||||
console.log("Charged");
|
||||
console.log(importSSHKeyPage.activeTransfer.items[0].url);
|
||||
var ret = Git.importSshKey(importSSHKeyPage.activeTransfer.items[0].url, isPrivateKey);
|
||||
Utils.rmFile(importSSHKeyPage.activeTransfer.items[0].url);
|
||||
importSSHKeyPage.activeTransfer = null;
|
||||
if (ret)
|
||||
PopupUtils.open(importSSHKeyPage.dialogImportKeyPageSucess);
|
||||
else
|
||||
PopupUtils.open(importSSHKeyPage.dialogImportKeyPageError);
|
||||
}
|
||||
});
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user