Mercurial > octave

comparison 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
comparison
equal deleted inserted replaced
31637:34c3cd39c4b9 31638:474e184321d3
109 m_suppress_dbg_location (true), 109 m_suppress_dbg_location (true),
110 m_closing (false), m_file_encoding (QString ()) 110 m_closing (false), m_file_encoding (QString ())
111 { 111 {
112 resource_manager& rmgr = m_octave_qobj.get_resource_manager (); 112 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
113 113
114 if (rmgr.is_first_run ()) 114 gui_settings settings;
115
116 if (! settings.value (global_skip_welcome_wizard).toBool ())
115 { 117 {
116 // Before wizard. 118 // Before wizard.
117 m_octave_qobj.config_translators (); 119 m_octave_qobj.config_translators ();
118 120
119 welcome_wizard welcomeWizard (m_octave_qobj); 121 welcome_wizard welcomeWizard (m_octave_qobj);
120 122
121 if (welcomeWizard.exec () == QDialog::Rejected) 123 if (welcomeWizard.exec () == QDialog::Rejected)
122 exit (1); 124 exit (1);
123 125
126 settings.setValue (global_skip_welcome_wizard.key, QVariant (true));
127
124 // Install settings file. 128 // Install settings file.
125 rmgr.reload_settings (); 129 settings.reload ();
126 } 130 }
127 else 131 else
128 { 132 {
129 // Get settings file. 133 // Get settings file.
130 rmgr.reload_settings (); 134 settings.reload ();
131 135
132 // After settings. 136 // After settings.
133 m_octave_qobj.config_translators (); 137 m_octave_qobj.config_translators ();
134 } 138 }
135 139
136 setObjectName (gui_obj_name_main_window); 140 setObjectName (gui_obj_name_main_window);
137
138 gui_settings settings;
139 141
140 settings.config_icon_theme (); 142 settings.config_icon_theme ();
141 143
142 rmgr.update_network_settings (); 144 rmgr.update_network_settings ();
143 145