view libgui/src/command-widget.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 b818d4ec035e
children ca7d58406f82
line wrap: on
line source

////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2021-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_command_widget_h)
#define octave_command_widget_h 1

#include <QWidget>

#include <Qsci/qsciscintilla.h>

#include "octave-qobject.h"

class QsciScintilla;

namespace octave
{
  class base_qobject;
  class command_widget;

  class console : public QsciScintilla
  {
    Q_OBJECT

  public:

    console (command_widget *p, base_qobject& oct_qobj);

  public slots:

    void cursor_position_changed (int line, int col);

    void text_changed (void);

    void move_cursor_to_end (void);

    void new_command_line (const QString& command = QString ());

    void execute_command (const QString& command);

  protected:

    void keyPressEvent (QKeyEvent *e);

  private:

    void append_string (const QString& string);

    void accept_command_line (void);

    int m_command_position;
    int m_cursor_position;
    bool m_text_changed;
    command_widget *m_command_widget;
    QString m_last_key_string;

  };

  class command_widget : public QWidget
  {
    Q_OBJECT

  public:

    command_widget (base_qobject& oct_qobj, QWidget *p);

    console * get_console ( ) { return m_console; };

    void init_command_prompt ();

    QString prompt (void);

  signals:

    void clear_line_edit (void);

    void interpreter_pause (void);
    void interpreter_resume (void);
    void interpreter_stop (void);

    void interpreter_event (const fcn_callback& fcn);
    void interpreter_event (const meth_callback& meth);

    void new_command_line_signal (const QString& command = QString ());

  public slots:

    void process_input_line (const QString& input_line);

    void update_prompt (const QString& prompt);

    void insert_interpreter_output (const QString& msg);

    void notice_settings (void);

  private:

    bool m_incomplete_parse;
    QString m_prompt;
    console *m_console;
  };
}

#endif