Merge branch 'staged' into dev

.clang-format

@@ -142,4 +142,7 @@ StatementMacros:
   - QT_REQUIRE_VERSION
 UseCRLF: false
 UseTab: Never
+---
+Language: ObjC
+BasedOnStyle: WebKit
 ...

.clang-tidy

@@ -17,7 +17,6 @@ Checks: >
   portability-*,
   readability-*,
   -bugprone-easily-swappable-parameters,
-  -bugprone-reserved-identifier,
   -cppcoreguidelines-owning-memory,
   -cppcoreguidelines-prefer-member-initializer,
   -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
@@ -26,6 +25,7 @@ Checks: >
   -google-default-arguments,
   -google-readability-casting,
   -hicpp-deprecated-headers,
+  -hicpp-no-array-decay,
   -misc-const-correctness,
   -misc-include-cleaner,
   -misc-non-private-member-variables-in-classes,
@@ -43,5 +43,11 @@ CheckOptions:
     value: 1
   - key: cppcoreguidelines-explicit-virtual-functions.IgnoreDestructors
     value: 1
+  - key: modernize-avoid-c-arrays.AllowStringArrays
+    value: 1
+  - key: cppcoreguidelines-avoid-c-arrays.AllowStringArrays
+    value: 1
+  - key: hicpp-avoid-c-arrays.AllowStringArrays
+    value: 1
 ...
 

.git-blame-ignore-revs

@@ -12,3 +12,9 @@ b5349478cfb0dc2dd0de8c8e8aeebdd24cf7ac6b
 
 # mass apply clang-tidy's readability-braces-around-statements
 a11c9e3aeca4329e1982d8fe26bacbb21ab50ddf
+
+# mass apply clang-tidy's modernize-use-using
+d15081e723756eef053550dc9e06e31d7828dec3
+
+# remove gd::toWString
+c8af0450f1f7f8188004db96e3f53e7e33e2ccad

.github/workflows/Release-all.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-13,macos-14]
-        qt_ver: [ 6.6.3, 6.7.3 ]
+        qt_ver: [ 6.6.3, 6.7.2 ]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -73,7 +73,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2022]
-        qt_ver: [ 6.6.3, 6.7.3 ]
+        qt_ver: [ 6.6.3, 6.7.2 ]
     steps:
       - uses: jurplel/install-qt-action@v4
         with:
@@ -147,7 +147,7 @@ jobs:
           if [[ '${{env.prerelease}}' == 'true' ]]
           then
             echo "This is a pre-release"
-            previousTag=$(git tag --sort=-creatordate | grep "^v" | head -n 1)
+            previousTag=$(git tag --sort=-creatordate | grep "^v" | grep -v "Release" | head -n 1)
           else 
             echo "This is not a pre-release"
             previousTag=$(git tag --sort=-creatordate | grep "^v" | grep -v "alpha" | head -n 1)

.github/workflows/auto format.yml

@@ -29,8 +29,7 @@ jobs:
           eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
           brew install clang-format
           (/home/linuxbrew/.linuxbrew/opt/clang-format/bin/git-clang-format --binary=/home/linuxbrew/.linuxbrew/opt/clang-format/bin/clang-format --style=file HEAD^) || true
-
-      - uses: autofix-ci/action@89762f9c25dd85f6b78cd40e521232e403357ec0    
+      - uses: autofix-ci/action@ff86a557419858bb967097bfc916833f5647fa8c
 
 
   css-js-html-format:
@@ -39,16 +38,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 2
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 16
-
       - run: npm ci
-      - run: npx prettier  --write src/stylesheets src/scripts/gd-*.js
-      # Optimize all PNGs with https://pngquant.org/
-      # - run: sudo apt-get update && sudo apt-get install -y pngquant
-      # - name: Run pngquant
-      #   run: |
-      #     shopt -s globstar
-      #     pngquant -f --ext .png --skip-if-larger -- **/*.png
-      - uses: autofix-ci/action@89762f9c25dd85f6b78cd40e521232e403357ec0
+      - run: npx prettier . --write
+      - uses: autofix-ci/action@ff86a557419858bb967097bfc916833f5647fa8c

