Mercurial > hg > octave-lojdl
changeset 16522:bfff338c56d1
set default terminal font for the GUI from the configure script
* configure.ac (DEFAULT_TERMINAL_FONT, DEFAULT_TERMINAL_FONT_SIZE):
New variables. Set depending on system type.
* common.mk: Substitute them here.
(do_subst_qt_settings): New macro.
* libgui/default-qt-settings.in: Rename from default-qt-settings.
Substitute terminal font and size.
* libgui/Makefile.am (EXTRA_DIST): Distribute default-qt-settings.in
instead of default-qt-settings.
(default-qt-settings): New rule.
* run-octave.in (OCTAVE_DEFAULT_QT_SETTINGS): Look in build directory
for default-qt-settings file.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 16 Apr 2013 13:10:29 -0400 |
| parents | dbc7018be4be |
| children | 62d8aaf6ba8f |
| files | build-aux/common.mk configure.ac libgui/Makefile.am libgui/default-qt-settings libgui/default-qt-settings.in run-octave.in |
| diffstat | 5 files changed, 31 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/common.mk +++ b/build-aux/common.mk @@ -67,6 +67,9 @@ DEFAULT_PAGER = @DEFAULT_PAGER@ +DEFAULT_TERMINAL_FONT = @DEFAULT_TERMINAL_FONT@ +DEFAULT_TERMINAL_FONT_SIZE = @DEFAULT_TERMINAL_FONT_SIZE@ + ENABLE_DYNAMIC_LINKING = @ENABLE_DYNAMIC_LINKING@ SHLEXT = @SHLEXT@ @@ -702,6 +705,14 @@ $(simple_move_if_change_rule) endef +define do_subst_qt_settings +echo "making $@ from $<" +$(SED) < $< \ + -e "s|%DEFAULT_TERMINAL_FONT%|${DEFAULT_TERMINAL_FONT}|" \ + -e "s|%DEFAULT_TERMINAL_FONT_SIZE%|${DEFAULT_TERMINAL_FONT_SIZE}|" > $@-t +$(simple_move_if_change_rule) +endef + define test-file-commands ( echo "## DO NOT EDIT! Generated automatically from $(<F) by Make."; $(GREP) '^%!' $< ) > $@-t mv $@-t $@
--- a/configure.ac +++ b/configure.ac @@ -130,6 +130,19 @@ OCTAVE_PROG_PAGER OCTAVE_PROG_PYTHON +### Default terminal font for the GUI +case $host_os in + mingw* | msdosmsvc) + DEFAULT_TERMINAL_FONT="Lucida Console" + ;; + *) + DEFAULT_TERMINAL_FONT="Courier" + ;; +esac +DEFAULT_TERMINAL_FONT_SIZE=10 +AC_SUBST(DEFAULT_TERMINAL_FONT) +AC_SUBST(DEFAULT_TERMINAL_FONT_SIZE) + ### Path separator. sepchar=':'
--- a/libgui/Makefile.am +++ b/libgui/Makefile.am @@ -38,7 +38,7 @@ LOCALES = $(patsubst languages/%.ts, languages/%.qm, $(TRANSLATIONS)) -EXTRA_DIST = default-qt-settings $(TRANSLATIONS) +EXTRA_DIST = default-qt-settings.in $(TRANSLATIONS) CLEANFILES = BUILT_SOURCES = @@ -83,6 +83,9 @@ octlocale_DATA = $(LOCALES) +default-qt-settings: default-qt-settings.in + $(do_subst_qt_settings) + moc-%.cc: %.h $(MOC) -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MOC_CPPFLAGS) $(liboctgui_la_CPPFLAGS) $<
rename from libgui/default-qt-settings rename to libgui/default-qt-settings.in --- a/libgui/default-qt-settings +++ b/libgui/default-qt-settings.in @@ -21,8 +21,8 @@ savedSessionTabs=@Invalid() [terminal] -fontSize=10 -fontName=Courier +fontSize=%DEFAULT_TERMINAL_FONT_SIZE% +fontName=%DEFAULT_TERMINAL_FONT% cursorBlinking=true cursorType=ibeam
--- a/run-octave.in +++ b/run-octave.in @@ -79,7 +79,7 @@ fi OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \ -OCTAVE_DEFAULT_QT_SETTINGS="$top_srcdir/libgui/default-qt-settings" \ +OCTAVE_DEFAULT_QT_SETTINGS="$builddir/libgui/default-qt-settings" \ OCTAVE_LOCALE_DIR="$top_srcdir/libgui/languages" \ OCTAVE_JAVA_DIR="$builddir/scripts/java" \ exec $builddir/libtool --mode=execute $driver \