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

re-enable front-panel settings for Trinity; re-sort vfd_setup

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c52e2b87f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-04 (Tue, 04 Nov 2014)

Origin message was:
------------------
- re-enable front-panel settings for Trinity; re-sort vfd_setup

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2014-11-04 14:59:23 +01:00
parent 0429f6465e
commit 0ec6babd36
6 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/locale/deutsch.locale
View File

@@ -807,7 +807,7 @@ lcdcontroler.brightnessdeepstandby Deep-Standby
lcdcontroler.brightnessstandby Standby lcdcontroler.brightnessstandby Standby
lcdmenu.dim_brightness nach Dimm-Timeout lcdmenu.dim_brightness nach Dimm-Timeout
lcdmenu.dim_time Dimm-Timeout lcdmenu.dim_time Dimm-Timeout
lcdmenu.head VFD Einstellungen lcdmenu.head VFD/LED Einstellungen
lcdmenu.lcdcontroler Helligkeit lcdmenu.lcdcontroler Helligkeit
lcdmenu.scroll Laufschrift lcdmenu.scroll Laufschrift
lcdmenu.statusline Statuszeile lcdmenu.statusline Statuszeile
@@ -861,7 +861,7 @@ mainsettings.audio Audio
mainsettings.head Einstellungen mainsettings.head Einstellungen
mainsettings.keybinding Tasten mainsettings.keybinding Tasten
mainsettings.language Sprache mainsettings.language Sprache
mainsettings.lcd VFD-Display mainsettings.lcd Front-Panel
mainsettings.manage Einstellungen verwalten mainsettings.manage Einstellungen verwalten
mainsettings.misc Erweiterte Einstellungen mainsettings.misc Erweiterte Einstellungen
mainsettings.multimedia Multimedia mainsettings.multimedia Multimedia

6
data/locale/english.locale
View File

@@ -809,7 +809,7 @@ lcdcontroler.brightnessdeepstandby DeepStandby Brightness
lcdcontroler.brightnessstandby Standby Brightness lcdcontroler.brightnessstandby Standby Brightness
lcdmenu.dim_brightness Brightness after dim timeout lcdmenu.dim_brightness Brightness after dim timeout
lcdmenu.dim_time Dim timeout lcdmenu.dim_time Dim timeout
lcdmenu.head VFD Settings lcdmenu.head VFD/LED Settings
lcdmenu.lcdcontroler Brightness lcdmenu.lcdcontroler Brightness
lcdmenu.scroll Enable text scroll lcdmenu.scroll Enable text scroll
lcdmenu.statusline status line lcdmenu.statusline status line
@@ -863,7 +863,7 @@ mainsettings.audio Audio
mainsettings.head Settings mainsettings.head Settings
mainsettings.keybinding Key Setup mainsettings.keybinding Key Setup
mainsettings.language Language / Timezone mainsettings.language Language / Timezone
mainsettings.lcd VFD-Display mainsettings.lcd Front-Panel
mainsettings.manage Manage settings mainsettings.manage Manage settings
mainsettings.misc Extended settings mainsettings.misc Extended settings
mainsettings.multimedia Multimedia mainsettings.multimedia Multimedia
@@ -1314,7 +1314,7 @@ menu.hint_tools Run tools
menu.hint_tvmode Switch box to TV mode menu.hint_tvmode Switch box to TV mode
menu.hint_tvradio_switch Switches between TV and Radio mode menu.hint_tvradio_switch Switches between TV and Radio mode
menu.hint_upnp Universal Plug and Play Browser menu.hint_upnp Universal Plug and Play Browser
menu.hint_vfd Frontpanel LEDS, VFD options menu.hint_vfd Frontpanel LEDs, VFD options
menu.hint_vfd_brightness Working brightness menu.hint_vfd_brightness Working brightness
menu.hint_vfd_brightness_setup Configure frontpanel display brightness\nfor different modes menu.hint_vfd_brightness_setup Configure frontpanel display brightness\nfor different modes
menu.hint_vfd_brightnessdeepstandby Brightness in deep-standby mode menu.hint_vfd_brightnessdeepstandby Brightness in deep-standby mode

6
data/locale/nederlands.locale
View File

