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

Merge branch 'check/pu-cc' into master

Browse Source 
Conflicts:
	src/gui/osd_setup.cpp
	src/neutrino.cpp
This commit is contained in:
Stefan Seyfried
2013-04-13 17:17:30 +02:00
parent fa87c27dfe 4b624f88bd
commit 61bf95f552
15 changed files with 123 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/system/settings.h
View File

@@ -424,6 +424,7 @@ struct SNeutrinoSettings
int pip_y;
int bigFonts;
int big_windows;
int eventlist_additional;
int channellist_additional;
int channellist_epgtext_align_right;
int channellist_extended;
@@ -472,7 +473,7 @@ struct SNeutrinoSettings
// Font sizes
#define FONT_TYPE_COUNT 24
#define FONT_TYPE_COUNT 25
enum FONT_TYPES {
FONT_TYPE_MENU = 0,
FONT_TYPE_MENU_TITLE = 1,
@@ -485,19 +486,20 @@ struct SNeutrinoSettings
FONT_TYPE_EVENTLIST_ITEMLARGE = 8,
FONT_TYPE_EVENTLIST_ITEMSMALL = 9,
FONT_TYPE_EVENTLIST_DATETIME = 10,
FONT_TYPE_GAMELIST_ITEMLARGE = 11,
FONT_TYPE_GAMELIST_ITEMSMALL = 12,
FONT_TYPE_CHANNELLIST = 13,
FONT_TYPE_CHANNELLIST_DESCR = 14,
FONT_TYPE_CHANNELLIST_NUMBER = 15,
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
FONT_TYPE_EVENTLIST_EVENT = 11,
FONT_TYPE_GAMELIST_ITEMLARGE = 12,
FONT_TYPE_GAMELIST_ITEMSMALL = 13,
FONT_TYPE_CHANNELLIST = 14,
FONT_TYPE_CHANNELLIST_DESCR = 15,
FONT_TYPE_CHANNELLIST_NUMBER = 16,
FONT_TYPE_CHANNELLIST_EVENT = 17,
FONT_TYPE_CHANNEL_NUM_ZAP = 18,
FONT_TYPE_INFOBAR_NUMBER = 19,
FONT_TYPE_INFOBAR_CHANNAME = 20,
FONT_TYPE_INFOBAR_INFO = 21,
FONT_TYPE_INFOBAR_SMALL = 22,
FONT_TYPE_FILEBROWSER_ITEM = 23,
FONT_TYPE_MENU_HINT = 24
};
// lcdd