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

Merge branch 'staged' of https://github.com/xiaoyifang/goldendict into staged

Browse source
This commit is contained in:
YiFang Xiao 2023-07-12 10:25:18 +08:00
parent ad426ae4af 9c1413adea
commit 26e7ab6baa
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/ui/mainwindow.cc
View file

@ -712,24 +712,17 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
// Create tab list menu // Create tab list menu
createTabList(); createTabList();
if ( cfg.mainWindowGeometry.size() )
restoreGeometry( cfg.mainWindowGeometry );
if ( cfg.mainWindowState.size() && !cfg.resetState ) if ( cfg.mainWindowState.size() && !cfg.resetState )
restoreState( cfg.mainWindowState ); restoreState( cfg.mainWindowState );
if ( cfg.mainWindowGeometry.size() )
restoreGeometry( cfg.mainWindowGeometry );
// Show the initial welcome text // Show the initial welcome text
ArticleView * view = getCurrentArticleView();
{ history.enableAdd( false );
ArticleView * view = getCurrentArticleView(); blockUpdateWindowTitle = true;
view->showDefinition( tr( "Welcome!" ), Instances::Group::HelpGroupId );
history.enableAdd( false ); history.enableAdd( cfg.preferences.storeHistory );
blockUpdateWindowTitle = true;
view->showDefinition( tr( "Welcome!" ), Instances::Group::HelpGroupId );
history.enableAdd( cfg.preferences.storeHistory );
}
translateLine->setFocus(); translateLine->setFocus();