Merge branch '1.4.0'

Author: kefir500

.appveyor.yml

@@ -1,5 +1,14 @@
 image: Visual Studio 2017
 
+environment:
+  matrix:
+    - NAME: MSI
+      SCRIPT: msi/build.msi.bat
+      ARTIFACT: scripts\win32\packages\msi\wix\bin\apk-editor-studio_win32_dev.msi
+    - NAME: ZIP
+      SCRIPT: zip/build.zip.bat
+      ARTIFACT: scripts\win32\packages\zip\apk-editor-studio_win32_dev.zip
+
 install:
   - set QTDIR=C:\Qt\5.13.2\msvc2017
   - set MAKE=C:\Qt\Tools\QtCreator\bin\jom.exe
@@ -15,14 +24,11 @@ before_build:
   - cd scripts\win32\packages
 
 build_script:
-  - call msi/build.msi.bat
-  - call zip/build.zip.bat
+  - call %SCRIPT%
 
 artifacts:
-  - path: scripts\win32\packages\msi\wix\bin\apk-editor-studio_win32_dev.msi
-    name: APK Editor Studio - Windows Installer (MSI)
-  - path: scripts\win32\packages\zip\apk-editor-studio_win32_dev.zip
-    name: APK Editor Studio - Windows Portable (ZIP)
+  - path: $(ARTIFACT)
+    name: $(NAME)
 
 deploy:
   - provider: GitHub

.gitignore

@@ -32,4 +32,3 @@ Makefile*
 moc_*.cpp
 moc_*.h
 qrc_*.cpp
-!res/deploy/linux/bin/

.travis.yml

@@ -6,27 +6,33 @@ before_script:
 
 matrix:
   include:
-  - os: linux
+  - name: Linux (DEB)
+    os: linux
+    compiler: gcc
+    install:
+      - sudo apt-get install qt5-default qttools5-dev-tools libsecret-1-dev debhelper devscripts fakeroot
+    script:
+      - scripts/linux/packages/deb/build.deb.sh
+
+  - name: Linux (AppImage)
+    os: linux
     compiler: gcc
     before_install:
       - sudo add-apt-repository ppa:beineri/opt-qt-5.10.1-xenial -y
       - sudo apt-get update -qq
     install:
-      - sudo apt-get install qt5-default qttools5-dev-tools libsecret-1-dev dh-make devscripts fakeroot
-      - sudo apt-get install qt510base qt510imageformats qt510svg qt510tools libgl1-mesa-dev
-    script:
-      - cd scripts/linux/packages
-      - tar.xz/build.tar.xz.sh
-      - deb/build.deb.sh
+      - sudo apt-get install qt510base qt510imageformats qt510svg qt510tools libgl1-mesa-dev libsecret-1-dev adb zipalign
       - source /opt/qt510/bin/qt510-env.sh
-      - appimage/build.appimage.sh
-      - cd -
-  - os: osx
+    script:
+      - scripts/linux/packages/appimage/build.appimage.sh
+
+  - name: macOS
+    os: osx
+    compiler: clang
     install:
-      - brew update
-      - brew install qt
+      - brew uninstall --ignore-dependencies qt
+      - brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/a3e89f6b3fcfd6f4240360053b0f730e8ce4a74d/Formula/qt.rb
       - brew link qt --force
-      - brew upgrade python
       - nvm install node
       - npm i appdmg
     script:
@@ -43,7 +49,6 @@ deploy:
   api_key:
     secure: "WtUyLKiBPfQsGQo5Mg/SfdyPoUhsrx0bMMNOw21PO2I8GYeMrwq/SiWjS9kDdUaQ1rZ2EHq25nAiX5Ndcw3Am6ivrHvKpu9nbCeTZ+d5GQ9d2YjE3yHushpGbVZ5z1yy9dg4QBEN55Vo4OLTe5HsaYFW1QKIebHUCA3l0O7u/h8wdM3qtiNdb0I1RTsqvdARtZiUpY0843k1Mni4j2RIzrepEpZsv42/rcsomJ+8A/DoMss+AIv1eySyxD3uZuKVFpUEofCNOhU0ZR3B4MQlf6gtc290H4fOJpjYnEACI+ZM9XlLX2AououJbTSsDuJo1w7e/Pw6hNIp+7qEyS5zkGHrqVfP3LldMtPCf8EJymSUlIo1XeSjXAkJ8RHcHASP5u2N85mO0MibFPwB0zQwxReh1OYGM4aDF83LtKYJsDHjV8vv1EjpRcKOxfI0YBD9VaTjvY/ReYFKdTtN+hKh6pGF+1dRsWts9nId+r16ItiLCUE8k/97a2VCBpygDs7JhvuHperlD2dixnqw9YYZZ204hUVZPF+mImx3zEJXmkXsunmX174G1nEMQnAWHK+SVRX2MAE0PEJeuBlAPWVPZDmv08CV+e1qHvboFlEw5WrYqJcKfC1gyqyKipAer+6zH7Ke9iCsnqL9zRlpnXgIbXubgCLMOyLa5FXHb2RgkpE="
   file:
-    - "scripts/linux/packages/tar.xz/apk-editor-studio_linux_dev.tar.xz"
     - "scripts/linux/packages/appimage/apk-editor-studio_linux_dev.AppImage"
     - "scripts/linux/packages/deb/apk-editor-studio_linux_dev.deb"
     - "scripts/macos/packages/app/apk-editor-studio_macos_dev.app.zip"
