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

Merge branch 'cst-next' into nmp-cst-next

Browse Source 
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-08-19 17:40:48 +02:00
parent 3daad4c6d5 59d3c49084
commit 2c4ccf9555
260 changed files with 8682 additions and 4001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/test_menu.cpp
View File

@@ -110,7 +110,7 @@ CTestMenu::~CTestMenu()
delete scrollbar;
}
static int test_pos[4] = { 130, 192, 282, 360 };
//static int test_pos[4] = { 130, 192, 282, 360 };
int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
{
@@ -138,13 +138,12 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
CVFD::getInstance()->ShowIcon((fp_icon) 0x09000002, true);
CVFD::getInstance()->ShowIcon((fp_icon) 0x0B000002, true);
char text[255];
char buf[XML_UTF8_ENCODE_MAX];
int ch = 0x2588;
int len = XmlUtf8Encode(ch, buf);
std::string tmp = Unicode_Character_to_UTF8(ch);
size_t len = tmp.size();
for (int i = 0; i < 12; i++)
{
memmove(&text[i*len], buf, len);
memmove(&text[i*len], tmp.c_str(), len);
}
text[12*len] = 0;
@@ -556,7 +555,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
if (footer == NULL){
footer = new CComponentsFooter (100, 30, 1000, hh, CComponentsFooter::CC_BTN_HELP | CComponentsFooter::CC_BTN_EXIT | CComponentsFooter::CC_BTN_MENU |CComponentsFooter::CC_BTN_MUTE_ZAP_ACTIVE, NULL, true);
//int start = 5, btnw =90, btnh = 37;
footer->setButtonFont(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]);
footer->setButtonFont(g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]);
footer->setIcon(NEUTRINO_ICON_INFO);
//add button labels with conventional button label struct
@@ -685,7 +684,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
if (clock_r == NULL){
clock_r = new CComponentsFrmClock(100, 50, NULL, "%H.%M:%S", NULL, true);
clock_r->setClockFont(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]);
clock_r->setClockIntervall(1);
clock_r->setClockInterval(1);
// clock_r->doPaintBg(false);
}