Mercurial > octave-nkf
diff libgui/src/settings-dialog.cc @ 19382:c364b9a44580 gui-release
provide an editor lexer for text or unknown files (bug #43572)
* default-qt-settings.in: fix color for numbers in bash files, add defaults
for the new text lexer
* file-editor-tab.cc (update_lexer): only select the bash lexer for .sh-files,
select the new text lexer for .m-files or unnamed files if octave and matlab
lexer is not available as well as for files with no or unknown extension
* octave-txt-lexer.h: new lexer class derived from QsciLexer just providing
the default style for text or unknown files
* octave-txt-lexer.cc (language, description): implemented functions
* module.mk: added new files octave-txt-lexer.cc/.h
* settings-dialog.cc (constructor): read the settings for the new text lexer;
(write-changed-settings): write settings for the new lexer into the files
author | Torsten <ttl@justmail.de> |
---|---|
date | Sun, 23 Nov 2014 13:13:35 +0100 |
parents | 5fb4505b84ff |
children | ef3d0cf7aed5 d93293218966 |
line wrap: on
line diff
--- a/libgui/src/settings-dialog.cc Sat Nov 22 20:19:23 2014 -0800 +++ b/libgui/src/settings-dialog.cc Sun Nov 23 13:13:35 2014 +0100 @@ -37,6 +37,7 @@ #ifdef HAVE_QSCINTILLA #include "octave-qscintilla.h" +#include "octave-txt-lexer.h" #include <QScrollArea> #if defined (HAVE_QSCI_QSCILEXEROCTAVE_H) @@ -358,6 +359,9 @@ lexer = new QsciLexerBash (); read_lexer_settings (lexer,settings); delete lexer; + lexer = new octave_txt_lexer (); + read_lexer_settings (lexer,settings); + delete lexer; #endif // which tab is the desired one? @@ -757,6 +761,9 @@ lexer = new QsciLexerBash (); write_lexer_settings (lexer,settings); delete lexer; + lexer = new octave_txt_lexer (); + write_lexer_settings (lexer,settings); + delete lexer; #endif // Workspace