diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 77d5e0db6..13594279f 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -506,14 +506,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) break; pos++; } -#if 0 - GenericMenuBack->setHint("", NONEXISTANT_LOCALE); -#endif checkHints(); -#if 0 - if (has_hints) - GenericMenuBack->setHint(NEUTRINO_ICON_HINT_BACK, LOCALE_MENU_HINT_BACK); -#endif if(savescreen) { calcSize(); @@ -816,11 +809,6 @@ void CMenuWidget::calcSize() int tmpw = items[i]->getWidth() + 10 + 10 + wi; /* 10 pixels to the left and right of the text */ if (tmpw > width) width = tmpw; -#if 0 - if(!items[i]->hintIcon.empty() || items[i]->hint != NONEXISTANT_LOCALE) { - has_hints = true; - } -#endif } hint_height = 0; if(g_settings.show_menu_hints && has_hints) { @@ -1077,27 +1065,6 @@ void CMenuWidget::paintHint(int pos) if (pos < 0 && !hint_painted) return; -#if 0 - if (hint_painted) { - /* clear detailsline line */ - // TODO CComponents::hide with param restore ? or auto (if it have saved screens) ? - if (details_line != NULL) { - if (savescreen) - details_line->restore(); - else - details_line->hide(); - } - /* clear info box */ - if (info_box != NULL) { - if (pos == -1) { - if (savescreen) - info_box->restore(); - else - info_box->hide(); - } - } - hint_painted = false; -#endif if (hint_painted) { /* clear detailsline line */ if (details_line) @@ -1113,18 +1080,8 @@ void CMenuWidget::paintHint(int pos) CMenuItem* item = items[pos]; if (item->hintIcon.empty() && item->hint == NONEXISTANT_LOCALE) { -#if 0 - if (info_box != NULL) { - if (savescreen) -#endif if (info_box) info_box->hide(false); -#if 0 - info_box->restore(); - else - info_box->hide(); - } -#endif return; } @@ -1153,9 +1110,6 @@ void CMenuWidget::paintHint(int pos) details_line->setHMarkDown(markh); details_line->syncSysColors(); } -#if 0 - details_line->paint(savescreen); -#endif //init infobox std::string str = g_Locale->getText(item->hint); @@ -1170,18 +1124,12 @@ void CMenuWidget::paintHint(int pos) info_box->setShadowOnOff(CC_SHADOW_ON); info_box->setPicture(item->hintIcon); } -#if 0 - /* force full paint - menu-over i.e. option chooser with pulldown can overwrite */ - info_box->paint(savescreen, true); -#endif - //paint result details_line->paint(); info_box->paint(); hint_painted = true; - } void CMenuWidget::addKey(neutrino_msg_t key, CMenuTarget *menue, const std::string & action)