hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 15:24:05 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge pull request #1822 from xiaoyifang/staged
Some checks failed
Release AutoTag / Build (push) Has been cancelled
Details
Release macOS / Build (macos-13, clang_64, 6.6.3) (push) Has been cancelled
Details
Release macOS / Build (macos-13, clang_64, 6.7.3) (push) Has been cancelled
Details
Release macOS / Build (macos-14, clang_64, 6.6.3) (push) Has been cancelled
Details
Release macOS / Build (macos-14, clang_64, 6.7.3) (push) Has been cancelled
Details
Release Windows CMake / Build (windows-2022, win64_msvc2019_64, 6.6.3) (push) Has been cancelled
Details
Release Windows CMake / Build (windows-2022, win64_msvc2019_64, 6.7.3) (push) Has been cancelled
Details

Browse source 
merge staged to dev
This commit is contained in:
shenleban tongying 2024-10-12 22:14:01 -04:00 committed by GitHub
parent 66ec040750 40670d8197
commit 9b84bf40cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/PR-check-cmake.yml vendored
View file

@ -17,6 +17,8 @@ jobs:
steps:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install build-essential ninja-build \
libvorbis-dev zlib1g-dev libhunspell-dev x11proto-record-dev \
libxtst-dev liblzo2-dev libbz2-dev \
@ -34,7 +36,6 @@ jobs:
qt6-webengine-dev
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
submodules: false
- name: Run build
run: |
@ -49,7 +50,6 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
submodules: false
- name: Install dependencies
run: |
@ -92,7 +92,6 @@ jobs:
setup-python: 'false'
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
submodules: true
- name: Run build
run: |

6
src/dict/programs.cc
View file

@ -200,7 +200,7 @@ void RunInstance::handleProcessFinished()
QByteArray err = process.readAllStandardError();
if ( !err.isEmpty() ) {
error += "\n\n" + QString::fromLocal8Bit( err );
error += "\n\n" + QString::fromUtf8( err );
}
}
@ -252,8 +252,8 @@ void ProgramDataRequest::instanceFinished( QByteArray output, QString error )
prog_output = QString::fromUtf8( output.data() + 3, output.length() - 3 );
}
else {
// No BOM, assume local 8-bit encoding
prog_output = QString::fromLocal8Bit( output );
// No BOM, assume UTF-8 encoding
prog_output = QString::fromUtf8( output );
}
}
catch ( std::exception & e ) {

2
src/ui/mainwindow.cc
View file

@ -1851,7 +1851,7 @@ ArticleView * MainWindow::createNewTab( bool switchToIt, QString const & name )
connect( view, &ArticleView::zoomOut, this, &MainWindow::zoomout );
connect( view, &ArticleView::saveBookmarkSignal, this, &MainWindow::addBookmarkToFavorite );
connect( ui.searchInPageAction, &QAction::triggered, this, [ this, view ]() {
connect( ui.searchInPageAction, &QAction::triggered, view, [ this, view ]() {
#ifdef Q_OS_MACOS
//workaround to fix macos popup page search Ctrl + F
if ( scanPopup && scanPopup->isActiveWindow() ) {