@@ -54,7 +59,5 @@ deploy:
   overwrite: true
   skip_cleanup: true
   on:
-    branch:
-      - master
-      - /^\d+\.\d+\.\d+$/
-    tags: false
+    all_branches: true
+    condition: $TRAVIS_BRANCH =~ ^(master|[0-9]+\.[0-9]+\.[0-9]+)$

AUTHORS.md

@@ -1 +1 @@
-1.3.1
+1.4.0

README.md

@@ -4,13 +4,13 @@ QT += core gui widgets xml network
 CONFIG += c++11
 
 TARGET = apk-editor-studio
-VERSION = 1.3.1
+VERSION = 1.4.0
 CI = $$(CI)
 
 QMAKE_TARGET_PRODUCT = APK Editor Studio
 QMAKE_TARGET_COMPANY = Alexander Gorishnyak
 QMAKE_TARGET_DESCRIPTION = APK Editor Studio v$$VERSION
-QMAKE_TARGET_COPYRIGHT = Copyright (C) 2019
+QMAKE_TARGET_COPYRIGHT = Copyright (C) 2019-2020
 
 DEFINES += APPLICATION='"\\\"$$QMAKE_TARGET_PRODUCT\\\""'
 DEFINES += VERSION=\\\"$$VERSION\\\"
@@ -21,14 +21,18 @@ include($$PWD/lib/qtkeychain/qt5keychain.pri)
 include($$PWD/lib/qtsingleapplication/src/qtsingleapplication.pri)
 include($$PWD/deploy.pri)
 
-TRANSLATIONS += \
+EXTRA_TRANSLATIONS += \
     $$PWD/res/translations/apk-editor-studio.de.ts \
+    $$PWD/res/translations/apk-editor-studio.el.ts \
     $$PWD/res/translations/apk-editor-studio.es.ts \
     $$PWD/res/translations/apk-editor-studio.ja.ts \
+    $$PWD/res/translations/apk-editor-studio.pl.ts \
     $$PWD/res/translations/apk-editor-studio.pt.ts \
-    $$PWD/res/translations/apk-editor-studio.ru.ts
+    $$PWD/res/translations/apk-editor-studio.ro.ts \
+    $$PWD/res/translations/apk-editor-studio.ru.ts \
+    $$PWD/res/translations/apk-editor-studio.tr.ts
 
-updateqm.input = TRANSLATIONS
+updateqm.input = EXTRA_TRANSLATIONS
 updateqm.output = $$PWD/res/deploy/all/resources/translations/${QMAKE_FILE_IN_BASE}.qm
 updateqm.commands = $$[QT_INSTALL_BINS]/lrelease ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
 updateqm.CONFIG += no_link target_predeps

VERSION

@@ -54,8 +54,4 @@ macx {
     QMAKE_POST_LINK += $$executable($$DESTDIR/$${TARGET}.app/Contents/MacOS/adb)
     QMAKE_POST_LINK += $$executable($$DESTDIR/$${TARGET}.app/Contents/MacOS/zipalign)
     QMAKE_INFO_PLIST = $$PWD/res/deploy/macos/Info.plist
-    !equals(CI, true) {
-        QMAKE_MAC_SDK = macosx10.7
-        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
-    }
 }

apk-editor-studio.pro

@@ -1,6 +1,16 @@
 ChangeLog
 =========
 
+version 0.10.0 (release 2019-12-17)
+
+  * Detect XFCE desktop correctly. (Sandro Knauß <hefee@debian.org>)
+  * Windows Use CRED_PERSIST_ENTERPRISE (Olivier Goffart <ogoffart@woboq.com>)
+  * Windows: Improve CredWrite() error handling (Christian Kamm <mail@ckamm.de>)
+  * Fix build with Qt 5.12.x (Sergey Ilinykh <rion4ik@gmail.com>)
+  * Fix Qt 4 build (Robert-André Mauchin <zebob.m@gmail.com>)
+  * Translation: Mandarin (Taiwan) (Poren Chiang <ren.chiang@gmail.com>)
+  * Translation: French (François Revol <revol@free.fr>)
+
 version 0.9.1 (release 2018-08-20)
   * Windows Credential Store: Use CRED_PERSIST_ENTERPRISE (Olivier Goffart <ogoffart@woboq.com>)
   * Secret: Don't match the schema name #114 (Christian Kamm <mail@ckamm.de>)

deploy.pri

@@ -54,6 +54,8 @@ static DesktopEnvironment detectDesktopEnvironment() {
         return DesktopEnv_Unity;
     } else if ( xdgCurrentDesktop == "KDE" ) {
         return getKdeVersion();
+    } else if ( xdgCurrentDesktop == "XFCE" ) {
+        return DesktopEnv_Xfce;
     }
 
     QByteArray desktopSession = qgetenv("DESKTOP_SESSION");
@@ -91,7 +93,7 @@ static bool isKwallet5Available()
     // a wallet can be opened.
 
     iface.setTimeout(500);
-    QDBusMessage reply = iface.call(QStringLiteral("networkWallet"));
+    QDBusMessage reply = iface.call(QLatin1String("networkWallet"));
     return reply.type() == QDBusMessage::ReplyMessage;
 }