From 8a8748c5e761b78b46a8f80a33c9bdf684fa64f8 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sat, 8 Mar 2014 22:38:12 +0100 Subject: [PATCH] CMiscMenue: add entry for temporarily debug mode settings Option "Level" overwrites assigned debug level output mode of Neutrino start parameters, but only temporarily till change of options by user or restart of Neutrino. --- data/locale/deutsch.locale | 5 +++++ data/locale/english.locale | 5 +++++ data/locale/nederlands.locale | 5 +++++ data/locale/slovak.locale | 5 +++++ src/gui/miscsettings_menu.cpp | 15 ++++++++++++++- src/system/debug.h | 12 +++++++++--- src/system/locals.h | 5 +++++ src/system/locals_intern.h | 5 +++++ 8 files changed, 53 insertions(+), 4 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 63f24fdb3..5aaf633c1 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -317,6 +317,11 @@ date.Sun So date.Thu Do date.Tue Di date.Wed Mi +debug Debug Ausgabe +debug.level Stufe +debug.level_1 normal +debug.level_2 informativ +debug.level_3 ausführlich epg.saving Speichere EPG epgextended.actors Darsteller epgextended.director Regie diff --git a/data/locale/english.locale b/data/locale/english.locale index d5d9006cf..538422bf6 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -317,6 +317,11 @@ date.Sun Sun date.Thu Thu date.Tue Tue date.Wed Wed +debug Debug Output +debug.level Level +debug.level_1 normal +debug.level_2 informative +debug.level_3 verbose epg.saving Saving EPG epgextended.actors Actors epgextended.director Director diff --git a/data/locale/nederlands.locale b/data/locale/nederlands.locale index 6d0d1d789..6688ca37b 100644 --- a/data/locale/nederlands.locale +++ b/data/locale/nederlands.locale @@ -314,6 +314,11 @@ date.Sun Zo date.Thu Do date.Tue Di date.Wed Wo +debug Debug Output +debug.level Level +debug.level_1 normaal +debug.level_2 informatieve +debug.level_3 verbose epg.saving Opslaan EPG epgextended.actors Acteurs epgextended.director Regisseur diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale index de11ee7c4..7b58fab24 100644 --- a/data/locale/slovak.locale +++ b/data/locale/slovak.locale @@ -316,6 +316,11 @@ date.Sun Ne date.Thu Št date.Tue Ut date.Wed St +debug Debug Output +debug.level Rovina +debug.level_1 normálne +debug.level_2 informatívny +debug.level_3 detail epg.saving Uloženie EPG epgextended.actors Herci epgextended.director Režisér diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index bd1114bde..43d8dbae9 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -35,7 +35,7 @@ #include #include #include - +#include #include #include #include @@ -312,6 +312,13 @@ int CMiscMenue::showMiscSettingsMenu() return res; } +const CMenuOptionChooser::keyval DEBUG_MODE_OPTIONS[DEBUG_MODES] = +{ + { DEBUG_NORMAL , LOCALE_DEBUG_LEVEL_1 }, + { DEBUG_INFO , LOCALE_DEBUG_LEVEL_2 }, + { DEBUG_DEBUG , LOCALE_DEBUG_LEVEL_3 } +}; + //general settings void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general) { @@ -347,6 +354,12 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general) mf = new CMenuForwarder(LOCALE_MPKEY_PLUGIN, true, g_settings.movieplayer_plugin, this, "movieplayer_plugin"); mf->setHint("", LOCALE_MENU_HINT_MOVIEPLAYER_PLUGIN); ms_general->addItem(mf); + + //set debug level + ms_general->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_DEBUG)); + CMenuOptionChooser * md = new CMenuOptionChooser(LOCALE_DEBUG_LEVEL, &debug, DEBUG_MODE_OPTIONS, DEBUG_MODES, true); +// mc->setHint("", LOCALE_MENU_HINT_START_TOSTANDBY); + ms_general->addItem(md); } #define VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT 2 diff --git a/src/system/debug.h b/src/system/debug.h index 9ba7bfc83..62ea60732 100644 --- a/src/system/debug.h +++ b/src/system/debug.h @@ -27,9 +27,15 @@ extern int debug; -#define DEBUG_NORMAL 0 -#define DEBUG_INFO 1 -#define DEBUG_DEBUG 2 +enum +{ + DEBUG_NORMAL , // 0 + DEBUG_INFO , // 1 + DEBUG_DEBUG , // 2 + + DEBUG_MODES // 3 count of available modes +}; + void setDebugLevel( int level ); diff --git a/src/system/locals.h b/src/system/locals.h index 0b33294d5..1ba70b1e1 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -344,6 +344,11 @@ typedef enum LOCALE_DATE_THU, LOCALE_DATE_TUE, LOCALE_DATE_WED, + LOCALE_DEBUG, + LOCALE_DEBUG_LEVEL, + LOCALE_DEBUG_LEVEL_1, + LOCALE_DEBUG_LEVEL_2, + LOCALE_DEBUG_LEVEL_3, LOCALE_EPG_SAVING, LOCALE_EPGEXTENDED_ACTORS, LOCALE_EPGEXTENDED_DIRECTOR, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 08c228fe7..d51107a11 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -344,6 +344,11 @@ const char * locale_real_names[] = "date.Thu", "date.Tue", "date.Wed", + "debug", + "debug.level", + "debug.level_1", + "debug.level_2", + "debug.level_3", "epg.saving", "epgextended.actors", "epgextended.director",