@@ -807,7 +807,7 @@ lcdcontroler.brightnessdeepstandby Deep Standby helderheid
lcdcontroler.brightnessstandby Standby Helderheid lcdcontroler.brightnessstandby Standby Helderheid
lcdmenu.dim_brightness Helderheid na dim timeout lcdmenu.dim_brightness Helderheid na dim timeout
lcdmenu.dim_time Dim timeout lcdmenu.dim_time Dim timeout
lcdmenu.head VFD Instellingen lcdmenu.head VFD/LED Instellingen
lcdmenu.lcdcontroler Helderheid lcdmenu.lcdcontroler Helderheid
lcdmenu.scroll Enable tekst scroll lcdmenu.scroll Enable tekst scroll
lcdmenu.statusline statuslijn lcdmenu.statusline statuslijn
@@ -861,7 +861,7 @@ mainsettings.audio Audio
mainsettings.head Instellingen mainsettings.head Instellingen
mainsettings.keybinding Sneltoetsen aanpassen mainsettings.keybinding Sneltoetsen aanpassen
mainsettings.language Taal / Tijdzone mainsettings.language Taal / Tijdzone
mainsettings.lcd Display instellingen mainsettings.lcd Voorpaneel instellingen
mainsettings.manage Beheer instellingen mainsettings.manage Beheer instellingen
mainsettings.misc Diverse instellingen mainsettings.misc Diverse instellingen
mainsettings.multimedia Multimedia mainsettings.multimedia Multimedia
@@ -1310,7 +1310,7 @@ menu.hint_tools Start tools
menu.hint_tvmode Schakel ontvanger in TV modus menu.hint_tvmode Schakel ontvanger in TV modus
menu.hint_tvradio_switch Schakelen tussen TV en Radio modus menu.hint_tvradio_switch Schakelen tussen TV en Radio modus
menu.hint_upnp Universal Plug and Play Browser menu.hint_upnp Universal Plug and Play Browser
menu.hint_vfd Voorpaneel LEDS, VFD opties menu.hint_vfd Voorpaneel LEDs, VFD opties
menu.hint_vfd_brightness Helderheid in gebruik menu.hint_vfd_brightness Helderheid in gebruik
menu.hint_vfd_brightness_setup Configureer helderheid van het display menu.hint_vfd_brightness_setup Configureer helderheid van het display
menu.hint_vfd_brightnessdeepstandby Helderheid in deep-standby modus menu.hint_vfd_brightnessdeepstandby Helderheid in deep-standby modus

4
data/locale/slovak.locale
View File

@@ -719,7 +719,7 @@ lcdcontroler.brightnessdeepstandby Jas v hlbokom spánku
lcdcontroler.brightnessstandby Jas v spánku lcdcontroler.brightnessstandby Jas v spánku
lcdmenu.dim_brightness Jas po zhasnutí lcdmenu.dim_brightness Jas po zhasnutí
lcdmenu.dim_time Čas zhasnutia lcdmenu.dim_time Čas zhasnutia
lcdmenu.head Nastavenie VFD lcdmenu.head Nastavenie VFD/LED
lcdmenu.lcdcontroler Jas lcdmenu.lcdcontroler Jas
lcdmenu.scroll Povoliť pohyb textu lcdmenu.scroll Povoliť pohyb textu
lcdmenu.statusline Stavový riadok lcdmenu.statusline Stavový riadok
@@ -767,7 +767,7 @@ mainsettings.audio Zvuk
mainsettings.head Nastavenia mainsettings.head Nastavenia
mainsettings.keybinding Nastavenia kláves mainsettings.keybinding Nastavenia kláves
mainsettings.language Jazyk / Časové pásmo mainsettings.language Jazyk / Časové pásmo
mainsettings.lcd Zobrazovač VFD mainsettings.lcd Zobrazovač VFD / LED
mainsettings.manage Spravovanie nastavení mainsettings.manage Spravovanie nastavení
mainsettings.misc Iné nastavenia mainsettings.misc Iné nastavenia
mainsettings.network Sieť mainsettings.network Sieť

58
src/gui/vfd_setup.cpp
View File

