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

Merge branch 'pu/cc' into next-cc

Browse Source 
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/eitd/SIlanguage.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan.h
	src/gui/test_menu.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
	src/neutrino.cpp
	src/nhttpd/yconfig.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2013-04-17 13:32:12 +04:00
parent 92e86d7ee3 05b8330f39
commit 0c3a4fa858
86 changed files with 5196 additions and 1514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/widget/menue.h
View File

@@ -425,6 +425,7 @@ class CMenuWidget : public CMenuTarget
CMenuGlobal *mglobal;
CComponentsDetailLine *details_line;
CComponentsInfoBox *info_box;
int hint_height;
protected:
std::string nameString;
@@ -448,7 +449,6 @@ class CMenuWidget : public CMenuTarget
fb_pixel_t *background;
int full_width, full_height;
bool savescreen;
int hint_height;
bool has_hints; // is any items has hints
bool hint_painted; // is hint painted