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

Merge branch 'staged' into dev

Browse source
This commit is contained in:
Xiao YiFang 2022-10-11 00:00:58 +08:00
parent 57ae18a081 33c631e4e5
commit cc92a771ca
3 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
article_netmgr.cc
View file

@ -335,7 +335,7 @@ sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::getResource(
QByteArray bytes; QByteArray bytes;
QBuffer buffer(&bytes); QBuffer buffer(&bytes);
buffer.open(QIODevice::WriteOnly); buffer.open(QIODevice::WriteOnly);
dictionaries[ x ]->getIcon().pixmap( 16 ).save(&buffer, "PNG"); dictionaries[ x ]->getIcon().pixmap( 64 ).save(&buffer, "webp");
buffer.close(); buffer.close();
sptr< Dictionary::DataRequestInstant > ico = new Dictionary::DataRequestInstant( true ); sptr< Dictionary::DataRequestInstant > ico = new Dictionary::DataRequestInstant( true );
ico->getData().resize( bytes.size() ); ico->getData().resize( bytes.size() );

10
goldendict.pro
View file

@ -13,15 +13,7 @@ system(git describe --tags --always --dirty): hasGit=1
GIT_HASH=$$system(git rev-parse --short=8 HEAD ) GIT_HASH=$$system(git rev-parse --short=8 HEAD )
} }
win32{ system(echo $${VERSION}.$${GIT_HASH} on $${_DATE_} > version.txt)
# date /T output is locale aware.
DATE=$$system(date /T)
}
else{
DATE=$$system(date '+%Y/%m/%d')
}
system(echo $${VERSION}.$${GIT_HASH} on $${DATE} > version.txt)
!CONFIG( verbose_build_output ) { !CONFIG( verbose_build_output ) {
!win32|*-msvc* { !win32|*-msvc* {

2
headwordsmodel.cpp
View file

@ -2,7 +2,7 @@
#include "wstring_qt.hh" #include "wstring_qt.hh"
HeadwordListModel::HeadwordListModel( QObject * parent ) : HeadwordListModel::HeadwordListModel( QObject * parent ) :
QAbstractListModel( parent ), filtering( false ), index( 0 ), ptr( 0 ) QAbstractListModel( parent ), filtering( false ), totalSize(0), index( 0 ),ptr( 0 )
{ {
} }