summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2019-04-18 16:40:06 +0200
committerGitHub <noreply@github.com>2019-04-18 16:40:06 +0200
commit5759b50f9dc3a5424e39ad3410f3bdcf95301cb7 (patch)
treef7c9e5993f8da10c260ebee4e808370fbbf390f4
parent0789259aa59a565ba6c899a8c4e8da88fd5f5637 (diff)
parentd483e98152c64a2d9a6458f634e3c9f14133b96e (diff)
Merge pull request #425 from IJHack/clang-tidy-clazy
Semi-automatic code cleanup
-rw-r--r--CHANGELOG.md3
-rw-r--r--FAQ.md2
-rw-r--r--README.md2
-rw-r--r--localization/localization_ar_MA.ts36
-rw-r--r--localization/localization_ca.ts36
-rw-r--r--localization/localization_cs_CZ.ts36
-rwxr-xr-xlocalization/localization_de_DE.ts40
-rwxr-xr-xlocalization/localization_de_LU.ts40
-rw-r--r--localization/localization_el_GR.ts36
-rw-r--r--localization/localization_en_GB.ts36
-rw-r--r--localization/localization_en_US.ts36
-rw-r--r--localization/localization_es_ES.ts40
-rw-r--r--localization/localization_fr_BE.ts36
-rw-r--r--localization/localization_fr_FR.ts36
-rw-r--r--localization/localization_fr_LU.ts36
-rw-r--r--localization/localization_gl_ES.ts36
-rw-r--r--localization/localization_he_IL.ts36
-rw-r--r--localization/localization_hu_HU.ts36
-rw-r--r--localization/localization_it_IT.ts36
-rw-r--r--localization/localization_lb_LU.ts36
-rw-r--r--localization/localization_nl.ts36
-rw-r--r--localization/localization_pl_PL.ts36
-rw-r--r--localization/localization_pt_PT.ts36
-rw-r--r--localization/localization_ru_RU.ts40
-rw-r--r--localization/localization_sv_SE.ts40
-rw-r--r--localization/localization_zh_CN.ts36
-rw-r--r--main/main.cpp12
-rwxr-xr-xrelease-mac3
-rw-r--r--src/configdialog.cpp19
-rw-r--r--src/executor.cpp5
-rw-r--r--src/filecontent.cpp2
-rw-r--r--src/imitatepass.cpp9
-rw-r--r--src/imitatepass.h2
-rw-r--r--src/keygendialog.cpp6
-rw-r--r--src/keygendialog.h2
-rw-r--r--src/mainwindow.cpp16
-rw-r--r--src/pass.cpp2
-rw-r--r--src/passworddialog.cpp6
-rw-r--r--src/qprogressindicator.cpp6
-rw-r--r--src/qpushbuttonasqrcode.cpp6
-rw-r--r--src/qpushbuttonasqrcode.h2
-rw-r--r--src/qtpass.cpp13
-rw-r--r--src/qtpasssettings.cpp4
-rw-r--r--src/realpass.cpp11
-rw-r--r--src/settingsconstants.cpp2
-rw-r--r--src/singleapplication.cpp7
-rw-r--r--src/singleapplication.h2
-rw-r--r--src/storemodel.cpp17
-rw-r--r--src/trayicon.cpp8
-rw-r--r--src/trayicon.h2
-rw-r--r--src/usersdialog.cpp25
-rw-r--r--src/util.cpp14
-rw-r--r--src/util.h2
-rw-r--r--tests/auto/ui/tst_ui.cpp14
-rw-r--r--tests/auto/util/tst_util.cpp6
55 files changed, 657 insertions, 423 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f410aca..2d19a105 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,8 @@
**Merged pull requests:**
+- Use key fingerprint as ID instead of “long” ID. [\#452](https://github.com/IJHack/QtPass/pull/452) ([Natureshadow](https://github.com/Natureshadow))
+- Typo: dialouge to dialogue. [\#444](https://github.com/IJHack/QtPass/pull/444) ([georgjaehnig](https://github.com/georgjaehnig))
- Scripts and logic specific to Windows Store releases [\#439](https://github.com/IJHack/QtPass/pull/439) ([rdoeffinger](https://github.com/rdoeffinger))
- For config check, check that the selected binary is available. [\#438](https://github.com/IJHack/QtPass/pull/438) ([rdoeffinger](https://github.com/rdoeffinger))
- Fix character encoding issues for non-UTF-8 locales. [\#435](https://github.com/IJHack/QtPass/pull/435) ([rdoeffinger](https://github.com/rdoeffinger))
@@ -39,6 +41,7 @@
- Support for using WSL binaries on Windows [\#431](https://github.com/IJHack/QtPass/pull/431) ([rdoeffinger](https://github.com/rdoeffinger))
- Bugfixes and Windows compatibility improvements [\#430](https://github.com/IJHack/QtPass/pull/430) ([mrsch](https://github.com/mrsch))
- Update to prevent the installer requesting admin [\#424](https://github.com/IJHack/QtPass/pull/424) ([hughwilliams94](https://github.com/hughwilliams94))
+- Display passwords as QR codes [\#421](https://github.com/IJHack/QtPass/pull/421) ([frawi](https://github.com/frawi))
- Tested working on Mac Os HS with pinentry-mac [\#419](https://github.com/IJHack/QtPass/pull/419) ([riccardocossu](https://github.com/riccardocossu))
- Dutch \(nl\) translation improvements [\#418](https://github.com/IJHack/QtPass/pull/418) ([equaeghe](https://github.com/equaeghe))
- Bugfixes [\#413](https://github.com/IJHack/QtPass/pull/413) ([rdoeffinger](https://github.com/rdoeffinger))
diff --git a/FAQ.md b/FAQ.md
index b5db83e8..ab357c29 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -43,6 +43,8 @@ fi
* On some esotheric systems it might be necessary to create a symbolic
link `/usr/bin/pinentry` to your pinentry application of choice
eg: `ln -s /usr/bin/pinentry-qt5 /usr/bin/pinentry`
+* On MacOs `pinentry-program /usr/local/bin/pinentry-mac` works after installing `pinentry-mac` from homebrew.
+
### I have an other issue with gpg
diff --git a/README.md b/README.md
index 9e93862f..c7072113 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ Windows
At runtime the only real dependency is `gpg2` but to make the most of it, you'll need `git` and `pass` too.
Your GPG has to be set-up with a graphical pinentry when applicable, same goes for git authentication.
-On Mac OS X this currently seems to only work with MacGPG2 from gpgtools or pinentry-mac from homebrew.
+On Mac OS X this currently seems to only work best with `pinentry-mac` from homebrew, although gpgtools works too.
On most unix systems all you need is:
```
diff --git a/localization/localization_ar_MA.ts b/localization/localization_ar_MA.ts
index 3298de5d..e944ae0c 100644
--- a/localization/localization_ar_MA.ts
+++ b/localization/localization_ar_MA.ts
@@ -321,12 +321,17 @@ email</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>Pass OTP extension needs to be installed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+5"/>
+ <source>qrencode needs to be installed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
<source>No Clipboard</source>
<translation type="unfinished"></translation>
</message>
@@ -341,7 +346,7 @@ email</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+418"/>
+ <location line="+419"/>
<source>No profile selected</source>
<translation type="unfinished"></translation>
</message>
@@ -351,7 +356,7 @@ email</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+65"/>
<source>GnuPG not found</source>
<translation type="unfinished"></translation>
</message>
@@ -395,11 +400,16 @@ email</source>
<source>Autodetect</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location/>
+ <source>Use qrencode</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ImitatePass</name>
<message>
- <location filename="../src/imitatepass.cpp" line="+94"/>
+ <location filename="../src/imitatepass.cpp" line="+95"/>
<location line="+203"/>
<source>Can not edit</source>
<translation type="unfinished"></translation>
@@ -551,7 +561,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location/>
- <location filename="../src/mainwindow.cpp" line="+903"/>
+ <location filename="../src/mainwindow.cpp" line="+904"/>
<source>Edit</source>
<translation type="unfinished"></translation>
</message>
@@ -655,12 +665,12 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+4"/>
- <location line="+641"/>
+ <location line="+649"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-617"/>
+ <location line="-625"/>
<source>OTP Code</source>
<translation type="unfinished"></translation>
</message>
@@ -804,7 +814,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>QObject</name>
<message>
- <location filename="../main/main.cpp" line="+83"/>
+ <location filename="../main/main.cpp" line="+84"/>
<source>LTR</source>
<translatorcomment>Flips interface</translatorcomment>
<translation>RTL</translation>
@@ -813,7 +823,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>QtPass</name>
<message>
- <location filename="../src/qtpass.cpp" line="+136"/>
+ <location filename="../src/qtpass.cpp" line="+140"/>
<source>Generating GPG key pair</source>
<translation type="unfinished"></translation>
</message>
@@ -894,7 +904,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>StoreModel</name>
<message>
- <location filename="../src/storemodel.cpp" line="+246"/>
+ <location filename="../src/storemodel.cpp" line="+245"/>
<source>force overwrite?</source>
<translation type="unfinished"></translation>
</message>
@@ -963,7 +973,7 @@ Red entries are not valid, you will not be able to encrypt to these.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/usersdialog.cpp" line="+24"/>
+ <location filename="../src/usersdialog.cpp" line="+25"/>
<source>Can not get key list</source>
<translation type="unfinished"></translation>
</message>
@@ -978,7 +988,7 @@ Red entries are not valid, you will not be able to encrypt to these.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+92"/>
<source>created</source>
<translation type="unfinished"></translation>
</message>
diff --git a/localization/localization_ca.ts b/localization/localization_ca.ts
index 16394839..8d4ce609 100644
--- a/localization/localization_ca.ts
+++ b/localization/localization_ca.ts
@@ -327,12 +327,17 @@ email</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>Pass OTP extension needs to be installed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+5"/>
+ <source>qrencode needs to be installed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
<source>No Clipboard</source>
<translation>Sense porta-retalls</translation>
</message>
@@ -347,7 +352,7 @@ email</translation>
<translation>Copia sota demanda al porta-retalls</translation>
</message>
<message>
- <location line="+418"/>
+ <location line="+419"/>
<source>No profile selected</source>
<translation>Cap perfil seleccionat</translation>
</message>
@@ -357,7 +362,7 @@ email</translation>
<translation>No s&apos;ha seleccionat cap perfil per suprimir</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+65"/>
<source>GnuPG not found</source>
<translation>No s&apos;ha trobat GnuPG</translation>
</message>
@@ -401,11 +406,16 @@ email</translation>
<source>Autodetect</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location/>
+ <source>Use qrencode</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ImitatePass</name>
<message>
- <location filename="../src/imitatepass.cpp" line="+94"/>
+ <location filename="../src/imitatepass.cpp" line="+95"/>
<location line="+203"/>
<source>Can not edit</source>
<translation>No es pot editar</translation>
@@ -564,7 +574,7 @@ Expire-Date: 0
</message>
<message>
<location/>
- <location filename="../src/mainwindow.cpp" line="+903"/>
+ <location filename="../src/mainwindow.cpp" line="+904"/>
<source>Edit</source>
<translation>Edita</translation>
</message>
@@ -748,12 +758,12 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+4"/>
- <location line="+641"/>
+ <location line="+649"/>
<source>Password</source>
<translation>Contrasenya</translation>
</message>
<message>
- <location line="-617"/>
+ <location line="-625"/>
<source>OTP Code</source>
<translation>Codi OTP</translation>
</message>
@@ -963,7 +973,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>QObject</name>
<message>
- <location filename="../main/main.cpp" line="+83"/>
+ <location filename="../main/main.cpp" line="+84"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
@@ -971,7 +981,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>QtPass</name>
<message>
- <location filename="../src/qtpass.cpp" line="+136"/>
+ <location filename="../src/qtpass.cpp" line="+140"/>
<source>Generating GPG key pair</source>
<translation type="unfinished">Generació del parell de claus GPG</translation>
</message>
@@ -1055,7 +1065,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>StoreModel</name>
<message>
- <location filename="../src/storemodel.cpp" line="+246"/>
+ <location filename="../src/storemodel.cpp" line="+245"/>
<source>force overwrite?</source>
<translation>voleu forçar la sobreescriptura?</translation>
</message>
@@ -1127,7 +1137,7 @@ Les entrades vermelles no són vàlides, no podreu xifrar.</translation>
<translation>Mostra les claus inutilitzables</translation>
</message>
<message>
- <location filename="../src/usersdialog.cpp" line="+24"/>
+ <location filename="../src/usersdialog.cpp" line="+25"/>
<source>Can not get key list</source>
<translation type="unfinished">No es pot obtenir la llista de claus</translation>
</message>
@@ -1142,7 +1152,7 @@ Les entrades vermelles no són vàlides, no podreu xifrar.</translation>
<translation type="unfinished">No s&apos;ha trobat la clau a l&apos;anell de claus</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+92"/>
<source>created</source>
<translation>creada</translation>
</message>
diff --git a/localization/localization_cs_CZ.ts b/localization/localization_cs_CZ.ts
index 836ca5ac..dfff6a34 100644
--- a/localization/localization_cs_CZ.ts
+++ b/localization/localization_cs_CZ.ts
@@ -327,12 +327,17 @@ email</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>Pass OTP extension needs to be installed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+5"/>
+ <source>qrencode needs to be installed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
<source>No Clipboard</source>
<translation>Bez schránky</translation>
</message>
@@ -347,7 +352,7 @@ email</translation>
<translation>Na vyžádání zkopírovat do schránky</translation>
</message>
<message>
- <location line="+418"/>
+ <location line="+419"/>
<source>No profile selected</source>
<translation>Nebyl vybrán profil</translation>
</message>
@@ -357,7 +362,7 @@ email</translation>
<translation>Nebyl vybrán profil ke smazání</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+65"/>
<source>GnuPG not found</source>
<translation>GnuPG nenalezeno</translation>
</message>
@@ -401,11 +406,16 @@ email</translation>
<source>Autodetect</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location/>
+ <source>Use qrencode</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ImitatePass</name>
<message>
- <location filename="../src/imitatepass.cpp" line="+94"/>
+ <location filename="../src/imitatepass.cpp" line="+95"/>
<location line="+203"/>
<source>Can not edit</source>
<translation type="unfinished">Nelze upravovat</translation>
@@ -564,7 +574,7 @@ Expire-Date: 0
</message>
<message>
<location/>
- <location filename="../src/mainwindow.cpp" line="+903"/>
+ <location filename="../src/mainwindow.cpp" line="+904"/>
<source>Edit</source>
<translation>Upravit</translation>
</message>
@@ -730,12 +740,12 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+4"/>
- <location line="+641"/>
+ <location line="+649"/>
<source>Password</source>
<translation type="unfinished">Heslo</translation>
</message>
<message>
- <location line="-617"/>
+ <location line="-625"/>
<source>OTP Code</source>
<translation type="unfinished"></translation>
</message>
@@ -941,7 +951,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>QObject</name>
<message>
- <location filename="../main/main.cpp" line="+83"/>
+ <location filename="../main/main.cpp" line="+84"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
@@ -949,7 +959,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>QtPass</name>
<message>
- <location filename="../src/qtpass.cpp" line="+136"/>
+ <location filename="../src/qtpass.cpp" line="+140"/>
<source>Generating GPG key pair</source>
<translation type="unfinished">Generování páru GPG klíčů</translation>
</message>
@@ -1033,7 +1043,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>StoreModel</name>
<message>
- <location filename="../src/storemodel.cpp" line="+246"/>
+ <location filename="../src/storemodel.cpp" line="+245"/>
<source>force overwrite?</source>
<translation type="unfinished"></translation>
</message>
@@ -1105,7 +1115,7 @@ Modře označené záznamy poskytují tajný klíč, vyberte jeden z nich, kter
<translation>Zobrazit nepoužitelné klíče</translation>
</message>
<message>
- <location filename="../src/usersdialog.cpp" line="+24"/>
+ <location filename="../src/usersdialog.cpp" line="+25"/>
<source>Can not get key list</source>
<translation type="unfinished">Nelze získat seznam klíčů</translation>
</message>
@@ -1120,7 +1130,7 @@ Modře označené záznamy poskytují tajný klíč, vyberte jeden z nich, kter
<translation type="unfinished">Klíč nebyl v klíčence nalezen</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+92"/>
<source>created</source>
<translation>vytvořen</translation>
</message>
diff --git a/localization/localization_de_DE.ts b/localization/localization_de_DE.ts
index 0db653d8..07a963fa 100755
--- a/localization/localization_de_DE.ts
+++ b/localization/localization_de_DE.ts
@@ -323,7 +323,7 @@ email</translation>
<translation>Inhalt ausblenden</translation>
</message>
<message>
- <location filename="../src/configdialog.cpp" line="+567"/>
+ <location filename="../src/configdialog.cpp" line="+588"/>
<source>GnuPG not found</source>
<translation>GnuPG nicht gefunden</translation>
</message>
@@ -363,22 +363,27 @@ email</translation>
<translation>Ordner %1 ist kein Passwort Speicher oder wurde noch nicht initialisiert.</translation>
</message>
<message>
- <location line="-115"/>
+ <location line="-128"/>
<source>No profile selected</source>
<translation>Kein Profil ausgewählt</translation>
</message>
<message>
- <location line="-467"/>
+ <location line="-475"/>
<source>System tray is not available</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>Pass OTP extension needs to be installed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+5"/>
+ <source>qrencode needs to be installed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+24"/>
<source>No Clipboard</source>
<translation>Keine Zwischenablage</translation>
</message>
@@ -393,7 +398,7 @@ email</translation>
<translation>Bei Bedarf in Zwischenablage kopieren</translation>
</message>
<message>
- <location line="+419"/>
+ <location line="+420"/>
<source>No profile selected to delete</source>
<translation>Kein Profil zum Löschen ausgewählt</translation>
</message>
@@ -402,11 +407,16 @@ email</translation>
<source>Autodetect</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location/>
+ <source>Use qrencode</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ImitatePass</name>
<message>
- <location filename="../src/imitatepass.cpp" line="+94"/>
+ <location filename="../src/imitatepass.cpp" line="+95"/>
<location line="+203"/>
<source>Can not edit</source>
<translation>Ändern nicht möglich</translation>
@@ -552,7 +562,7 @@ Expire-Date: 0
</message>
<message>
<location/>
- <location filename="../src/mainwindow.cpp" line="+903"/>
+ <location filen