diff --git a/src/gui/info_menue.cpp b/src/gui/info_menue.cpp index 215158fc4..e2add1b43 100644 --- a/src/gui/info_menue.cpp +++ b/src/gui/info_menue.cpp @@ -38,7 +38,10 @@ #include #include #include + +#if 0 #include +#endif #include #include "gui/cam_menu.h" @@ -73,7 +76,7 @@ int CInfoMenu::showMenu() CImageInfo imageinfo; CDBoxInfoWidget boxinfo; CStreamInfo2 streaminfo; - CBuildInfo buildinfo; + info->addIntroItems(); CMenuForwarder * mf = new CMenuForwarder(LOCALE_SERVICEMENU_IMAGEINFO, true, NULL, &imageinfo, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED ); @@ -87,17 +90,19 @@ int CInfoMenu::showMenu() mf = new CMenuForwarder(LOCALE_STREAMINFO_HEAD, !CNeutrinoApp::getInstance()->channelList->isEmpty(), NULL, &streaminfo, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); mf->setHint(NEUTRINO_ICON_HINT_STREAMINFO, LOCALE_MENU_HINT_STREAMINFO); info->addItem(mf); - + +#if 0 + CBuildInfo buildinfo; mf = new CMenuForwarder(LOCALE_BUILDINFO_MENU, true, NULL, &buildinfo, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE ); mf->setHint(NEUTRINO_ICON_HINT_IMAGEINFO, LOCALE_MENU_HINT_BUILDINFO); info->addItem(mf); +#endif if (g_settings.easymenu) { mf = new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); mf->setHint(NEUTRINO_ICON_HINT_CI, LOCALE_MENU_HINT_CI); info->addItem(mf); } - int res = info->exec(NULL, ""); delete info; return res; diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp index 9ffd75917..d2380fdd3 100644 --- a/src/gui/test_menu.cpp +++ b/src/gui/test_menu.cpp @@ -54,7 +54,7 @@ #include #include #include - +#include extern int cs_test_card(int unit, char * str); @@ -675,6 +675,11 @@ int CTestMenu::showTestMenu() 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); + + //buildinfo + CMenuForwarder *f_bi = new CMenuForwarder(LOCALE_BUILDINFO_MENU, true, NULL, new CBuildInfo()); + f_bi->setHint(NEUTRINO_ICON_HINT_IMAGEINFO, LOCALE_MENU_HINT_BUILDINFO); + w_test.addItem(f_bi); //exit return w_test.exec(NULL, "");;