Mercurial > octave
view libgui/src/documentation-bookmarks.h @ 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 | 796f54d4ddbf |
children | ca7d58406f82 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 2018-2022 The Octave Project Developers // // See the file COPYRIGHT.md in the top-level directory of this // distribution or <https://octave.org/copyright/>. // // This file is part of Octave. // // Octave is free software: you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // Octave is distributed in the hope that it will be useful, but // WiTHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with Octave; see the file COPYING. If not, see // <https://www.gnu.org/licenses/>. // //////////////////////////////////////////////////////////////////////// #if ! defined (octave_documentation_bookmarks_h) #define octave_documentation_bookmarks_h 1 #include <QCheckBox> #include <QComboBox> #include <QTreeWidget> #include <QXmlStreamWriter> #include "documentation.h" #include "octave-qobject.h" namespace octave { class base_qobject; class documentation; class documentation_bookmarks : public QWidget { Q_OBJECT public: documentation_bookmarks ( documentation *doc, documentation_browser *browser, base_qobject& oct_qobj, QWidget *p = nullptr); ~documentation_bookmarks (void) = default; public slots: void add_bookmark (void); void add_folder (bool); void save_settings (void); private slots: void filter_bookmarks (const QString& pattern); void filter_activate (bool state); void update_filter_history (void); void handle_double_click (QTreeWidgetItem *item, int col = 0); void ctx_menu (const QPoint& xpos); void open (bool); void edit (bool); void remove (bool); void show_filter (bool); private: enum item_role { url_role = Qt::UserRole, tag_role = Qt::UserRole + 1 }; enum item_tag { bookmark_tag, folder_tag }; void add_bookmark (const QString& title, const QString& url, QTreeWidgetItem *item = nullptr); QTreeWidgetItem* add_folder (const QString& folder, QTreeWidgetItem *item = nullptr, bool expanded = true); /*! Writing to and reading bookmarks from an xbel-file as proposed in the qt example [QXmlStream Bookmarks Example](https://doc.qt.io/qt-5/qtxml-streambookmarks-example.html) */ void write_bookmarks (void); void write_tree_item (QXmlStreamWriter *xml_writer, const QTreeWidgetItem *item); QString read_bookmarks (void); void read_next_item (QXmlStreamReader *xml_writer, item_tag tag, QTreeWidgetItem *item = nullptr); documentation *m_doc; documentation_browser *m_browser; base_qobject& m_octave_qobj; QComboBox *m_filter; QTreeWidget *m_tree; QTreeWidgetItem *m_ctx_menu_item; QIcon icon_folder; QIcon icon_bookmark; QWidget *m_filter_widget; QCheckBox *m_filter_checkbox; bool m_filter_shown; QFile m_xbel_file; }; } #endif