Mercurial > octave-nkf
view libgui/src/main-window.h @ 16446:4b3a4bf8569b
improve encapsulation of command window object
* terminal-dockwidget.h, terminal-dockwidget.cc
(terminal_dock_widget::terminal): New data member.
(terminal_dock_widget::terminal_dock_widget): Delete QTerminal
argument. Initialize QTerminal object here.
Connect terminal_dock_widget::notice_settings_signal to
QTerminal::notice_settings.
Connect terminal_dock_widget::relay_command_signal to
Qterminal::relay_command.
Connect terminal_dock_widget::copyClipboard_signal to
Qterminal::copyClipboard.
Connect terminal_dock_widget::pasteClipboard_signal to
Qterminal::pasteClipboard.
(terminal_dock_widget::connect_visibility_changed,
terminal_dock_widget::focus, terminal_dock_widget::handle_visibility,
terminal_dock_widget::notice_settings,
terminal_dock_widget::relay_command,
terminal_dock_widget::copyClipboard,
terminal_dock_widget::pasteClipboard): New functions.
terminal_dock_widget::notice_settings_signal,
terminal_dock_widget::relay_command_signal,
terminal_dock_widget::copyClipboard_signal,
terminal_dock_widget::pasteClipboard_signal): New signals.
* main-window.h, main-window.cc (main_window::command_window): Rename
from main_window::_terminal_dock_widget. Don't use a pointer. Change
all uses.
(main_window::main_window): Initialize it here.
(main_window::~main_window): Don't delete _terminal_dock_widget.
(main_window::relay_command_signal
main_window::focus_command_window_signal): New signals.
(main_window::handle_command_double_clicked): Emit
relay_command_signal, and focus_command_window_signal signals
instead of calling focus_command_window.
(main_window::focus_command_window): Emit
focus_command_window_signal singal instead of performing
actions on _terminal_dock_widget object directly.
(main_window::handle_command_window_visible): Delete.
(main_window::connect_visibility_changed): Call
command_window.connect_visibility_changed instead of performing
actions here.
(main_window::construct): Don't create _terminal_dock_widget.
Adapt signal/slot connections for new command_window object.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 06 Apr 2013 16:14:32 -0400 |
parents | 3f8d3fc907af |
children | e3b33a7530bc |
line wrap: on
line source
/* Copyright (C) 2011-2012 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/>. */ #ifndef MAINWINDOW_H #define MAINWINDOW_H // Qt includes #include <QtGui/QMainWindow> #include <QThread> #include <QTabWidget> #include <QMdiArea> #include <QStatusBar> #include <QToolBar> #include <QQueue> #include <QMdiSubWindow> #include <QCloseEvent> #include <QToolButton> #include <QComboBox> // Editor includes #include "file-editor-interface.h" // QTerminal includes #include "QTerminal.h" // Own includes #include "resource-manager.h" #include "workspace-model.h" #include "workspace-view.h" #include "history-dockwidget.h" #include "files-dockwidget.h" #include "terminal-dockwidget.h" #include "documentation-dockwidget.h" #include "octave-qt-event-listener.h" #include "octave-qt-link.h" /** * \class MainWindow * * Represents the main window. */ class main_window : public QMainWindow { Q_OBJECT public: main_window (QWidget *parent = 0); ~main_window (); signals: void settings_changed (const QSettings *); void relay_command_signal (const QString&); void focus_command_window_signal (void); public slots: void report_status_message (const QString& statusMessage); void handle_save_workspace_request (); void handle_load_workspace_request (); void handle_clear_workspace_request (); void handle_clear_history_request (void); void new_file (); void open_file (); void open_file (const QString& file_name); void open_online_documentation_page (); void open_bug_tracker_page (); void open_octave_forge_page (); void open_agora_page (); void process_settings_dialog_request (); void show_about_octave (); void notice_settings (const QSettings *settings); void prepare_for_quit (); void reset_windows (); void update_workspace (void); void change_directory (const QString& dir); void browse_for_directory (void); void set_current_working_directory (const QString& dir); void change_directory_up (void); void accept_directory_line_edit (void); void handle_command_double_clicked (const QString& command); void focus_command_window (void); void focus_command_history (); void focus_current_directory (); void focus_workspace (); void focus_editor (); void focus_documentation (); void handle_command_history_visible (bool); void handle_current_directory_visible (bool); void handle_workspace_visible (bool); void handle_editor_visible (bool); void handle_documentation_visible (bool); void handle_enter_debugger (void); void handle_exit_debugger (void); void debug_continue (); void debug_step_into (); void debug_step_over (); void debug_step_out (); void debug_quit (); void read_settings (); void write_settings (); void connect_visibility_changed (); protected: void closeEvent (QCloseEvent * closeEvent); private: void construct (); void establish_octave_link (); void save_workspace_callback (const std::string& file); void load_workspace_callback (const std::string& file); void clear_workspace_callback (void); void clear_history_callback (void); void change_directory_callback (const std::string& directory); void debug_continue_callback (void); void debug_step_into_callback (void); void debug_step_over_callback (void); void debug_step_out_callback (void); void debug_quit_callback (void); void exit_callback (void); terminal_dock_widget command_window; #ifdef HAVE_QSCINTILLA file_editor_interface * _file_editor; #endif QMenu * _debug_menu; QAction * _debug_continue; QAction * _debug_step_into; QAction * _debug_step_over; QAction * _debug_step_out; QAction * _debug_quit; // Data models. workspace_model * _workspace_model; // Dock widgets. workspace_view * _workspace_view; history_dock_widget * _history_dock_widget; files_dock_widget * _files_dock_widget; documentation_dock_widget*_documentation_dock_widget; // Toolbars. QStatusBar * _status_bar; QComboBox * _current_directory_combo_box; static const int current_directory_width = 300; static const int current_directory_max_visible = 16; static const int current_directory_max_count = 16; QLineEdit * _current_directory_line_edit; octave_qt_event_listener *_octave_qt_event_listener; octave_qt_link *_octave_qt_link; // Flag for closing whole application bool _closing; }; #endif // MAINWINDOW_H