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

Merge pull request #873 from shenlebantongying/zim_icon

Browse source 
feat: load and display ZIM dictionary icon
This commit is contained in:
xiaoyifang 2023-06-18 20:04:45 +08:00 committed by GitHub
parent 0b36b846ce feda879a30
commit 7fa6d42c3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/dict/zim.cc
View file

@ -41,6 +41,8 @@
#include <zim/archive.h> #include <zim/archive.h>
#include <zim/entry.h> #include <zim/entry.h>
#include <zim/item.h> #include <zim/item.h>
#include <zim/error.h>
namespace Zim { namespace Zim {
using std::string; using std::string;
@ -275,17 +277,31 @@ void ZimDictionary::loadIcon() noexcept
if ( dictionaryIconLoaded ) if ( dictionaryIconLoaded )
return; return;
// Try to load Original GD's user provided icon
QString fileName = QDir::fromNativeSeparators( getDictionaryFilenames()[ 0 ].c_str() ); QString fileName = QDir::fromNativeSeparators( getDictionaryFilenames()[ 0 ].c_str() );
// Remove the extension // Remove the extension
fileName.chop( 3 ); fileName.chop( 3 );
if ( loadIconFromFile( fileName ) ) {
if( !loadIconFromFile( fileName ) ) dictionaryIconLoaded = true;
{ return;
// Load failed -- use default icons
dictionaryNativeIcon = dictionaryIcon = QIcon(":/icons/icon32_zim.png");
} }
// Try to load zim's illustration, which is usually 48x48 png
try {
auto illustration = df.getIllustrationItem( 48 ).getData();
QImage img = QImage::fromData( reinterpret_cast< const uchar * >( illustration.data() ), illustration.size() );
dictionaryNativeIcon = dictionaryIcon = QIcon( QPixmap::fromImage( img ) );
dictionaryIconLoaded = true;
return;
}
catch ( zim::EntryNotFound & e ) {
gdDebug( "ZIM icon not loaded for: %s", dictionaryName.c_str() );
}
// Fallback to default icon
dictionaryNativeIcon = dictionaryIcon = QIcon( ":/icons/icon32_zim.png" );
dictionaryIconLoaded = true; dictionaryIconLoaded = true;
} }