Mercurial > octave

comparison libgui/src/dialog.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 796f54d4ddbf
children 9034cf663768
comparison
equal deleted inserted replaced
31618:cd833a9baaa7 31619:ad014fc78bd6
40 #include <QMessageBox> 40 #include <QMessageBox>
41 #include <QPushButton> 41 #include <QPushButton>
42 #include <QVBoxLayout> 42 #include <QVBoxLayout>
43 43
44 #include "dialog.h" 44 #include "dialog.h"
45 #include "gui-preferences-global.h"
46 #include "gui-settings.h"
45 #include "octave-qobject.h" 47 #include "octave-qobject.h"
46 #include "gui-preferences-global.h"
47 48
48 namespace octave 49 namespace octave
49 { 50 {
50 QUIWidgetCreator::QUIWidgetCreator (base_qobject& oct_qobj) 51 QUIWidgetCreator::QUIWidgetCreator (base_qobject& oct_qobj)
51 : QObject (), m_octave_qobj (oct_qobj), m_dialog_result (-1), 52 : QObject (), m_octave_qobj (oct_qobj), m_dialog_result (-1),
629 630
630 setWindowTitle (title.isEmpty () ? " " : title); 631 setWindowTitle (title.isEmpty () ? " " : title);
631 setDirectory (dirname); 632 setDirectory (dirname);
632 633
633 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved. 634 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved.
634 resource_manager& rmgr = oct_qobj.get_resource_manager (); 635
635 gui_settings *settings = rmgr.get_settings (); 636 gui_settings settings;
636 if (! settings->value (global_use_native_dialogs).toBool ()) 637
638 if (! settings.value (global_use_native_dialogs).toBool ())
637 setOption(QFileDialog::DontUseNativeDialog); 639 setOption(QFileDialog::DontUseNativeDialog);
638 640
639 if (multimode == "on") // uigetfile multiselect=on 641 if (multimode == "on") // uigetfile multiselect=on
640 { 642 {
641 setFileMode (QFileDialog::ExistingFiles); 643 setFileMode (QFileDialog::ExistingFiles);