Mercurial > octave
comparison libgui/src/workspace-model.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 | 9d9b31c8458b |
| children | ca7d58406f82 |
comparison
equal
deleted
inserted
replaced
| 31618:cd833a9baaa7 | 31619:ad014fc78bd6 |
|---|---|
| 196 clear_data (); | 196 clear_data (); |
| 197 update_table (); | 197 update_table (); |
| 198 } | 198 } |
| 199 | 199 |
| 200 void | 200 void |
| 201 workspace_model::notice_settings (const gui_settings *settings) | 201 workspace_model::notice_settings (void) |
| 202 { | 202 { |
| 203 m_enable_colors = settings->value (ws_enable_colors).toBool (); | 203 gui_settings settings; |
| 204 | 204 |
| 205 int mode = settings->value (ws_color_mode).toInt (); | 205 m_enable_colors = settings.value (ws_enable_colors).toBool (); |
| 206 | |
| 207 int mode = settings.value (ws_color_mode).toInt (); | |
| 206 | 208 |
| 207 for (int i = 0; i < ws_colors_count; i++) | 209 for (int i = 0; i < ws_colors_count; i++) |
| 208 { | 210 { |
| 209 QColor setting_color = settings->color_value (ws_colors[i], mode); | 211 QColor setting_color = settings.color_value (ws_colors[i], mode); |
| 210 | 212 |
| 211 QPalette p (setting_color); | 213 QPalette p (setting_color); |
| 212 m_storage_class_colors.replace (i, setting_color); | 214 m_storage_class_colors.replace (i, setting_color); |
| 213 | 215 |
| 214 QColor fg_color = p.color (QPalette::WindowText); | 216 QColor fg_color = p.color (QPalette::WindowText); |