mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove --enable-testing switch; testmenu is intergrated into usermenu

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 327ce6d81e
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-12-10 (Fri, 10 Dec 2021)

Origin message was:
------------------
- remove --enable-testing switch; testmenu is intergrated into usermenu

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-12-10 19:56:53 +01:00
parent b0c7549c45
commit 0078138934
5 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -321,11 +321,6 @@ AC_ARG_ENABLE(dynamicdemux,
AS_HELP_STRING([--enable-dynamicdemux], [enable dynamic demux @<:@default=no@:>@]), AS_HELP_STRING([--enable-dynamicdemux], [enable dynamic demux @<:@default=no@:>@]),
AC_DEFINE(DYNAMIC_DEMUX, 1, [enable dynamic demux])) 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, AC_ARG_ENABLE(fribidi,
AS_HELP_STRING([--enable-fribidi], [enable fribidi support @<:@default=no@:>@]), AS_HELP_STRING([--enable-fribidi], [enable fribidi support @<:@default=no@:>@]),
AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support])) AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support]))

5
data/icons/various/Makefile.am
View File

@@ -14,7 +14,6 @@ install_DATA = \
tmdb.png \ tmdb.png \
volume.png volume.png
if ENABLE_TESTING # used by testmenu only
install_DATA += \ install_DATA += \
tux.svg tux.svg
endif

6
src/gui/Makefile.am
View File

@@ -99,6 +99,7 @@ libneutrino_gui_a_SOURCES = \
sleeptimer.cpp \ sleeptimer.cpp \
start_wizard.cpp \ start_wizard.cpp \
subchannel_select.cpp \ subchannel_select.cpp \
test_menu.cpp \
themes.cpp \ themes.cpp \
timeosd.cpp \ timeosd.cpp \
update.cpp \ update.cpp \
@@ -164,11 +165,6 @@ libneutrino_gui_a_SOURCES += \
psisetup.cpp psisetup.cpp
endif endif
#NI if ENABLE_TESTING
libneutrino_gui_a_SOURCES += \
test_menu.cpp
#NI endif
libneutrino_gui2_a_SOURCES = \ libneutrino_gui2_a_SOURCES = \
cam_menu.cpp \ cam_menu.cpp \
color.cpp \ color.cpp \

7
src/neutrino_menue.cpp
View File

@@ -66,9 +66,6 @@
#include "gui/sleeptimer.h" #include "gui/sleeptimer.h"
#include "gui/timerlist.h" #include "gui/timerlist.h"
#include "gui/update_menue.h" #include "gui/update_menue.h"
#ifdef ENABLE_TESTING
#include "gui/test_menu.h"
#endif
#include "gui/update.h" #include "gui/update.h"
#include "gui/vfd_setup.h" #include "gui/vfd_setup.h"
#include "gui/videosettings.h" #include "gui/videosettings.h"
@@ -280,10 +277,6 @@ void CNeutrinoApp::InitMenuMain()
mf->setHint(NEUTRINO_ICON_HINT_CI, LOCALE_MENU_HINT_CI); mf->setHint(NEUTRINO_ICON_HINT_CI, LOCALE_MENU_HINT_CI);
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_CISETTINGS]); 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 // settings menue

3
src/neutrino_menue.h
View File

@@ -198,12 +198,11 @@ enum MN_WIDGET_ID
MN_WIDGET_ID_SCAN_MANUAL_SCAN, MN_WIDGET_ID_SCAN_MANUAL_SCAN,
MN_WIDGET_ID_SCAN_FAST_SCAN, MN_WIDGET_ID_SCAN_FAST_SCAN,
MN_WIDGET_ID_SCAN_CABLE_SCAN, MN_WIDGET_ID_SCAN_CABLE_SCAN,
#ifdef ENABLE_TESTING
MN_WIDGET_ID_TESTMENU, MN_WIDGET_ID_TESTMENU,
MN_WIDGET_ID_TESTMENU_HARDWARE, MN_WIDGET_ID_TESTMENU_HARDWARE,
MN_WIDGET_ID_TESTMENU_COMPONENTS, MN_WIDGET_ID_TESTMENU_COMPONENTS,
MN_WIDGET_ID_TESTMENU_HINT_MSG_TESTS, MN_WIDGET_ID_TESTMENU_HINT_MSG_TESTS,
#endif
// network services // network services
MN_WIDGET_ID_NETWORKSETUP_SERVICES, MN_WIDGET_ID_NETWORKSETUP_SERVICES,