Mercurial > octave

comparison libgui/src/terminal-dock-widget.cc @ 31619:ad014fc78bd6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1a0756f7c90a
children 431f80aba37a
comparison
equal deleted inserted replaced
31618:cd833a9baaa7 31619:ad014fc78bd6
99 setWidget (m_terminal); 99 setWidget (m_terminal);
100 setFocusProxy (m_terminal); 100 setFocusProxy (m_terminal);
101 101
102 // Chose a reasonable size at startup in order to avoid truncated 102 // Chose a reasonable size at startup in order to avoid truncated
103 // startup messages 103 // startup messages
104 resource_manager& rmgr = m_octave_qobj.get_resource_manager (); 104
105 gui_settings *settings = rmgr.get_settings (); 105 gui_settings settings;
106 106
107 QFont font = QFont (); 107 QFont font = QFont ();
108 font.setStyleHint (QFont::TypeWriter); 108 font.setStyleHint (QFont::TypeWriter);
109 QString default_font = settings->value (global_mono_font).toString (); 109 QString default_font = settings.value (global_mono_font).toString ();
110 font.setFamily 110 font.setFamily
111 (settings->value (cs_font.key, default_font).toString ()); 111 (settings.value (cs_font.key, default_font).toString ());
112 font.setPointSize 112 font.setPointSize
113 (settings->value (cs_font_size).toInt ()); 113 (settings.value (cs_font_size).toInt ());
114 114
115 QFontMetrics metrics(font); 115 QFontMetrics metrics(font);
116 116
117 int win_x = metrics.maxWidth()*80; 117 int win_x = metrics.maxWidth()*80;
118 int win_y = metrics.height()*25; 118 int win_y = metrics.height()*25;
149 return (m_experimental_terminal_widget 149 return (m_experimental_terminal_widget
150 ? dynamic_cast<command_widget *> (m_terminal) : nullptr); 150 ? dynamic_cast<command_widget *> (m_terminal) : nullptr);
151 } 151 }
152 #endif 152 #endif
153 153
154 void terminal_dock_widget::notice_settings (const gui_settings *settings) 154 void terminal_dock_widget::notice_settings (void)
155 { 155 {
156 emit settings_changed (settings); 156 emit settings_changed ();
157 } 157 }
158 158
159 void terminal_dock_widget::init_command_prompt () 159 void terminal_dock_widget::init_command_prompt ()
160 { 160 {
161 if (m_experimental_terminal_widget) 161 if (m_experimental_terminal_widget)