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

*! Another fix to complete the previous commit.

Browse source
This commit is contained in:
Konstantin Isakov 2009-05-15 12:39:53 +00:00
parent 2a81429d0a
commit 91c97256d3
2 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/editdictionaries.cc
View file

@ -37,11 +37,11 @@ EditDictionaries::EditDictionaries( QWidget * parent, Config::Class & cfg_,
void EditDictionaries::accept()
{
if ( isSourcesChanged() )
acceptChangedSources();
Config::Groups newGroups = groups->getGroups();
if ( isSourcesChanged() )
acceptChangedSources( false );
if ( origCfg.groups != newGroups )
{
groupsChanged = true;
@ -77,11 +77,7 @@ void EditDictionaries::on_tabs_currentChanged( int index )
if ( question.clickedButton() == accept )
{
acceptChangedSources();
// Rebuild groups from scratch
rebuildGroups();
acceptChangedSources( true );
lastCurrentTab = index;
ui.tabs->setCurrentIndex( index );
@ -100,8 +96,7 @@ void EditDictionaries::on_tabs_currentChanged( int index )
void EditDictionaries::rescanSources()
{
acceptChangedSources();
rebuildGroups();
acceptChangedSources( true );
}
bool EditDictionaries::isSourcesChanged() const
@ -113,30 +108,32 @@ bool EditDictionaries::isSourcesChanged() const
sources.getMediaWikis() != cfg.mediawikis;
}
void EditDictionaries::acceptChangedSources()
void EditDictionaries::acceptChangedSources( bool rebuildGroups )
{
dictionariesChanged = true;
Config::Groups savedGroups = groups->getGroups();
cfg.paths = sources.getPaths();
cfg.soundDirs = sources.getSoundDirs();
cfg.hunspell = sources.getHunspell();
cfg.transliteration = sources.getTransliteration();
cfg.mediawikis = sources.getMediaWikis();
groupInstances.clear(); // Those hold pointers to dictionaries, we need to
// free them.
loadDictionaries( this, true, cfg, dictionaries, dictNetMgr );
}
void EditDictionaries::rebuildGroups()
{
Config::Groups savedGroups = groups->getGroups();
ui.tabs->setUpdatesEnabled( false );
ui.tabs->removeTab( 1 );
groups.reset();
groups = new Groups( this, dictionaries, savedGroups );
ui.tabs->insertTab( 1, groups.get(), QIcon(":/icons/bookcase.png"), tr( "&Groups" ) );
ui.tabs->setUpdatesEnabled( true );
loadDictionaries( this, true, cfg, dictionaries, dictNetMgr );
if ( rebuildGroups )
{
groups = new Groups( this, dictionaries, savedGroups );
ui.tabs->insertTab( 1, groups.get(), QIcon(":/icons/bookcase.png"), tr( "&Groups" ) );
ui.tabs->setUpdatesEnabled( true );
}
}

4
src/editdictionaries.hh
View file

@ -45,9 +45,7 @@ private:
bool isSourcesChanged() const;
void acceptChangedSources();
void rebuildGroups();
void acceptChangedSources( bool rebuildGroups );
private: