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

drop obsolete code around FONT_TYPE_GAMELIST

Browse Source 
these fonts are not needed since gamelist/scriptlist
 are painted with menu-widget


Origin commit data
------------------
Branch: ni/coolstream
Commit: da7f3b9cb1
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-05-02 (Fri, 02 May 2014)

Origin message was:
------------------
- drop obsolete code around FONT_TYPE_GAMELIST

 these fonts are not needed since gamelist/scriptlist
 are painted with menu-widget


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2014-05-02 22:28:36 +02:00
parent c8eb485154
commit cdb47cfcf4
11 changed files with 8 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/locale/deutsch.locale
View File

@@ -573,7 +573,6 @@ flashupdate.wrongbase Abweichende Release-Information\nFortfahren?
fontmenu.channellist Kanalliste
fontmenu.epg EPG (Programmführer)
fontmenu.eventlist Event-Liste
fontmenu.gamelist Spiele-Liste
fontmenu.head Schrift
fontmenu.infobar Infobar
fontmenu.menu Menü
@@ -599,8 +598,6 @@ fontsize.eventlist_itemlarge Groß
fontsize.eventlist_itemsmall Klein
fontsize.eventlist_title Titel
fontsize.filebrowser_item Dateibrowsereinträge
fontsize.gamelist_itemlarge Groß
fontsize.gamelist_itemsmall Klein
fontsize.hint Schriftart wird initialisiert,\nbitte warten...
fontsize.infobar_channame Kanalname
fontsize.infobar_info Info
@@ -881,7 +878,6 @@ menu.hint_font_gui Wählen Sie die Schriftart für die Menüs
menu.hint_font_scaling Legen Sie die vertikale und horizontale Skalierung der Menüschrift fest
menu.hint_font_ttx Wählen Sie die Schriftart für den Teletext
menu.hint_fonts Konfigurieren Sie die Schriftart und die Schriftgrößen für die Menüs
menu.hint_gamelist_fonts Ändern die Schriftgrößen für die Spiele- und Script-Liste
menu.hint_games Zeige Liste der installierten Spiele
menu.hint_hdd Formatierung und Prüfung der Datenträger
menu.hint_hdd_apply Die veränderten Einstellungen zum Sleep- und Akustik-Modus werden übernommen
@@ -1045,6 +1041,7 @@ menu.hint_osd Farben, Schriftarten, Anzeigegröße, Ansichtsoptionen der Menüs
menu.hint_osd_language Wählen Sie ihre Menü-Sprache
menu.hint_osd_preset Wählen Sie zwischen Röhren-TV (CRT) oder Flachbildschirm (LCD)
menu.hint_osd_timing Einblendzeit, die das OSD auf dem TV angezeigt wird
menu.hint_other_fonts Ändern Sie andere Schriftgrößen
menu.hint_parentallock_changepin Geben Sie den 4-stelligen PIN-Code ein, der dann ggf. abgefragt wird
menu.hint_parentallock_lockage Legen Sie fest, bei welcher Altersklasse die Abfrage der PIN erfolgt
menu.hint_parentallock_menu Menüs mit PIN Code sichern

5
data/locale/english.locale
View File

@@ -573,7 +573,6 @@ flashupdate.wrongbase Your Release cycle differs.\nTo continue?
fontmenu.channellist Channellist
fontmenu.epg EPG
fontmenu.eventlist Eventlist
fontmenu.gamelist Gamelist
fontmenu.head Font settings
fontmenu.infobar Infobar
fontmenu.menu Menu
@@ -599,8 +598,6 @@ fontsize.eventlist_itemlarge Large
fontsize.eventlist_itemsmall Small
fontsize.eventlist_title Title
fontsize.filebrowser_item Filebrowser items
fontsize.gamelist_itemlarge Large
fontsize.gamelist_itemsmall Small
fontsize.hint Initialising font,\nplease wait...
fontsize.infobar_channame Channel name
fontsize.infobar_info info
@@ -881,7 +878,6 @@ menu.hint_font_gui Select font file to use for GUI
menu.hint_font_scaling Set global vertical and horizontal\nGUI font scaling
menu.hint_font_ttx Select font file to use for teletext
menu.hint_fonts Configure GUI fonts and font sizes
menu.hint_gamelist_fonts Change games and scripts list font sizes
menu.hint_games Show list of installed games
menu.hint_hdd Format / check data storage
menu.hint_hdd_apply Apply sleep/noise parameters
@@ -1045,6 +1041,7 @@ menu.hint_osd Colors, fonts, screen size\nGUI look and feel options
menu.hint_osd_language Select OSD language
menu.hint_osd_preset Pre-configured screen margins for CRT and LCD TV
menu.hint_osd_timing After this time the OSD will be faded out
menu.hint_other_fonts Change other font sizes
menu.hint_parentallock_changepin Change PIN code
menu.hint_parentallock_lockage Select age allowed to watch
menu.hint_parentallock_menu Lock menus with pin code

