Mercurial > octave-nkf

comparison libgui/src/main-window.h @ 16648:b04413e5a811

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improve handling of interrupts, copy and paste shortcuts * QTerminal.h (QTerminal::report_status_message): New signal. (QTerminal::QTerminal): Set shortcuts for copy and paste actions. Add copy and paste actions to QTerminal widget. Connect settings_changed, report_status_message, copyClipboard_signal, and pasteClipboard_signal. * QWinTerminalImpl.cpp (QWinTerminalImpl::copyClipboard): If selection is set, copy it and report status message. Otherwise, interrupt. * TerminalView.cpp (TerminalView::copyClipboard): Likewise. * main-window.cc (main_menu::construct_file_menu): Don't set shortcut for open action. (main_window::construct_edit_menu): Delete unimplemented cut, select all, and delete actions. Connect copy and paste actions to signals. (main_window::copyClipboard_signal, main_window::pasteClipboard_signal): New signals. (main_window::copyClipboard, main_window::pasteClipboard): New slots. (main_window::_cut_action): Delete member variable. * octave-qt-link.cc (octave_qt_link::do_pre_input_event): Disable input processing by the windows console. (octave_qt_link::do_post_input_event): Enable input processing by the windows console. * terminal-dock-widget.h, terminal-dock-widget.cc: Delete notice_settings, copyClipboard, and pasteClipboard signals, slots, and connections. (terminal_dock_widget::terminal_dock_widget): Don't connect visibilityChanged signal.
author John W. Eaton <jwe@octave.org>
date Mon, 13 May 2013 07:26:37 -0400
parents e3a0ca9c8836
children d749c9b588e5
comparison
equal deleted inserted replaced
16647:d446e99f89f7 16648:b04413e5a811
83 83
84 void insert_debugger_pointer_signal (const QString& file, int line); 84 void insert_debugger_pointer_signal (const QString& file, int line);
85 void delete_debugger_pointer_signal (const QString& file, int line); 85 void delete_debugger_pointer_signal (const QString& file, int line);
86 void update_breakpoint_marker_signal (bool insert, const QString& file, 86 void update_breakpoint_marker_signal (bool insert, const QString& file,
87 int line); 87 int line);
88
89 void copyClipboard_signal (void);
90 void pasteClipboard_signal (void);
88 91
89 public slots: 92 public slots:
90 void report_status_message (const QString& statusMessage); 93 void report_status_message (const QString& statusMessage);
91 void handle_save_workspace_request (void); 94 void handle_save_workspace_request (void);
92 void handle_load_workspace_request (const QString& file = QString ()); 95 void handle_load_workspace_request (const QString& file = QString ());
136 void read_settings (void); 139 void read_settings (void);
137 void set_window_layout (QSettings *settings); 140 void set_window_layout (QSettings *settings);
138 void write_settings (void); 141 void write_settings (void);
139 void connect_visibility_changed (void); 142 void connect_visibility_changed (void);
140 143
144 void copyClipboard (void);
145 void pasteClipboard (void);
146
141 void connect_uiwidget_links (); 147 void connect_uiwidget_links ();
142 148
143 void handle_create_dialog (const QString& message, const QString& title, 149 void handle_create_dialog (const QString& message, const QString& title,
144 const QString& icon, const QStringList& button, 150 const QString& icon, const QStringList& button,
145 const QString& defbutton, 151 const QString& defbutton,
254 QAction *_debug_quit; 260 QAction *_debug_quit;
255 261
256 QAction *_new_script_action; 262 QAction *_new_script_action;
257 QAction *_open_action; 263 QAction *_open_action;
258 264
259 QAction *_cut_action;
260 QAction *_copy_action; 265 QAction *_copy_action;
261 QAction *_paste_action; 266 QAction *_paste_action;
262 QAction *_undo_action; 267 QAction *_undo_action;
263 268
264 // Toolbars. 269 // Toolbars.