Mercurial > octave
changeset 29594:26af8b64a739
connect qt-link doc signals directlty to documentation widget
* main-window.h, main-window.cc (main_window::handle_show_doc,
main_window::handle_register_doc, main_window::handle_unregister_doc):
Delete slots.
(main_window::show_doc_signal, main_window::register_doc_signal,
main_window::unregister_doc_signal): Delete signals.
(main_window::construct_octave_qt_link): Instead of going through main
window slots to emit a new signal, connect qt_link signals directly to
the documentation_dock_widget slots:
qt_interpreter_events::show_doc_signal to
documentation_dock_widget::showDoc,
qt_interpreter_events::register_doc_signal to
documentation_dock_widget::registerDoc, and
qt_interpreter_events::unregister_doc_signal to
documentation_dock_widget::unregisterDoc.
* documentation-dock-widget.h, documentation-dock-widget.cc
Declare all slots public.
(documentation_dock_widget::documentation_dock_widget):
Don't connect showDoc, registerDoc, and unregisterDoc slots to parent
signals here.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 02 May 2021 21:00:31 -0400 |
| parents | 250cefb729d1 |
| children | f72796c1ccbc |
| files | libgui/src/documentation-dock-widget.cc libgui/src/documentation-dock-widget.h libgui/src/main-window.cc libgui/src/main-window.h |
| diffstat | 4 files changed, 3 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/documentation-dock-widget.cc Sun May 02 20:25:38 2021 -0400 +++ b/libgui/src/documentation-dock-widget.cc Sun May 02 21:00:31 2021 -0400 @@ -43,15 +43,6 @@ setStatusTip (tr ("See the documentation for help.")); setWidget (m_docs); - - connect (p, SIGNAL (show_doc_signal (const QString&)), - this, SLOT (showDoc (const QString&))); - - connect (p, SIGNAL (register_doc_signal (const QString&)), - this, SLOT (registerDoc (const QString&))); - - connect (p, SIGNAL (unregister_doc_signal (const QString&)), - this, SLOT (unregisterDoc (const QString&))); } void documentation_dock_widget::notice_settings (const gui_settings *settings)
--- a/libgui/src/documentation-dock-widget.h Sun May 02 20:25:38 2021 -0400 +++ b/libgui/src/documentation-dock-widget.h Sun May 02 21:00:31 2021 -0400 @@ -52,8 +52,6 @@ void notice_settings (const gui_settings *settings); void save_settings (void); - protected slots: - void copyClipboard (void); void pasteClipboard (void); void selectAll (void);
--- a/libgui/src/main-window.cc Sun May 02 20:25:38 2021 -0400 +++ b/libgui/src/main-window.cc Sun May 02 21:00:31 2021 -0400 @@ -1639,22 +1639,6 @@ emit selectAll_signal (); } - void main_window::handle_show_doc (const QString& file) - { - m_doc_browser_window->setVisible (true); - emit show_doc_signal (file); - } - - void main_window::handle_register_doc (const QString& file) - { - emit register_doc_signal (file); - } - - void main_window::handle_unregister_doc (const QString& file) - { - emit unregister_doc_signal (file); - } - void main_window::handle_gui_status_update (const QString& feature, const QString& status) { @@ -2232,13 +2216,13 @@ this, &main_window::handle_update_breakpoint_marker_request); connect (qt_link, &qt_interpreter_events::show_doc_signal, - this, &main_window::handle_show_doc); + m_doc_browser_window, &documentation_dock_widget::showDoc); connect (qt_link, &qt_interpreter_events::register_doc_signal, - this, &main_window::handle_register_doc); + m_doc_browser_window, &documentation_dock_widget::registerDoc); connect (qt_link, &qt_interpreter_events::unregister_doc_signal, - this, &main_window::handle_unregister_doc); + m_doc_browser_window, &documentation_dock_widget::unregisterDoc); connect (qt_link, &qt_interpreter_events::gui_status_update_signal, this, &main_window::handle_gui_status_update);
--- a/libgui/src/main-window.h Sun May 02 20:25:38 2021 -0400 +++ b/libgui/src/main-window.h Sun May 02 21:00:31 2021 -0400 @@ -109,9 +109,6 @@ void open_file_signal (const QString& file, const QString& enc, int line); void step_into_file_signal (void); - void show_doc_signal (const QString&); - void register_doc_signal (const QString&); - void unregister_doc_signal (const QString&); void update_gui_lexer_signal (bool); void insert_debugger_pointer_signal (const QString& file, int line); @@ -213,9 +210,6 @@ void handle_gui_status_update (const QString& feature, const QString& status); void focus_console_after_command (void); - void handle_show_doc (const QString& file); - void handle_register_doc (const QString& file); - void handle_unregister_doc (const QString& file); void profiler_session (void); void profiler_session_resume (void);