From 216bd2d407cc2e508afc75a454e14d92b831181c Mon Sep 17 00:00:00 2001 From: satbaby Date: Mon, 20 Sep 2010 17:41:44 +0000 Subject: [PATCH] fix cpu locale, fix menu & descrete rc git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@783 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- data/locale/deutsch.locale | 4 ++++ src/neutrino.cpp | 2 +- src/neutrino_menue.cpp | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index a3003e80f..1ea331388 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -151,6 +151,10 @@ colorthememenu.gray Grau colorthememenu.head Theme auswählen colorthememenu.neutrino_theme Neutrino Theme colorthememenu.red_theme Simply Red +cpu.freq CPU Frequenz +cpu.freq_normal Normale Frequenz +cpu.freq_standby Standby Frequenz +cpu.freq_default Standard Frequenz date.Apr Apr date.Aug Aug date.Dec Dez diff --git a/src/neutrino.cpp b/src/neutrino.cpp index c2d1ee15a..2c22e41fb 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3200,7 +3200,7 @@ _repeat: g_RCInput->postMsg(NeutrinoMessages::STANDBY_ON, 0); return messages_return::handled; } - else if (msg == CRCInput::RC_standby_off) { + else if ((msg == CRCInput::RC_standby_off) || (msg == CRCInput::RC_power_on)) { if (data == 0) g_RCInput->postMsg(NeutrinoMessages::STANDBY_OFF, 0); return messages_return::handled; diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index d81ea0c50..11a4d4bcf 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -1476,10 +1476,10 @@ void CNeutrinoApp::InitServiceSettings(CMenuWidget &service, CMenuWidget &_scanS CDataResetNotifier * resetNotifier = new CDataResetNotifier(); service.addItem(new CMenuForwarder(LOCALE_RESET_CHANNELS , true, NULL, resetNotifier, "channels", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE )); - service.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_GETPLUGINS, true, NULL, this, "reloadplugins")); service.addItem(GenericMenuSeparatorLine); service.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_RESTART , true, NULL, this, "restart", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER)); + service.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_GETPLUGINS, true, NULL, this, "reloadplugins")); // start infomenu in service if (g_settings.show_infomenu == 1) { CMenuWidget *info = new CMenuWidget(LOCALE_MESSAGEBOX_INFO, NEUTRINO_ICON_INFO);