From 8c1d8a83237e40ffd3b214018a3f727c0ad13dcb Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 19 Oct 2016 14:06:24 +0200 Subject: [PATCH 1/2] menue: fix listModeKey handling Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/870981c889d39bd09554233a6ff35744ea683b36 Author: vanhofen Date: 2016-10-19 (Wed, 19 Oct 2016) Origin message was: ------------------ - menue: fix listModeKey handling ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 3472e3515..638cbf11b 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -986,6 +986,8 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) default: if (CNeutrinoApp::getInstance()->listModeKey(msg)) { g_RCInput->postMsg (msg, 0); + retval = menu_return::RETURN_EXIT_ALL; + msg = CRCInput::RC_timeout; } else if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all ) { retval = menu_return::RETURN_EXIT_ALL; From b393d775dcc68163b89b687a4cf73395e24c1dc9 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 19 Oct 2016 14:35:38 +0200 Subject: [PATCH 2/2] various: use DARK text color on DARK background Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/957b1e05dfc8fe3b6c49cb18ad67545a2949e58c Author: vanhofen Date: 2016-10-19 (Wed, 19 Oct 2016) Origin message was: ------------------ - various: use DARK text color on DARK background ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/audioplayer.cpp | 1 + src/gui/bedit/bouqueteditor_channels.cpp | 1 + src/gui/bedit/bouqueteditor_chanselect.cpp | 1 + src/gui/upnpbrowser.cpp | 2 ++ src/gui/widget/menue.cpp | 1 + 5 files changed, 6 insertions(+) diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 95d11cbbe..1561a8616 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -1819,6 +1819,7 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos) ibox->setFrameThickness(2); ibox->setCorner(RADIUS_LARGE); ibox->setColorBody(COL_MENUCONTENTDARK_PLUS_0); + ibox->setTextColor(COL_MENUCONTENTDARK_TEXT); ibox->forceTextPaint(false); } diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index 6588801e2..874096dd7 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -225,6 +225,7 @@ void CBEChannelWidget::paintDetails(int index) //info box ibox->setText(str, CTextBox::AUTO_WIDTH | CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT]); ibox->setColorBody(COL_MENUCONTENTDARK_PLUS_0); + ibox->setTextColor(COL_MENUCONTENTDARK_TEXT); ibox->paint(CC_SAVE_SCREEN_NO); } diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp index 91e26dff3..79896b0b1 100644 --- a/src/gui/bedit/bouqueteditor_chanselect.cpp +++ b/src/gui/bedit/bouqueteditor_chanselect.cpp @@ -282,6 +282,7 @@ void CBEChannelSelectWidget::paintDetails(int index) //info box ibox->setText(str, CTextBox::AUTO_WIDTH | CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT]); ibox->setColorBody(COL_MENUCONTENTDARK_PLUS_0); + ibox->setTextColor(COL_MENUCONTENTDARK_TEXT); ibox->paint(false); } diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index 3a5ba2982..faf85ed8b 100644 --- a/src/gui/upnpbrowser.cpp +++ b/src/gui/upnpbrowser.cpp @@ -97,6 +97,7 @@ void CUpnpBrowserGui::Init() infobox.enableFrame(true, 2); infobox.setCorner(RADIUS_LARGE); infobox.setColorAll(topbox.getColorFrame(), COL_MENUCONTENTDARK_PLUS_0); + infobox.setTextColor(COL_MENUCONTENTDARK_TEXT); infobox.setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_MENU]); infobox.enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_SHADOW_PLUS_0, g_settings.theme.menu_Hint_gradient_direction); infobox.enableShadow(CC_SHADOW_ON, -1, true); @@ -104,6 +105,7 @@ void CUpnpBrowserGui::Init() timebox.enableFrame(true, 2); timebox.setCorner(RADIUS_LARGE); timebox.setColorAll(infobox.getColorFrame(), infobox.getColorBody()); + timebox.setTextColor(infobox.getTextColor()); timebox.setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_MENU]); timebox.enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_SHADOW_PLUS_0, g_settings.theme.menu_Hint_gradient_direction); timebox.enableShadow(CC_SHADOW_ON, -1, true); diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 638cbf11b..32533c863 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1482,6 +1482,7 @@ void CMenuWidget::paintHint(int pos) info_box->setText(str, CTextBox::AUTO_WIDTH, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT], COL_MENUCONTENT_TEXT); info_box->setCorner(RADIUS_LARGE); info_box->setColorAll(COL_FRAME_PLUS_0, COL_MENUCONTENTDARK_PLUS_0); + info_box->setTextColor(COL_MENUCONTENTDARK_TEXT); info_box->enableShadow(); info_box->setPicture(item->hintIcon ? item->hintIcon : ""); info_box->enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_MENUFOOT_PLUS_0, g_settings.theme.menu_Hint_gradient_direction);// COL_MENUFOOT_PLUS_0 is default footer color