From 1fb15ee287fbf5ac5997acad2a99aaa477e17637 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Thu, 14 Mar 2013 22:20:47 +0100 Subject: [PATCH] CTestMenu: remove minitv sample Can not be displayed here nicely. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c17e2e5d6ca34397d1c7f141e3d5cc8e51f6600a Author: Thilo Graf Date: 2013-03-14 (Thu, 14 Mar 2013) ------------------ This commit was generated by Migit --- src/gui/test_menu.cpp | 13 ------------- src/gui/test_menu.h | 1 - 2 files changed, 14 deletions(-) diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp index e9c681e1c..b714c5f22 100644 --- a/src/gui/test_menu.cpp +++ b/src/gui/test_menu.cpp @@ -65,7 +65,6 @@ CTestMenu::CTestMenu() circle = NULL; sq = NULL; pic= NULL; - pip = NULL; form = NULL; txt = NULL; header = NULL; @@ -78,7 +77,6 @@ CTestMenu::~CTestMenu() delete sq; delete circle; delete pic; - delete pip; delete form; delete txt; delete header; @@ -360,16 +358,6 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) pic->hide(); return res; } - else if (actionKey == "pip"){ - if (pip == NULL) - pip = new CComponentsPIP (100, 100, 25); - - if (!pip->isPainted()) - pip->paint(); - else - pip->hide(); - return res; - } else if (actionKey == "form"){ if (form == NULL) form = new CComponentsForm(); @@ -564,7 +552,6 @@ void CTestMenu::showCCTests(CMenuWidget *widget) widget->addItem(new CMenuForwarderNonLocalized("Circle", true, NULL, this, "circle")); widget->addItem(new CMenuForwarderNonLocalized("Square", true, NULL, this, "square")); widget->addItem(new CMenuForwarderNonLocalized("Picture", true, NULL, this, "picture")); - widget->addItem(new CMenuForwarderNonLocalized("PiP", true, NULL, this, "pip")); widget->addItem(new CMenuForwarderNonLocalized("Form", true, NULL, this, "form")); widget->addItem(new CMenuForwarderNonLocalized("Text", true, NULL, this, "text")); widget->addItem(new CMenuForwarderNonLocalized("Header", true, NULL, this, "header")); diff --git a/src/gui/test_menu.h b/src/gui/test_menu.h index 7e7fa47f9..9b6bf40f4 100644 --- a/src/gui/test_menu.h +++ b/src/gui/test_menu.h @@ -42,7 +42,6 @@ class CTestMenu : public CMenuTarget CComponentsShapeCircle * circle; CComponentsShapeSquare* sq; CComponentsPicture* pic; - CComponentsPIP* pip; CComponentsForm *form; CComponentsText *txt; CComponentsHeader *header;