Mercurial > octave
diff libgui/src/variable-editor.cc @ 31619:ad014fc78bd6
use individual local gui_settings objects
Previously, we created a single gui_settings object (derived from
QSettings) and accessed it from the resource_manager object. That
design is not necessary and is not the way QSettings was designed to
be used. Instead of managing a single object, we should be using
individual QSettings objects where needed. Each individual QSettings
object manages thread-safe access to a single global collection of
settings. The Qt docs say that operations on QSettings are not thread
safe, but that means that you can't create a QSettings object in one
thread and use it in another without some locking. I'm not sure
whether we were doing that correctly, but with this change it no
longer matters. Each QSettings object does perform locking when
reading or writing the underlying global data.
* resource-manager.h, resource-manager.cc
(resource_manager::m_settings): Delete data member.
(resource_manager::get_settings): Delete.
* annotation-dialog.cc, QTerminal.cc, QTerminal.h, command-widget.cc,
command-widget.h, community-news.cc, dialog.cc,
documentation-bookmarks.cc, documentation-bookmarks.h,
documentation-dock-widget.cc, documentation-dock-widget.h,
documentation.cc, documentation.h, dw-main-window.cc,
dw-main-window.h, external-editor-interface.cc, files-dock-widget.cc,
files-dock-widget.h, find-files-dialog.cc, history-dock-widget.cc,
history-dock-widget.h, file-editor-interface.h, file-editor-tab.cc,
file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc,
octave-qscintilla.cc, main-window.cc, main-window.h, news-reader.cc,
octave-dock-widget.cc, octave-dock-widget.h, qt-interpreter-events.cc,
qt-interpreter-events.h, release-notes.cc, resource-manager.cc,
resource-manager.h, set-path-dialog.cc, settings-dialog.cc,
settings-dialog.h, shortcut-manager.cc, shortcut-manager.h,
terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor.cc,
variable-editor.h, welcome-wizard.cc, workspace-model.cc,
workspace-model.h, workspace-view.cc: Use local gui_settings objects
instead of accessing a pointer to a single gui_settings object owned
by the resource_manager object.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 02 Dec 2022 14:23:53 -0500 |
| parents | 9f4a9dd4a6ee |
| children | 0645ea65ca6b |
line wrap: on
line diff
--- a/libgui/src/variable-editor.cc Fri Dec 02 15:51:44 2022 -0500 +++ b/libgui/src/variable-editor.cc Fri Dec 02 14:23:53 2022 -0500 @@ -55,6 +55,7 @@ #include "gui-preferences-global.h" #include "gui-preferences-sc.h" #include "gui-preferences-ve.h" +#include "gui-settings.h" #include "octave-qobject.h" #include "octave-qtutils.h" #include "ovl.h" @@ -493,9 +494,10 @@ // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved. int opts = 0; // No options by default. - resource_manager& rmgr = m_octave_qobj.get_resource_manager (); - gui_settings *settings = rmgr.get_settings (); - if (! settings->value (global_use_native_dialogs).toBool ()) + + gui_settings settings; + + if (! settings.value (global_use_native_dialogs).toBool ()) opts = QFileDialog::DontUseNativeDialog; QString name = objectName (); @@ -1203,13 +1205,8 @@ void variable_editor::edit_variable (const QString& name, const octave_value& val) { - resource_manager& rmgr = m_octave_qobj.get_resource_manager (); - if (m_stylesheet.isEmpty ()) - { - gui_settings *settings = rmgr.get_settings (); - notice_settings (settings); - } + notice_settings (); QDockWidget *existing_qdw = m_main->findChild<QDockWidget *> (name); if (existing_qdw) @@ -1417,31 +1414,33 @@ } void - variable_editor::notice_settings (const gui_settings *settings) + variable_editor::notice_settings (void) { - m_main->notice_settings (settings); // update settings in parent main win + gui_settings settings; - m_default_width = settings->value (ve_column_width).toInt (); + m_main->notice_settings (); // update settings in parent main win - m_default_height = settings->value (ve_row_height).toInt (); + m_default_width = settings.value (ve_column_width).toInt (); + + m_default_height = settings.value (ve_row_height).toInt (); - m_alternate_rows = settings->value (ve_alternate_rows).toBool (); + m_alternate_rows = settings.value (ve_alternate_rows).toBool (); - m_use_terminal_font = settings->value (ve_use_terminal_font).toBool (); + m_use_terminal_font = settings.value (ve_use_terminal_font).toBool (); QString font_name; int font_size; - QString default_font = settings->value (global_mono_font).toString (); + QString default_font = settings.value (global_mono_font).toString (); if (m_use_terminal_font) { - font_name = settings->value (cs_font.key, default_font).toString (); - font_size = settings->value (cs_font_size).toInt (); + font_name = settings.value (cs_font.key, default_font).toString (); + font_size = settings.value (cs_font_size).toInt (); } else { - font_name = settings->value (ve_font_name.key, default_font).toString (); - font_size = settings->value (ve_font_size).toInt (); + font_name = settings.value (ve_font_name.key, default_font).toString (); + font_size = settings.value (ve_font_size).toInt (); } m_font = QFont (font_name, font_size); @@ -1450,11 +1449,11 @@ m_add_font_height = fm.height (); - int mode = settings->value (ve_color_mode).toInt (); + int mode = settings.value (ve_color_mode).toInt (); for (int i = 0; i < ve_colors_count; i++) { - QColor setting_color = settings->color_value (ve_colors[i], mode); + QColor setting_color = settings.color_value (ve_colors[i], mode); m_table_colors.replace (i, setting_color); } @@ -1464,7 +1463,7 @@ if (m_tool_bar) { - int size_idx = settings->value (global_icon_size).toInt (); + int size_idx = settings.value (global_icon_size).toInt (); size_idx = (size_idx > 0) - (size_idx < 0) + 1; // Make valid index from 0 to 2 QStyle *st = style ();