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

infoviewer_bb: use new infobar_buttons_usertitle key

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 974480fc4f
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: use new infobar_buttons_usertitle key

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2015-12-29 13:02:16 +01:00
parent 3b47fa1c0d
commit e5a7522184
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/infoviewer_bb.cpp
View File

@@ -226,7 +226,7 @@ void CInfoViewerBB::getBBButtonInfo()
if (!text.empty()) if (!text.empty())
break; break;
} }
text = CUserMenu::getUserMenuButtonName(0, active); text = CUserMenu::getUserMenuButtonName(0, active, g_settings.infobar_buttons_usertitle);
if (!text.empty()) if (!text.empty())
break; break;
text = g_settings.usermenu[SNeutrinoSettings::BUTTON_RED]->title; text = g_settings.usermenu[SNeutrinoSettings::BUTTON_RED]->title;
@@ -241,7 +241,7 @@ void CInfoViewerBB::getBBButtonInfo()
if (!text.empty()) if (!text.empty())
break; break;
} }
text = CUserMenu::getUserMenuButtonName(1, active); text = CUserMenu::getUserMenuButtonName(1, active, g_settings.infobar_buttons_usertitle);
if (!text.empty()) if (!text.empty())
break; break;
text = g_settings.usermenu[SNeutrinoSettings::BUTTON_GREEN]->title; text = g_settings.usermenu[SNeutrinoSettings::BUTTON_GREEN]->title;
@@ -256,7 +256,7 @@ void CInfoViewerBB::getBBButtonInfo()
if (!text.empty()) if (!text.empty())
break; break;
} }
text = CUserMenu::getUserMenuButtonName(2, active); text = CUserMenu::getUserMenuButtonName(2, active, g_settings.infobar_buttons_usertitle);
if (!text.empty()) if (!text.empty())
break; break;
text = g_settings.usermenu[SNeutrinoSettings::BUTTON_YELLOW]->title; text = g_settings.usermenu[SNeutrinoSettings::BUTTON_YELLOW]->title;
@@ -271,7 +271,7 @@ void CInfoViewerBB::getBBButtonInfo()
if (!text.empty()) if (!text.empty())
break; break;
} }
text = CUserMenu::getUserMenuButtonName(3, active); text = CUserMenu::getUserMenuButtonName(3, active, g_settings.infobar_buttons_usertitle);
if (!text.empty()) if (!text.empty())
break; break;
text = g_settings.usermenu[SNeutrinoSettings::BUTTON_BLUE]->title; text = g_settings.usermenu[SNeutrinoSettings::BUTTON_BLUE]->title;
@@ -284,7 +284,7 @@ void CInfoViewerBB::getBBButtonInfo()
{ {
if (!CMoviePlayerGui::getInstance().timeshift) if (!CMoviePlayerGui::getInstance().timeshift)
{ {
if (text == g_Locale->getText(LOCALE_MPKEY_AUDIO)) if (text == g_Locale->getText(LOCALE_MPKEY_AUDIO) && !g_settings.infobar_buttons_usertitle)
{ {
text = CMoviePlayerGui::getInstance(mode == NeutrinoMessages::mode_webtv).CurrentAudioName(); text = CMoviePlayerGui::getInstance(mode == NeutrinoMessages::mode_webtv).CurrentAudioName();
} }