Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
when merge the changes introduced by pull #77
  • Loading branch information
xiaoyifang committed May 25, 2022
2 parents 12f7db7 + c770e96 commit e241cbe
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions mainwindow.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2813,10 +2813,6 @@ void MainWindow::showTranslationFor( Config::InputPhrase const & phrase,

view->showDefinition( phrase, group, scrollTo );

updatePronounceAvailability();
updateFoundInDictsList();

updateBackForwardButtons();

//ui.tabWidget->setTabText( ui.tabWidget->indexOf(ui.tab), inWord.trimmed() );
}
Expand All @@ -2838,11 +2834,6 @@ void MainWindow::showTranslationFor( QString const & inWord,
view->showDefinition( inWord, dictIDs, searchRegExp,
groupInstances[ groupList->currentIndex() ].id,
ignoreDiacritics );

updatePronounceAvailability();
updateFoundInDictsList();

updateBackForwardButtons();
}

#ifdef HAVE_X11
Expand Down

0 comments on commit e241cbe

Please sign in to comment.