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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)
This commit is contained in:
vanhofen
2017-09-12 22:32:07 +02:00
parent f37efba8f7 367977ada4
commit c6c61f6b22
41 changed files with 802 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/infoviewer_bb.cpp
View File

@@ -1030,8 +1030,8 @@ void CInfoViewerBB::paint_cam_icons()
std::ostringstream buf;
int emu_pic_startx = g_InfoViewer->ChanInfoX + (g_settings.infobar_casystem_frame ? 20 : 10);
int py = g_InfoViewer->BoxEndY + (g_settings.infobar_casystem_frame ? 4 : 2);
const char *icon_name[] = {"mgcamd","doscam","oscam","osemu","newcs","gbox"};
static int icon_space[] = {10,10,10,10,10,10};
const char *icon_name[] = {"mgcamd","doscam","ncam","oscam","osemu","newcs","gbox"};
static int icon_space[] = {10,10,10,10,10,10,10};
int icon_sizeH = 0;
int icon_sizeW = 0;
bool useCI = CCamManager::getInstance()->getUseCI();