mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-09-13 13:40:40 +02:00
parent 2d4f52ae62 932a535b6a
commit 2c5bf73006
44 changed files with 349 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/gui/scan_setup.cpp
View File

@@ -762,19 +762,12 @@ int CScanSetup::showScanMenuFrontendSetup()
snprintf(tmp, sizeof(tmp), "config_frontend%d", i);
char name[255];
if (g_settings.easymenu)
snprintf(name, sizeof(name), "%s %d: %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));
else
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)
: g_Locale->getText(LOCALE_SCANTS_ACTCABLE),
fe->getName());
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)
: g_Locale->getText(LOCALE_SCANTS_ACTCABLE),
fe->getName());
neutrino_msg_t key = CRCInput::RC_nokey;
if (i == 0)
@@ -908,14 +901,7 @@ int CScanSetup::showFrontendSetup(int number)
dmode = fe_config.diseqcType;
char name[255];
if (g_settings.easymenu)
snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), number+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));
else
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", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), number+1, fe->getName());
CMenuWidget * setupMenu = new CMenuWidget(name, NEUTRINO_ICON_SETTINGS, width);
setupMenu->setSelected(feselected);
@@ -1516,12 +1502,9 @@ void CScanSetup::addScanMenuFastScan(CMenuWidget *fast_ScanMenu)
mf->setHint("", LOCALE_MENU_HINT_SCAN_FASTDISEQC);
fast_ScanMenu->addItem(mf);
if (1 /* !g_settings.easymenu */)
{
mf = new CMenuForwarder(LOCALE_SCANTS_STARTNOW, allow_start, NULL, this, "sfast", CRCInput::RC_blue);
mf->setHint("", LOCALE_MENU_HINT_SCAN_START);
fast_ScanMenu->addItem(mf);
}
mf = new CMenuForwarder(LOCALE_SCANTS_STARTNOW, allow_start, NULL, this, "sfast", CRCInput::RC_blue);
mf->setHint("", LOCALE_MENU_HINT_SCAN_START);
fast_ScanMenu->addItem(mf);
}
int CScanSetup::showFastscanDiseqcSetup()