summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2018-09-05 19:15:41 +0200
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2018-12-12 21:35:22 +0100
commit5a6089494b758ee03d9eb92b27b533e827797ec2 (patch)
tree335d9f0d23d35b7008cd1281f7b29247a486c29c
parentf3b41aefb7d1338e309734005af3c7b5e8d352de (diff)
Add a special winstore config flag.
Use it to make "missing GnuPG" message for Windows conditional. When set, remove references to GnuPG downloads to make Windows Store reviewers happy... In all cases, suggest installing Ubuntu from the Store as an alternative.
-rw-r--r--qtpass.pri2
-rw-r--r--src/configdialog.cpp17
2 files changed, 18 insertions, 1 deletions
diff --git a/qtpass.pri b/qtpass.pri
index 535a13c7..8959dd5d 100644
--- a/qtpass.pri
+++ b/qtpass.pri
@@ -63,6 +63,8 @@ isEmpty(QMAKE_LUPDATE) {
}
}
+winstore: DEFINES += "WINSTORE=1"
+
win32 {
RC_FILE = ../windows.rc
static {
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 578f182d..db72fb08 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -565,11 +565,26 @@ void ConfigDialog::wizard() {
if (!gpg.startsWith("wsl ") && !QFile(gpg).exists()) {
criticalMessage(
tr("GnuPG not found"),
+#ifdef Q_OS_WIN
+#ifdef WINSTORE
+ tr("Please install GnuPG on your system.<br>Install "
+ "<strong>Ubuntu</strong> from the Microsoft Store to get it.<br>"
+ "If you already did so, make sure you started it once and<br>"
+ "click \"Autodetect\" in the next dialog.")
+#else
+ tr("Please install GnuPG on your system.<br>Install "
+ "<strong>Ubuntu</strong> from the Microsoft Store<br>or <a "
+ "href=\"https://www.gnupg.org/download/#sec-1-2\">download</a> it "
+ "from GnuPG.org")
+#endif
+#else
tr("Please install GnuPG on your system.<br>Install "
"<strong>gpg</strong> using your favorite package manager<br>or "
"<a "
"href=\"https://www.gnupg.org/download/#sec-1-2\">download</a> it "
- "from GnuPG.org"));
+ "from GnuPG.org")
+#endif
+ );
clean = true;
}