Mercurial > octave
view libgui/src/dw-main-window.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 | 796f54d4ddbf |
children | 0645ea65ca6b |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 2013-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/>. // //////////////////////////////////////////////////////////////////////// /* This is the main window derived from QMainWindow for being used as the main window in dock widgets like the variable editor or the file editor */ #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include <QDockWidget> #include <QMenu> #include "dw-main-window.h" #include "gui-preferences-sc.h" #include "octave-qobject.h" #include "shortcut-manager.h" namespace octave { dw_main_window::dw_main_window (base_qobject& oct_qobj, QWidget *p) : QMainWindow (p), m_octave_qobj (oct_qobj) { resource_manager& rmgr = m_octave_qobj.get_resource_manager (); // Adding the actions for closing the dock widgets m_close_action = add_action (nullptr, rmgr.icon ("window-close", false), tr ("&Close"), SLOT (request_close ()), this); m_close_all_action = add_action (nullptr, rmgr.icon ("window-close", false), tr ("Close &All"), SLOT (request_close_all ()), this); m_close_others_action = add_action (nullptr, rmgr.icon ("window-close", false), tr ("Close &Other"), SLOT (request_close_other ()), this); m_switch_left_action = add_action (nullptr, QIcon (), tr ("Switch to &Left Widget"), SLOT (request_switch_left ()), this); m_switch_right_action = add_action (nullptr, QIcon (), tr ("Switch to &Right Widget"), SLOT (request_switch_right ()), this); // The list of actions for floating widgets m_actions_list << m_close_action; m_actions_list << m_close_others_action; m_actions_list << m_close_all_action; m_actions_list << m_switch_left_action; m_actions_list << m_switch_right_action; notice_settings (); } // Re-implementing the popup menu of the main window QMenu *dw_main_window::createPopupMenu () { QList<QAction *> new_actions = QList<QAction *> (); new_actions.append (m_close_action); new_actions.append (m_close_others_action); new_actions.append (m_close_all_action); QMenu *menu = QMainWindow::createPopupMenu (); QList<QAction *> actions = menu->actions(); if (actions.length () > 0) { QAction *sep = menu->insertSeparator (actions.at (0)); menu->insertActions (sep, new_actions); } else menu->addActions (new_actions); return menu; } // Adding an action to the main window QAction * dw_main_window::add_action (QMenu *menu, const QIcon& icon, const QString& text, const char *member, QWidget *receiver) { QAction *a; QWidget *r = this; if (receiver != nullptr) r = receiver; if (menu) a = menu->addAction (icon, text, r, member); else { a = new QAction (icon, text, this); a->setEnabled (true); connect (a, SIGNAL (triggered ()), r, member); } addAction (a); // important for shortcut context a->setShortcutContext (Qt::WidgetWithChildrenShortcut); return a; } // Update the settings void dw_main_window::notice_settings (void) { shortcut_manager& scmgr = m_octave_qobj.get_shortcut_manager (); scmgr.set_shortcut (m_close_action, sc_edit_file_close); scmgr.set_shortcut (m_close_all_action, sc_edit_file_close_all); scmgr.set_shortcut (m_close_others_action, sc_edit_file_close_other); scmgr.set_shortcut (m_switch_left_action, sc_edit_tabs_switch_left_tab); scmgr.set_shortcut (m_switch_right_action, sc_edit_tabs_switch_right_tab); } // Slots for handling actions // Close current widget void dw_main_window::request_close () { for (int i = 0; i < m_dw_list.length (); i++) { if (m_dw_list.at (i)->hasFocus ()) { m_dw_list.at (i)->close (); if (i > 0) m_dw_list.at (i-1)->setFocus (); break; } } } // Close other widgets void dw_main_window::request_close_other () { for (int i = m_dw_list.length () - 1; i >= 0; i--) { if (! m_dw_list.at (i)->hasFocus ()) m_dw_list.at (i)->close (); } } // Close all widgets void dw_main_window::request_close_all () { for (int i = m_dw_list.length () - 1; i >= 0; i--) m_dw_list.at (i)->close (); } // Switch to left widget void dw_main_window::request_switch_left () { request_switch (-1); } // Switch to right widget void dw_main_window::request_switch_right () { request_switch (1); } // Switch to left/right widget void dw_main_window::request_switch (int direction) { int active = -1, next; for (int i = m_dw_list.length () - 1; i >= 0; i--) { if (m_dw_list.at (i)->hasFocus ()) { active = i; break; } } if (active == -1) return; if (direction == -1 && active == 0) next = m_dw_list.length () - 1; else if (direction == 1 && active == m_dw_list.length () - 1) next = 0; else next = active + direction; m_dw_list.at (next)->raise (); m_dw_list.at (next)->activateWindow (); m_dw_list.at (next)->setFocus (); } // Reimplemented Event bool dw_main_window::event (QEvent *ev) { if (ev->type () == QEvent::ChildAdded || ev->type () == QEvent::ChildRemoved) { // Adding or Removing a child indicates that a dock widget was // created or removed. // In all cases, the list of dock widgets has to be updated. m_dw_list = findChildren<QDockWidget *>(); } if (ev->type () == QEvent::StyleChange) { // This might indicate un- or re-docking a widget: Make sure // floating widgets get a copy of our actions for (int i = m_dw_list.length () - 1; i >= 0; i--) { // First remove possibly existing actions for (int j = m_actions_list.length () - 1; j >0; j--) m_dw_list.at (i)->removeAction (m_actions_list.at (j)); // Then add our actions for floating widgets if (m_dw_list.at (i)->isFloating ()) m_dw_list.at (i)->addActions (m_actions_list); } } return QMainWindow::event (ev); } }