Mercurial > mxe-octave

changeset 4810:b5247f4c2dd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow default font, font size and editor to be set from environment
author John W. Eaton <jwe@octave.org>
date Tue, 21 Aug 2018 16:21:27 -0400
parents 1ce75b5e4757
children 2199acff25f8
files dist-files.mk src/release-octave-1-defaults.patch src/stable-octave-1-defaults.patch
diffstat 3 files changed, 86 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Tue Aug 21 16:19:15 2018 -0400
+++ b/dist-files.mk	Tue Aug 21 16:21:27 2018 -0400
@@ -635,6 +635,7 @@
   readline-1-sigwinch.patch \
   readline-2-event-hook.patch \
   readline.mk \
+  release-octave-1-defaults.patch \
   release-octave-1-gnulib.patch \
   release-octave.mk \
   renderproto.mk \
@@ -689,6 +690,7 @@
   src-msys-wget.mk \
   src-msys-zip.mk \
   src-msys-zlib.mk \
+  stable-octave-1-defaults.patch \
   stable-octave-1-gnulib.patch \
   stable-octave.mk \
   suitesparse-1.patch \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/release-octave-1-defaults.patch	Tue Aug 21 16:21:27 2018 -0400
@@ -0,0 +1,42 @@
+diff --git a/libgui/src/resource-manager.cc b/libgui/src/resource-manager.cc
+--- a/libgui/src/resource-manager.cc
++++ b/libgui/src/resource-manager.cc
+@@ -233,6 +233,20 @@ namespace octave
+         QString default_family = "courier";
+ #endif
+ 
++        std::string env_default_family
++          = sys::env::getenv ("OCTAVE_DEFAULT_FONT");
++
++        if (! env_default_family.empty ())
++          default_family = QString::fromStdString (env_default_family);
++
++        QString default_font_size = "10";
++
++        std::string env_default_font_size
++          = sys::env::getenv ("OCTAVE_DEFAULT_FONT_SIZE");
++
++        if (! env_default_font_size.empty ())
++          default_font_size = QString::fromStdString (env_default_font_size);
++
+         // Get the default custom editor
+ #if defined (Q_OS_WIN32)
+         QString custom_editor = "notepad++ -n%l %f";
+@@ -240,10 +254,16 @@ namespace octave
+         QString custom_editor = "emacs +%l %f";
+ #endif
+ 
++        std::string env_default_editor
++          = sys::env::getenv ("OCTAVE_DEFAULT_EDITOR");
++
++        if (! env_default_editor.empty ())
++          custom_editor = QString::fromStdString (env_default_editor);
++
+         // Replace placeholders
+         settings_text.replace ("__default_custom_editor__", custom_editor);
+         settings_text.replace ("__default_font__", default_family);
+-        settings_text.replace ("__default_font_size__", "10");
++        settings_text.replace ("__default_font_size__", default_font_size);
+ 
+         QFile user_settings (m_settings_file);
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/stable-octave-1-defaults.patch	Tue Aug 21 16:21:27 2018 -0400
@@ -0,0 +1,42 @@
+diff --git a/libgui/src/resource-manager.cc b/libgui/src/resource-manager.cc
+--- a/libgui/src/resource-manager.cc
++++ b/libgui/src/resource-manager.cc
+@@ -233,6 +233,20 @@ namespace octave
+         QString default_family = "courier";
+ #endif
+ 
++        std::string env_default_family
++          = sys::env::getenv ("OCTAVE_DEFAULT_FONT");
++
++        if (! env_default_family.empty ())
++          default_family = QString::fromStdString (env_default_family);
++
++        QString default_font_size = "10";
++
++        std::string env_default_font_size
++          = sys::env::getenv ("OCTAVE_DEFAULT_FONT_SIZE");
++
++        if (! env_default_font_size.empty ())
++          default_font_size = QString::fromStdString (env_default_font_size);
++
+         // Get the default custom editor
+ #if defined (Q_OS_WIN32)
+         QString custom_editor = "notepad++ -n%l %f";
+@@ -240,10 +254,16 @@ namespace octave
+         QString custom_editor = "emacs +%l %f";
+ #endif
+ 
++        std::string env_default_editor
++          = sys::env::getenv ("OCTAVE_DEFAULT_EDITOR");
++
++        if (! env_default_editor.empty ())
++          custom_editor = QString::fromStdString (env_default_editor);
++
+         // Replace placeholders
+         settings_text.replace ("__default_custom_editor__", custom_editor);
+         settings_text.replace ("__default_font__", default_family);
+-        settings_text.replace ("__default_font_size__", "10");
++        settings_text.replace ("__default_font_size__", default_font_size);
+ 
+         QFile user_settings (m_settings_file);
+