diff libgui/src/m-editor/file-editor-tab.cc @ 27583:315c35e6037c

use symbolic constants for command widget preferences * QTerminal.cc: include new header file for shortcut preferences; (default_colors, color_names): removed obsolete methods; (notice_settings): replace preferences literals by symbolic constants; * QTerminal.h: remove obsolete methods, reorder enum CursorType matching the order in settings dialog * gui-preferences-all.h: add command window related preferences keys and default values as symbolic constants * gui-preferences-cs.h: add command window related preferences keys and default values as symbolic constants * gui-preferences-global.h: add global cursor blinking preferences constants * gui-preferences-sc.h: new header with shortcut related preferences * history-dock-widget.cc (notice_settings): replace font size literals by symbolic constants * file-editor-tab.cc (notice_settings): use cursor blinking pref. constants * main-window.cc (notice_settings): use cursor blinking pref. constants * module.mk: add new header gui-preferences-sc.h with shortcut preferences * resource-manager.cc (terminal_color_names, terminal_default_colors): remove obsolete methods * resource-manager.h: remove obsolete methods * settings-dialog.cc (settings_dialog, write_changed_settings): replace preferences key and default literals by new symbolic constants (read_terminal_colors, write_terminal_colors): use new arrays of symbolic constants and color names instead of literals * terminal-dock-widget.cc (terminal_dock_widget): use symbolic constants for font size preference key and default value * variable-editor.cc (variable_editor::notice_settings): use symbolic constants for font size preference key and default value
author Torsten Lilge <ttl-octave@mailbox.org>
date Tue, 29 Oct 2019 17:23:08 +0100
parents d7876110e854
children 60cecb3fed04
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor-tab.cc	Tue Oct 29 08:10:02 2019 -0700
+++ b/libgui/src/m-editor/file-editor-tab.cc	Tue Oct 29 17:23:08 2019 +0100
@@ -2924,10 +2924,12 @@
     // handling is required
     bool cursor_blinking;
 
-    if (settings->contains ("cursor_blinking"))
-      cursor_blinking = settings->value ("cursor_blinking",true).toBool ();
+    if (settings->contains (global_cursor_blinking.key))
+      cursor_blinking = settings->value (global_cursor_blinking.key,
+                                         global_cursor_blinking.def).toBool ();
     else
-      cursor_blinking = settings->value ("terminal/cursorBlinking",true).toBool ();
+      cursor_blinking = settings->value (cs_cursor_blinking.key,
+                                         cs_cursor_blinking.def).toBool ();
 
     if (cursor_blinking)
       m_edit_area->SendScintilla (QsciScintillaBase::SCI_SETCARETPERIOD,500);