From aa1cd4ace0a252558c414a110a5f419203728fe9 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 13 Sep 2017 10:45:23 +0200 Subject: [PATCH 1/3] locale: minor changes; fix typo Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3742ca7dfdd054a48b42a24931d425b8cf8ea8a6 Author: vanhofen Date: 2017-09-13 (Wed, 13 Sep 2017) Origin message was: ------------------ - locale: minor changes; fix typo ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 4 ++-- data/locale/english.locale | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index e59b84f04..760835540 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -696,7 +696,7 @@ flashupdate.createimage_warning Nachfolgend wird ein Image für die %s STB erste flashupdate.currentversion_sep Installierte Version flashupdate.currentversiondate Datum flashupdate.currentversiontime Uhrzeit -flashupdate.enter_flash_script Stoppe laufende Dienste und Softcams ... +flashupdate.enter_flash_script Stoppe laufende Dienste ... flashupdate.erasefailed Flash löschen fehlgeschlagen flashupdate.erasing lösche Flash flashupdate.experimentalimage Sie haben einen Snapshot ausgewählt, bitte beachten Sie,\ndass diese Version ungetestet ist und u.U. Ihre Box\nnach dem Update nicht mehr funktionsfähig ist.\n\nSoll diese Version wirklich installiert werden? @@ -732,7 +732,7 @@ flashupdate.namemode2_hostname_time ++.img flashupdate.new_found Updates verfügbar! flashupdate.new_notfound Keine Updates verfügbar! flashupdate.ng_noflash USB-Image aktiv, Update nicht möglich! -flashupdate.noversion Eine Versionsüberprüfungen ist nur über das Online-Update möglich.\nWollen Sie das ausgewählte Image trotzdem installieren? +flashupdate.noversion Eine Versionsüberprüfung ist nur über das Online-Update möglich.\nWollen Sie das ausgewählte Image trotzdem installieren? flashupdate.programmingflash programmiere Flash flashupdate.proxypassword Passwort flashupdate.proxypassword_hint1 Geben sie das Proxy-Passwort ein diff --git a/data/locale/english.locale b/data/locale/english.locale index ad3625e77..331c03014 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -695,7 +695,7 @@ flashupdate.createimage_warning Now an image for the %s STB is created.\nThis im flashupdate.currentversion_sep Current version flashupdate.currentversiondate Date flashupdate.currentversiontime Time -flashupdate.enter_flash_script Stopping services and softcams ... +flashupdate.enter_flash_script Stopping services ... flashupdate.erasefailed erasure of flash failed flashupdate.erasing erasing flash flashupdate.experimentalimage The image you have selected is an untested version, this means\nyour box maybe fail to boot after update.\n\nDo you really want to update to this version? From 2a4d7155b5916daafeb6cb0f06f663062eed0a96 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 13 Sep 2017 10:45:23 +0200 Subject: [PATCH 2/3] remove easymenu from config-file Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f42b74a317973416b0ce8fd2bc33f9e353b14ce0 Author: vanhofen Date: 2017-09-13 (Wed, 13 Sep 2017) Origin message was: ------------------ - remove easymenu from config-file ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 5 +++++ version_pseudo.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 436334aec..9e2062240 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1153,6 +1153,11 @@ void CNeutrinoApp::upgradeSetup(const char * fname) if (g_settings.mode_icons_flag[4].empty()) g_settings.mode_icons_flag[4] = FLAGDIR "/.update"; } + if (g_settings.version_pseudo < "20170913110000") + { + //remove easymenu + configfile.deleteKey("easymenu"); + } g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO; configfile.setString("version_pseudo", g_settings.version_pseudo); diff --git a/version_pseudo.h b/version_pseudo.h index 5540dd3fd..d32ebccc9 100644 --- a/version_pseudo.h +++ b/version_pseudo.h @@ -1 +1 @@ -#define NEUTRINO_VERSION_PSEUDO "20170904080000" +#define NEUTRINO_VERSION_PSEUDO "20170913110000" From 1a2f2df4e8c800ecc4b9b8e82ca235244980d602 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 13 Sep 2017 12:50:11 +0200 Subject: [PATCH 3/3] neutrino_menu: re-add accidently removed plugin-items Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1c3f1ed7ae51a0729150224cb1ab554e7bebff8a Author: vanhofen Date: 2017-09-13 (Wed, 13 Sep 2017) Origin message was: ------------------ - neutrino_menu: re-add accidently removed plugin-items ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino_menue.cpp | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 2a55401ee..190867081 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -168,12 +168,36 @@ void CNeutrinoApp::InitMenuMain() media->setHint(NEUTRINO_ICON_HINT_MEDIA, LOCALE_MENU_HINT_MEDIA); personalize.addItem(MENU_MAIN, media, &g_settings.personalize[SNeutrinoSettings::P_MAIN_MEDIA]); + CMenuForwarder *mf; + //games + bool show_games = g_Plugins->hasPlugin(CPlugins::P_TYPE_GAME); + mf = new CMenuForwarder(LOCALE_MAINMENU_GAMES, show_games, NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME)); + mf->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES); + personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_GAMES]); + + //tools + bool show_tools = g_Plugins->hasPlugin(CPlugins::P_TYPE_TOOL); + mf = new CMenuForwarder(LOCALE_MAINMENU_TOOLS, show_tools, NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL)); + mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_TOOLS); + personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TOOLS]); + + //scripts + bool show_scripts = g_Plugins->hasPlugin(CPlugins::P_TYPE_SCRIPT); + mf = new CMenuForwarder(LOCALE_MAINMENU_SCRIPTS, show_scripts, NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT)); + mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS); + personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SCRIPTS]); + + //lua + bool show_lua = g_Plugins->hasPlugin(CPlugins::P_TYPE_LUA); + mf = new CMenuForwarder(LOCALE_MAINMENU_LUA, show_lua, NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA)); + mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_LUA); + personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_LUA]); + //separator personalize.addSeparator(MENU_MAIN); //2nd section*************************************************************************************************** - CMenuForwarder *mf; // settings, also as pin protected option in personalize menu, as a result of parameter value CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION mf = new CMenuForwarder(LOCALE_MAINMENU_SETTINGS, true, NULL, &personalize.getWidget(MENU_SETTINGS)); mf->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_SETTINGS);