mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 02:41:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/dvbsi++' commit 5db16ee2ff

Browse Source 
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
This commit is contained in:
Stefan Seyfried
2013-02-21 17:07:18 +01:00
parent c83a35ebfc 5db16ee2ff
commit 0cf191822a
42 changed files with 871 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/system/settings.h
View File

@@ -73,6 +73,7 @@ struct SNeutrinoSettings
int fan_speed;
int infobar_show;
int infobar_show_channellogo;
int infobar_progressbar;
int progressbar_color;
int casystem_display;
int scrambled_message;
@@ -421,6 +422,7 @@ struct SNeutrinoSettings
int pip_y;
int bigFonts;
int big_windows;
int channellist_additional;
int channellist_epgtext_align_right;
int channellist_extended;
int channellist_foot;
@@ -468,7 +470,7 @@ struct SNeutrinoSettings
// Font sizes
#define FONT_TYPE_COUNT 23
#define FONT_TYPE_COUNT 24
enum FONT_TYPES {
FONT_TYPE_MENU = 0,
FONT_TYPE_MENU_TITLE = 1,
@@ -486,13 +488,14 @@ struct SNeutrinoSettings
FONT_TYPE_CHANNELLIST = 13,
FONT_TYPE_CHANNELLIST_DESCR = 14,
FONT_TYPE_CHANNELLIST_NUMBER = 15,
FONT_TYPE_CHANNEL_NUM_ZAP = 16,
FONT_TYPE_INFOBAR_NUMBER = 17,
FONT_TYPE_INFOBAR_CHANNAME = 18,
FONT_TYPE_INFOBAR_INFO = 19,
FONT_TYPE_INFOBAR_SMALL = 20,
FONT_TYPE_FILEBROWSER_ITEM = 21,
FONT_TYPE_MENU_HINT = 22
FONT_TYPE_CHANNELLIST_EVENT = 16,
FONT_TYPE_CHANNEL_NUM_ZAP = 17,
FONT_TYPE_INFOBAR_NUMBER = 18,
FONT_TYPE_INFOBAR_CHANNAME = 19,
FONT_TYPE_INFOBAR_INFO = 20,
FONT_TYPE_INFOBAR_SMALL = 21,
FONT_TYPE_FILEBROWSER_ITEM = 22,
FONT_TYPE_MENU_HINT = 23
};
// lcdd