QRouland/UTPass
1
0
Fork 0
mirror of https://github.com/QRouland/UTPass.git synced 2025-01-24 07:36:39 +00:00
Code Issues Wiki Activity

Fix am issue with page stack titles when navigationg the password list

Browse Source
This commit is contained in:
Quentin Rouland 2025-01-14 13:57:29 +01:00
parent fd3ab95b27
commit 00116aea8c
6 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Pass/pass.cpp
View File

@ -39,7 +39,7 @@ void Pass::show(QUrl url)
emit decryptCanceled(); emit decryptCanceled();
} else { } else {
qInfo() << "Decrypt OK"; qInfo() << "Decrypt OK";
emit decrypted(decrypt_ret.second); emit decrypted(url.fileName(), decrypt_ret.second);
} }
} }

2
plugins/Pass/pass.h
View File

@ -15,7 +15,7 @@ private:
QString m_password_store; QString m_password_store;
signals: signals:
void decrypted(QString text); void decrypted(QString name, QString text);
void decryptCanceled(); void decryptCanceled();
void decryptFailed(); void decryptFailed();

34
po/utpass.qrouland.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: utpass.qrouland\n" "Project-Id-Version: utpass.qrouland\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-01-14 12:17+0100\n" "POT-Creation-Date: 2025-01-14 13:57+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n" "Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: ../qml/components/FileDir.qml:72 #: ../qml/components/FileDir.qml:59
msgid "Decryption failed !" msgid "Decryption failed !"
msgstr "" msgstr ""
@ -67,34 +67,34 @@ msgstr ""
msgid "<b>Maintainer</>" msgid "<b>Maintainer</>"
msgstr "" msgstr ""
#: ../qml/pages/Info.qml:108 #: ../qml/pages/Info.qml:109
msgid "Suggest improvement(s) or report a bug(s)" msgid "Suggest improvement(s) or report a bug(s)"
msgstr "" msgstr ""
#: ../qml/pages/Info.qml:113 #: ../qml/pages/Info.qml:114
msgid "Access to the source code" msgid "Access to the source code"
msgstr "" msgstr ""
#: ../qml/pages/Info.qml:121 #: ../qml/pages/Info.qml:122
msgid "Released under the terms of the GNU GPL v3" msgid "Released under the terms of the GNU GPL v3"
msgstr "" msgstr ""
#: ../qml/pages/Info.qml:130 ../qml/pages/headers/MainHeader.qml:33 #: ../qml/pages/Info.qml:131 ../qml/pages/headers/MainHeader.qml:33
msgid "Info" msgid "Info"
msgstr "" msgstr ""
#: ../qml/pages/PasswordList.qml:26 #: ../qml/pages/PasswordList.qml:22
msgid "" msgid ""
"No password found<br>You can import a password store by cloning or importing " "No password found<br>You can import a password store by cloning or importing "
"a zip in the settings" "a zip in the settings"
msgstr "" msgstr ""
#: ../qml/pages/PasswordList.qml:65 #: ../qml/pages/PasswordList.qml:61
msgid "Back" msgid "Back"
msgstr "" msgstr ""
#: ../qml/pages/headers/MainHeader.qml:9 ../qml/pages/headers/StackHeader.qml:9 #: ../qml/pages/PasswordList.qml:68 ../qml/pages/headers/MainHeader.qml:9
#: UTPass.desktop.in.h:1 #: ../qml/pages/headers/StackHeader.qml:9 UTPass.desktop.in.h:1
msgid "UTPass" msgid "UTPass"
msgstr "" msgstr ""
@ -126,7 +126,7 @@ msgstr ""
#: ../qml/pages/settings/ImportGitClone.qml:91 #: ../qml/pages/settings/ImportGitClone.qml:91
#: ../qml/pages/settings/ImportZip.qml:62 #: ../qml/pages/settings/ImportZip.qml:62
#: ../qml/pages/settings/InfoKeys.qml:117 #: ../qml/pages/settings/InfoKeys.qml:122
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
@ -172,27 +172,27 @@ msgstr ""
msgid "Key ID :" msgid "Key ID :"
msgstr "" msgstr ""
#: ../qml/pages/settings/InfoKeys.qml:72 #: ../qml/pages/settings/InfoKeys.qml:73
msgid "Users IDs : " msgid "Users IDs : "
msgstr "" msgstr ""
#: ../qml/pages/settings/InfoKeys.qml:96 #: ../qml/pages/settings/InfoKeys.qml:99
msgid "Delete this key" msgid "Delete this key"
msgstr "" msgstr ""
#: ../qml/pages/settings/InfoKeys.qml:116 #: ../qml/pages/settings/InfoKeys.qml:121
msgid "You're are about to delete<br>%1<br>Continue ?" msgid "You're are about to delete<br>%1<br>Continue ?"
msgstr "" msgstr ""
#: ../qml/pages/settings/InfoKeys.qml:134 #: ../qml/pages/settings/InfoKeys.qml:139
msgid "Key removal failed !" msgid "Key removal failed !"
msgstr "" msgstr ""
#: ../qml/pages/settings/InfoKeys.qml:143 #: ../qml/pages/settings/InfoKeys.qml:148
msgid "Key successfully deleted !" msgid "Key successfully deleted !"
msgstr "" msgstr ""
#: ../qml/pages/settings/InfoKeys.qml:154 #: ../qml/pages/settings/InfoKeys.qml:159
msgid "Info Keys" msgid "Info Keys"
msgstr "" msgstr ""

