Mercurial > octave-nkf
diff libgui/src/m-editor/octave-qscintilla.cc @ 18459:f01ac1bb8a5d gui-release
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
* file-editor.cc (zoom_in): slot for zoom-in action, triggering signal for tab;
(zoom_out): slot for zoom-out action, triggering signal for tab;
(zoom_normal): slot for zoom-to-normal action, triggering signal for tab;
(construct): new View-menu with zoom-in, zoom-out and zoom-normal entries;
(add_file_editor_tab): connect zoom-signal to newly created tabs;
(set_shortcuts): set shortcuts for new zoom actions;
(check_actions): disable zoom action when no editor tab is open
* file-editor.h: zoom-in, zoom-out and zoom-normal actions, related slots
and related signals to the actual tab
* file-editor-tab.cc (zoom_in): new slot for signal from file_editor;
(zoom_out): new slot for signal from file_editor;
(zoom_normal): new slot for signal from file_editor
* file-editor-tab.h: new slots zoom_in, zoom_out, zoom_normal
* octave-qscintilla.cc (eventFilter): event filter for overriding qscintilla
internal shortcuts;
(constructor): install event filter
* octave-qscintilla.h: event filter
author | Torsten <ttl@justmail.de> |
---|---|
date | Thu, 13 Feb 2014 20:39:09 +0100 |
parents | 86c6ae5f969e |
children | f959c63934e6 |
line wrap: on
line diff
--- a/libgui/src/m-editor/octave-qscintilla.cc Thu Feb 13 12:15:14 2014 -0500 +++ b/libgui/src/m-editor/octave-qscintilla.cc Thu Feb 13 20:39:09 2014 +0100 @@ -29,13 +29,16 @@ #ifdef HAVE_QSCINTILLA #include <Qsci/qscilexer.h> +#include <QShortcut> #include "octave-qscintilla.h" #include "file-editor-tab.h" octave_qscintilla::octave_qscintilla (QWidget *p) : QsciScintilla (p) -{ } +{ + installEventFilter (this); +} octave_qscintilla::~octave_qscintilla () { } @@ -186,4 +189,13 @@ emit execute_command_in_terminal_signal (commands.at (i)); } +bool +octave_qscintilla::eventFilter(QObject *obj, QEvent *e) + { + if (e->type() == QEvent::ShortcutOverride) + return true; + else + return QObject::eventFilter(obj, e); + } + #endif