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

Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-10 16:45:30 +02:00
parent bc79592586 bb756163b1
commit 3739b4de04
88 changed files with 525 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/audioplayer.cpp
View File

@@ -804,7 +804,7 @@ int CAudioPlayerGui::show()
int y1=(g_settings.screen_EndY- g_settings.screen_StartY)/2 + g_settings.screen_StartY;
int h = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNEL_NUM_ZAP]->getHeight();
w = std::max(w, g_Font[SNeutrinoSettings::FONT_TYPE_CHANNEL_NUM_ZAP]->getRenderWidth(selectedKey));
m_frameBuffer->paintBoxRel(x1 - 7, y1 - h - 5, w + 14, h + 10, COL_MENUCONTENT_PLUS_1, RADIUS_SMALL); //NI
m_frameBuffer->paintBoxRel(x1 - 7, y1 - h - 5, w + 14, h + 10, COL_FRAME_PLUS_0, RADIUS_SMALL); //NI
m_frameBuffer->paintBoxRel(x1 - 6, y1 - h - 4, w + 12, h + 8, COL_MENUCONTENTSELECTED_PLUS_0, RADIUS_SMALL); //NI
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNEL_NUM_ZAP]
->RenderString(x1,y1,w+1,selectedKey,COL_MENUCONTENTSELECTED_TEXT);
@@ -1769,7 +1769,7 @@ void CAudioPlayerGui::paintInfo()
title_height -= m_fheight;
m_frameBuffer->paintBoxRel(m_x, m_y, m_width, title_height - 10, COL_MENUHEAD_PLUS_0, c_rad_mid); //NI
m_frameBuffer->paintBoxFrame(m_x, m_y, m_width, title_height - 10, 1, COL_MENUCONTENT_PLUS_1, c_rad_mid); //NI
m_frameBuffer->paintBoxFrame(m_x, m_y, m_width, title_height - 10, 1, COL_FRAME_PLUS_0, c_rad_mid); //NI
paintCover();
@@ -1840,14 +1840,14 @@ void CAudioPlayerGui::paint()
int ypos = m_y + m_title_height + m_theight;
int sb = m_fheight * m_listmaxshow;
m_frameBuffer->paintBoxRel(m_x + m_width - 15, ypos, 15, sb, COL_MENUCONTENT_PLUS_1);
m_frameBuffer->paintBoxRel(m_x + m_width - 15, ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0);
int sbc = ((m_playlist.size() - 1) / tmp_max) + 1;
int sbs = (m_selected / tmp_max);
if (sbc < 1)
sbc = 1;
m_frameBuffer->paintBoxRel(m_x + m_width - 13, ypos + 2 + sbs*(sb-4)/sbc , 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3, RADIUS_SMALL);
m_frameBuffer->paintBoxRel(m_x + m_width - 13, ypos + 2 + sbs*(sb-4)/sbc , 11, (sb-4)/sbc, COL_SCROLLBAR_ACTIVE_PLUS_0, RADIUS_SMALL);
}
paintInfo();
@@ -1864,13 +1864,16 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos)
{
int xpos = m_x - ConnectLineBox_Width;
int ypos1 = m_y + m_title_height + m_theight + pos*m_fheight;
int ypos2 = m_y + (m_height - m_info_height) + INFO_BOX_Y_OFFSET;
int ypos2 = m_y + (m_height - m_info_height) + OFFSET_INTER;
int ypos1a = ypos1 + (m_fheight / 2);
int ypos2a = ypos2 + (m_info_height / 2);
// clear details line
if (dline != NULL)
{
dline->kill();
dline = NULL;
}
// paint Line if detail info (and not valid list pos) and info box
if (!m_playlist.empty() && (pos >= 0))
@@ -1885,7 +1888,7 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos)
ibox = new CComponentsInfoBox(m_x, ypos2, m_width, m_info_height);
ibox->setFrameThickness(1); //NI
ibox->setCorner(RADIUS_LARGE);
ibox->setColorFrame(COL_MENUCONTENT_PLUS_1); //NI
ibox->setColorFrame(COL_FRAME_PLUS_0);
ibox->setColorBody(COL_MENUCONTENTDARK_PLUS_0);
ibox->forceTextPaint(false);
}
@@ -2312,7 +2315,7 @@ bool CAudioPlayerGui::getNumericInput(neutrino_msg_t& msg, int& val) {
sprintf(str, "%d", val);
int w = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNEL_NUM_ZAP]->getRenderWidth(str);
int h = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNEL_NUM_ZAP]->getHeight();
m_frameBuffer->paintBoxRel(x1 - 7, y1 - h - 5, w + 14, h + 10, COL_MENUCONTENT_PLUS_1); //NI
m_frameBuffer->paintBoxRel(x1 - 7, y1 - h - 5, w + 14, h + 10, COL_FRAME_PLUS_0); //NI
m_frameBuffer->paintBoxRel(x1 - 6, y1 - h - 4, w + 12, h + 8, COL_MENUCONTENTSELECTED_PLUS_0); //NI
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNEL_NUM_ZAP]->RenderString(x1, y1, w + 1, str, COL_MENUCONTENTSELECTED_TEXT);
while (true)