Mercurial > octave

diff libgui/src/main-window.cc @ 31638:474e184321d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move some functions from resource_manager to gui_settings * gui-settings.h, gui-settings.cc (gui_settings::get_default_font_family, gui_settings::get_default_font, gui_settings::reload, gui_settings::check): Rename and move here from resource-manager.h and resource-manager.cc. Change all uses. * resource-manager.h, resource-manager.cc (resource_manager::is_first_run): Delete. * gui-preferences-global.h (global_skip_welcome_wizard): New gui_pref object. * main-window.cc (main_window::main_window): Check this setting to determine whether to display welcome wizard.
author John W. Eaton <jwe@octave.org>
date Sun, 04 Dec 2022 22:56:23 -0500
parents 0645ea65ca6b
children ca7d58406f82
line wrap: on
line diff
--- a/libgui/src/main-window.cc	Sun Dec 04 15:29:51 2022 -0500
+++ b/libgui/src/main-window.cc	Sun Dec 04 22:56:23 2022 -0500
@@ -111,7 +111,9 @@
   {
     resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
 
-    if (rmgr.is_first_run ())
+    gui_settings settings;
+
+    if (! settings.value (global_skip_welcome_wizard).toBool ())
       {
         // Before wizard.
         m_octave_qobj.config_translators ();
@@ -121,13 +123,15 @@
         if (welcomeWizard.exec () == QDialog::Rejected)
           exit (1);
 
+        settings.setValue (global_skip_welcome_wizard.key, QVariant (true));
+
         // Install settings file.
-        rmgr.reload_settings ();
+        settings.reload ();
       }
     else
       {
         // Get settings file.
-        rmgr.reload_settings ();
+        settings.reload ();
 
         // After settings.
         m_octave_qobj.config_translators ();
@@ -135,8 +139,6 @@
 
     setObjectName (gui_obj_name_main_window);
 
-    gui_settings settings;
-
     settings.config_icon_theme ();
 
     rmgr.update_network_settings ();