Mercurial > octave
view libgui/src/resource-manager.h @ 27556:410622ac120f
improve run selection from editor (bug #42705)
* file-editor-tab.cc (file_editor_tab): relay interpreter event signals
to the ones of the editor widget
* file-editor.cc (make_file_editor_tab): connect signal of edit area for
giving focus to console window to the new slot in main_window
* octave-qscintilla.cc: include headers required for interpreter threads
and for additionally used Qt libs;
(octave_qscintilla): connect new signals for finished run selection
action to the new related slot;
(contextmenu_run_temp_error): new method displaying a message box on
error handling temp. files;
(contextmenu_run): create a temp. file with all selected lines extended
by commands for displaying each line and add it to the command history,
disable opening a file at breakpoints, run this temp. file by the
interpreter and emit new signal when running this file is finished;
(ctx_menu_run_finished): slot when running the temp. file is finished,
removing temp. files and reset modified editor preferences;
* octave-qscintilla.h: include QSettings and interpreter-events,
interpreter signal, signal for focusing console window and signal when
running temp file is finished, new slot for the latter
* main-window.cc (focus_console_after_command): do not return the related
setting, but actually give console window the focus if desired,
(run_file_in_terminal, execute_command_in_terminal): use this new form
* main-window.h: change focus_console_method from private method into
public slot
* resource-manager.cc (resource_manager): initialize new list of created
temp. files;
(~resource_manager): remove any temp. files that are still existing;
(do_create_tmp_file): create a new temp. file with the given contents
and store its smart pointer into a list for removing the file later;
(do_remove_tmp_file): remove given temp. file and remove it from the list;
* resource-manager.h: include QPointer and QTemporaryFile,
(create_tmp_file): new static method calling internal do_create_tmp_file;
(remove_tmp_file): new static method calling internal do_create_tmp_file;
new internal methods do_create_tmp_file and do_remove_tmp_file,
new list for storing temp. file pointers
author | Torsten Lilge <ttl-octave@mailbox.org> |
---|---|
date | Fri, 25 Oct 2019 07:36:37 +0200 |
parents | da1f59fe04b3 |
children | 315c35e6037c |
line wrap: on
line source
/* Copyright (C) 2011-2019 Jacob Dawid 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_resource_manager_h) #define octave_resource_manager_h 1 #include <QComboBox> #include <QDesktopServices> #include <QIcon> #include <QMap> #include <QPointer> #include <QSettings> #include <QTranslator> #include <QTemporaryFile> namespace octave { class resource_manager : public QObject { Q_OBJECT protected: public: resource_manager (void); // No copying! resource_manager (const resource_manager&) = delete; resource_manager& operator = (const resource_manager&) = delete; ~resource_manager (); static QSettings * get_settings (void) { return instance_ok () ? instance->do_get_settings () : nullptr; } static QIcon icon (const QString& icon_name, bool fallback = true) { if (instance_ok ()) return instance->do_icon (icon_name, fallback); return QIcon (); } static QSettings * get_default_settings (void) { return instance_ok () ? instance->do_get_default_settings () : nullptr; } static QString get_settings_file (void) { return instance_ok () ? instance->do_get_settings_file () : QString (); } static void reload_settings (void) { if (instance_ok ()) instance->do_reload_settings (); } static void set_settings (const QString& file) { if (instance_ok ()) instance->do_set_settings (file); } static bool update_settings_key (const QString& new_key, const QString& old_key) { return (instance_ok () ? instance->do_update_settings_key (new_key, old_key) : false); } static void get_codecs (QStringList *codecs) { if (instance_ok ()) instance->do_get_codecs (codecs); } static void combo_encoding (QComboBox *combo, QString current = QString ()) { if (instance_ok ()) instance->do_combo_encoding (combo, current); } static QString get_gui_translation_dir (void); static void config_translators (QTranslator*, QTranslator*, QTranslator*); static void update_network_settings (void) { if (instance_ok ()) instance->do_update_network_settings (); } static bool is_first_run (void) { return instance_ok () ? instance->do_is_first_run () : true; } static QPointer<QTemporaryFile> create_tmp_file ( const QString& extension = QString (), const QString& contents = QString ()) { return instance_ok () ? instance->do_create_tmp_file (extension, contents) : QPointer<QTemporaryFile> (); } static void remove_tmp_file (QPointer<QTemporaryFile> tmp_file) { if (instance_ok ()) instance->do_remove_tmp_file (tmp_file); } static QString storage_class_chars (void) { return "agp"; } static QStringList storage_class_names (void); static QList<QColor> storage_class_default_colors (void); static QString terminal_color_chars (void) { return "fbsc"; } static QStringList terminal_color_names (void); static QList<QColor> terminal_default_colors (void); static resource_manager *instance; public slots: static void cleanup_instance (void) { delete instance; instance = nullptr; } static QString varedit_color_chars (void) {return "fbsha"; } static QStringList varedit_color_names (void); static QList<QColor> varedit_default_colors (void); private: static bool instance_ok (void); QSettings * do_get_settings (void) const; QSettings * do_get_default_settings (void) const; QString do_get_settings_directory (void); QString do_get_settings_file (void); QString do_get_default_font_family (void); QPointer<QTemporaryFile> do_create_tmp_file (const QString& extension, const QString& contents); void do_remove_tmp_file (QPointer<QTemporaryFile> tmp_file); void do_reload_settings (void); void do_set_settings (const QString& file); bool do_update_settings_key (const QString& new_key, const QString& old_key); bool do_is_first_run (void) const; void do_update_network_settings (void); QIcon do_icon (const QString& icon, bool fallback); void do_get_codecs (QStringList *codecs); void do_combo_encoding (QComboBox *combo, QString current); QString m_settings_directory; QString m_settings_file; QSettings *m_settings; QSettings *m_default_settings; QList<QTemporaryFile *> m_temporary_files; }; } #endif