Mercurial > octave
diff libgui/src/documentation.cc @ 27630:262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
Move ownership of the shorcut_manager object to the base_qobject
class. Eliminate static member functions in shortcut_managar class.
Provide a get_shortcut_manager method in the base_qboject class and
access reference to shortcut_manager object from m_octave_qobj member
variables in classes that need it.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 04 Nov 2019 14:03:00 -0500 |
parents | 8b6e928e0705 |
children | a36443e94f8a |
line wrap: on
line diff
--- a/libgui/src/documentation.cc Mon Nov 04 13:34:44 2019 -0500 +++ b/libgui/src/documentation.cc Mon Nov 04 14:03:00 2019 -0500 @@ -580,15 +580,17 @@ m_tool_bar->setIconSize (QSize (icon_size, icon_size)); // Shortcuts - shortcut_manager::set_shortcut (m_action_find, "editor_edit:find_replace"); - shortcut_manager::shortcut (m_findnext_shortcut, "editor_edit:find_next"); - shortcut_manager::shortcut (m_findprev_shortcut, "editor_edit:find_previous"); - shortcut_manager::set_shortcut (m_action_zoom_in, "editor_view:zoom_in"); - shortcut_manager::set_shortcut (m_action_zoom_out, "editor_view:zoom_out"); - shortcut_manager::set_shortcut (m_action_zoom_original, "editor_view:zoom_normal"); - shortcut_manager::set_shortcut (m_action_go_home, "doc_browser:go_home"); - shortcut_manager::set_shortcut (m_action_go_prev, "doc_browser:go_back"); - shortcut_manager::set_shortcut (m_action_go_next, "doc_browser:go_next"); + shortcut_manager& scmgr = m_octave_qobj.get_shortcut_manager (); + + scmgr.set_shortcut (m_action_find, "editor_edit:find_replace"); + scmgr.shortcut (m_findnext_shortcut, "editor_edit:find_next"); + scmgr.shortcut (m_findprev_shortcut, "editor_edit:find_previous"); + scmgr.set_shortcut (m_action_zoom_in, "editor_view:zoom_in"); + scmgr.set_shortcut (m_action_zoom_out, "editor_view:zoom_out"); + scmgr.set_shortcut (m_action_zoom_original, "editor_view:zoom_normal"); + scmgr.set_shortcut (m_action_go_home, "doc_browser:go_home"); + scmgr.set_shortcut (m_action_go_prev, "doc_browser:go_back"); + scmgr.set_shortcut (m_action_go_next, "doc_browser:go_next"); } void documentation::copyClipboard (void)