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

CTestMenu: add buildinfo as menu entry

Browse Source 
Buildinfo also exists in infomenu, but is outcommented, so it is
prepared just for testings.
This commit is contained in:
Thilo Graf
2013-11-11 00:18:22 +01:00
parent 2bd2714770
commit ac6f547d0f
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/info_menue.cpp
View File

@@ -38,7 +38,10 @@
#include <gui/imageinfo.h> #include <gui/imageinfo.h>
#include <gui/dboxinfo.h> #include <gui/dboxinfo.h>
#include <gui/streaminfo2.h> #include <gui/streaminfo2.h>
#if 0
#include <gui/buildinfo.h> #include <gui/buildinfo.h>
#endif
#include <driver/screen_max.h> #include <driver/screen_max.h>
#include "gui/cam_menu.h" #include "gui/cam_menu.h"
@@ -73,7 +76,7 @@ int CInfoMenu::showMenu()
CImageInfo imageinfo; CImageInfo imageinfo;
CDBoxInfoWidget boxinfo; CDBoxInfoWidget boxinfo;
CStreamInfo2 streaminfo; CStreamInfo2 streaminfo;
CBuildInfo buildinfo;
info->addIntroItems(); info->addIntroItems();
CMenuForwarder * mf = new CMenuForwarder(LOCALE_SERVICEMENU_IMAGEINFO, true, NULL, &imageinfo, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED ); CMenuForwarder * mf = new CMenuForwarder(LOCALE_SERVICEMENU_IMAGEINFO, true, NULL, &imageinfo, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED );
@@ -88,16 +91,18 @@ int CInfoMenu::showMenu()
mf->setHint(NEUTRINO_ICON_HINT_STREAMINFO, LOCALE_MENU_HINT_STREAMINFO); mf->setHint(NEUTRINO_ICON_HINT_STREAMINFO, LOCALE_MENU_HINT_STREAMINFO);
info->addItem(mf); 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 = 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); mf->setHint(NEUTRINO_ICON_HINT_IMAGEINFO, LOCALE_MENU_HINT_BUILDINFO);
info->addItem(mf); info->addItem(mf);
#endif
if (g_settings.easymenu) { if (g_settings.easymenu) {
mf = new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); 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); mf->setHint(NEUTRINO_ICON_HINT_CI, LOCALE_MENU_HINT_CI);
info->addItem(mf); info->addItem(mf);
} }
int res = info->exec(NULL, ""); int res = info->exec(NULL, "");
delete info; delete info;
return res; return res;

7
src/gui/test_menu.cpp
View File

@@ -54,7 +54,7 @@
#include <zapit/scan.h> #include <zapit/scan.h>
#include <zapit/femanager.h> #include <zapit/femanager.h>
#include <gui/widget/messagebox.h> #include <gui/widget/messagebox.h>
#include <gui/buildinfo.h>
extern int cs_test_card(int unit, char * str); extern int cs_test_card(int unit, char * str);
@@ -676,6 +676,11 @@ int CTestMenu::showTestMenu()
w_test.addItem(new CMenuForwarderNonLocalized(w_cc->getName().c_str(), true, NULL, w_cc)); w_test.addItem(new CMenuForwarderNonLocalized(w_cc->getName().c_str(), true, NULL, w_cc));
showCCTests(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 //exit
return w_test.exec(NULL, "");; return w_test.exec(NULL, "");;
} }