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

Merge branch 'Original' into Qt4x5

Browse source
This commit is contained in:
Abs62 2016-04-02 01:51:38 +03:00
parent 8bd4e7ab48 30dad341d1
commit eee04266db
4 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
articleview.cc
View file

@ -519,10 +519,10 @@ void ArticleView::loadFinished( bool )
{
// Anchor found, jump to it
url.clear();
url.setFragment( rx.cap( 0 ) );
ui.definition->page()->mainFrame()->evaluateJavaScript(
QString( "window.location = \"%1\"" ).arg( QString::fromUtf8( url.toEncoded() ) ) );
QString( "window.location.hash = \"%1\"" ).arg( QString::fromUtf8( url.toEncoded() ) ) );
break;
}
@ -530,9 +530,10 @@ void ArticleView::loadFinished( bool )
}
else
{
url.clear();
url.setFragment( anchor );
ui.definition->page()->mainFrame()->evaluateJavaScript(
QString( "window.location = \"%1\"" ).arg( QString::fromUtf8( url.toEncoded() ) ) );
QString( "window.location.hash = \"%1\"" ).arg( QString::fromUtf8( url.toEncoded() ) ) );
}
}
#endif
@ -545,7 +546,8 @@ void ArticleView::loadFinished( bool )
void ArticleView::handleTitleChanged( QString const & title )
{
emit titleChanged( this, title );
if( !title.isEmpty() ) // Qt 5.x WebKit raise signal titleChanges(QString()) while navigation within page
emit titleChanged( this, title );
}
void ArticleView::handleUrlChanged( QUrl const & url )

2
langcoder.cc
View file

@ -322,7 +322,7 @@ quint32 LangCoder::guessId( const QString & lang )
{
for( GDLangCode const * lc = LangCodes; lc->code[ 0 ]; ++lc )
{
if ( lstr == QString( lc->lang ) )
if ( lstr == ( lstr.size() == 3 ? QString( lc->code3 ) : QString( lc->lang ) ) )
{
// We've got a match
return code2toInt( lc->code );

26
mdx.cc
View file

@ -848,6 +848,32 @@ void MddResourceRequest::run()
if ( Filetype::isNameOfCSS( u8ResourceName ) )
{
QString css = QString::fromUtf8( data.data(), data.size() );
// Correct some url's
QRegExp links( "url\\(\\s*(['\"]?)([^'\"]*)(['\"]?)\\s*\\)", Qt::CaseInsensitive, QRegExp::RegExp );
QString id = QString::fromUtf8( dict.getId().c_str() );
int pos = 0;
for( ; ; )
{
pos = links.indexIn( css, pos );
if( pos < 0 )
break;
QString url = links.cap( 2 );
if( url.indexOf( ":/" ) >= 0 )
{
// External link
pos += links.cap().size();
continue;
}
QString newUrl = QString( "url(" ) + links.cap( 1 ) + "bres://"
+ id + "/" + url + links.cap( 3 ) + ")";
css.replace( pos, links.cap().size(), newUrl );
pos += newUrl.size();
}
dict.isolateCSS( css, ".mdict" );
QByteArray bytes = css.toUtf8();
data.resize( bytes.size() );

2
stardict.cc
View file

@ -1549,7 +1549,7 @@ void StardictResourceRequest::run()
// Correct some url's
QRegExp links( "url\\(\\s*(['\"])([^'\"]*)(['\"])\\s*\\)");
QRegExp links( "url\\(\\s*(['\"]?)([^'\"]*)(['\"]?)\\s*\\)", Qt::CaseInsensitive, QRegExp::RegExp );
QString id = QString::fromUtf8( dict.getId().c_str() );
int pos = 0;
for( ; ; )