Mercurial > octave
changeset 22618:5fdfde2a873d
maint: merge stable to default.
author | Rik <rik@octave.org> |
---|---|
date | Wed, 12 Oct 2016 18:24:08 -0700 |
parents | 68e9bdb7cde3 (current diff) 51b7d8456ce3 (diff) |
children | 74fb14727a30 |
files | |
diffstat | 4 files changed, 37 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/BaseControl.cc Tue Oct 11 14:14:44 2016 -0700 +++ b/libgui/graphics/BaseControl.cc Wed Oct 12 18:24:08 2016 -0700 @@ -42,18 +42,35 @@ QPalette p = w->palette (); if (props.style_is ("edit") - || props.style_is ("listbox") - || props.style_is ("popupmenu")) + || props.style_is ("listbox")) { p.setColor (QPalette::Base, Utils::fromRgb (props.get_backgroundcolor_rgb ())); p.setColor (QPalette::Text, Utils::fromRgb (props.get_foregroundcolor_rgb ())); } + else if (props.style_is ("popupmenu")) + { + // popumenu (QComboBox) is a listbox with a button, so needs set colors for both + p.setColor (QPalette::Base, + Utils::fromRgb (props.get_backgroundcolor_rgb ())); + p.setColor (QPalette::Text, + Utils::fromRgb (props.get_foregroundcolor_rgb ())); + p.setColor (QPalette::Button, + Utils::fromRgb (props.get_backgroundcolor_rgb ())); + p.setColor (QPalette::ButtonText, + Utils::fromRgb (props.get_foregroundcolor_rgb ())); + } + else if (props.style_is ("radiobutton") + || props.style_is ("checkbox")) + { + p.setColor (QPalette::Button, + Utils::fromRgb (props.get_backgroundcolor_rgb ())); + p.setColor (QPalette::WindowText, + Utils::fromRgb (props.get_foregroundcolor_rgb ())); + } else if (props.style_is ("pushbutton") - || props.style_is ("togglebutton") - || props.style_is ("radiobutton") - || props.style_is ("checkbox")) + || props.style_is ("togglebutton")) { p.setColor (QPalette::Button, Utils::fromRgb (props.get_backgroundcolor_rgb ()));
--- a/libinterp/module.mk Tue Oct 11 14:14:44 2016 -0700 +++ b/libinterp/module.mk Wed Oct 12 18:24:08 2016 -0700 @@ -286,7 +286,8 @@ OCTAVE_INTERPRETER_TARGETS += \ $(OCT_FILES) \ - $(DLDFCN_PKG_ADD_FILE) + $(DLDFCN_PKG_ADD_FILE) \ + $(LIBINTERP_TST_FILES) DIRSTAMP_FILES += libinterp/$(octave_dirstamp)
--- a/liboctave/module.mk Tue Oct 11 14:14:44 2016 -0700 +++ b/liboctave/module.mk Wed Oct 12 18:24:08 2016 -0700 @@ -117,6 +117,9 @@ -e "s|%OCTAVE_HG_ID%|$(HG_ID_VAR)|" $< > $@-t && \ $(simple_move_if_change_rule) +OCTAVE_INTERPRETER_TARGETS += \ + $(LIBOCTAVE_TST_FILES) + DIRSTAMP_FILES += liboctave/$(octave_dirstamp) EXTRA_DIST += $(liboctave_EXTRA_DIST)
--- a/scripts/startup/version-rcfile Tue Oct 11 14:14:44 2016 -0700 +++ b/scripts/startup/version-rcfile Wed Oct 12 18:24:08 2016 -0700 @@ -11,6 +11,16 @@ __octave_config_info__ ("startupfiledir"), filesep, "inputrc")); +## Re-read user's personal inputrc to give precedence over Octave's default. +inputrc = getenv ("INPUTRC"); +if (isempty (inputrc) && exist ("~/.inputrc", "file")) + inputrc = "~/.inputrc"; +endif +if (! isempty (inputrc)) + readline_read_init_file (inputrc); +endif +clear ("inputrc"); + ## Configure LESS pager if present if (strcmp (PAGER (), "less") && isempty (getenv ("LESS"))) PAGER_FLAGS ('-e -X -P"-- less ?pB(%pB\\%):--. (f)orward, (b)ack, (q)uit$"');