4
data/locale/nederlands.locale
View File

@@ -543,7 +543,6 @@ flashupdate.wrongbase Uw release-cyclus verschilt.\nVerder gaan?
fontmenu.channellist Kanalenlijst
fontmenu.epg EPG
fontmenu.eventlist Programmalijst
fontmenu.gamelist Spelletjes lijst
fontmenu.head Lettertype instellingen
fontmenu.infobar Informatiebalk
fontmenu.menu Menu
@@ -567,8 +566,6 @@ fontsize.eventlist_itemlarge Groot
fontsize.eventlist_itemsmall Klein
fontsize.eventlist_title Titel
fontsize.filebrowser_item Verkenner items
fontsize.gamelist_itemlarge Groot
fontsize.gamelist_itemsmall Klein
fontsize.hint Initialiseren lettertype,\néén moment geduld...
fontsize.infobar_channame Kanaalnaam
fontsize.infobar_info Info
@@ -810,7 +807,6 @@ menu.hint_font_gui Selecteer het algemene lettertype dat u wenst te gebruiken vo
menu.hint_font_scaling Globale verticale en horizontale font schaling instellen.
menu.hint_font_ttx Selecteer het lettertype dat u wenst te gebruiken voor teletekst.
menu.hint_fonts Configureer lettertypes gebruikersinterface
menu.hint_gamelist_fonts Wijzig lettertype games en scripts lijst
menu.hint_games Lijst met geïnstalleerde games weergeven.
menu.hint_hdd Formatteer / check harde schijf
menu.hint_hdd_apply Slaap/Geluid parameters toepassen

4
data/locale/slovak.locale
View File

@@ -571,7 +571,6 @@ flashupdate.wrongbase Vaša verzia je odlišná.\nPokračovať?
fontmenu.channellist Zoznam kanálov
fontmenu.epg EPG
fontmenu.eventlist Programový sprievodca
fontmenu.gamelist Zoznam hier
fontmenu.head Nastavenia písma
fontmenu.infobar Informačná lišta
fontmenu.menu Menu
@@ -596,8 +595,6 @@ fontsize.eventlist_itemlarge Veľké EPG
fontsize.eventlist_itemsmall Malé EPG
fontsize.eventlist_title Titul EPG
fontsize.filebrowser_item Položka prehliadača súborov
fontsize.gamelist_itemlarge Veľký zoznam hier
fontsize.gamelist_itemsmall Malý zoznam hier
fontsize.hint Inicializácia písma,\nprosím čakaj...
fontsize.infobar_channame Názov kanálu
fontsize.infobar_info Informácia na informačnej lište
@@ -862,7 +859,6 @@ menu.hint_font_gui Výber súboru písma pre GUI
menu.hint_font_scaling Zvislé a vodorovné nastavenie globálnej mierky písma
menu.hint_font_ttx Výber písma pre teletext
menu.hint_fonts Konfigurácia písma GUI
menu.hint_gamelist_fonts Zmena veľkosti písma zoznamu hier a skriptov
menu.hint_games Zobrazenie zoznamu inštalovaných hier
menu.hint_hdd Formátovanie/kontrola pevného disku
menu.hint_hdd_apply Použitie parametrov uspania/stíšenia

2
src/gui/luainstance.cpp
View File

@@ -203,8 +203,6 @@ static void set_lua_variables(lua_State *L)
{ "EVENTLIST_ITEMLARGE",SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE },
{ "EVENTLIST_ITEMSMALL",SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMSMALL },
{ "EVENTLIST_DATETIME", SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME },
{ "GAMELIST_ITEMLARGE", SNeutrinoSettings::FONT_TYPE_GAMELIST_ITEMLARGE },
{ "GAMELIST_ITEMSMALL", SNeutrinoSettings::FONT_TYPE_GAMELIST_ITEMSMALL },
{ "CHANNELLIST", SNeutrinoSettings::FONT_TYPE_CHANNELLIST },
{ "CHANNELLIST_DESCR", SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR },
{ "CHANNELLIST_NUMBER", SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER },

