hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-12-02 19:14:05 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Don't jump to dictionary when new page opens in background

Browse source
This commit is contained in:
Abs62 2014-02-09 19:00:48 +04:00
parent 7cea352be9
commit dabceff223
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
articleview.cc
View file

@ -451,6 +451,9 @@ void ArticleView::setCurrentArticle( QString const & id, bool moveToIt )
if ( !id.startsWith( "gdfrom-" ) ) if ( !id.startsWith( "gdfrom-" ) )
return; // Incorrect id return; // Incorrect id
if ( !ui.definition->isVisible() )
return; // No action on background page, scrollIntoView there don't work
if ( getArticlesList().contains( id.mid( 7 ) ) ) if ( getArticlesList().contains( id.mid( 7 ) ) )
{ {
if ( moveToIt ) if ( moveToIt )
@ -1828,7 +1831,7 @@ void ArticleView::onJsActiveArticleChanged(QString const & id)
if ( !id.startsWith( "gdfrom-" ) ) if ( !id.startsWith( "gdfrom-" ) )
return; // Incorrect id return; // Incorrect id
emit activeArticleChanged( id.mid( 7 ) ); emit activeArticleChanged( this, id.mid( 7 ) );
} }
void ArticleView::doubleClicked() void ArticleView::doubleClicked()

2
articleview.hh
View file

@ -196,7 +196,7 @@ signals:
/// typically in response to user actions /// typically in response to user actions
/// (clicking on the article or using shortcuts). /// (clicking on the article or using shortcuts).
/// id - the dictionary id of the active article. /// id - the dictionary id of the active article.
void activeArticleChanged ( QString const & id ); void activeArticleChanged ( ArticleView const *, QString const & id );
/// Signal to add word to history even if history is disabled /// Signal to add word to history even if history is disabled
void forceAddWordToHistory( const QString & word); void forceAddWordToHistory( const QString & word);

12
mainwindow.cc
View file

@ -1396,8 +1396,8 @@ ArticleView * MainWindow::createNewTab( bool switchToIt,
connect( view, SIGNAL( typingEvent( QString const & ) ), connect( view, SIGNAL( typingEvent( QString const & ) ),
this, SLOT( typingEvent( QString const & ) ) ); this, SLOT( typingEvent( QString const & ) ) );
connect( view, SIGNAL( activeArticleChanged( const QString & ) ), connect( view, SIGNAL( activeArticleChanged( ArticleView const *, const QString & ) ),
this, SLOT( activeArticleChanged( const QString & ) ) ); this, SLOT( activeArticleChanged( ArticleView const *, const QString & ) ) );
connect( view, SIGNAL( statusBarMessage( QString const &, int, QPixmap const & ) ), connect( view, SIGNAL( statusBarMessage( QString const &, int, QPixmap const & ) ),
this, SLOT( showStatusBarMessage( QString const &, int, QPixmap const & ) ) ); this, SLOT( showStatusBarMessage( QString const &, int, QPixmap const & ) ) );
@ -1588,6 +1588,9 @@ void MainWindow::updateWindowTitle()
void MainWindow::pageLoaded( ArticleView * view ) void MainWindow::pageLoaded( ArticleView * view )
{ {
if( view != getCurrentArticleView() )
return; // It was background action
updateBackForwardButtons(); updateBackForwardButtons();
updatePronounceAvailability(); updatePronounceAvailability();
@ -2329,8 +2332,11 @@ void MainWindow::showDefinitionInNewTab( QString const & word,
showDefinition( word, group, fromArticle, contexts ); showDefinition( word, group, fromArticle, contexts );
} }
void MainWindow::activeArticleChanged( QString const & id ) void MainWindow::activeArticleChanged( ArticleView const * view, QString const & id )
{ {
if( view != getCurrentArticleView() )
return; // It was background action
// select the row with the corresponding id // select the row with the corresponding id
for (int i = 0; i < ui.dictsList->count(); ++i) { for (int i = 0; i < ui.dictsList->count(); ++i) {
QListWidgetItem * w = ui.dictsList->item( i ); QListWidgetItem * w = ui.dictsList->item( i );

2
mainwindow.hh
View file

@ -339,7 +339,7 @@ private slots:
ArticleView::Contexts const & contexts ); ArticleView::Contexts const & contexts );
void typingEvent( QString const & ); void typingEvent( QString const & );
void activeArticleChanged( QString const & id ); void activeArticleChanged( ArticleView const *, QString const & id );
void mutedDictionariesChanged(); void mutedDictionariesChanged();