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

Remove obsolete 'contrast_fonts' code from osd menu

Browse Source 
Origin commit data
------------------
Commit: 6803a8dff3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)
This commit is contained in:
Michael Liebmann
2017-01-24 22:33:27 +01:00
parent d64cc8c88a
commit a4326eaf79
11 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -319,7 +319,6 @@ colormenu.advanced_mode_off Standard-Optionen
colormenu.advanced_mode_on Erweiterte Optionen
colormenu.background Hintergrundfarbe
colormenu.clock_textcolor Ziffernfarbe
colormenu.contrast_fonts Schriftkontrast
colormenu.fade Ein-/Ausblenden
colormenu.font Verwendete Schriftart
colormenu.font_ttx Teletext Schriftart
@@ -1030,7 +1029,6 @@ menu.hint_colored_events_textcolor Ändern Sie die Farbe für farbige Events in
menu.hint_colors Konfigurieren Sie die Menü-Farben
menu.hint_content_back Ändern Sie die Hintergrundfarbe für den Fensterinhalt
menu.hint_content_textcolor Ändern Sie die Textfarbe für den Fensterinhalt
menu.hint_contrast_fonts Wählen Sie einen höheren Schriftkontrast
menu.hint_dboxinfo Informationen über CPU und Arbeitsspeicher der Box
menu.hint_delete_channels Löschen aller Kanäle
menu.hint_delete_removed Lösche das Bouquet 'Gelöschte Kanäle'

2
data/locale/english.locale
View File

@@ -319,7 +319,6 @@ colormenu.advanced_mode_off Default options
colormenu.advanced_mode_on Advanced options
colormenu.background Background
colormenu.clock_textcolor Digit color
colormenu.contrast_fonts Contrast fonts
colormenu.fade Fade GUI
colormenu.font Select GUI font
colormenu.font_ttx Select Teletext font
@@ -1030,7 +1029,6 @@ menu.hint_colored_events_textcolor Change color for colored events in channellis
menu.hint_colors Configure GUI colors
menu.hint_content_back Change GUI window background color
menu.hint_content_textcolor Change GUI window text color
menu.hint_contrast_fonts Make fonts contrast (do not blend with background)
menu.hint_dboxinfo Information about box cpu and storage
menu.hint_delete_channels Remove all channels
menu.hint_delete_removed Delete the channels in the 'Removed channels' boquet

2
data/locale/nederlands.locale
View File

@@ -289,7 +289,6 @@ colormenu.advanced_mode_off Toon standaard opties
colormenu.advanced_mode_on Toon geavanceerde zoekopties
colormenu.background Achtergrond
colormenu.clock_textcolor Digit kleur
colormenu.contrast_fonts Contrast lettertype
colormenu.fade Menu's vervagen
colormenu.font Selecteer lettertype gebruikersinterface
colormenu.font_ttx Selecteer lettertype teletekst
@@ -953,7 +952,6 @@ menu.hint_colored_events_textcolor Wijzig programma kleur voor gekleurde program
menu.hint_colors Configureer GUI-kleuren
menu.hint_content_back Wijzig venster achtergrond kleur
menu.hint_content_textcolor Wijzig venster tekst kleur
menu.hint_contrast_fonts Lettertype contrast (Niet overgaan in achtergrond)
menu.hint_dboxinfo Informatie over STB CPU en opslag
menu.hint_delete_channels Verplaats alle kanalen
menu.hint_delete_removed Verwijder de zenders in de 'Verwijderde zenders' bouquet

2
data/locale/slovak.locale
View File

@@ -319,7 +319,6 @@ colormenu.advanced_mode_off Predvolené hodnoty
colormenu.advanced_mode_on Rozšírené voľby
colormenu.background Pozadie
colormenu.clock_textcolor Farba číslic
colormenu.contrast_fonts Kontrast písma
colormenu.fade Miznúce menu
colormenu.font Výber písma
colormenu.font_ttx Výber teletextového písma
@@ -1030,7 +1029,6 @@ menu.hint_colored_events_textcolor Zmena farby pre farebné udalosti v zozname k
menu.hint_colors Konfigurácia farieb GUI
menu.hint_content_back Zmena farby podkladu GUI okna
menu.hint_content_textcolor Zmena farby textu GUI okna
menu.hint_contrast_fonts Zvýraznenie kontrastu pisma (neúčinné pri podklade)
menu.hint_dboxinfo Informácia o procesore a úložisku
menu.hint_delete_channels Odstránenie všetkých kanálov
menu.hint_delete_removed Vymazanie kanálov v bukete "Odstránené kanaly"

2
data/locale/unmaintained/czech.locale
View File

@@ -281,7 +281,6 @@ colorchooser.green Zelený
colorchooser.red Červený
colormenu.background Pozadí
colormenu.clock_textcolor Barva číslic
colormenu.contrast_fonts Kontrast písma
colormenu.fade Mizící menu
colormenu.font Výběr písma
colormenu.font_ttx Výběr teletextového písma
@@ -946,7 +945,6 @@ menu.hint_color_gradient Přepne barevné přechody pro různé položky nabídk
menu.hint_colors Konfigurace barev GUI
menu.hint_content_back Změna barvy podkladu GUI okna
menu.hint_content_textcolor Změna barvy textu GUI okna
menu.hint_contrast_fonts Zvýraznění kontrastu pisma (neúčinné u podkladu)
menu.hint_dboxinfo Informace o procesoru a úložišti
menu.hint_delete_channels Odstranění všech kanálů
menu.hint_delete_removed Vymazání kanálů v buketu "Odstraněné kanály"