15
src/gui/osd_setup.cpp
View File

@@ -128,12 +128,6 @@ const SNeutrinoSettings::FONT_TYPES epg_font_sizes[4] =
SNeutrinoSettings::FONT_TYPE_EPG_DATE
};
const SNeutrinoSettings::FONT_TYPES gamelist_font_sizes[2] =
{
SNeutrinoSettings::FONT_TYPE_GAMELIST_ITEMLARGE,
SNeutrinoSettings::FONT_TYPE_GAMELIST_ITEMSMALL
};
const SNeutrinoSettings::FONT_TYPES menu_font_sizes[4] =
{
SNeutrinoSettings::FONT_TYPE_MENU_TITLE,
@@ -147,16 +141,15 @@ const SNeutrinoSettings::FONT_TYPES other_font_sizes[2] =
SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM
};
#define FONT_GROUP_COUNT 7
#define FONT_GROUP_COUNT 6
font_sizes_groups font_sizes_groups[FONT_GROUP_COUNT] =
{
{LOCALE_FONTMENU_MENU , 4, menu_font_sizes , "fontsize.doth", LOCALE_MENU_HINT_MENU_FONTS },
{LOCALE_FONTMENU_MENU , 4, menu_font_sizes , "fontsize.dmen", LOCALE_MENU_HINT_MENU_FONTS },
{LOCALE_FONTMENU_CHANNELLIST, 5, channellist_font_sizes, "fontsize.dcha", LOCALE_MENU_HINT_CHANNELLIST_FONTS },
{LOCALE_FONTMENU_EVENTLIST , 5, eventlist_font_sizes , "fontsize.deve", LOCALE_MENU_HINT_EVENTLIST_FONTS },
{LOCALE_FONTMENU_EPG , 4, epg_font_sizes , "fontsize.depg", LOCALE_MENU_HINT_EPG_FONTS },
{LOCALE_FONTMENU_INFOBAR , 4, infobar_font_sizes , "fontsize.dinf", LOCALE_MENU_HINT_INFOBAR_FONTS },
{LOCALE_FONTMENU_GAMELIST , 2, gamelist_font_sizes , "fontsize.dgam", LOCALE_MENU_HINT_GAMELIST_FONTS },
{LOCALE_FONTMENU_OTHER , 2, other_font_sizes , "fontsize.dgam", LOCALE_MENU_HINT_GAMELIST_FONTS }
{LOCALE_FONTMENU_OTHER , 2, other_font_sizes , "fontsize.doth", LOCALE_MENU_HINT_OTHER_FONTS }
};
font_sizes_struct neutrino_font[SNeutrinoSettings::FONT_TYPE_COUNT] =
@@ -173,8 +166,6 @@ font_sizes_struct neutrino_font[SNeutrinoSettings::FONT_TYPE_COUNT] =
{LOCALE_FONTSIZE_EVENTLIST_ITEMSMALL, 14, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
{LOCALE_FONTSIZE_EVENTLIST_DATETIME , 16, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
{LOCALE_FONTSIZE_EVENTLIST_EVENT , 17, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
{LOCALE_FONTSIZE_GAMELIST_ITEMLARGE , 20, CNeutrinoFonts::FONT_STYLE_BOLD , 1},
{LOCALE_FONTSIZE_GAMELIST_ITEMSMALL , 16, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
{LOCALE_FONTSIZE_CHANNELLIST , 20, CNeutrinoFonts::FONT_STYLE_BOLD , 1},
{LOCALE_FONTSIZE_CHANNELLIST_DESCR , 20, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
{LOCALE_FONTSIZE_CHANNELLIST_NUMBER , 14, CNeutrinoFonts::FONT_STYLE_BOLD , 2},

2
src/gui/widget/shellwindow.cpp
View File

@@ -62,7 +62,7 @@ CShellWindow::CShellWindow(const std::string &command, const int _mode, int *res
*res = -1;
return;
}
Font *font = g_Font[SNeutrinoSettings::FONT_TYPE_GAMELIST_ITEMSMALL];
Font *font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO];
frameBuffer = CFrameBuffer::getInstance();
unsigned int lines_max = frameBuffer->getScreenHeight() / font->getHeight();
list<std::string> lines;

1
src/neutrino_menue.h
View File

@@ -71,7 +71,6 @@ enum MN_WIDGET_ID
MN_WIDGET_ID_OSDSETUP_FONTSIZE_EVENTLIST,
MN_WIDGET_ID_OSDSETUP_FONTSIZE_EPG,
MN_WIDGET_ID_OSDSETUP_FONTSIZE_INFOBAR,
MN_WIDGET_ID_OSDSETUP_FONTSIZE_GAMELIST,
//progressbar setup
MN_WIDGET_ID_PROGRESSBAR,

5
src/system/locals.h
View File

@@ -600,7 +600,6 @@ typedef enum
LOCALE_FONTMENU_CHANNELLIST,
LOCALE_FONTMENU_EPG,
LOCALE_FONTMENU_EVENTLIST,
LOCALE_FONTMENU_GAMELIST,
LOCALE_FONTMENU_HEAD,
LOCALE_FONTMENU_INFOBAR,
LOCALE_FONTMENU_MENU,
@@ -626,8 +625,6 @@ typedef enum
LOCALE_FONTSIZE_EVENTLIST_ITEMSMALL,
LOCALE_FONTSIZE_EVENTLIST_TITLE,
LOCALE_FONTSIZE_FILEBROWSER_ITEM,
LOCALE_FONTSIZE_GAMELIST_ITEMLARGE,
LOCALE_FONTSIZE_GAMELIST_ITEMSMALL,
LOCALE_FONTSIZE_HINT,
LOCALE_FONTSIZE_INFOBAR_CHANNAME,
LOCALE_FONTSIZE_INFOBAR_INFO,
@@ -908,7 +905,6 @@ typedef enum
LOCALE_MENU_HINT_FONT_SCALING,
LOCALE_MENU_HINT_FONT_TTX,
LOCALE_MENU_HINT_FONTS,
LOCALE_MENU_HINT_GAMELIST_FONTS,
LOCALE_MENU_HINT_GAMES,
LOCALE_MENU_HINT_HDD,
LOCALE_MENU_HINT_HDD_APPLY,
@@ -1072,6 +1068,7 @@ typedef enum
LOCALE_MENU_HINT_OSD_LANGUAGE,
LOCALE_MENU_HINT_OSD_PRESET,
LOCALE_MENU_HINT_OSD_TIMING,
LOCALE_MENU_HINT_OTHER_FONTS,
LOCALE_MENU_HINT_PARENTALLOCK_CHANGEPIN,
LOCALE_MENU_HINT_PARENTALLOCK_LOCKAGE,
LOCALE_MENU_HINT_PARENTALLOCK_MENU,

5
src/system/locals_intern.h
View File

@@ -600,7 +600,6 @@ const char * locale_real_names[] =
"fontmenu.channellist",
"fontmenu.epg",
"fontmenu.eventlist",
"fontmenu.gamelist",
"fontmenu.head",
"fontmenu.infobar",
"fontmenu.menu",
@@ -626,8 +625,6 @@ const char * locale_real_names[] =
"fontsize.eventlist_itemsmall",
"fontsize.eventlist_title",
"fontsize.filebrowser_item",
"fontsize.gamelist_itemlarge",
"fontsize.gamelist_itemsmall",
"fontsize.hint",
"fontsize.infobar_channame",
"fontsize.infobar_info",
@@ -908,7 +905,6 @@ const char * locale_real_names[] =
"menu.hint_font_scaling",
"menu.hint_font_ttx",
"menu.hint_fonts",
"menu.hint_gamelist_fonts",
"menu.hint_games",
"menu.hint_hdd",
"menu.hint_hdd_apply",
@@ -1072,6 +1068,7 @@ const char * locale_real_names[] =
"menu.hint_osd_language",
"menu.hint_osd_preset",
"menu.hint_osd_timing",
"menu.hint_other_fonts",
"menu.hint_parentallock_changepin",
"menu.hint_parentallock_lockage",
"menu.hint_parentallock_menu",

2
src/system/settings.h
View File

@@ -554,8 +554,6 @@ struct SNeutrinoSettings
FONT_TYPE_EVENTLIST_ITEMSMALL,
FONT_TYPE_EVENTLIST_DATETIME,
FONT_TYPE_EVENTLIST_EVENT,
FONT_TYPE_GAMELIST_ITEMLARGE,
FONT_TYPE_GAMELIST_ITEMSMALL,
FONT_TYPE_CHANNELLIST,
FONT_TYPE_CHANNELLIST_DESCR,
FONT_TYPE_CHANNELLIST_NUMBER,