diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 31e10a789..3dbc549a0 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -71,6 +71,8 @@ extern char zapit_long[21]; //static int all_usals = 1; //sat_iterator_t sit; +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" }; + #define SCANTS_BOUQUET_OPTION_COUNT 3 const CMenuOptionChooser::keyval SCANTS_BOUQUET_OPTIONS[SCANTS_BOUQUET_OPTION_COUNT] = { @@ -793,11 +795,12 @@ int CScanSetup::showScanMenuFrontendSetup() snprintf(tmp, sizeof(tmp), "config_frontend%d", i); char name[255]; - snprintf(name, sizeof(name), "%s %d: %s %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), 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) + snprintf(name, sizeof(name), "%s %d: %s [%s] %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), 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), + tuner_desc[i], fe->getName()); neutrino_msg_t key = CRCInput::RC_nokey; @@ -932,7 +935,7 @@ int CScanSetup::showFrontendSetup(int number) dmode = fe_config.diseqcType; char name[255]; - snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), number+1, fe->getName()); + snprintf(name, sizeof(name), "%s %d: [%s] %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), number+1, tuner_desc[number], fe->getName()); CMenuWidget * setupMenu = new CMenuWidget(name, NEUTRINO_ICON_SETTINGS, width); setupMenu->setSelected(feselected); @@ -1161,7 +1164,7 @@ int CScanSetup::showScanMenuLnbSetup() CFrontend * fe = CFEManager::getInstance()->getFE(fenumber); char name[255]; - snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_SATSETUP_SATELLITE), fenumber+1, fe->getName()); + snprintf(name, sizeof(name), "%s %d: [%s] %s", g_Locale->getText(LOCALE_SATSETUP_SATELLITE), fenumber+1, tuner_desc[fenumber], fe->getName()); CMenuWidget * sat_setup = new CMenuWidget(name, NEUTRINO_ICON_SETTINGS, width); sat_setup->addIntroItems(); @@ -1323,7 +1326,7 @@ int CScanSetup::showScanMenuSatFind() r_system = ALL_SAT; - snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_MOTORCONTROL_HEAD), fenumber+1, fe->getName()); + snprintf(name, sizeof(name), "%s %d: [%s] %s", g_Locale->getText(LOCALE_MOTORCONTROL_HEAD), fenumber+1, tuner_desc[fenumber], fe->getName()); CMenuWidget* sat_findMenu = new CMenuWidget(name /*LOCALE_MOTORCONTROL_HEAD*/, NEUTRINO_ICON_SETTINGS, width); sat_findMenu->setSelected(selected); diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index 9a38b18ef..27a648ae7 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -343,8 +343,12 @@ void CFrontend::getFEInfo(void) if ((line.find("Name:") != std::string::npos) && found) { //printf("NIM SOCKET: %s\n",line.substr(line.find_first_of(":")+2).c_str()); +#if BOXMODEL_VUPLUS_ALL + sprintf(info.name,"%s", line.substr(line.find_first_of(":") + 9).c_str()); +#else std::string tmp = info.name; - sprintf(info.name,"%s (%s)",tmp.c_str(),line.substr(line.find_first_of(":")+2).c_str()); + sprintf(info.name,"%s (%s)", tmp.c_str(), line.substr(line.find_first_of(":") + 2).c_str()); +#endif break; } }