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

Preparing the menu classes for Lua Part #2

Browse Source 
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
  THX Martii
This commit is contained in:
M. Liebmann
2014-01-16 23:20:04 +01:00
parent 2c9c9debcc
commit b41819190d
35 changed files with 298 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/gui/test_menu.cpp
View File

@@ -665,15 +665,15 @@ int CTestMenu::showTestMenu()
//hardware
CMenuWidget * w_hw = new CMenuWidget("Hardware Test", NEUTRINO_ICON_INFO, width, MN_WIDGET_ID_TESTMENU_HARDWARE);
w_test.addItem(new CMenuForwarderNonLocalized(w_hw->getName().c_str(), true, NULL, w_hw));
w_test.addItem(new CMenuForwarder(w_hw->getName().c_str(), true, NULL, w_hw));
showHWTests(w_hw);
//buttons
w_test.addItem(new CMenuForwarderNonLocalized("Buttons", true, NULL, this, "buttons"));
w_test.addItem(new CMenuForwarder("Buttons", true, NULL, this, "buttons"));
//components
CMenuWidget * w_cc = new CMenuWidget("OSD-Components Demo", NEUTRINO_ICON_INFO, width, MN_WIDGET_ID_TESTMENU_COMPONENTS);
w_test.addItem(new CMenuForwarderNonLocalized(w_cc->getName().c_str(), true, NULL, w_cc));
w_test.addItem(new CMenuForwarder(w_cc->getName().c_str(), true, NULL, w_cc));
showCCTests(w_cc);
//buildinfo
@@ -688,31 +688,31 @@ int CTestMenu::showTestMenu()
void CTestMenu::showCCTests(CMenuWidget *widget)
{
widget->addIntroItems();
widget->addItem(new CMenuForwarderNonLocalized("Running Clock", true, NULL, this, "running_clock"));
widget->addItem(new CMenuForwarderNonLocalized("Clock", true, NULL, this, "clock"));
widget->addItem(new CMenuForwarderNonLocalized("Button", true, NULL, this, "button"));
widget->addItem(new CMenuForwarderNonLocalized("Circle", true, NULL, this, "circle"));
widget->addItem(new CMenuForwarderNonLocalized("Square", true, NULL, this, "square"));
widget->addItem(new CMenuForwarderNonLocalized("Picture", true, NULL, this, "picture"));
widget->addItem(new CMenuForwarderNonLocalized("Channel-Logo", true, NULL, this, "channellogo"));
widget->addItem(new CMenuForwarderNonLocalized("Form", true, NULL, this, "form"));
widget->addItem(new CMenuForwarderNonLocalized("Text", true, NULL, this, "text"));
widget->addItem(new CMenuForwarderNonLocalized("Header", true, NULL, this, "header"));
widget->addItem(new CMenuForwarderNonLocalized("Footer", true, NULL, this, "footer"));
widget->addItem(new CMenuForwarderNonLocalized("Icon-Form", true, NULL, this, "iconform"));
widget->addItem(new CMenuForwarderNonLocalized("Window", true, NULL, this, "window"));
widget->addItem(new CMenuForwarderNonLocalized("Text-Extended", true, NULL, this, "text_ext"));
widget->addItem(new CMenuForwarder("Running Clock", true, NULL, this, "running_clock"));
widget->addItem(new CMenuForwarder("Clock", true, NULL, this, "clock"));
widget->addItem(new CMenuForwarder("Button", true, NULL, this, "button"));
widget->addItem(new CMenuForwarder("Circle", true, NULL, this, "circle"));
widget->addItem(new CMenuForwarder("Square", true, NULL, this, "square"));
widget->addItem(new CMenuForwarder("Picture", true, NULL, this, "picture"));
widget->addItem(new CMenuForwarder("Channel-Logo", true, NULL, this, "channellogo"));
widget->addItem(new CMenuForwarder("Form", true, NULL, this, "form"));
widget->addItem(new CMenuForwarder("Text", true, NULL, this, "text"));
widget->addItem(new CMenuForwarder("Header", true, NULL, this, "header"));
widget->addItem(new CMenuForwarder("Footer", true, NULL, this, "footer"));
widget->addItem(new CMenuForwarder("Icon-Form", true, NULL, this, "iconform"));
widget->addItem(new CMenuForwarder("Window", true, NULL, this, "window"));
widget->addItem(new CMenuForwarder("Text-Extended", true, NULL, this, "text_ext"));
}
void CTestMenu::showHWTests(CMenuWidget *widget)
{
widget->addIntroItems();
widget->addItem(new CMenuForwarderNonLocalized("VFD", true, NULL, this, "vfd"));
widget->addItem(new CMenuForwarderNonLocalized("Network", true, NULL, this, "network"));
widget->addItem(new CMenuForwarderNonLocalized("Smartcard 1", true, NULL, this, "card0"));
widget->addItem(new CMenuForwarderNonLocalized("Smartcard 2", true, NULL, this, "card1"));
widget->addItem(new CMenuForwarderNonLocalized("HDD", true, NULL, this, "hdd"));
widget->addItem(new CMenuForwarderNonLocalized("SD/MMC", true, NULL, this, "mmc"));
widget->addItem(new CMenuForwarder("VFD", true, NULL, this, "vfd"));
widget->addItem(new CMenuForwarder("Network", true, NULL, this, "network"));
widget->addItem(new CMenuForwarder("Smartcard 1", true, NULL, this, "card0"));
widget->addItem(new CMenuForwarder("Smartcard 2", true, NULL, this, "card1"));
widget->addItem(new CMenuForwarder("HDD", true, NULL, this, "hdd"));
widget->addItem(new CMenuForwarder("SD/MMC", true, NULL, this, "mmc"));
for (unsigned i = 0; i < sizeof(test_pos)/sizeof(int); i++) {
CServiceManager::getInstance()->InitSatPosition(test_pos[i], NULL, true);
@@ -732,7 +732,7 @@ void CTestMenu::showHWTests(CMenuWidget *widget)
} else
continue;
widget->addItem(new CMenuForwarderNonLocalized(title, true, NULL, this, scan));
widget->addItem(new CMenuForwarder(title, true, NULL, this, scan));
if (frontend->getInfo()->type == FE_QPSK) {
frontend->setMode(CFrontend::FE_MODE_INDEPENDENT);
@@ -740,20 +740,20 @@ void CTestMenu::showHWTests(CMenuWidget *widget)
satmap[test_pos[i]].configured = 1;
frontend->setSatellites(satmap);
if (i == 0) {
widget->addItem(new CMenuForwarderNonLocalized("Tuner 1: 22 Khz ON", true, NULL, this, "22kon0"));
widget->addItem(new CMenuForwarderNonLocalized("Tuner 1: 22 Khz OFF", true, NULL, this, "22koff0"));
widget->addItem(new CMenuForwarder("Tuner 1: 22 Khz ON", true, NULL, this, "22kon0"));
widget->addItem(new CMenuForwarder("Tuner 1: 22 Khz OFF", true, NULL, this, "22koff0"));
}
if (i == 1) {
widget->addItem(new CMenuForwarderNonLocalized("Tuner 2: 22 Khz ON", true, NULL, this, "22kon1"));
widget->addItem(new CMenuForwarderNonLocalized("Tuner 2: 22 Khz OFF", true, NULL, this, "22koff1"));
widget->addItem(new CMenuForwarder("Tuner 2: 22 Khz ON", true, NULL, this, "22kon1"));
widget->addItem(new CMenuForwarder("Tuner 2: 22 Khz OFF", true, NULL, this, "22koff1"));
}
if (i == 2) {
widget->addItem(new CMenuForwarderNonLocalized("Tuner 3: 22 Khz ON", true, NULL, this, "22kon2"));
widget->addItem(new CMenuForwarderNonLocalized("Tuner 3: 22 Khz OFF", true, NULL, this, "22koff2"));
widget->addItem(new CMenuForwarder("Tuner 3: 22 Khz ON", true, NULL, this, "22kon2"));
widget->addItem(new CMenuForwarder("Tuner 3: 22 Khz OFF", true, NULL, this, "22koff2"));
}
if (i == 3) {
widget->addItem(new CMenuForwarderNonLocalized("Tuner 4: 22 Khz ON", true, NULL, this, "22kon3"));
widget->addItem(new CMenuForwarderNonLocalized("Tuner 4: 22 Khz OFF", true, NULL, this, "22koff3"));
widget->addItem(new CMenuForwarder("Tuner 4: 22 Khz ON", true, NULL, this, "22kon3"));
widget->addItem(new CMenuForwarder("Tuner 4: 22 Khz OFF", true, NULL, this, "22koff3"));
}
}
}