Mercurial > octave

comparison libgui/src/main-window.cc @ 31690:1a1f47f17ed4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate resource_manager class * gui-settings.cc, gui-settings.h (gui_settings::get_gui_translation_dir, gui_settings::config_translators, gui_settings::get_valid_lexer_styles, gui_settings::read_lexer_settings, gui_settings::update_settings_key, gui_settings::update_network_settings, gui_settings::get_codecs, gui_settings::combo_encoding): Move here from resource_manager class. * file-editor-tab.cc, find-dialog.cc, main-window.cc, octave-qobject.h, octave-qobject.cc, qt-interpreter-events.cc, settings-dialog.cc: Change all uses of resource_manager class to use gui_settings instead. * octave-qscintilla.h, octave-qscintilla.cc (octave_qscintilla::create_tmp_file): Move here from resource_manager class. (octave_qscintilla::ctx_menu_run_finished_signal, octave_qscintilla::ctx_menu_run_finished): Use QPointer<QTemporaryFile> instead of bare pointer in signal/slot functions. * octave-qobject.h, octave-qobject.cc (octave_base_qobject::m_resource_manager): Delete data member. (octave_base_qobject::get_resource_manager): Delete. * resource-manager.h, resource-manager.cc: Delete. * libgui/src/module.mk: Update.
author John W. Eaton <jwe@octave.org>
date Tue, 27 Dec 2022 14:55:03 -0500
parents deb553ac2c54
children 2422fb7f1e6c
comparison
equal deleted inserted replaced
31689:a8a7207a7341 31690:1a1f47f17ed4
107 m_prevent_readline_conflicts (true), 107 m_prevent_readline_conflicts (true),
108 m_prevent_readline_conflicts_menu (false), 108 m_prevent_readline_conflicts_menu (false),
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 ();
113
114 gui_settings settings; 112 gui_settings settings;
115 113
116 if (! settings.value (global_skip_welcome_wizard).toBool ()) 114 if (! settings.value (global_skip_welcome_wizard).toBool ())
117 { 115 {
118 // Before wizard. 116 // Before wizard.
139 137
140 setObjectName (gui_obj_name_main_window); 138 setObjectName (gui_obj_name_main_window);
141 139
142 settings.config_icon_theme (); 140 settings.config_icon_theme ();
143 141
144 rmgr.update_network_settings (); 142 settings.update_network_settings ();
145 143
146 // We provide specific terminal capabilities, so ensure that 144 // We provide specific terminal capabilities, so ensure that
147 // TERM is always set appropriately. 145 // TERM is always set appropriately.
148 146
149 #if defined (OCTAVE_USE_WINDOWS_API) 147 #if defined (OCTAVE_USE_WINDOWS_API)
963 = settings.value (sc_prevent_rl_conflicts_menu).toBool (); 961 = settings.value (sc_prevent_rl_conflicts_menu).toBool ();
964 962
965 m_suppress_dbg_location 963 m_suppress_dbg_location
966 = ! settings.value (cs_dbg_location).toBool (); 964 = ! settings.value (cs_dbg_location).toBool ();
967 965
968 resource_manager& rmgr = m_octave_qobj.get_resource_manager (); 966 settings.update_network_settings ();
969 rmgr.update_network_settings ();
970 967
971 emit active_dock_changed (nullptr, m_active_dock); // update dock widget styles 968 emit active_dock_changed (nullptr, m_active_dock); // update dock widget styles
972 969
973 configure_shortcuts (); 970 configure_shortcuts ();
974 971