Merge pull request #439 from rdoeffinger/winstore

Scripts and logic specific to Windows Store releases

3 files changed, 39 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/release-winstore.bat b/release-winstore.bat
new file mode 100644
index 00000000..a6f45ad0
--- /dev/null
+++ b/release-winstore.bat
@@ -0,0 +1,21 @@
+call vcvars64.bat

+jom.exe distclean

+qmake.exe -config release CONFIG+=winstore

+jom.exe clean

+jom.exe

+rmdir /s /q main\release\deploy

+del /q /s main\release\deploy

+mkdir main\release\deploy

+windeployqt.exe --no-compiler-runtime --no-angle --no-opengl-sw main\release\qtpass.exe --dir main\release\deploy

+copy /b /y main\release\qtpass.exe main\release\deploy\qtpass.exe

+copy /b /y "%VSINSTALLDIR%"\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT\concrt140.dll main\release\deploy\concrt140.dll

+copy /b /y "%VSINSTALLDIR%"\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT\msvcp140.dll main\release\deploy\msvcp140.dll

+copy /b /y "%VSINSTALLDIR%"\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT\vcruntime140.dll main\release\deploy\vcruntime140.dll

+

+REM Just a workaround for a bug in the Windows Store validation

+

+mkdir main\release\deploy\Assets

+

+for %%I in (artwork\*.png) do copy /b /y %%I main\release\deploy\Assets

+

+REM DesktopAppConverter.exe -Installer main\release\deploy -AppExecutable qtpass.exe -AppId ReimarDffinger.QtPassApp -PackageName 33893ReimarDffinger.QtPassApp -PackageDisplayName "QtPass App" -AppDisplayName "QtPass App" -Destination . -Publisher CN=7FA184CD-E614-4630-8C10-9BC1E1A38DD7 -PackagePublisherDisplayName "Reimar Döffinger" -Version 1.2.3.0 -MakeAppx

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;
   }