From df109a6889c2daf896ad0e81d7f0c61d3f5416b8 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 10 Dec 2021 19:56:53 +0100 Subject: [PATCH] remove --enable-testing switch; testmenu is intergrated into usermenu Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/327ce6d81ee106059fbcdcbc51817bcfcd410e2f Author: vanhofen Date: 2021-12-10 (Fri, 10 Dec 2021) Origin message was: ------------------ - remove --enable-testing switch; testmenu is intergrated into usermenu --- configure.ac | 5 ----- data/icons/various/Makefile.am | 5 ++--- src/gui/Makefile.am | 6 +----- src/neutrino_menue.cpp | 7 ------- src/neutrino_menue.h | 3 +-- 5 files changed, 4 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index a23c48a5e..c7f724eee 100644 --- a/configure.ac +++ b/configure.ac @@ -321,11 +321,6 @@ AC_ARG_ENABLE(dynamicdemux, AS_HELP_STRING([--enable-dynamicdemux], [enable dynamic demux @<:@default=no@:>@]), AC_DEFINE(DYNAMIC_DEMUX, 1, [enable dynamic demux])) -AC_ARG_ENABLE(testing, - AS_HELP_STRING([--enable-testing], [enable development code @<:@default=no@:>@]), - AC_DEFINE(ENABLE_TESTING, 1, [enable development code])) -AM_CONDITIONAL(ENABLE_TESTING, test "$enable_testing" = "yes") - AC_ARG_ENABLE(fribidi, AS_HELP_STRING([--enable-fribidi], [enable fribidi support @<:@default=no@:>@]), AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support])) diff --git a/data/icons/various/Makefile.am b/data/icons/various/Makefile.am index e7677c398..071e641ae 100644 --- a/data/icons/various/Makefile.am +++ b/data/icons/various/Makefile.am @@ -14,7 +14,6 @@ install_DATA = \ tmdb.png \ volume.png -if ENABLE_TESTING - install_DATA += \ +# used by testmenu only +install_DATA += \ tux.svg -endif diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index fe9476c66..8803ae864 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -99,6 +99,7 @@ libneutrino_gui_a_SOURCES = \ sleeptimer.cpp \ start_wizard.cpp \ subchannel_select.cpp \ + test_menu.cpp \ themes.cpp \ timeosd.cpp \ update.cpp \ @@ -164,11 +165,6 @@ libneutrino_gui_a_SOURCES += \ psisetup.cpp endif -#NI if ENABLE_TESTING -libneutrino_gui_a_SOURCES += \ - test_menu.cpp -#NI endif - libneutrino_gui2_a_SOURCES = \ cam_menu.cpp \ color.cpp \ diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index df61133e3..ef2e63d2f 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -66,9 +66,6 @@ #include "gui/sleeptimer.h" #include "gui/timerlist.h" #include "gui/update_menue.h" -#ifdef ENABLE_TESTING -#include "gui/test_menu.h" -#endif #include "gui/update.h" #include "gui/vfd_setup.h" #include "gui/videosettings.h" @@ -280,10 +277,6 @@ void CNeutrinoApp::InitMenuMain() mf->setHint(NEUTRINO_ICON_HINT_CI, LOCALE_MENU_HINT_CI); personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_CISETTINGS]); } - -#ifdef ENABLE_TESTING - personalize.addItem(MENU_MAIN, new CMenuForwarder("Test menu", true, NULL, new CTestMenu()), NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); -#endif } // settings menue diff --git a/src/neutrino_menue.h b/src/neutrino_menue.h index 2a086ad1b..d08ef8d04 100644 --- a/src/neutrino_menue.h +++ b/src/neutrino_menue.h @@ -198,12 +198,11 @@ enum MN_WIDGET_ID MN_WIDGET_ID_SCAN_MANUAL_SCAN, MN_WIDGET_ID_SCAN_FAST_SCAN, MN_WIDGET_ID_SCAN_CABLE_SCAN, -#ifdef ENABLE_TESTING + MN_WIDGET_ID_TESTMENU, MN_WIDGET_ID_TESTMENU_HARDWARE, MN_WIDGET_ID_TESTMENU_COMPONENTS, MN_WIDGET_ID_TESTMENU_HINT_MSG_TESTS, -#endif // network services MN_WIDGET_ID_NETWORKSETUP_SERVICES,