Mercurial > octave

diff libgui/src/settings-dialog.cc @ 26008:38a881b8fbec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not use courier new as default font (bug #54086) * gui-preferences.h: move the definition of fallback monospace font families from resource_manager to here in case Qt does not provide a default monospace font family; define keys for the font of the variable editor and the console, but without default values since the latter is provided by resource_manager and is read later from the preferences file * resource-manager.cc (do_get_default_font_family): new method for detecting the default monospace font family, code is moved from do_reload_settings; (do_reload_settings): always get the default monospace font and write it to the preferences files as possible fallback for other console, editor etc. * resource-manager.h: new method do_get_default_font_family * settings-dialog.cc (settings_dialog): use new monospace font from preferences as fallback for terminal and variable editor font (write_lexer_settings): use new monospace font from preferences as fallback * QTerminal.cc: include gui-preferences.h; (notice_settings): get default monospace font from preferences file and use it as fallback for reading the terminal front from the file * terminal-dock-widget.cc (terminal_dock_widget): use new monospace font from preferences as fallback * variable-editor.cc (notice_settings): use new monospace font from preferences as fallback
author Torsten <mttl@mailbox.org>
date Thu, 01 Nov 2018 22:10:00 +0100
parents c3cd63006870
children 1002b49ce7b3
line wrap: on
line diff
--- a/libgui/src/settings-dialog.cc	Thu Nov 01 13:10:23 2018 -0700
+++ b/libgui/src/settings-dialog.cc	Thu Nov 01 22:10:00 2018 +0100
@@ -33,6 +33,7 @@
 #include "variable-editor.h"
 #include "workspace-model.h"
 #include "settings-dialog.h"
+#include "gui-preferences.h"
 
 #include <QButtonGroup>
 #include <QDir>
@@ -333,7 +334,8 @@
     editor_show_dbg_file->setChecked (settings->value (ed_show_dbg_file.key, ed_show_dbg_file.def).toBool ());
 
     // terminal
-    terminal_fontName->setCurrentFont (QFont (settings->value ("terminal/fontName", "Courier New").toString ()));
+    QString default_font = settings->value (global_mono_font.key, global_mono_font.def).toString ();
+    terminal_fontName->setCurrentFont (QFont (settings->value (cs_font.key, default_font).toString ()));
     terminal_fontSize->setValue (settings->value ("terminal/fontSize", 10).toInt ());
     terminal_history_buffer->setValue (settings->value ("terminal/history_buffer", 1000).toInt ());
     terminal_cursorUseForegroundColor->setChecked (settings->value ("terminal/cursorUseForegroundColor", true).toBool ());
@@ -400,7 +402,7 @@
     varedit_rowHeight->setValue (settings->value ("variable_editor/row_height", 10).toInt ());
     varedit_rowAutofit->setChecked (settings->value ("variable_editor/autofit_row_height", true).toBool ());
 
-    varedit_font->setCurrentFont (QFont (settings->value ("variable_editor/font_name", settings->value ("terminal/fontName", "Courier New")).toString ()));
+    varedit_font->setCurrentFont (QFont (settings->value ("variable_editor/font_name", settings->value (cs_font.key, default_font)).toString ()));
     varedit_fontSize->setValue (settings->value ("variable_editor/font_size", QVariant (10)).toInt ());
     connect (varedit_useTerminalFont, SIGNAL (toggled (bool)),
              varedit_font, SLOT (setDisabled (bool)));
@@ -695,7 +697,10 @@
     color_picker *color;
     color_picker *bg_color;
     int default_size = 10;
-    QFont default_font = QFont ("Courier New", 10, -1, 0);
+
+    QString default_font_name
+      = settings->value (global_mono_font.key, global_mono_font.def).toString ();
+    QFont default_font = QFont (default_font_name, 10, -1, 0);
     QColor default_color = QColor ();
     QColor dummy_color = QColor (255, 0, 255);