From 1ca8ae5393b04c8356a7b10a1c1ab36f853b5698 Mon Sep 17 00:00:00 2001 From: shenlebantongying Date: Sun, 5 May 2024 09:12:03 -0400 Subject: [PATCH] [skip ci] delete staff --- .github/workflows/macos-arm-homebrew.yml | 223 --------------------- .github/workflows/windows.yml | 241 ----------------------- src/ui/translatebox.hh | 1 - 3 files changed, 465 deletions(-) delete mode 100644 .github/workflows/macos-arm-homebrew.yml delete mode 100644 .github/workflows/windows.yml diff --git a/.github/workflows/macos-arm-homebrew.yml b/.github/workflows/macos-arm-homebrew.yml deleted file mode 100644 index ede22e2e9..000000000 --- a/.github/workflows/macos-arm-homebrew.yml +++ /dev/null @@ -1,223 +0,0 @@ -name: macos-arm-homebrew -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true -on: - workflow_dispatch: - push: - branches: - - dev - - master - # - staged - paths-ignore: - - 'docs/**' - # - ".github/**" - - "howto/**" - - "*.md" - - ".clang-format" -jobs: - build: - name: Build - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [flyci-macos-large-latest-m2] - qt_ver: [ 6.6.1 ] - qt_arch: [clang_64] - env: - targetName: GoldenDict - version: 24.01.22 - version-suffix: LoongYear - prerelease: false - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - submodules: true - - name: Set outputs - id: githash - run: | - echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - - - name: install deps on macos - run: | - export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE - brew install cmake ninja - brew install automake - brew install autoconf - brew install libtool - brew install opencc - brew install automake git lame libass libtool shtool texi2html theora wget xvid nasm - - brew install libiconv - brew install lzo bzip2 - brew install libogg - brew install zstd lzip - brew install libvorbis - brew install hunspell - git clone https://github.com/xiaoyifang/eb.git - cd eb && ./configure && make -j 8 && sudo make install && cd .. - # brew install xz - brew install pkg-config - brew install create-dmg - brew install xapian - brew install libzim - - # brew install dylibbundler - git clone https://github.com/xiaoyifang/macdylibbundler.git - cd macdylibbundler - cmake -B build -DCMAKE_BUILD_TYPE=release - cmake --build build --config release - sudo make install - # find /usr/local -name libzstd.1.dylib - # find /usr/local -name liblzma.5.dylib - - name: version-file - shell: bash - env: - VAR_SUFFIX: ${{env.version-suffix}} - VAR_VERSION: ${{env.version}} - run: | - current_tag=$(git rev-parse --short=8 HEAD) - release_date=$(date +'%Y%m%d') - echo "$VAR_VERSION-$VAR_SUFFIX.$release_date.$current_tag">version.txt - cat version.txt - echo "$version" - - - name: Install Qt - uses: jurplel/install-qt-action@v3 - with: - version: ${{ matrix.qt_ver }} - arch: ${{ matrix.qt_arch }} - modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech - - - name: compile - run: | - qmake CONFIG+=release CONFIG+=no_macos_universal CONFIG+=zim_support CONFIG+=use_xapian CONFIG+=no_ffmpeg_player CONFIG+=no_tts_support - make -j8 - - - name: package - run: | - - macdeployqt ${targetName}.app -qmldir=. -verbose=1 - otool -L GoldenDict.app/Contents/MacOS/GoldenDict - - find /opt -name "libicudata.73.dylib" -exec cp {} GoldenDict.app/Contents/Frameworks/ \; - ls -al GoldenDict.app/Contents/Frameworks - - find GoldenDict.app/Contents/Frameworks/ -maxdepth 1 -name "libicu*" -exec ls -al {} \; - find GoldenDict.app/Contents/Frameworks/ -maxdepth 1 -type f -name "libicu*" -exec ls -al {} \; - - find GoldenDict.app/Contents/Frameworks/ -maxdepth 1 -type f -name "libzim*" -exec dylibbundler -of -b -x {} -d GoldenDict.app/Contents/Frameworks/ -p @executable_path/../Frameworks -s /usr/local/ -s /opt/ \; - find GoldenDict.app/Contents/Frameworks/ -maxdepth 1 -name "libicu*" -exec dylibbundler -of -b -x {} -d GoldenDict.app/Contents/Frameworks/ -p @executable_path/../Frameworks -s /usr/local/ -s /opt/ \; - - otool -L GoldenDict.app/Contents/Frameworks/libicu* - otool -L GoldenDict.app/Contents/Frameworks/libzim* - - codesign --force --deep -s - GoldenDict.app - - ls -al GoldenDict.app/Contents/Frameworks - mkdir tmp - mv ${targetName}.app ./tmp - # --background "installer_background.png" - create-dmg --hdiutil-verbose --volname "${targetName} Installer" --volicon "icons/macicon.icns" --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon "${targetName}.app" 200 190 --hide-extension "${targetName}.app" --app-drop-link 600 185 --skip-jenkins "${targetName}.dmg" tmp/ - - name: changelog - id: changelog - run: | - previousTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 2p) - echo "previousTag : $previousTag" - - echo "prev_tag=$previousTag" >> $GITHUB_OUTPUT - echo "curr_tag=$(git tag --sort=-creatordate | grep "^v" | sed -n 1p)" >> $GITHUB_OUTPUT - - - name: Set outputs - id: vars - run: | - echo "sha_short=$(git rev-parse --short=8 HEAD)" >> $GITHUB_OUTPUT - echo "release_date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT - echo "release_time=$(date +'%H%M%S')" >> $GITHUB_OUTPUT - echo "release_time_clock=$(date +'%H:%M:%S')" >> $GITHUB_OUTPUT - echo "release_hm=$(date +'%y%m%d')" >> $GITHUB_OUTPUT - - # tag 上传Release - - name: "Build Changelog" - id: build_changelog - uses: mikepenz/release-changelog-builder-action@v3 - with: - commitMode: false - fromTag: ${{ steps.changelog.outputs.prev_tag }} - toTag: "${{ steps.changelog.outputs.curr_tag }}" - configurationJson: | - { - "template": "#{{CHANGELOG}}\n\n
\n🔴 Uncategorized\n\n#{{UNCATEGORIZED}}\n
", - "categories": [ - { - "title": "## 🚀 Features", - "labels": ["feature","feat","opt"] - }, - { - "title": "## 🐛 Fixes", - "labels": ["fix","bug"] - } - , - { - "title": "## 🤖 Github action", - "labels": ["action"] - } - , - { - "title": "## 🧼 Clean Code", - "labels": ["clean"] - } - - ], - "label_extractor": [ - { - "pattern": "([^:]*):.*", - "target": "$1", - "on_property": "title", - "flags": "gu" - } - ] - } - - name: uploadRelease - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ env.targetName }}.dmg - asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_homebrew_${{steps.vars.outputs.release_date}}.dmg - - tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }} - overwrite: true - release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} - prerelease: ${{env.prerelease}} - body: | - #### Install instructions for Windows, macOS and Linux - - . - - #### Filename pattern (文件名模式): **[Qt version]-GoldenDict-ng-[OS]-[release-date].[ext]** - - Qt6.X is recommended for various enhancements. - - Windows users can use either `****-installer.exe` (for installer) or `****.zip` (unzip and run). - The `goldendict.exe` can be dropped into previous installation's folder (if dependencies aren't changed). - - Linux users can use Flatpak or build from source. - https://flathub.org/apps/io.github.xiaoyifang.goldendict_ng - - macOS users can use `.dmg` installer. - - `6.5.1-GoldenDict.exe_windows-2019_20230701.zip` means built with Qt6.5.1, windows/msvc-2019 at 20230701 as a zip archive. - - #### Build Details - - AppImage: Ubuntu-20.04 - macOS: macOS-12 and macOS-13 - Windows: Visual studio 2019 - based on: ${{github.ref_name}} - - - - #### Changes - - ${{steps.build_changelog.outputs.changelog}} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml deleted file mode 100644 index 55fa95627..000000000 --- a/.github/workflows/windows.yml +++ /dev/null @@ -1,241 +0,0 @@ -name: Windows -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true -on: - workflow_dispatch: - # push: - # branches: - # - dev - # - master - # paths-ignore: - # - 'docs/**' - # - "howto/**" - # - "*.md" - # - ".clang-format" - -jobs: - build: - name: Build - # 运行平台 - # 参考文档 https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [windows-2019] - qt_ver: [5.15.2] - qt_arch: [win64_msvc2019_64] - env: - targetName: GoldenDict.exe - version: 24.02.16 - version-suffix: alpha - prerelease: true - # 步骤 - steps: - # 安装Qt - - name: Install Qt - # 使用外部action。这个action专门用来安装Qt - uses: jurplel/install-qt-action@v3 - with: - # Version of Qt to install - version: ${{ matrix.qt_ver }} - # Target platform for build - # target: ${{ matrix.qt_target }} - arch: ${{ matrix.qt_arch }} - - modules: qtwebengine - # 拉取代码 - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - submodules: true - - - name: changelog - id: changelog - shell: bash - run: | - previousTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 2p) - echo "previousTag : $previousTag" - - - echo "prev_tag=$previousTag" >> $GITHUB_OUTPUT - echo "curr_tag=$(git tag --sort=-creatordate | grep "^v" | sed -n 1p)" >> $GITHUB_OUTPUT - - - name: Set outputs - id: vars - shell: bash - run: | - echo "sha_short=$(git rev-parse --short=8 HEAD)" >> $GITHUB_OUTPUT - echo "release_date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT - echo "release_time=$(date +'%H%M%S')" >> $GITHUB_OUTPUT - echo "release_time_clock=$(date +'%H:%M:%S')" >> $GITHUB_OUTPUT - echo "release_hm=$(date +'%y%m%d')" >> $GITHUB_OUTPUT - - - name: version-file - shell: bash - env: - VAR_SUFFIX: ${{env.version-suffix}} - VAR_VERSION: ${{env.version}} - run: | - current_tag=$(git rev-parse --short=8 HEAD) - release_date=$(date +'%Y%m%d') - echo "$VAR_VERSION-$VAR_SUFFIX.$release_date.$current_tag">version.txt - cat version.txt - echo "$version" - - - uses: ilammy/msvc-dev-cmd@v1 - # msvc编译 - - name: msvc-build goldendict - id: build - shell: cmd - run: | - qmake "CONFIG+=zim_support" CONFIG+=release CONFIG+=use_iconv CONFIG+=use_xapian CONFIG+=no_ffmpeg_player - nmake - - echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV% - echo winSdkVer=%WindowsSdkVersion% >> %GITHUB_ENV% - echo vcToolsInstallDir=%VCToolsInstallDir% >> %GITHUB_ENV% - echo vcToolsRedistDir=%VCToolsRedistDir% >> %GITHUB_ENV% - echo QTDIR=%Qt5_DIR% >> %GITHUB_ENV% - - # 打包 - - name: windows ps package - id: package-windows - env: - archiveName: GoldenDict-Windows.${{ steps.vars.outputs.sha_short }}-${{ steps.vars.outputs.release_time }} - shell: pwsh - run: | - & .github\scripts\windows-publish.ps1 ${env:archiveName} ${env:targetName} - - - name: package - id: package - shell: bash - run: | - packageName=GoldenDict-Windows.${{ steps.vars.outputs.sha_short }}-${{ steps.vars.outputs.release_time }} - echo $packageName - echo "packageName=$packageName" >> $GITHUB_OUTPUT - - - name: "Build Changelog" - id: build_changelog - uses: mikepenz/release-changelog-builder-action@v3 - with: - commitMode: false - fromTag: ${{ steps.changelog.outputs.prev_tag }} - toTag: "${{ steps.changelog.outputs.curr_tag }}" - configurationJson: | - { - "template": "#{{CHANGELOG}}\n\n
\n🔴 Uncategorized\n\n#{{UNCATEGORIZED}}\n
", - "categories": [ - { - "title": "## 🚀 Features", - "labels": ["feature","feat","opt"] - }, - { - "title": "## 🐛 Fixes", - "labels": ["fix","bug"] - } - , - { - "title": "## 🤖 Github action", - "labels": ["action"] - } - , - { - "title": "## 🧼 Clean Code", - "labels": ["clean"] - } - - ], - "label_extractor": [ - { - "pattern": "([^:]*):.*", - "target": "$1", - "on_property": "title", - "flags": "gu" - } - ] - } - - - name: upload goldendict.exe only - # if: startsWith(github.event.ref, 'refs/tags/') - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: release/${{ env.targetName }} - asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }} - - tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }} - overwrite: true - release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} - prerelease: ${{env.prerelease}} - - - - name: copy nsis - shell: bash - run: | - ls -al - cp tools/nsis/GoldenDict.nsi ${{ steps.package.outputs.packageName }}/ - - name: Create installer - uses: joncloud/makensis-action@v4 - with: - arguments: "/V3" - script-file: ${{ steps.package.outputs.packageName }}/GoldenDict.nsi - - name: make installer - run: | - ls *.exe - cd ${{ steps.package.outputs.packageName }} - ls *.exe - - name: upload goldendict installer - # if: startsWith(github.event.ref, 'refs/tags/') - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ steps.package.outputs.packageName }}/GoldenDict-ng-v23-Installer.exe - asset_name: ${{ matrix.qt_ver }}-GoldenDict-ng-Installer.exe - - tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }} - overwrite: true - release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} - prerelease: ${{env.prerelease}} - - name: uploadRelease - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ steps.package.outputs.packageName }}.zip - asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_${{steps.vars.outputs.release_date}}.zip - - tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }} - overwrite: true - release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} - prerelease: ${{env.prerelease}} - body: | - #### Install instructions for Windows, macOS and Linux - - . - - #### Filename pattern (文件名模式): **[Qt version]-GoldenDict-ng-[OS]-[release-date].[ext]** - - Qt6.X is recommended for various enhancements. - - Windows users can use either `****-installer.exe` (for installer) or `****.zip` (unzip and run). - The `goldendict.exe` can be dropped into previous installation's folder (if dependencies aren't changed). - - Linux users can use Flatpak or build from source. - https://flathub.org/apps/io.github.xiaoyifang.goldendict_ng - - macOS users can use `.dmg` installer. - - `6.5.1-GoldenDict.exe_windows-2019_20230701.zip` means built with Qt6.5.1, windows/msvc-2019 at 20230701 as a zip archive. - - #### Build Details - - Flatpak - macOS: macOS-12 and macOS-13 - Windows: Visual studio 2019 - based on: ${{github.ref_name}} - - - - #### Changes - - ${{steps.build_changelog.outputs.changelog}} diff --git a/src/ui/translatebox.hh b/src/ui/translatebox.hh index efa35d06c..e6a3b2b8c 100644 --- a/src/ui/translatebox.hh +++ b/src/ui/translatebox.hh @@ -36,7 +36,6 @@ private slots: private: QLineEdit * translate_line; - bool selectedItem = false; bool m_popupEnabled; QCompleter * completer; QStringList words;