Mercurial > octave
view libgui/src/files-dock-widget.h @ 22177:6e9f5408c0db
Save settings in Qt convention, delete all children in destructors (bug #45366)
* QUnixTerminalImpl.cpp (QUnixTerminalImpl::~QUnixTerminalImpl): Delete
dynamic objects pointed to by m_terminal (TerminalModel), m_kpty (KPty) and
m_terminalView (TerminalView). (bug fix)
* files-dock-widget.cc: (files_dock_widget::~files_dock_widget): Rename to
save_settings. Return if variable 'settings' is not valid object pointer.
(files_dock_widget::save_settings): Added. Similar code as destructor was.
Call base class octave_dock_widget::save_settings at end of routine.
* files-dock-widget.h: (files_dock_widget::~files_dock_widget): Provide empty
destructor.
(files_dock_widget::save_settings): Added, public slot.
* find-files-dialog.cc: (find_files_dialog::~find_files_dialog): Moved most
of the code, except the statement deleting the directory iterator, to
new routine save_settings.
(find_files_dialog::save_settings): Added. Large portion of the code that was
in the destructor. Return immediately if variable 'settings' is not valid
object pointer.
* find-files-dialog.h: (find_files_dialog::save_settings): Added, public slot.
* history-dock-widget.cc: (history_dock_widget::~history_dock_widget): Rename
to save_settings. Return if variable 'settings' is not valid object pointer.
(history_dock_widget::save_settings): Similar code as destructor was. Call
base class octave_dock_widget::save_settings at end of routine.
* history-dock-widget.h: (history_dock_widget::~history_dock_widget): Provide
empty destructor.
(history_dock_widget::save_settings): Added, public slot.
* main-window.cc (main_window::prepare_to_exit): If find_files_dlg is valid,
call the object's save_settings routine.
(main_window::construct): Connect appropriate slot of all objects that must
save_settings information to the qApp aboutToQuit signal. (Except for
find_files_dlg, see above.) At end of this sequence, connect aboutToQuit to
the shortcut_manager and resource_manager function that deletes instance.
* octave-dock-widget.cc: (octave_dock_widget::~octave_dock_widget): Rename to
save_settings. Return if variable 'settings' is not valid object pointer.
(octave_dock_widget::save_settings): Similar code as destructor was.
* octave-dock-widget.h: (octave_dock_widget::~octave_dock_widget): Provide
empty destructor.
(octave_dock_widget::save_settings): Added, public slot.
* octave-qt-link.cc (octave_qt_link::do_prompt_new_edit_file): Check that
'settings' pointer is valid before using.
* resource-manager.cc: Remove "singleton-cleanup.h" header reference.
(resource_manager::instance_ok): Do not add cleanup_instance to worker
thread's exit cleanup procedure.
* resource-manager.h (resource_manager::instance) Change variable to public for
connecting.
(resource_manager::cleanup_instance) Change to a public slot for connecting to
qApp aboutToQuit signal.
(resource_manager::resource_manager): Remove an unused variation of the
constructor.
(resource_manager::operator =) Removed.
* settings-dialog.cc: Add QMessageBox to header file list.
(settings_dialog::settings_dialog): If QSettings pointer settings is not valid
return immediately.
(settings_dialog::show_tab): Condition setting the current index on pointer
'settings' being valid.
(settings_dialog::write_changed_settings): Remove FIXME comment. If the
settings are not valid, display a dialog about missing file and return.
* shortcut-manager.cc: Remove "singleton-cleanup.h" header reference.
(shortcut_manager::instance_ok): Do not add cleanup_instance to worker
thread's exit cleanup procedure.
* shortcut-manager.h (shortcut_manager::instance) Change variable to public for
connecting.
(shortcut_manager::cleanup_instance) Change to a public slot for connecting to
qApp aboutToQuit signal.
(shortcut_manager::shortcut_manager): Remove an unused variation of the
constructor.
(shortcut_manager::operator =) Removed.
* terminal-dock-widget.cc (terminal_dock_widget::~terminal_dock_widget): Added.
Delete QTerminal terminal. (bug fix)
* terminal-dock-widget.h (terminal_dock_widget::~terminal_dock_widget): Added.
* workspace-view.cc: (workspace_view::workspace_view): Place code hunk using
QSettings pointer 'settings' within a conditional block.
(workspace_view::~workspace_view): Rename to save_settings. Return if
variable 'settings' is not valid object pointer.
(workspace_view::save_settings): Almost same code as destructor was. Call base
class octave_dock_widget::save_settings at end of routine.
* workspace-view.h: (workspace_view::~workspace_view): Provide empty
destructor.
(workspace_view::save_settings): Added, public slot.
author | Daniel J Sebald <daniel.sebald@ieee.org> |
---|---|
date | Mon, 25 Jul 2016 17:44:02 -0400 |
parents | 710e700cdd7f |
children | bac0d6f07a3e |
line wrap: on
line source
/* Copyright (C) 2011-2015 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 <http://www.gnu.org/licenses/>. */ #if ! defined (octave_files_dock_widget_h) #define octave_files_dock_widget_h 1 #include <QListView> #include <QDate> #include <QObject> #include <QWidget> #include <QListWidget> #include <QFileSystemModel> #include <QToolBar> #include <QToolButton> #include <QVBoxLayout> #include <QAction> #include <QTreeView> #include <QMouseEvent> #include <QSignalMapper> #include <QComboBox> #include "octave-dock-widget.h" /** @class files_dock_widget @brief Dock widget to display files in the current directory. */ class files_dock_widget : public octave_dock_widget { Q_OBJECT public: files_dock_widget (QWidget *parent = 0); ~files_dock_widget (void) { } public slots: /** Slot for handling a change in directory via double click. */ void item_double_clicked (const QModelIndex & index); /** Slot for handling the up-directory button in the toolbar. */ void change_directory_up (); /** Slot for handling the sync octave directory button in the toolbar. */ void do_sync_octave_directory (); /** Slot for handling the sync browser directory button in the toolbar. */ void do_sync_browser_directory (); /** Sets the current directory being displayed. */ void set_current_directory (const QString& dir); /** Accepts user input a the line edit for the current directory. */ void accept_directory_line_edit (); /** set the internal variable that holds the actual octave variable **/ void update_octave_directory (const QString& dir); /** Tells the widget to react on changed settings. */ void notice_settings (const QSettings *settings); void save_settings (void); private slots: void headercontextmenu_requested (const QPoint& pos); void toggle_header (int col); /** context menu wanted */ void contextmenu_requested (const QPoint& pos); /* context menu actions */ void contextmenu_open (bool); void contextmenu_open_in_editor (bool); void contextmenu_open_in_app (bool); void contextmenu_copy_selection (bool); void contextmenu_run (bool); void contextmenu_load (bool); void contextmenu_rename (bool); void contextmenu_delete (bool); void contextmenu_newfile (bool); void contextmenu_newdir (bool); void contextmenu_setcurrentdir (bool); void contextmenu_findfiles (bool); /* popdown menu options */ void popdownmenu_newfile (bool); void popdownmenu_newdir (bool); void popdownmenu_search_dir (bool); void popdownmenu_findfiles (bool); void popdownmenu_home (bool); /* from octave_doc_widget */ void copyClipboard (); void pasteClipboard (); void selectAll (); signals: /** Emitted, whenever the user requested to open a file. */ void open_file (const QString& fileName); /** Emitted, whenever the currently displayed directory changed. */ void displayed_directory_changed (const QString& dir); /** Emitted, whenever the user requested to load a file. */ void load_file_signal (const QString& fileName); /** Emitted, whenever the user requested to run a file. */ void run_file_signal (const QFileInfo& info); /** Emitted, whenever wants to search for a file . */ void find_files_signal (const QString &startdir); private: void process_new_file (const QString &parent_name); void process_new_dir (const QString &parent_name); void process_set_current_dir (const QString &parent_name); void process_find_files (const QString &dir_name); /** set a new directory or open a file **/ void display_directory (const QString& dir, bool set_octave_dir = true); void open_item_in_app (const QModelIndex& index); /** Variables for the actions **/ QToolBar * _navigation_tool_bar; QAction * _sync_octave_directory_action; QAction * _sync_browser_directory_action; /** The file system model. */ QFileSystemModel *_file_system_model; /** The file system view. */ QTreeView * _file_tree_view; QComboBox * _current_directory; /** Internal variables **/ bool _sync_octave_dir; // flag if syncing with octave QString _octave_dir; // the actual octave dir enum { MaxMRUDirs = 10 }; QStringList _columns_shown; QStringList _columns_shown_keys; QSignalMapper *_sig_mapper; }; #endif