mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-07 13:48:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next

Browse Source 
Origin commit data
------------------
Commit: 26f5742797
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)
This commit is contained in:
vanhofen
2016-10-19 14:39:32 +02:00
parent d301e06c51 7c36bd6884
commit e18c48cf31
5 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/audioplayer.cpp
View File

@@ -1856,6 +1856,7 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos)
ibox->setCorner(RADIUS_LARGE); ibox->setCorner(RADIUS_LARGE);
ibox->setColorFrame(COL_FRAME_PLUS_0); ibox->setColorFrame(COL_FRAME_PLUS_0);
ibox->setColorBody(COL_MENUCONTENTDARK_PLUS_0); ibox->setColorBody(COL_MENUCONTENTDARK_PLUS_0);
ibox->setTextColor(COL_MENUCONTENTDARK_TEXT);
ibox->forceTextPaint(false); ibox->forceTextPaint(false);
} }

1
src/gui/bedit/bouqueteditor_channels.cpp
View File

@@ -225,6 +225,7 @@ void CBEChannelWidget::paintDetails(int index)
//info box //info box
ibox->setText(str, CTextBox::AUTO_WIDTH | CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT]); ibox->setText(str, CTextBox::AUTO_WIDTH | CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT]);
ibox->setColorBody(COL_MENUCONTENTDARK_PLUS_0); ibox->setColorBody(COL_MENUCONTENTDARK_PLUS_0);
ibox->setTextColor(COL_MENUCONTENTDARK_TEXT);
ibox->paint(CC_SAVE_SCREEN_NO); ibox->paint(CC_SAVE_SCREEN_NO);
} }

1
src/gui/bedit/bouqueteditor_chanselect.cpp
View File

@@ -282,6 +282,7 @@ void CBEChannelSelectWidget::paintDetails(int index)
//info box //info box
ibox->setText(str, CTextBox::AUTO_WIDTH | CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT]); ibox->setText(str, CTextBox::AUTO_WIDTH | CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT]);
ibox->setColorBody(COL_MENUCONTENTDARK_PLUS_0); ibox->setColorBody(COL_MENUCONTENTDARK_PLUS_0);
ibox->setTextColor(COL_MENUCONTENTDARK_TEXT);
ibox->paint(false); ibox->paint(false);
} }

2
src/gui/upnpbrowser.cpp
View File

@@ -101,6 +101,7 @@ void CUpnpBrowserGui::Init()
infobox.enableFrame(true, 1); //NI infobox.enableFrame(true, 1); //NI
infobox.setCorner(RADIUS_LARGE); infobox.setCorner(RADIUS_LARGE);
infobox.setColorAll(topbox.getColorFrame(), COL_MENUCONTENTDARK_PLUS_0); infobox.setColorAll(topbox.getColorFrame(), COL_MENUCONTENTDARK_PLUS_0);
infobox.setTextColor(COL_MENUCONTENTDARK_TEXT);
infobox.setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_MENU]); 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.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); infobox.enableShadow(CC_SHADOW_ON, -1, true);
@@ -108,6 +109,7 @@ void CUpnpBrowserGui::Init()
timebox.enableFrame(true, 1); //NI timebox.enableFrame(true, 1); //NI
timebox.setCorner(RADIUS_LARGE); timebox.setCorner(RADIUS_LARGE);
timebox.setColorAll(infobox.getColorFrame(), infobox.getColorBody()); timebox.setColorAll(infobox.getColorFrame(), infobox.getColorBody());
timebox.setTextColor(infobox.getTextColor());
timebox.setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_MENU]); 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.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); timebox.enableShadow(CC_SHADOW_ON, -1, true);

3
src/gui/widget/menue.cpp
View File

@@ -1001,6 +1001,8 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
default: default:
if (CNeutrinoApp::getInstance()->listModeKey(msg)) { if (CNeutrinoApp::getInstance()->listModeKey(msg)) {
g_RCInput->postMsg (msg, 0); 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 ) { else if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all ) {
retval = menu_return::RETURN_EXIT_ALL; retval = menu_return::RETURN_EXIT_ALL;
@@ -1498,6 +1500,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->setText(str, CTextBox::AUTO_WIDTH, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT], COL_MENUCONTENT_TEXT);
info_box->setCorner(RADIUS_LARGE); info_box->setCorner(RADIUS_LARGE);
info_box->setColorAll(COL_FRAME_PLUS_0, COL_MENUCONTENTDARK_PLUS_0); info_box->setColorAll(COL_FRAME_PLUS_0, COL_MENUCONTENTDARK_PLUS_0);
info_box->setTextColor(COL_MENUCONTENTDARK_TEXT);
info_box->enableShadow(); info_box->enableShadow();
info_box->setPicture(item->hintIcon ? item->hintIcon : ""); 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 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