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 branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	configure.ac
	data/icons/filetypes/mp3.png
	data/icons/filetypes/picture.png
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/filebrowser.cpp
	src/gui/followscreenings.cpp
	src/gui/followscreenings.h
	src/gui/osd_setup.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 75db11c2e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-07 15:14:51 +02:00
parent 83cdc44dca 8d55020df7
commit 48db0bd94c
10 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/audioplayer.cpp
View File

@@ -263,7 +263,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
m_fheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
int iw, ih;
m_frameBuffer->getIconSize(NEUTRINO_ICON_AUDIO, &iw, &ih); //NI
m_frameBuffer->getIconSize(NEUTRINO_ICON_AUDIO, &iw, &ih);
m_theight = std::max(m_theight, ih+4);
m_title_height = m_fheight*2 + 20 + m_sheight + 4;
@@ -1572,7 +1572,7 @@ void CAudioPlayerGui::paintHead()
if (!m_show_playlist || m_screensaver)
return;
CComponentsHeaderLocalized header(m_x, m_y + m_title_height, m_width, m_theight, LOCALE_AUDIOPLAYER_HEAD, NEUTRINO_ICON_AUDIO); //NI
CComponentsHeaderLocalized header(m_x, m_y + m_title_height, m_width, m_theight, LOCALE_AUDIOPLAYER_HEAD, NEUTRINO_ICON_AUDIO);
header.setCorner(RADIUS_MID, CORNER_TOP);
if (m_inetmode)