2
data/locale/unmaintained/polski.locale
View File

@@ -281,7 +281,6 @@ colorchooser.green Zielony
colorchooser.red Czerwony
colormenu.background Kolor tła
colormenu.clock_textcolor Kolor zegara
colormenu.contrast_fonts Kontrast fontów
colormenu.fade Zanikanie menu
colormenu.font Font OSD
colormenu.font_ttx Font teletekstu
@@ -946,7 +945,6 @@ menu.hint_color_gradient Switches color gradients for various menu items on/off
menu.hint_colors Configure GUI colors
menu.hint_content_back Change GUI window background color
menu.hint_content_textcolor Change GUI window text color
menu.hint_contrast_fonts Make fonts contrast (do not blend with background)
menu.hint_dboxinfo Information about box cpu and storage
menu.hint_delete_channels Remove all channels
menu.hint_delete_removed Delete the channels in the 'Removed channels' boquet

9
src/gui/osd_setup.cpp
View File

@@ -973,11 +973,6 @@ void COsdSetup::showOsdFontSizeSetup(CMenuWidget *menu_fonts)
mfTtxFontFile->setHint("", LOCALE_MENU_HINT_FONT_TTX);
fontSettings->addItem(mfTtxFontFile);
// contrast fonts
CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_COLORMENU_CONTRAST_FONTS, &g_settings.contrast_fonts, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this, CRCInput::RC_yellow);
mc->setHint("", LOCALE_MENU_HINT_CONTRAST_FONTS);
fontSettings->addItem(mc);
fontSettings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_FONTMENU_SIZES));
//submenu font scaling
@@ -1325,9 +1320,7 @@ void COsdSetup::showOsdInfoclockSetup(CMenuWidget *menu_infoclock)
bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
{
if(ARE_LOCALES_EQUAL(OptionName, LOCALE_COLORMENU_CONTRAST_FONTS))
return true;
else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_SETTINGS_MENU_POS)) {
if (ARE_LOCALES_EQUAL(OptionName, LOCALE_SETTINGS_MENU_POS)) {
submenu_menus->hide();
return true;
}

3
src/neutrino.cpp
View File

@@ -577,8 +577,6 @@ int CNeutrinoApp::loadSetup(const char * fname)
for (int i = 0; i < SNeutrinoSettings::P_SETTINGS_MAX; i++)//settings.h, settings.cpp
g_settings.personalize[i] = configfile.getInt32( personalize_settings[i].personalize_settings_name, personalize_settings[i].personalize_default_val );
g_settings.contrast_fonts = configfile.getInt32("contrast_fonts", 0);
//network
for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES ; i++) {
std::string i_str(to_string(i));
@@ -1189,7 +1187,6 @@ void CNeutrinoApp::saveSetup(const char * fname)
for (int i = 0; i < SNeutrinoSettings::P_SETTINGS_MAX; i++) //settings.h, settings.cpp
configfile.setInt32(personalize_settings[i].personalize_settings_name, g_settings.personalize[i]);
configfile.setInt32( "contrast_fonts", g_settings.contrast_fonts );
//network
for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES ; i++) {
sprintf(cfg_key, "network_nfs_ip_%d", i);

2
src/system/locals.h
View File

@@ -346,7 +346,6 @@ typedef enum
LOCALE_COLORMENU_ADVANCED_MODE_ON,
LOCALE_COLORMENU_BACKGROUND,
LOCALE_COLORMENU_CLOCK_TEXTCOLOR,
LOCALE_COLORMENU_CONTRAST_FONTS,
LOCALE_COLORMENU_FADE,
LOCALE_COLORMENU_FONT,
LOCALE_COLORMENU_FONT_TTX,
@@ -1057,7 +1056,6 @@ typedef enum
LOCALE_MENU_HINT_COLORS,
LOCALE_MENU_HINT_CONTENT_BACK,
LOCALE_MENU_HINT_CONTENT_TEXTCOLOR,
LOCALE_MENU_HINT_CONTRAST_FONTS,
LOCALE_MENU_HINT_DBOXINFO,
LOCALE_MENU_HINT_DELETE_CHANNELS,
LOCALE_MENU_HINT_DELETE_REMOVED,

2
src/system/locals_intern.h
View File

@@ -346,7 +346,6 @@ const char * locale_real_names[] =
"colormenu.advanced_mode_on",
"colormenu.background",
"colormenu.clock_textcolor",
"colormenu.contrast_fonts",
"colormenu.fade",
"colormenu.font",
"colormenu.font_ttx",
@@ -1057,7 +1056,6 @@ const char * locale_real_names[] =
"menu.hint_colors",
"menu.hint_content_back",
"menu.hint_content_textcolor",
"menu.hint_contrast_fonts",
"menu.hint_dboxinfo",
"menu.hint_delete_channels",
"menu.hint_delete_removed",

2
src/system/settings.h
View File

@@ -422,8 +422,6 @@ struct SNeutrinoSettings
SNeutrinoTheme theme;
bool osd_colorsettings_advanced_mode;
int contrast_fonts;
//network
#define NETWORK_NFS_NR_OF_ENTRIES 8
struct {