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

GLS: Show alternate neadwords in headword tooltip

Browse source
This commit is contained in:
Abs62 2017-03-20 17:34:42 +03:00
parent a1a8ece42c
commit ffd56c73dc
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gls.cc
View file

@ -507,7 +507,7 @@ private:
/// Loads the article /// Loads the article
void loadArticleText( uint32_t address, void loadArticleText( uint32_t address,
list< string > & headwords, vector< string > & headwords,
string & articleText ); string & articleText );
/// Process resource links (images, audios, etc) /// Process resource links (images, audios, etc)
@ -677,7 +677,7 @@ void GlsDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration
} }
void GlsDictionary::loadArticleText( uint32_t address, void GlsDictionary::loadArticleText( uint32_t address,
list< string > & headwords, vector< string > & headwords,
string & articleText ) string & articleText )
{ {
vector< char > chunk; vector< char > chunk;
@ -764,7 +764,7 @@ void GlsDictionary::loadArticle( uint32_t address,
string & articleText ) string & articleText )
{ {
string articleBody; string articleBody;
list< string > headwords; vector< string > headwords;
loadArticleText( address, headwords, articleBody ); loadArticleText( address, headwords, articleBody );
QString article = QString::fromLatin1( "<div class=\"glsdict\">" ); QString article = QString::fromLatin1( "<div class=\"glsdict\">" );
@ -774,6 +774,17 @@ void GlsDictionary::loadArticle( uint32_t address,
article += "<div class=\"glsdict_headwords\""; article += "<div class=\"glsdict_headwords\"";
if( isFromLanguageRTL() ) if( isFromLanguageRTL() )
article += " dir=\"rtl\""; article += " dir=\"rtl\"";
if( headwords.size() > 1 )
{
QString altHeadwords;
for( vector< string >::size_type i = 1; i < headwords.size(); i++ )
{
if( i > 1 )
altHeadwords += ", ";
altHeadwords += QString::fromUtf8( headwords[ i ].c_str(), headwords[ i ].size() );
}
article += " title=\"" + altHeadwords + "\"";
}
article += ">"; article += ">";
headword = headwords.front(); headword = headwords.front();
@ -851,7 +862,7 @@ void GlsDictionary::getArticleText( uint32_t articleAddress, QString & headword,
{ {
try try
{ {
list< string > headwords; vector< string > headwords;
string articleStr; string articleStr;
loadArticleText( articleAddress, headwords, articleStr ); loadArticleText( articleAddress, headwords, articleStr );
@ -953,7 +964,7 @@ void GlsHeadwordsRequest::run()
} }
string articleText; string articleText;
list< string > headwords; vector< string > headwords;
dict.loadArticleText( chain[ x ].articleOffset, dict.loadArticleText( chain[ x ].articleOffset,
headwords, articleText ); headwords, articleText );