Mercurial > octave

comparison libgui/src/octave-qobject.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 8fed04d0607c
comparison
equal deleted inserted replaced
31689:a8a7207a7341 31690:1a1f47f17ed4
52 #include "main-window.h" 52 #include "main-window.h"
53 #include "octave-qobject.h" 53 #include "octave-qobject.h"
54 #include "qt-application.h" 54 #include "qt-application.h"
55 #include "qt-interpreter-events.h" 55 #include "qt-interpreter-events.h"
56 #include "release-notes.h" 56 #include "release-notes.h"
57 #include "resource-manager.h"
58 #include "shortcut-manager.h" 57 #include "shortcut-manager.h"
59 #include "terminal-dock-widget.h" 58 #include "terminal-dock-widget.h"
60 #include "variable-editor.h" 59 #include "variable-editor.h"
61 #include "workspace-model.h" 60 #include "workspace-model.h"
62 #include "workspace-view.h" 61 #include "workspace-view.h"
173 : QObject (), 172 : QObject (),
174 m_app_context (app_context), 173 m_app_context (app_context),
175 m_argc (m_app_context.sys_argc ()), 174 m_argc (m_app_context.sys_argc ()),
176 m_argv (m_app_context.sys_argv ()), 175 m_argv (m_app_context.sys_argv ()),
177 m_qapplication (new octave_qapplication (m_argc, m_argv)), 176 m_qapplication (new octave_qapplication (m_argc, m_argv)),
178 m_resource_manager (),
179 m_shortcut_manager (), 177 m_shortcut_manager (),
180 m_qt_tr (new QTranslator ()), 178 m_qt_tr (new QTranslator ()),
181 m_gui_tr (new QTranslator ()), 179 m_gui_tr (new QTranslator ()),
182 m_qsci_tr (new QTranslator ()), 180 m_qsci_tr (new QTranslator ()),
183 m_translators_installed (false), 181 m_translators_installed (false),
391 void base_qobject::config_translators (void) 389 void base_qobject::config_translators (void)
392 { 390 {
393 if (m_translators_installed) 391 if (m_translators_installed)
394 return; 392 return;
395 393
396 m_resource_manager.config_translators (m_qt_tr, m_qsci_tr, m_gui_tr); 394 gui_settings settings;
395
396 settings.config_translators (m_qt_tr, m_qsci_tr, m_gui_tr);
397 397
398 m_qapplication->installTranslator (m_qt_tr); 398 m_qapplication->installTranslator (m_qt_tr);
399 m_qapplication->installTranslator (m_gui_tr); 399 m_qapplication->installTranslator (m_gui_tr);
400 m_qapplication->installTranslator (m_qsci_tr); 400 m_qapplication->installTranslator (m_qsci_tr);
401 401