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

Revert "opt: update name should reflect the latest info"

Browse source 
This reverts commit 1272ea2d20a7908b9a69d6b551511916f97cc024.
This commit is contained in:
xiaoyifang 2024-11-02 17:32:05 +08:00 committed by xiaoyifang
parent ac11ba7b51
commit 7784f8bb62
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/ui/editdictionaries.cc
View file

@ -113,6 +113,7 @@ void EditDictionaries::currentChanged( int index )
if ( index == -1 || !isVisible() ) { if ( index == -1 || !isVisible() ) {
return; // Sent upon the construction/destruction return; // Sent upon the construction/destruction
} }
qDebug() << ui.tabs->currentWidget()->objectName();
if ( lastTabName.isEmpty() || lastTabName == "Sources" ) { if ( lastTabName.isEmpty() || lastTabName == "Sources" ) {
// We're switching away from the Sources tab -- if its contents were // We're switching away from the Sources tab -- if its contents were
// changed, we need to either apply or reject now. // changed, we need to either apply or reject now.
@ -182,6 +183,9 @@ void EditDictionaries::acceptChangedSources( bool rebuildGroups )
{ {
dictionariesChanged = true; dictionariesChanged = true;
Config::Groups savedGroups = groups->getGroups();
Config::Group savedOrder = orderAndProps->getCurrentDictionaryOrder();
Config::Group savedInactive = orderAndProps->getCurrentInactiveDictionaries();
cfg.paths = sources.getPaths(); cfg.paths = sources.getPaths();
cfg.soundDirs = sources.getSoundDirs(); cfg.soundDirs = sources.getSoundDirs();
@ -205,6 +209,10 @@ void EditDictionaries::acceptChangedSources( bool rebuildGroups )
loadDictionaries( this, cfg, dictionaries, dictNetMgr ); loadDictionaries( this, cfg, dictionaries, dictNetMgr );
Instances::updateNames( savedGroups, dictionaries );
Instances::updateNames( savedOrder, dictionaries );
Instances::updateNames( savedInactive, dictionaries );
if ( rebuildGroups ) { if ( rebuildGroups ) {
// ui.tabs->removeTab( 1 ); // ui.tabs->removeTab( 1 );
// ui.tabs->removeTab( 1 ); // ui.tabs->removeTab( 1 );
@ -217,15 +225,6 @@ void EditDictionaries::acceptChangedSources( bool rebuildGroups )
// connect( groups, &Groups::showDictionaryInfo, this, &EditDictionaries::showDictionaryInfo ); // connect( groups, &Groups::showDictionaryInfo, this, &EditDictionaries::showDictionaryInfo );
// connect( orderAndProps, &OrderAndProps::showDictionaryHeadwords, this, &EditDictionaries::showDictionaryHeadwords ); // connect( orderAndProps, &OrderAndProps::showDictionaryHeadwords, this, &EditDictionaries::showDictionaryHeadwords );
} }
Config::Groups savedGroups = groups->getGroups();
Config::Group savedOrder = orderAndProps->getCurrentDictionaryOrder();
Config::Group savedInactive = orderAndProps->getCurrentInactiveDictionaries();
Instances::updateNames( savedGroups, dictionaries );
Instances::updateNames( savedOrder, dictionaries );
Instances::updateNames( savedInactive, dictionaries );
setUpdatesEnabled( true ); setUpdatesEnabled( true );
} }
EditDictionaries::~EditDictionaries() EditDictionaries::~EditDictionaries()