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

test-menu: move separator types into own methode

Browse Source
This commit is contained in:
Thilo Graf
2019-10-27 16:24:47 +01:00
parent 3932a71d80
commit 0080ac220d
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gui/test_menu.cpp
View File

@@ -51,6 +51,7 @@
#include <xmlinterface.h> #include <xmlinterface.h>
#include <gui/widget/msgbox.h> #include <gui/widget/msgbox.h>
#include <gui/widget/keyboard_input.h>
#include <gui/widget/progresswindow.h> #include <gui/widget/progresswindow.h>
#include <gui/widget/termwindow.h> #include <gui/widget/termwindow.h>
#include <gui/scan.h> #include <gui/scan.h>
@@ -1151,21 +1152,18 @@ int CTestMenu::showTestMenu()
w_test.addItem(new CMenuForwarder(w_msg->getName(), true, NULL, w_msg)); w_test.addItem(new CMenuForwarder(w_msg->getName(), true, NULL, w_msg));
showMsgTests(w_msg); showMsgTests(w_msg);
//separator types
CMenuWidget * w_types = new CMenuWidget("Menu Separators", NEUTRINO_ICON_INFO, width, MN_WIDGET_ID_TESTMENU_HINT_MSG_TESTS);
w_test.addItem(new CMenuForwarder(w_types->getName(), true, NULL, w_types));
showSeparatorTypes(w_types);
std::string input_txt;
CKeyboardInput input("Text input", &input_txt, 30, NULL, NULL, "Test");
w_test.addItem(new CMenuForwarder("Text input", true, NULL, &input));
//restart gui //restart gui
w_test.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_RESTART , true, NULL, CNeutrinoApp::getInstance(), "restart", CRCInput::RC_standby)); w_test.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_RESTART , true, NULL, CNeutrinoApp::getInstance(), "restart", CRCInput::RC_standby));
w_test.addItem(GenericMenuSeparatorLine);
w_test.addItem(new CMenuSeparator(CMenuSeparator::STRING, "String Separator"));
w_test.addItem(new CMenuSeparator(CMenuSeparator::STRING | CMenuSeparator::LINE, "String Line Separator"));
w_test.addItem(new CMenuSeparator(CMenuSeparator::SUB_HEAD, "Sub Title"));
w_test.addItem(new CMenuSeparator(CMenuSeparator::SUB_HEAD | CMenuSeparator::ALIGN_LEFT, "Sub Title L"));
w_test.addItem(new CMenuSeparator(CMenuSeparator::SUB_HEAD | CMenuSeparator::ALIGN_RIGHT, "Sub Title R"));
//footer buttons //footer buttons
static const struct button_label footerButtons[2] = { static const struct button_label footerButtons[2] = {
{ NEUTRINO_ICON_BUTTON_RED, LOCALE_COLORCHOOSER_RED }, { NEUTRINO_ICON_BUTTON_RED, LOCALE_COLORCHOOSER_RED },
@@ -1289,3 +1287,15 @@ void CTestMenu::showMsgTests(CMenuWidget *widget)
widget->addItem(new CMenuForwarder("Error Message!", true, NULL, this, "msgbox_error")); widget->addItem(new CMenuForwarder("Error Message!", true, NULL, this, "msgbox_error"));
widget->addItem(new CMenuForwarder("Info Message!", true, NULL, this, "msgbox_info")); widget->addItem(new CMenuForwarder("Info Message!", true, NULL, this, "msgbox_info"));
} }
void CTestMenu::showSeparatorTypes(CMenuWidget *widget)
{
widget->addIntroItems();
widget->addItem(new CMenuSeparator(CMenuSeparator::STRING, "String Separator"));
widget->addItem(new CMenuSeparator(CMenuSeparator::STRING | CMenuSeparator::LINE, "String Line Separator"));
widget->addItem(new CMenuSeparator(CMenuSeparator::SUB_HEAD, "Sub Title"));
widget->addItem(new CMenuSeparator(CMenuSeparator::SUB_HEAD | CMenuSeparator::ALIGN_LEFT, "Sub Title L"));
widget->addItem(new CMenuSeparator(CMenuSeparator::SUB_HEAD | CMenuSeparator::ALIGN_RIGHT, "Sub Title R"));
}

1
src/gui/test_menu.h
View File

@@ -61,6 +61,7 @@ class CTestMenu : public CMenuTarget
void showHWTests(CMenuWidget *widget); void showHWTests(CMenuWidget *widget);
void showCCTests(CMenuWidget *widget); void showCCTests(CMenuWidget *widget);
void showMsgTests(CMenuWidget *widget); void showMsgTests(CMenuWidget *widget);
void showSeparatorTypes(CMenuWidget *widget);
void showRecords(); void showRecords();
void handleShellOutput(std::string *line, int *, bool *); void handleShellOutput(std::string *line, int *, bool *);
public: public: