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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	configure.ac
	data/icons/filetypes/mp3.png
	data/icons/filetypes/picture.png
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/filebrowser.cpp
	src/gui/followscreenings.cpp
	src/gui/followscreenings.h
	src/gui/osd_setup.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 75db11c2e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
This commit is contained in:
vanhofen
2017-06-07 15:14:51 +02:00
parent 8c6d91b20e 66f45a1be9
commit 5a9e9904a7
10 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/osd_setup.cpp
View File

@@ -223,7 +223,7 @@ font_sizes_struct neutrino_font[SNeutrinoSettings::FONT_TYPE_COUNT] =
{LOCALE_FONTSIZE_INFOBAR_INFO , 20, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
{LOCALE_FONTSIZE_INFOBAR_SMALL , 14, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
{LOCALE_FONTSIZE_INFOBAR_ECMINFO , 15, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, //NI
{LOCALE_FONTSIZE_FILEBROWSER_ITEM , 17, CNeutrinoFonts::FONT_STYLE_REGULAR, 1}, //NI
{LOCALE_FONTSIZE_FILEBROWSER_ITEM , 17, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
{LOCALE_FONTSIZE_MENU_HINT , 16, CNeutrinoFonts::FONT_STYLE_REGULAR, 0},
{LOCALE_FONTSIZE_MOVIEBROWSER_HEAD , 14, CNeutrinoFonts::FONT_STYLE_REGULAR, 2}, //NI
{LOCALE_FONTSIZE_MOVIEBROWSER_LIST , 20, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, //NI