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 remote-tracking branch 'check/next-cc'

Browse Source 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
This commit is contained in:
Stefan Seyfried
2013-05-24 20:24:39 +02:00
parent 95813ab60e 00dd399ff9
commit a7f1e0e25e
50 changed files with 1106 additions and 665 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 <driver/display.h>
@@ -64,7 +65,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;
@@ -534,24 +534,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);
@@ -559,18 +557,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"));
@@ -585,7 +581,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"));