From fe38e435d9a8e6a73f9c50c5a7ff076290e7b709 Mon Sep 17 00:00:00 2001 From: BPanther Date: Mon, 13 Apr 2020 23:07:32 +0200 Subject: [PATCH] vuplus: tuner letters (scan setup) only for vuplus --- src/gui/scan_setup.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 1bd86bd73..7153fc6b5 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -71,7 +71,9 @@ extern char zapit_long[21]; //static int all_usals = 1; //sat_iterator_t sit; +#if BOXMODEL_VUPLUS static char * tuner_desc[24] = { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X" }; +#endif #define SCANTS_BOUQUET_OPTION_COUNT 3 const CMenuOptionChooser::keyval SCANTS_BOUQUET_OPTIONS[SCANTS_BOUQUET_OPTION_COUNT] = @@ -795,6 +797,7 @@ int CScanSetup::showScanMenuFrontendSetup() snprintf(tmp, sizeof(tmp), "config_frontend%d", i); char name[255]; +#if BOXMODEL_VUPLUS snprintf(name, sizeof(name), "%s %d: %s [%s] %s", g_Locale->getText(LOCALE_SATSETUP_FE_TUNER), i+1, fe->isHybrid() ? g_Locale->getText(LOCALE_SCANTS_ACTHYBRID) : fe->hasSat() ? g_Locale->getText(LOCALE_SCANTS_ACTSATELLITE) @@ -802,6 +805,14 @@ int CScanSetup::showScanMenuFrontendSetup() : g_Locale->getText(LOCALE_SCANTS_ACTCABLE), tuner_desc[i], fe->getName()); +#else + snprintf(name, sizeof(name), "%s %d: %s %s", g_Locale->getText(LOCALE_SATSETUP_FE_TUNER), i+1, + fe->isHybrid() ? g_Locale->getText(LOCALE_SCANTS_ACTHYBRID) + : fe->hasSat() ? g_Locale->getText(LOCALE_SCANTS_ACTSATELLITE) + : fe->hasTerr() ? g_Locale->getText(LOCALE_SCANTS_ACTTERRESTRIAL) + : g_Locale->getText(LOCALE_SCANTS_ACTCABLE), + fe->getName()); +#endif neutrino_msg_t key = CRCInput::RC_nokey; if (i == 0) @@ -935,7 +946,11 @@ int CScanSetup::showFrontendSetup(int number) dmode = fe_config.diseqcType; char name[255]; +#if BOXMODEL_VUPLUS snprintf(name, sizeof(name), "%s %d: [%s] %s", g_Locale->getText(LOCALE_SATSETUP_FE_TUNER), number+1, tuner_desc[number], fe->getName()); +#else + snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_SATSETUP_FE_TUNER), number+1, fe->getName()); +#endif CMenuWidget * setupMenu = new CMenuWidget(name, NEUTRINO_ICON_SETTINGS, width); setupMenu->setSelected(feselected); @@ -1164,7 +1179,11 @@ int CScanSetup::showScanMenuLnbSetup() CFrontend * fe = CFEManager::getInstance()->getFE(fenumber); char name[255]; +#if BOXMODEL_VUPLUS snprintf(name, sizeof(name), "%s %d: [%s] %s", g_Locale->getText(LOCALE_SATSETUP_SATELLITE), fenumber+1, tuner_desc[fenumber], fe->getName()); +#else + snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_SATSETUP_SATELLITE), fenumber+1, fe->getName()); +#endif CMenuWidget * sat_setup = new CMenuWidget(name, NEUTRINO_ICON_SETTINGS, width); sat_setup->addIntroItems(); @@ -1326,7 +1345,11 @@ int CScanSetup::showScanMenuSatFind() r_system = ALL_SAT; +#if BOXMODEL_VUPLUS snprintf(name, sizeof(name), "%s %d: [%s] %s", g_Locale->getText(LOCALE_MOTORCONTROL_HEAD), fenumber+1, tuner_desc[fenumber], fe->getName()); +#else + snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_MOTORCONTROL_HEAD), fenumber+1, fe->getName()); +#endif CMenuWidget* sat_findMenu = new CMenuWidget(name /*LOCALE_MOTORCONTROL_HEAD*/, NEUTRINO_ICON_SETTINGS, width); sat_findMenu->setSelected(selected);