From 47eb835d7fbe0b3c892f902c8fb6264c98d1de5d Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 2 Aug 2018 22:00:54 +0200 Subject: [PATCH] Revert "- menu: add condition to enable/disable items in record mode" This reverts commit 76c65843410308f2e714a393968ac10a673153b1. Doesn't work with current disableByCondition-code. This needs more care. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/2154812c84b6f458052e4da89414575c08c4f1aa Author: vanhofen Date: 2018-08-02 (Thu, 02 Aug 2018) --- src/gui/widget/menue.cpp | 7 ------- src/gui/widget/menue.h | 3 +-- src/neutrino_menue.cpp | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index a404ed10c..c56a60521 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -42,7 +42,6 @@ #include #include -#include #include #include @@ -134,7 +133,6 @@ bool CMenuItem::initModeCondition(const int& stb_mode) void CMenuItem::disableByCondition(const menu_item_disable_cond_t& condition) { int stb_mode = CNeutrinoApp::getInstance()->getMode(); - int rec_mode = CRecordManager::getInstance()->GetRecordMode(); if (condition & DCOND_MODE_TS){ if (stb_mode == NeutrinoModes::mode_ts) @@ -151,11 +149,6 @@ void CMenuItem::disableByCondition(const menu_item_disable_cond_t& condition) if (initModeCondition(stb_mode)) return; } - if (condition & DCOND_MODE_REC){ - if (rec_mode & CRecordManager::RECMODE_REC) - if (initModeCondition(rec_mode)) - return; - } active = current_active; diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index 3ffde1b93..154f949f4 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -78,8 +78,7 @@ enum DCOND_MODE_TV = 2, DCOND_MODE_RADIO = 4, - DCOND_MODE_TS = 8, - DCOND_MODE_REC = 16 + DCOND_MODE_TS = 8 }/*menu_item_disable_cond_t*/; class CChangeObserver diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index d46111363..f0874c40b 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -439,7 +439,7 @@ void CNeutrinoApp::InitMenuService() mf = new CMenuForwarder(LOCALE_CAMD_CONTROL, true, NULL, new CCamdControlMenu(), NULL); mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_CAMD_CONTROL); - personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_CAMD_CONTROL], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, NULL, DCOND_MODE_REC); + personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_CAMD_CONTROL]); personalize.addSeparator(MENU_SERVICE); //restart neutrino