diff --git a/.gitignore b/.gitignore index 3eeac9b..5bf7aab 100644 --- a/.gitignore +++ b/.gitignore @@ -11,12 +11,5 @@ build* *swp scripts -# Third parties ouput dir -libs/third/local - - -# desktop -desktop - -# Test (Not Ready yet !) -tests +# venv +venv diff --git a/clickable.json b/clickable.json deleted file mode 100644 index b46ff8d..0000000 --- a/clickable.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "template": "cmake", - "kill": "UTPass", - "scripts": { - "style": "echo 'Astyle :' && astyle --options=.astylerc main.cpp && astyle --options=.astylerc --recursive 'plugins/*.cpp,*.h' && echo 'QmlFmt :' && qmlfmt -l tests && qmlfmt -w tests && qmlfmt -l qml && qmlfmt -w qml" - }, - "libraries": { - "gpg": { - "template": "cmake", - "make_jobs": 4, - "dependencies_build": [ - "texinfo", - "gpgsm", - "bison" - ] - }, - "quazip": { - "template": "cmake", - "make_jobs": 4 - }, - "libgit2": { - "template": "cmake", - "make_jobs": 4, - "build_args": "-DBUILD_SHARED_LIBS=OFF" - } - } -} diff --git a/clickable.yaml b/clickable.yaml new file mode 100644 index 0000000..b36cf76 --- /dev/null +++ b/clickable.yaml @@ -0,0 +1,23 @@ +clickable_minimum_required: 7 +builder: cmake +kill: UTPass +scripts: + style: >- + echo 'Astyle :' && astyle --options=.astylerc main.cpp && astyle + --options=.astylerc --recursive 'plugins/*.cpp,*.h' && echo 'QmlFmt :' && + qmlfmt -l tests && qmlfmt -w tests && qmlfmt -l qml && qmlfmt -w qml +libraries: + gpg: + builder: cmake + make_jobs: 4 + dependencies_host: + - texinfo + - gpgsm + - bison + quazip: + builder: cmake + make_jobs: 4 + libgit2: + builder: cmake + make_jobs: 4 + build_args: '-DBUILD_SHARED_LIBS=OFF' diff --git a/libs/gpg/CMakeLists.txt b/libs/gpg/CMakeLists.txt index 48e9b2c..2667b32 100644 --- a/libs/gpg/CMakeLists.txt +++ b/libs/gpg/CMakeLists.txt @@ -66,3 +66,5 @@ ExternalProject_Add( BUILD_COMMAND make INSTALL_COMMAND make install ) + +install(TARGETS) diff --git a/libs/gpg/clean.sh b/libs/gpg/clean.sh old mode 100644 new mode 100755 diff --git a/po/utpass.qrouland.pot b/po/utpass.qrouland.pot index e841675..e78f637 100644 --- a/po/utpass.qrouland.pot +++ b/po/utpass.qrouland.pot @@ -1,5 +1,5 @@ -# UTPass -# Copyright (C) 2007 Free Software Foundation, Inc. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the utpass.qrouland package. # FIRST AUTHOR , YEAR. # @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: utpass.qrouland\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 14:01+0000\n" +"POT-Creation-Date: 2023-06-17 21:41-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,60 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../qml/components/FileDir.qml:71 -msgid "Decryption failed !" -msgstr "" - -#: ../qml/dialogs/DoubleValidationDialog.qml:28 -#: ../qml/dialogs/PassphraseDialog.qml:29 -#: ../qml/dialogs/SimpleValidationDialog.qml:19 -msgid "Ok" -msgstr "" - -#: ../qml/dialogs/DoubleValidationDialog.qml:44 -#: ../qml/dialogs/PassphraseDialog.qml:41 -#: ../qml/dialogs/SimpleValidationDialog.qml:30 -msgid "Cancel" -msgstr "" - -#: ../qml/dialogs/ErrorDialog.qml:12 -msgid "Error !" -msgstr "" - -#: ../qml/dialogs/ErrorDialog.qml:15 ../qml/dialogs/SuccessDialog.qml:15 -msgid "OK" -msgstr "" - -#: ../qml/dialogs/PassphraseDialog.qml:7 -msgid "Authentication required" -msgstr "" - -#: ../qml/dialogs/PassphraseDialog.qml:8 -msgid "Enter passphrase:" -msgstr "" - -#: ../qml/dialogs/PassphraseDialog.qml:20 -msgid "passphrase" -msgstr "" - -#: ../qml/dialogs/SuccessDialog.qml:12 -msgid "Success !" -msgstr "" - -#: ../qml/pages/headers/MainHeader.qml:8 ../qml/pages/headers/StackHeader.qml:8 -#: UTPass.desktop.in.h:1 -msgid "UTPass" -msgstr "" - -#: ../qml/pages/headers/MainHeader.qml:23 -msgid "Search" -msgstr "" - -#: ../qml/pages/headers/MainHeader.qml:51 ../qml/pages/settings/Settings.qml:14 -msgid "Settings" -msgstr "" - -#: ../qml/pages/headers/MainHeader.qml:58 ../qml/pages/Info.qml:11 +#: ../qml/pages/Info.qml:11 ../qml/pages/headers/MainHeader.qml:58 msgid "Info" msgstr "" @@ -94,13 +41,32 @@ msgstr "" msgid "Released under the terms of the GNU GPL v3" msgstr "" -#: ../qml/pages/PasswordList.qml:23 -msgid "Back" +#: ../qml/pages/settings/Settings.qml:14 ../qml/pages/headers/MainHeader.qml:51 +msgid "Settings" msgstr "" -#: ../qml/pages/PasswordList.qml:43 -msgid "" -"No password found
You can import a password store zip in the settings" +#: ../qml/pages/settings/Settings.qml:28 +msgid "GPG" +msgstr "" + +#: ../qml/pages/settings/Settings.qml:32 +msgid "Import a GPG key file" +msgstr "" + +#: ../qml/pages/settings/Settings.qml:36 +msgid "Show GPG keys" +msgstr "" + +#: ../qml/pages/settings/Settings.qml:43 +msgid "Password Store" +msgstr "" + +#: ../qml/pages/settings/Settings.qml:47 +msgid "Import a Password Store Zip" +msgstr "" + +#: ../qml/pages/settings/Settings.qml:56 +msgid "Warning: importing delete any exiting Password Store" msgstr "" #: ../qml/pages/settings/ImportKeyFile.qml:17 @@ -160,26 +126,60 @@ msgstr "" msgid "Key successfully deleted !" msgstr "" -#: ../qml/pages/settings/Settings.qml:28 -msgid "GPG" +#: ../qml/pages/PasswordList.qml:23 +msgid "Back" msgstr "" -#: ../qml/pages/settings/Settings.qml:32 -msgid "Import a GPG key file" +#: ../qml/pages/PasswordList.qml:43 +msgid "" +"No password found
You can import a password store zip in the settings" msgstr "" -#: ../qml/pages/settings/Settings.qml:36 -msgid "Show GPG keys" +#: ../qml/pages/headers/StackHeader.qml:8 ../qml/pages/headers/MainHeader.qml:8 +#: UTPass.desktop.in.h:1 +msgid "UTPass" msgstr "" -#: ../qml/pages/settings/Settings.qml:43 -msgid "Password Store" +#: ../qml/pages/headers/MainHeader.qml:23 +msgid "Search" msgstr "" -#: ../qml/pages/settings/Settings.qml:47 -msgid "Import a Password Store Zip" +#: ../qml/components/FileDir.qml:71 +msgid "Decryption failed !" msgstr "" -#: ../qml/pages/settings/Settings.qml:56 -msgid "Warning: importing delete any exiting Password Store" +#: ../qml/dialogs/ErrorDialog.qml:12 +msgid "Error !" +msgstr "" + +#: ../qml/dialogs/ErrorDialog.qml:15 ../qml/dialogs/SuccessDialog.qml:15 +msgid "OK" +msgstr "" + +#: ../qml/dialogs/PassphraseDialog.qml:7 +msgid "Authentication required" +msgstr "" + +#: ../qml/dialogs/PassphraseDialog.qml:8 +msgid "Enter passphrase:" +msgstr "" + +#: ../qml/dialogs/PassphraseDialog.qml:20 +msgid "passphrase" +msgstr "" + +#: ../qml/dialogs/PassphraseDialog.qml:29 +#: ../qml/dialogs/DoubleValidationDialog.qml:28 +#: ../qml/dialogs/SimpleValidationDialog.qml:19 +msgid "Ok" +msgstr "" + +#: ../qml/dialogs/PassphraseDialog.qml:41 +#: ../qml/dialogs/DoubleValidationDialog.qml:44 +#: ../qml/dialogs/SimpleValidationDialog.qml:30 +msgid "Cancel" +msgstr "" + +#: ../qml/dialogs/SuccessDialog.qml:12 +msgid "Success !" msgstr ""