Merge branch 'staged' into dev

.github/workflows/macos-homebrew.yml

@@ -4,17 +4,17 @@ concurrency:
   cancel-in-progress: true
 on: 
   workflow_dispatch:
-  push:
-    branches:
-      - dev
-      - master
-      # - staged
-    paths-ignore:
-      - 'docs/**'
-      - ".github/**"
-      - "howto/**"
-      - "*.md"
-      - ".clang-format"
+  # push:
+  #   branches:
+  #     - dev
+  #     - master
+  #     # - staged
+  #   paths-ignore:
+  #     - 'docs/**'
+  #     - ".github/**"
+  #     - "howto/**"
+  #     - "*.md"
+  #     - ".clang-format"
 jobs:
   build:
     name: Build

.github/workflows/ubuntu-6.2.yml

@@ -8,17 +8,17 @@ on:
   #   workflows: [AutoTag]
   #   types: [completed]
   workflow_dispatch:
-  # push:
-  #   branches:
-  #     - dev
-  #     - master
-  #     # - staged
-  #   paths-ignore:
-  #     - 'docs/**'
-  #     - ".github/**"
-  #     - "howto/**"
-  #     - "*.md"
-  #     - ".clang-format"
+  push:
+    branches:
+      - dev
+      - master
+      # - staged
+    paths-ignore:
+      - 'docs/**'
+      - ".github/**"
+      - "howto/**"
+      - "*.md"
+      - ".clang-format"
 
 jobs:
   build:
@@ -34,13 +34,19 @@ jobs:
       version-suffix: alpha
       prerelease: true
     steps:
+      - uses: actions/setup-python@v3
+        with:
+          python-version: '3.9'              
       - name: Install Qt
         uses: xiaoyifang/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
           arch: ${{ matrix.qt_arch }}
           cached: 'false'
-          modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia  qtimageformats
+          #serialport linuxdeploy need serialport to work.
+          modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtserialport
+          setup-python: 'false'
+          py7zrversion: '==0.18.1'
       - name: ubuntu install thirdparty dependencies
         run: |
           sudo apt-get install git pkg-config build-essential 
@@ -66,16 +72,13 @@ jobs:
           make INSTALL_ROOT=appdir -j`nproc` install; find appdir/
           
           ls -al appdir
-          #copy missing shared dll to appdir.
-          # mkdir -p appdir/usr/lib
-          # cp  $(ldd appdir/usr/bin/goldendict | grep -o '\W/[^ ]*' |grep gobject ) appdir/usr/lib
-          # cp  $(ldd appdir/usr/bin/goldendict | grep -o '\W/[^ ]*' |grep libpango ) appdir/usr/lib
       - name: Build AppImage
         run: |
-          wget -c https://github.com/$(wget -q https://github.com/probonopd/go-appimage/releases -O - | grep "appimagetool-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)
-          chmod +x appimagetool-*.AppImage
-          ./appimagetool-*.AppImage -s deploy appdir/usr/share/applications/*.desktop # Bundle EVERYTHING
-          # ./linuxdeploy-x86_64.AppImage --appdir appdir --output appimage --plugin qt  -i redist/icons/goldendict.png -d redist/org.goldendict.GoldenDict.desktop 
+          wget -c -nv "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage"
+          chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage
+          wget -c -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
+          chmod a+x linuxdeploy-x86_64.AppImage
+          ./linuxdeploy-x86_64.AppImage --appdir appdir --output appimage --plugin qt  -i redist/icons/goldendict.png -d redist/org.goldendict.GoldenDict.desktop 
 
       - name: Generate changelog
         if: ${{!env.prerelease}}

article-style.css

@@ -11,7 +11,6 @@ body
 
 h1,h2,h3,h4,h5,h6 {
   unicode-bidi: plaintext;
-  text-align: start;
 }
 /* This stylesheet is used to highligh current selection when doing a search.
   It changes the default selection color (e.g. blue under Windows, orange under Ubuntu) */
@@ -137,7 +136,6 @@ pre
 div.sdct_h
 {
   unicode-bidi: plaintext;
-  text-align: start;
 }
 
 .sdict_h_wav img

winlibs/lib/msvc/README.md

@@ -1,16 +1,5 @@
-## Prebuilt Libs for GoldenDict's MSVC++ 2012 build
+## Prebuilt Libs for GoldenDict's 
 
-### Prerequisites
+almost all of these are found in the vcpkg
 
-* Visual Studio 2012 (Express Edition should be OK too).
-
-### Libraries
-
-The libraries are built with the **/MD** switch and that's what GoldenDict build expects.
-Some libs are dynamic and some are static, whichever makes more sense.
-Both **x86** and **x64** versions are provided.
-
-### Build
-
-Use the following repository to build these libs yourself:
-[Tvangeste/goldendict-winlibs](https://github.com/Tvangeste/goldendict-winlibs).
+use vcpkg install [lib] and copy the packages into this directory.