.prettierignore

@@ -1,2 +1,12 @@
-**/.clang-format
+# ignore all
+/**/*.*
 
+# unignore js and cssfiles
+!**/*.js
+!**/*.css
+
+# reignore other js files
+**/*.min.js
+**/iframe-defer.js
+**/mark.js
+**/darkreader.js

.prettierrc.json

@@ -1 +1 @@
-
+{}

CMakeLists.txt

@@ -192,6 +192,12 @@ endif ()
 
 #### Compile definitions
 
+# Disable deprecated staffs for Qt<=6.7 (Bump this if ever consider bump Qt version)
+target_compile_definitions(${GOLDENDICT} PRIVATE
+        QT_DISABLE_DEPRECATED_UP_TO=0x060700
+        QT_NO_DEPRECATED_WARNINGS
+)
+
 target_compile_definitions(${GOLDENDICT} PUBLIC
         CMAKE_USED_HACK  # temporal hack to avoid breaking qmake build
         MAKE_QTMULTIMEDIA_PLAYER
@@ -266,15 +272,25 @@ if (APPLE)
     set(Assembling_Dir "${CMAKE_BINARY_DIR}/redist")
     set(App_Name "${GOLDENDICT}.app")
     set(Redistributable_APP "${Assembling_Dir}/${App_Name}")
-
+
+    # if anything wrong, delete this and affect lines, and see what's Qt will generate by default.
+    set(QtConfPath "${Redistributable_APP}/Contents/Resources/qt.conf")
+
     qt_generate_deploy_script(
             TARGET ${GOLDENDICT}
             OUTPUT_SCRIPT deploy_script
-            CONTENT "qt_deploy_runtime_dependencies(
+            CONTENT "
+            set(QT_DEPLOY_PREFIX \"${Redistributable_APP}\")
+            set(QT_DEPLOY_TRANSLATIONS_DIR \"Contents/Resources/translations\")
+            qt_deploy_runtime_dependencies(
                         EXECUTABLE \"${Redistributable_APP}\"
                         GENERATE_QT_CONF
-                        NO_APP_STORE_COMPLIANCE
-                )"
+                        NO_APP_STORE_COMPLIANCE)
+            qt_deploy_translations()
+            qt_deploy_qt_conf(\"${QtConfPath}\"
+                         PLUGINS_DIR PlugIns
+                         TRANSLATIONS_DIR Resources/translations)
+            "
     )
 
     install(TARGETS ${GOLDENDICT} BUNDLE DESTINATION "${Assembling_Dir}")

README.md

@@ -4,9 +4,7 @@
 [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=xiaoyifang_goldendict&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=xiaoyifang_goldendict)
 [![Build](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/PR-check-cmake.yml/badge.svg)](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/PR-check-cmake.yml)
 
-The Next Generation GoldenDict. A feature-rich open-source dictionary lookup program,
-supporting [multiple dictionary formats](https://xiaoyifang.github.io/goldendict-ng/dictformats/) and online
-dictionaries.
+GoldenDict-ng is an advanced dictionary lookup program, supporting [many formats](https://xiaoyifang.github.io/goldendict-ng/dictformats/).
 
 | Linux | Windows | macOS |
 |--|--|--|
@@ -20,7 +18,7 @@ dictionaries.
 
 [General discussions](https://github.com/xiaoyifang/goldendict-ng/discussions)
 
-# Some significant features of this fork
+# Some features compared to the original GoldenDict
 
 - webengine with latest html/css feature support
 - support >4GB dictionary

icons/readme.txt → icons/README.txt

@@ -1,79 +1,79 @@
-issue: https://github.com/goldendict/goldendict/issues/1441
-
-http://tango.freedesktop.org/Tango_Desktop_Project GPLv3
-list:
-internet.svg
-home.svg
-configure.svg
-fileopen.svg
-addtab.svg
-wizard.svg
-fulltext
-text2speech
-reload 
-icons/print.svg
-icons/programs.svg
-error
-star.svg
-star_blue.svg
-network.svg
-hotkeys
-previous
-next
-advanced
-windows-list
-filesave
-playsound_color
-interface
-webdict
-transliteration
-closetab
-folder
-reload
-menu.svg
-
-https://packages.debian.org/bullseye/gnome-icon-theme GPLv3
-lists:
-clear
-
-https://commons.wikimedia.org/wiki/File:Accessories-dictionary.svg
-lists:
-icon32_sdict.svg 
-
-
-https://freesvg.org/pushpin-vector-image  public domain 
-lists:
-pushbin
-
-
-https://commons.wikimedia.org/wiki/File:Arrow_bottom_svg.svg  license:public domain
-lists:
-1downarrow
-
-
-these two icons from sertoli @  https://forum.freemdict.com/u/sertoli/summary
-playsound.png
-playsound_full.png
-
-
-LGPL
-icon32_zoombase.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-page-zoom-icon.png
-icon32_zoomout.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-zoom-out-icon.png
-icon32_zoomin.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-zoom-in-icon.png
-reload.png https://iconarchive.com/show/oxygen-icons-by-oxygen-icons.org/Actions-edit-redo-icon.html
-advanced.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-system-run-icon.png
-sources.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Apps-plasma-icon.png
-
-book.svg https://github.com/johnfactotum/foliate
-
-
-lingualibre.svg https://en.m.wikipedia.org/wiki/File:Lingualibre-logo-no-text.svg
-
-
-Apache License Version 2.0
-1downarrow.svg
-system-search.svg
-Modified from  https://github.com/google/material-design-icons
-
-add-anki-icon.svg   MIT license
+issue: https://github.com/goldendict/goldendict/issues/1441
+
+http://tango.freedesktop.org/Tango_Desktop_Project GPLv3
+list:
+internet.svg
+home.svg
+configure.svg
+fileopen.svg
+addtab.svg
+wizard.svg
+fulltext
+text2speech
+reload 
+icons/print.svg
+icons/programs.svg
+error
+star.svg
+star_blue.svg
+network.svg
+hotkeys
+previous
+next
+advanced
+windows-list
+filesave
+playsound_color
+interface
+webdict
+transliteration
+closetab
+folder
+reload
+menu.svg
+
+https://packages.debian.org/bullseye/gnome-icon-theme GPLv3
+lists:
+clear
+
+https://commons.wikimedia.org/wiki/File:Accessories-dictionary.svg
+lists:
+icon32_sdict.svg 
+
+
+https://freesvg.org/pushpin-vector-image  public domain 
+lists:
+pushbin
+
+
+https://commons.wikimedia.org/wiki/File:Arrow_bottom_svg.svg  license:public domain
+lists:
+1downarrow
+
+
+these two icons from sertoli @  https://forum.freemdict.com/u/sertoli/summary
+playsound.png
+playsound_full.png
+
+
+LGPL
+icon32_zoombase.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-page-zoom-icon.png
+icon32_zoomout.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-zoom-out-icon.png
+icon32_zoomin.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-zoom-in-icon.png
+reload.png https://iconarchive.com/show/oxygen-icons-by-oxygen-icons.org/Actions-edit-redo-icon.html
+advanced.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-system-run-icon.png
+sources.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Apps-plasma-icon.png
+
+book.svg https://github.com/johnfactotum/foliate
+
+
+lingualibre.svg https://en.m.wikipedia.org/wiki/File:Lingualibre-logo-no-text.svg
+
+
+Apache License Version 2.0
+1downarrow.svg
+system-search.svg
+Modified from  https://github.com/google/material-design-icons
+
+add-anki-icon.svg   MIT license
 https://www.svgrepo.com/svg/435992/add-card