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

test_menu: add CTermWindow() test

Browse Source 
Conflicts:
	src/gui/test_menu.cpp
This commit is contained in:
Stefan Seyfried
2018-01-07 23:55:52 +01:00
committed by Thilo Graf
parent 903e19d9a0
commit a73b765df1
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/test_menu.cpp
View File

@@ -52,6 +52,7 @@
#include <gui/widget/msgbox.h> #include <gui/widget/msgbox.h>
#include <gui/widget/progresswindow.h> #include <gui/widget/progresswindow.h>
#include <gui/widget/termwindow.h>
#include <gui/scan.h> #include <gui/scan.h>
#include <gui/scan_setup.h> #include <gui/scan_setup.h>
#include <zapit/zapit.h> #include <zapit/zapit.h>
@@ -116,6 +117,11 @@ CTestMenu::~CTestMenu()
//static int test_pos[4] = { 130, 192, 282, 360 }; //static int test_pos[4] = { 130, 192, 282, 360 };
void CTestMenu::handleShellOutput(std::string *line, int *, bool *)
{
fprintf(stderr, "%s: %s\n", __func__, line->c_str());
}
int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
{ {
dprintf(DEBUG_DEBUG, "init test menu\n"); dprintf(DEBUG_DEBUG, "init test menu\n");
@@ -975,6 +981,19 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
DisplayInfoMessage("Info Test!"); DisplayInfoMessage("Info Test!");
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;
} }
else if (actionKey == "shellwindow"){
sigc::slot3<void, std::string*, int *, bool *> sl_shell_output;
sl_shell_output = sigc::mem_fun(*this, &CTestMenu::handleShellOutput);
int r = 0;
const char *c = getenv("TEST_COMMAND");
std::string cmd = "/bin/ps auxwf";
if (c)
cmd = (std::string)c;
CTermWindow term(cmd, CTermWindow::VERBOSE | CTermWindow::ACKNOWLEDGE, &r, false);
term.OnShellOutputLoop.connect(sl_shell_output);
term.exec();
return menu_return::RETURN_REPAINT;
}
else if (actionKey == "msgbox_alt_btn"){ else if (actionKey == "msgbox_alt_btn"){
CMsgBox msgBox("Variable buttontext...", "Msgbox Test"); CMsgBox msgBox("Variable buttontext...", "Msgbox Test");
msgBox.setShowedButtons(CMsgBox::mbNo | CMsgBox::mbYes); msgBox.setShowedButtons(CMsgBox::mbNo | CMsgBox::mbYes);
@@ -1110,6 +1129,7 @@ int CTestMenu::showTestMenu()
CMenuWidget w_test(rev /*"Test menu"*/, NEUTRINO_ICON_INFO, width, MN_WIDGET_ID_TESTMENU); CMenuWidget w_test(rev /*"Test menu"*/, NEUTRINO_ICON_INFO, width, MN_WIDGET_ID_TESTMENU);
w_test.addIntroItems(); w_test.addIntroItems();
w_test.addItem(new CMenuForwarder("Shell Window Test", true, NULL, this, "shellwindow"));
//hardware //hardware
CMenuWidget * w_hw = new CMenuWidget("Hardware Test", NEUTRINO_ICON_INFO, width, MN_WIDGET_ID_TESTMENU_HARDWARE); CMenuWidget * w_hw = new CMenuWidget("Hardware Test", NEUTRINO_ICON_INFO, width, MN_WIDGET_ID_TESTMENU_HARDWARE);
w_test.addItem(new CMenuForwarder(w_hw->getName(), true, NULL, w_hw)); w_test.addItem(new CMenuForwarder(w_hw->getName(), true, NULL, w_hw));

1
src/gui/test_menu.h
View File

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