From 0ec6babd36e83bd5ebe0b5fcec87f23c409efb1c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 4 Nov 2014 14:59:23 +0100 Subject: [PATCH] re-enable front-panel settings for Trinity; re-sort vfd_setup Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3c52e2b87f0eefcbcb3197bdd598a770711ae05b Author: vanhofen 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 --- data/locale/deutsch.locale | 4 +-- data/locale/english.locale | 6 ++-- data/locale/nederlands.locale | 6 ++-- data/locale/slovak.locale | 4 +-- src/gui/vfd_setup.cpp | 58 +++++++++++++++++++---------------- src/neutrino_menue.cpp | 8 ++--- 6 files changed, 45 insertions(+), 41 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 2663d9f28..6fd27279b 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -807,7 +807,7 @@ lcdcontroler.brightnessdeepstandby Deep-Standby lcdcontroler.brightnessstandby Standby lcdmenu.dim_brightness nach Dimm-Timeout lcdmenu.dim_time Dimm-Timeout -lcdmenu.head VFD Einstellungen +lcdmenu.head VFD/LED Einstellungen lcdmenu.lcdcontroler Helligkeit lcdmenu.scroll Laufschrift lcdmenu.statusline Statuszeile @@ -861,7 +861,7 @@ mainsettings.audio Audio mainsettings.head Einstellungen mainsettings.keybinding Tasten mainsettings.language Sprache -mainsettings.lcd VFD-Display +mainsettings.lcd Front-Panel mainsettings.manage Einstellungen verwalten mainsettings.misc Erweiterte Einstellungen mainsettings.multimedia Multimedia diff --git a/data/locale/english.locale b/data/locale/english.locale index a252ce33b..88089a430 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -809,7 +809,7 @@ lcdcontroler.brightnessdeepstandby DeepStandby Brightness lcdcontroler.brightnessstandby Standby Brightness lcdmenu.dim_brightness Brightness after dim timeout lcdmenu.dim_time Dim timeout -lcdmenu.head VFD Settings +lcdmenu.head VFD/LED Settings lcdmenu.lcdcontroler Brightness lcdmenu.scroll Enable text scroll lcdmenu.statusline status line @@ -863,7 +863,7 @@ mainsettings.audio Audio mainsettings.head Settings mainsettings.keybinding Key Setup mainsettings.language Language / Timezone -mainsettings.lcd VFD-Display +mainsettings.lcd Front-Panel mainsettings.manage Manage settings mainsettings.misc Extended settings mainsettings.multimedia Multimedia @@ -1314,7 +1314,7 @@ menu.hint_tools Run tools menu.hint_tvmode Switch box to TV mode menu.hint_tvradio_switch Switches between TV and Radio mode 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_setup Configure frontpanel display brightness\nfor different modes menu.hint_vfd_brightnessdeepstandby Brightness in deep-standby mode diff --git a/data/locale/nederlands.locale b/data/locale/nederlands.locale index 3f229a66e..9d05d7e13 100644 --- a/data/locale/nederlands.locale +++ b/data/locale/nederlands.locale @@ -807,7 +807,7 @@ lcdcontroler.brightnessdeepstandby Deep Standby helderheid lcdcontroler.brightnessstandby Standby Helderheid lcdmenu.dim_brightness Helderheid na dim timeout lcdmenu.dim_time Dim timeout -lcdmenu.head VFD Instellingen +lcdmenu.head VFD/LED Instellingen lcdmenu.lcdcontroler Helderheid lcdmenu.scroll Enable tekst scroll lcdmenu.statusline statuslijn @@ -861,7 +861,7 @@ mainsettings.audio Audio mainsettings.head Instellingen mainsettings.keybinding Sneltoetsen aanpassen mainsettings.language Taal / Tijdzone -mainsettings.lcd Display instellingen +mainsettings.lcd Voorpaneel instellingen mainsettings.manage Beheer instellingen mainsettings.misc Diverse instellingen mainsettings.multimedia Multimedia @@ -1310,7 +1310,7 @@ menu.hint_tools Start tools menu.hint_tvmode Schakel ontvanger in TV modus menu.hint_tvradio_switch Schakelen tussen TV en Radio modus 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_setup Configureer helderheid van het display menu.hint_vfd_brightnessdeepstandby Helderheid in deep-standby modus diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale index 729dc7ede..63b7cc53f 100644 --- a/data/locale/slovak.locale +++ b/data/locale/slovak.locale @@ -719,7 +719,7 @@ lcdcontroler.brightnessdeepstandby Jas v hlbokom spánku lcdcontroler.brightnessstandby Jas v spánku lcdmenu.dim_brightness Jas po zhasnutí lcdmenu.dim_time Čas zhasnutia -lcdmenu.head Nastavenie VFD +lcdmenu.head Nastavenie VFD/LED lcdmenu.lcdcontroler Jas lcdmenu.scroll Povoliť pohyb textu lcdmenu.statusline Stavový riadok @@ -767,7 +767,7 @@ mainsettings.audio Zvuk mainsettings.head Nastavenia mainsettings.keybinding Nastavenia kláves mainsettings.language Jazyk / Časové pásmo -mainsettings.lcd Zobrazovač VFD +mainsettings.lcd Zobrazovač VFD / LED mainsettings.manage Spravovanie nastavení mainsettings.misc Iné nastavenia mainsettings.network Sieť diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp index 3b1413a64..326a0c2a6 100644 --- a/src/gui/vfd_setup.cpp +++ b/src/gui/vfd_setup.cpp @@ -113,43 +113,49 @@ int CVfdSetup::showSetup() CMenuWidget *vfds = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_LCD, width, MN_WIDGET_ID_VFDSETUP); vfds->addIntroItems(LOCALE_LCDMENU_HEAD); - //vfd brightness menu - 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); + CMenuForwarder * mf; //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); 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); vfds->addItem(mf); } - if(cs_get_revision() == 9) - { - 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); + + if (CVFD::getInstance()->has_lcd) { + //vfd brightness menu + mf = new CMenuForwarder(LOCALE_LCDMENU_LCDCONTROLER, vfd_enabled, NULL, this, "brightness", CRCInput::RC_green); + mf->setHint("", LOCALE_MENU_HINT_VFD_BRIGHTNESS_SETUP); 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, ""); delete vfds; diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 8982982fc..2225c1cc1 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -424,11 +424,9 @@ void CNeutrinoApp::InitMenuSettings() } // lcd - if (CVFD::getInstance()->has_lcd) { - mf = new CMenuForwarder(LOCALE_MAINSETTINGS_LCD, true, NULL, new CVfdSetup()); - mf->setHint(NEUTRINO_ICON_HINT_VFD, LOCALE_MENU_HINT_VFD); - personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_VFD]); - } + mf = new CMenuForwarder(LOCALE_MAINSETTINGS_LCD, true, NULL, new CVfdSetup()); + mf->setHint(NEUTRINO_ICON_HINT_VFD, LOCALE_MENU_HINT_VFD); + personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_VFD]); // drive settings if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) {