Mercurial > octave
diff libgui/src/settings-dialog.cc @ 29162:bb6bb306b8a6
copy lexer settings from default settings file for new languages
* file-editor-tab.cc (update_lexer_settings): call the new member function
of the resource manager for loading the current lexer settings instead
of the related lexer function directly
* resource-manager.cc (get_default_font): move the code for determining
the default monospace font and size into a separate function;
(reload_settings): call new function for the default font and size;
(read_lexer_settings): new member function testing for lexer settings
in a given settings file and copy them from the default settings if
not available
* resource-manager.h: include Qsci/qscilexer.h, new member function
get_default_font and read_lexer_settings
* settings-dialog.cc (read_lexer_settings): call the new member function
of the resource manager for loading the current lexer settings instead
of the related lexer function directly
author | Torsten Lilge <ttl-octave@mailbox.org> |
---|---|
date | Tue, 08 Dec 2020 21:34:55 +0100 |
parents | d9ac99164c18 |
children | 617d3aa713a4 |
line wrap: on
line diff
--- a/libgui/src/settings-dialog.cc Tue Dec 08 11:13:26 2020 -0800 +++ b/libgui/src/settings-dialog.cc Tue Dec 08 21:34:55 2020 +0100 @@ -664,8 +664,12 @@ gui_settings *settings) { #if defined (HAVE_QSCINTILLA) + resource_manager& rmgr = m_octave_qobj.get_resource_manager (); - lexer->readSettings (*settings); + // Get lexer settings and copy from default settings if not yet + // available in normal settings file + rmgr.read_lexer_settings (lexer, settings); + int styles[MaxLexerStyles]; // array for saving valid styles // (enum is not continuous) int max_style = get_valid_lexer_styles (lexer, styles);