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

This commit is contained in:
YiFang Xiao 2023-07-12 10:25:18 +08:00
commit 26e7ab6baa

View file

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