view libgui/src/terminal-dock-widget.h @ 31696:8fed04d0607c

eliminate shortcut_manager class and revamp shortcut handling * settings-dialog.ui: Use a custom type for the * shortcuts-tree-widget.h, shortcuts-tree-widget.cc: New files. (shortcuts_tree_widget): New class to use for editing and displaying shortcuts in the settings dialog. Adapt constructor from shortcut_manager::fill_treewidget function. (enter_shortcut): Move here from shortcut-manager.h and shortcut-manager.cc. (tree_widget_shortcut_item): New class to use for items in the shortcuts_tree_widget class in place of QTreeWidgetItem. (shortcut_edit_dialog): New class to use for shortcut editing dialog in place of a simple QDialog. Allows for capturing edited values in the dialog object. * gui-preferences-sc.h, gui-preferences-sc.cc (sc_group): Drop trailing "/" from definition and move here from gui-preferences.h. Update code that prepends sc_group to a settings key. (get_shortcut_section): New function. * gui-preferences.h, gui-preferences.cc (sc_pref::def_value, sc_pref::def_text): New functions. (all_shortcut_preferences::value, all_shortcut_preferences::keys): New static funtions. (all_shortcut_preferences::do_value, all_shortcut_preferences::do_keys): New helper functions. * gui-settings.cc (gui_settings::sc_def_value): Simply call sc_pref::def_value. * settings-dialog.h, settings-dialog.cc (class settings_dialog): Eliminate use of base_qobject and shortcut_manager. (settings_dialog::import_shortcut_set): Get file name here. Call shortcuts_tree_widget::import_shortcuts instead of shortcut_manager::import_export. (settings_dialog::export_shortcut_set): Get file name here. Call shortcuts_tree_widget::export_shortcuts instead of shortcut_manager::import_export. (settings_dialog::default_shortcut_set): Check whether to overwrite shortcuts here. Call shortcuts_tree_widget::set_default_shortcuts instead of shortcut_manager::import_export. (settings_dialog::write_changed_settings): Eliminate CLOSING argument. Call shortcuts_tree_widget::write_settings instead of shortcut_manager::write_shortcuts. (settings_dialog::get_shortcuts_file_name): New function to prompt user for file name. (settings_dialog::overwrite_all_shortcuts): New function to ask user whether replacing shortcuts is OK. (import_export_action): Move enum decl here from shortcut-manager.h. * main-window.cc (main_window::process_settings_dialog_request): Eliminate m_octave_qobj in call to settings_dialog ctor. (main_window::main_window): Don't call shortcut_manager::init_data. * terminal-dock-widget.h, terminal-dock-widget.cc (terminal_dock_widget::init_control_d_shortcut_behavior): New function. (terminal_dock_widget::terminal_dock_widget): Use it instead of performing same action in shortcut_manager::init. * octave-qobject.h, octave-qobject.cc (base_qobject::m_shortcut_manager): Delete data member. (base_qobject::get_shortcut_manager): Delete. (base_qobject::base_qobject): Don't call shortcut_manager::init_data. * shortcut-manager.h, shortcut-manager.cc: Delete. Eliminates the now unnecessary shortcut_manager class. * libgui/src/module.mk: Update.
author John W. Eaton <jwe@octave.org>
date Mon, 26 Dec 2022 17:29:59 -0500
parents deb553ac2c54
children dd904ce6f53f
line wrap: on
line source

////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2011-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_terminal_dock_widget_h)
#define octave_terminal_dock_widget_h 1

#include <QString>

#include "octave-dock-widget.h"

class QTerminal;

OCTAVE_BEGIN_NAMESPACE(octave)

  class command_widget;
  class base_qobject;

  class terminal_dock_widget : public octave_dock_widget
  {
    Q_OBJECT

  public:

    terminal_dock_widget (QWidget *parent, base_qobject& oct_qobj);

    ~terminal_dock_widget (void) = default;

    bool has_focus (void) const;

    void init_command_prompt ();

    void init_control_d_shortcut_behavior ();

    // FIXME: The next two functions could be eliminated (or combined)
    // if we had a common interface for the old and new terminal
    // widgets.

    // Only valid if using the old terminal widget.
    QTerminal * get_qterminal (void);

#if defined (HAVE_QSCINTILLA)
    // Only valid if using the new terminal widget.
    command_widget * get_command_widget (void);
#endif

  signals:

    void settings_changed (void);

    // Note: the following four signals are
    // currently only used by the new experimental terminal widget.

    void update_prompt_signal (const QString&);

    void interpreter_output_signal (const QString&);

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

    void execute_command_signal (const QString&);

  public slots:

    void notice_settings (void);

  private:

    bool m_experimental_terminal_widget;

    // FIXME!!!  Maybe my_term should just be derived from QTerminal?
    QWidget *m_terminal;
  };

OCTAVE_END_NAMESPACE(octave)

#endif