15
qml/components/FileDir.qml
View File

@ -8,10 +8,6 @@ import QtQuick 2.4
Component { Component {
Rectangle { Rectangle {
id: fileDir
property string activePasswordName
anchors.right: parent.right anchors.right: parent.right
anchors.left: parent.left anchors.left: parent.left
height: units.gu(5) height: units.gu(5)
@ -40,17 +36,8 @@ Component {
if (fileIsDir) { if (fileIsDir) {
folderModel.folder = folderModel.folder + "/" + fileName; folderModel.folder = folderModel.folder + "/" + fileName;
backAction.visible = true; backAction.visible = true;
passwordListHeader.title = fileName;
} else { } else {
fileDir.activePasswordName = fileBaseName;
Pass.onDecrypted.connect(function(text) {
pageStack.push(Qt.resolvedUrl("../pages/Password.qml"), {
"plainText": text,
"title": fileDir.activePasswordName
});
});
Pass.onDecryptFailed.connect(function() {
PopupUtils.open(passwordPageDecryptError);
});
Pass.show(folderModel.folder + "/" + fileName); Pass.show(folderModel.folder + "/" + fileName);
} }
} }

10
qml/pages/Password.qml
View File

@ -49,11 +49,11 @@ Page {
iconName: "back" iconName: "back"
text: "Back" text: "Back"
onTriggered: { onTriggered: {
passwordPage.plainText = ""; // passwordPage.plainText = "";
for (var object in objects) { // for (var object in objects) {
object.text = ""; // object.text = "";
object.destroy(); // object.destroy();
} // }
pageStack.pop(); pageStack.pop();
} }
} }

17
qml/pages/PasswordList.qml
View File

@ -13,6 +13,15 @@ Page {
anchors.fill: parent anchors.fill: parent
Component.onCompleted: { Component.onCompleted: {
passwordStorePath = "file:" + Pass.password_store; passwordStorePath = "file:" + Pass.password_store;
Pass.onDecrypted.connect(function(filename, text) {
pageStack.push(Qt.resolvedUrl("../pages/Password.qml"), {
"plainText": text,
"title": filename
});
});
Pass.onDecryptFailed.connect(function() {
PopupUtils.open(passwordPageDecryptError);
});
} }
Rectangle { Rectangle {
@ -66,9 +75,13 @@ Page {
visible: false visible: false
onTriggered: { onTriggered: {
folderModel.folder = folderModel.parentFolder; folderModel.folder = folderModel.parentFolder;
if (folderModel.rootFolder === folderModel.folder) console.debug(folderModel.folder);
if (folderModel.rootFolder === folderModel.folder) {
backAction.visible = false; backAction.visible = false;
passwordListHeader.title = i18n.tr("UTPass");
} else {
passwordListHeader.title = folderModel.folder;
}
} }
} }
] ]