@@ -113,43 +113,49 @@ int CVfdSetup::showSetup()
CMenuWidget *vfds = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_LCD, width, MN_WIDGET_ID_VFDSETUP); CMenuWidget *vfds = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_LCD, width, MN_WIDGET_ID_VFDSETUP);
vfds->addIntroItems(LOCALE_LCDMENU_HEAD); vfds->addIntroItems(LOCALE_LCDMENU_HEAD);
//vfd brightness menu CMenuForwarder * mf;
CMenuForwarder * mf = new CMenuForwarder(LOCALE_LCDMENU_LCDCONTROLER, vfd_enabled, NULL, this, "brightness", CRCInput::RC_red);
mf->setHint("", LOCALE_MENU_HINT_VFD_BRIGHTNESS_SETUP);
vfds->addItem(mf);
//led menu //led menu
if(cs_get_revision() > 7) if (cs_get_revision() > 7) // not HD1 and BSE
{ {
CMenuWidget * ledMenu = new CMenuWidget(LOCALE_LCDMENU_HEAD, NEUTRINO_ICON_LCD, width, MN_WIDGET_ID_VFDSETUP_LED_SETUP); CMenuWidget * ledMenu = new CMenuWidget(LOCALE_LCDMENU_HEAD, NEUTRINO_ICON_LCD, width, MN_WIDGET_ID_VFDSETUP_LED_SETUP);
showLedSetup(ledMenu); showLedSetup(ledMenu);
mf = new CMenuDForwarder(LOCALE_LEDCONTROLER_MENU, true, NULL, ledMenu, NULL, CRCInput::RC_green); mf = new CMenuDForwarder(LOCALE_LEDCONTROLER_MENU, true, NULL, ledMenu, NULL, CRCInput::RC_red);
mf->setHint("", LOCALE_MENU_HINT_POWER_LEDS); mf->setHint("", LOCALE_MENU_HINT_POWER_LEDS);
vfds->addItem(mf); vfds->addItem(mf);
} }
if(cs_get_revision() == 9)
{ if (CVFD::getInstance()->has_lcd) {
CMenuWidget * blMenu = new CMenuWidget(LOCALE_LCDMENU_HEAD, NEUTRINO_ICON_LCD, width, MN_WIDGET_ID_VFDSETUP_BACKLIGHT); //vfd brightness menu
showBacklightSetup(blMenu); mf = new CMenuForwarder(LOCALE_LCDMENU_LCDCONTROLER, vfd_enabled, NULL, this, "brightness", CRCInput::RC_green);
mf = new CMenuDForwarder(LOCALE_LEDCONTROLER_BACKLIGHT, true, NULL, blMenu, NULL, CRCInput::RC_yellow); mf->setHint("", LOCALE_MENU_HINT_VFD_BRIGHTNESS_SETUP);
mf->setHint("", LOCALE_MENU_HINT_BACKLIGHT);
vfds->addItem(mf); vfds->addItem(mf);
if (cs_get_revision() == 9) // Tank only
{
//backlight menu
CMenuWidget * blMenu = new CMenuWidget(LOCALE_LCDMENU_HEAD, NEUTRINO_ICON_LCD, width, MN_WIDGET_ID_VFDSETUP_BACKLIGHT);
showBacklightSetup(blMenu);
mf = new CMenuDForwarder(LOCALE_LEDCONTROLER_BACKLIGHT, true, NULL, blMenu, NULL, CRCInput::RC_yellow);
mf->setHint("", LOCALE_MENU_HINT_BACKLIGHT);
vfds->addItem(mf);
}
vfds->addItem(GenericMenuSeparatorLine);
//status and info line options
CMenuOptionChooser* oj = new CMenuOptionChooser(LOCALE_LCDMENU_STATUSLINE, &g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME], LCDMENU_STATUSLINE_OPTIONS, LCDMENU_STATUSLINE_OPTION_COUNT, vfd_enabled);
oj->setHint("", LOCALE_MENU_HINT_VFD_STATUSLINE);
CMenuOptionChooser* lcd_clock_channelname_menu = new CMenuOptionChooser(LOCALE_LCD_INFO_LINE, &g_settings.lcd_info_line, LCD_INFO_OPTIONS, LCD_INFO_OPTION_COUNT, vfd_enabled);
lcd_clock_channelname_menu->setHint("", LOCALE_MENU_HINT_VFD_INFOLINE);
vfds->addItem(oj);
vfds->addItem(lcd_clock_channelname_menu);
oj = new CMenuOptionChooser(LOCALE_LCDMENU_SCROLL, &g_settings.lcd_scroll, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, vfd_enabled);
oj->setHint("", LOCALE_MENU_HINT_VFD_SCROLL);
vfds->addItem(oj);
} }
vfds->addItem(GenericMenuSeparatorLine);
//status and info line options
CMenuOptionChooser* oj = new CMenuOptionChooser(LOCALE_LCDMENU_STATUSLINE, &g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME], LCDMENU_STATUSLINE_OPTIONS, LCDMENU_STATUSLINE_OPTION_COUNT, vfd_enabled);
oj->setHint("", LOCALE_MENU_HINT_VFD_STATUSLINE);
CMenuOptionChooser* lcd_clock_channelname_menu = new CMenuOptionChooser(LOCALE_LCD_INFO_LINE, &g_settings.lcd_info_line, LCD_INFO_OPTIONS, LCD_INFO_OPTION_COUNT, vfd_enabled);
lcd_clock_channelname_menu->setHint("", LOCALE_MENU_HINT_VFD_INFOLINE);
vfds->addItem(oj);
vfds->addItem(lcd_clock_channelname_menu);
oj = new CMenuOptionChooser(LOCALE_LCDMENU_SCROLL, &g_settings.lcd_scroll, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, vfd_enabled);
oj->setHint("", LOCALE_MENU_HINT_VFD_SCROLL);
vfds->addItem(oj);
int res = vfds->exec(NULL, ""); int res = vfds->exec(NULL, "");
delete vfds; delete vfds;

8
src/neutrino_menue.cpp
View File

@@ -424,11 +424,9 @@ void CNeutrinoApp::InitMenuSettings()
} }
// lcd // lcd
if (CVFD::getInstance()->has_lcd) { mf = new CMenuForwarder(LOCALE_MAINSETTINGS_LCD, true, NULL, new CVfdSetup());
mf = new CMenuForwarder(LOCALE_MAINSETTINGS_LCD, true, NULL, new CVfdSetup()); mf->setHint(NEUTRINO_ICON_HINT_VFD, LOCALE_MENU_HINT_VFD);
mf->setHint(NEUTRINO_ICON_HINT_VFD, LOCALE_MENU_HINT_VFD); personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_VFD]);
personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_VFD]);
}
// drive settings // drive settings
if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) { if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) {