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

Populate list of matches in scan popup with results only from enabled

Browse source 
dictionaries.

Previously it was listing results from all dictionaries in the current group,
regardless of the dictionary bar.
This commit is contained in:
Konstantin Isakov 2010-04-30 13:56:40 +04:00
parent 964dd0d5bd
commit 6728671c7d
2 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/scanpopup.cc
View file

@ -361,11 +361,34 @@ void ScanPopup::initiateTranslation()
vector< sptr< Dictionary::Class > > const & ScanPopup::getActiveDicts()
{
int currentGroup = ui.groupList->currentIndex();
int current = ui.groupList->currentIndex();
return
currentGroup < 0 || currentGroup >= (int)groups.size() ? allDictionaries :
groups[ currentGroup ].dictionaries;
if ( current < 0 || current >= (int) groups.size() )
{
// This shouldn't ever happen
return allDictionaries;
}
if ( !dictionaryBar.toggleViewAction()->isChecked() )
return groups[ current ].dictionaries;
else
{
vector< sptr< Dictionary::Class > > const & activeDicts =
groups[ current ].dictionaries;
// Populate the special dictionariesUnmuted array with only unmuted
// dictionaries
dictionariesUnmuted.clear();
dictionariesUnmuted.reserve( activeDicts.size() );
for( unsigned x = 0; x < activeDicts.size(); ++x )
if ( !cfg.popupMutedDictionaries.contains(
QString::fromStdString( activeDicts[ x ]->getId() ) ) )
dictionariesUnmuted.push_back( activeDicts[ x ] );
return dictionariesUnmuted;
}
}
bool ScanPopup::eventFilter( QObject * watched, QEvent * event )
@ -679,7 +702,11 @@ void ScanPopup::updateDictionaryBar()
if ( !dictionaryBar.toggleViewAction()->isChecked() )
return; // It's not enabled, therefore hidden -- don't waste time
dictionaryBar.setDictionaries( getActiveDicts() );
Instances::Group const * grp =
groups.findGroup( ui.groupList->getCurrentGroup() );
if ( grp ) // Should always be !0, but check as a safeguard
dictionaryBar.setDictionaries( grp->dictionaries );
}
void ScanPopup::mutedDictionariesChanged()

1
src/scanpopup.hh
View file

@ -67,6 +67,7 @@ private:
Config::Class & cfg;
bool isScanningEnabled;
std::vector< sptr< Dictionary::Class > > const & allDictionaries;
std::vector< sptr< Dictionary::Class > > dictionariesUnmuted;
Instances::Groups const & groups;
History & history;
Ui::ScanPopup ui;