mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

CTestMenu: Add widget id's

Browse Source 
- Return menu result, to close all menus


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2244e418b7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-21 (Tue, 21 May 2013)

Origin message was:
------------------
* CTestMenu: Add widget id's

- Return menu result, to close all menus


------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2013-05-21 17:12:32 +02:00
parent 2fbf843d79
commit e25b16bcd6
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/test_menu.cpp
View File

@@ -34,6 +34,7 @@
#include <global.h>
#include <neutrino.h>
#include <neutrino_menue.h>
#include <driver/screen_max.h>
#include <system/debug.h>
@@ -61,7 +62,6 @@ extern int cs_test_card(int unit, char * str);
CTestMenu::CTestMenu()
{
width = w_max (50, 10);
selected = -1;
circle = NULL;
sq = NULL;
pic= NULL;
@@ -529,24 +529,22 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
}
showTestMenu();
return res;
return showTestMenu();
}
/* shows entries for proxy settings */
void CTestMenu::showTestMenu()
int CTestMenu::showTestMenu()
{
unsigned int system_rev = cs_get_revision();
//init
char rev[255];
sprintf(rev, "Test menu, System revision %d %s", system_rev, system_rev == 0 ? "WARNING - INVALID" : "");
CMenuWidget w_test(rev /*"Test menu"*/, NEUTRINO_ICON_INFO, width);
CMenuWidget w_test(rev /*"Test menu"*/, NEUTRINO_ICON_INFO, width, MN_WIDGET_ID_TESTMENU);
w_test.addIntroItems();
//hardware
CMenuWidget * w_hw = new CMenuWidget("Hardware Test", NEUTRINO_ICON_INFO, width);
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));
showHWTests(w_hw);
@@ -554,18 +552,16 @@ void CTestMenu::showTestMenu()
w_test.addItem(new CMenuForwarderNonLocalized("Buttons", true, NULL, this, "buttons"));
//components
CMenuWidget * w_cc = new CMenuWidget("OSD-Components Demo", NEUTRINO_ICON_INFO, width);
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));
showCCTests(w_cc);
//exit
w_test.exec(NULL, "");
selected = w_test.getSelected();
return w_test.exec(NULL, "");;
}
void CTestMenu::showCCTests(CMenuWidget *widget)
{
widget->setSelected(selected);
widget->addIntroItems();
widget->addItem(new CMenuForwarderNonLocalized("Button", true, NULL, this, "button"));
widget->addItem(new CMenuForwarderNonLocalized("Circle", true, NULL, this, "circle"));
@@ -580,7 +576,6 @@ void CTestMenu::showCCTests(CMenuWidget *widget)
void CTestMenu::showHWTests(CMenuWidget *widget)
{
widget->setSelected(selected);
widget->addIntroItems();
widget->addItem(new CMenuForwarderNonLocalized("VFD", true, NULL, this, "vfd"));
widget->addItem(new CMenuForwarderNonLocalized("Network", true, NULL, this, "network"));

2
src/gui/test_menu.h
View File

@@ -52,7 +52,7 @@ class CTestMenu : public CMenuTarget
CComponentsButton *button;
int width, selected;
void showTestMenu();
int showTestMenu();
void showHWTests(CMenuWidget *widget);
void showCCTests(CMenuWidget *widget);

6
src/neutrino_menue.h
View File

@@ -171,7 +171,11 @@ enum MN_WIDGET_ID
MN_WIDGET_ID_SCAN_MANUAL_SCAN,
MN_WIDGET_ID_SCAN_FAST_SCAN,
MN_WIDGET_ID_SCAN_CABLE_SCAN,
MN_WIDGET_ID_TESTMENU,
MN_WIDGET_ID_TESTMENU_HARDWARE,
MN_WIDGET_ID_TESTMENU_COMPONENTS,
MN_WIDGET_ID_MAX
};