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

Browse Source 
Conflicts:
	data/icons/status/ca/Makefile.am
	data/icons/status/ca/biss_green.png
	data/icons/status/ca/biss_white.png
	data/icons/status/ca/biss_yellow.png
	data/icons/status/ca/conax_green.png
	data/icons/status/ca/conax_white.png
	data/icons/status/ca/conax_yellow.png
	data/icons/status/ca/cw_green.png
	data/icons/status/ca/cw_white.png
	data/icons/status/ca/cw_yellow.png
	data/icons/status/ca/d_green.png
	data/icons/status/ca/d_white.png
	data/icons/status/ca/d_yellow.png
	data/icons/status/ca/ird_green.png
	data/icons/status/ca/ird_white.png
	data/icons/status/ca/ird_yellow.png
	data/icons/status/ca/nagra_green.png
	data/icons/status/ca/nagra_white.png
	data/icons/status/ca/nagra_yellow.png
	data/icons/status/ca/nds_green.png
	data/icons/status/ca/nds_white.png
	data/icons/status/ca/nds_yellow.png
	data/icons/status/ca/powervu_green.png
	data/icons/status/ca/powervu_white.png
	data/icons/status/ca/powervu_yellow.png
	data/icons/status/ca/seca_green.png
	data/icons/status/ca/seca_white.png
	data/icons/status/ca/seca_yellow.png
	data/icons/status/ca/tan_green.png
	data/icons/status/ca/tan_white.png
	data/icons/status/ca/tan_yellow.png
	data/icons/status/ca/via_green.png
	data/icons/status/ca/via_white.png
	data/icons/status/ca/via_yellow.png
	data/icons/status/ca/x_green.png
	data/icons/status/ca/x_white.png
	data/icons/status/ca/x_yellow.png
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: 1322c2de67
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-15 (Fri, 15 Dec 2017)
This commit is contained in:
vanhofen
2017-12-15 23:19:49 +01:00
parent 72afb8817b 70550ada22
commit efcb427f1a
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/infoviewer_bb.cpp
View File

@@ -743,10 +743,12 @@ void CInfoViewerBB::paint_ca_icon(int caid, const char *icon, int &icon_space_of
int py = g_InfoViewer->BoxEndY + OFFSET_INNER_SMALL;
int px = 0;
static std::map<int, std::pair<int,const char*> > icon_map;
const int icon_space = OFFSET_INNER_SMALL, icon_number = 12;
static int icon_offset[icon_number] = {0,0,0,0,0,0,0,0,0,0,0,0};
static int icon_sizeW [icon_number] = {0,0,0,0,0,0,0,0,0,0,0,0};
static bool init_flag = false;
if (!init_flag) {