From c8356949db393d5a86de41010b4c1ed55cb4cdb0 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 15 Sep 2013 11:12:57 +0200 Subject: [PATCH] CMenuItem:remove picked #ifdef statements Those cherry picks have no effect, but contain unfavorable maintainer tags or was mixed with other commits, therefore they may be removed or need separately revision. - g_settings.menu_numbers_as_icons: not exists - "active": was deliberately chosen so - g_settings.key_channelList_pageup: is intended for channel list handling --- src/gui/widget/menue.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 41861f370..6ed07b16b 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -214,11 +214,7 @@ void CMenuItem::paintItemButton(const bool select_mode, const int &item_height, int icon_h = 0; //define icon name depends of numeric value -#ifdef MARTII - if (g_settings.menu_numbers_as_icons && icon_name.empty() && CRCInput::isNumeric(directKey)) -#else if (icon_name.empty() && CRCInput::isNumeric(directKey)) -#endif { char i_name[6]; /* X +'\0' */ snprintf(i_name, 6, "%d", CRCInput::getNumericValue(directKey)); @@ -268,14 +264,8 @@ void CMenuItem::paintItemButton(const bool select_mode, const int &item_height, { frameBuffer->getIconSize(iconName_Info_right.c_str(), &icon_w, &icon_h); -#ifdef MARTII - if (icon_w>0 && icon_h>0) -#else if (active && icon_w>0 && icon_h>0) -#endif - { icon_painted = frameBuffer->paintIcon(iconName_Info_right, dx + icon_start_x - (icon_w + 20), y+ ((item_height/2- icon_h/2)) ); - } } } @@ -575,7 +565,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) break; } } -#ifdef MARTII +#if 0 if (msg == (uint32_t) g_settings.key_channelList_pageup) msg = CRCInput::RC_page_up; else if (msg == (uint32_t) g_settings.key_channelList_pagedown)