Mercurial > octave-nkf

comparison libgui/src/m-editor/octave-qscintilla.cc @ 18460:f959c63934e6 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset f01ac1bb8a5d which broke some editor short cuts
author Torsten <ttl@justmail.de>
date Thu, 13 Feb 2014 22:17:44 +0100
parents f01ac1bb8a5d
children 26d15a57f45b
comparison
equal deleted inserted replaced
18459:f01ac1bb8a5d 18460:f959c63934e6
27 #endif 27 #endif
28 28
29 #ifdef HAVE_QSCINTILLA 29 #ifdef HAVE_QSCINTILLA
30 30
31 #include <Qsci/qscilexer.h> 31 #include <Qsci/qscilexer.h>
32 #include <QShortcut>
33 32
34 #include "octave-qscintilla.h" 33 #include "octave-qscintilla.h"
35 #include "file-editor-tab.h" 34 #include "file-editor-tab.h"
36 35
37 octave_qscintilla::octave_qscintilla (QWidget *p) 36 octave_qscintilla::octave_qscintilla (QWidget *p)
38 : QsciScintilla (p) 37 : QsciScintilla (p)
39 { 38 { }
40 installEventFilter (this);
41 }
42 39
43 octave_qscintilla::~octave_qscintilla () 40 octave_qscintilla::~octave_qscintilla ()
44 { } 41 { }
45 42
46 void 43 void
187 QString::SkipEmptyParts); 184 QString::SkipEmptyParts);
188 for (int i = 0; i < commands.size (); i++ ) 185 for (int i = 0; i < commands.size (); i++ )
189 emit execute_command_in_terminal_signal (commands.at (i)); 186 emit execute_command_in_terminal_signal (commands.at (i));
190 } 187 }
191 188
192 bool
193 octave_qscintilla::eventFilter(QObject *obj, QEvent *e)
194 {
195 if (e->type() == QEvent::ShortcutOverride)
196 return true;
197 else
198 return QObject::eventFilter(obj, e);
199 }
200
201 #endif 189 #endif