From 0ade18e34807b71a0d3d9c2bb1de0645de3c8bb0 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 11 Jan 2011 12:17:00 +0000 Subject: [PATCH] fix transponder seleect osd git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1027 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/ea756115a09706c9007d406485bad4db4be01dfe Author: Jacek Jendrzej Date: 2011-01-11 (Tue, 11 Jan 2011) Origin message was: ------------------ -fix transponder seleect osd git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1027 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 2 +- src/neutrino_menue.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index da6404ef9..e9a401f01 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -189,7 +189,7 @@ void CMenuItem::paintItemButton(const int startX, const int frame_height, const { //paint icon centered, if we using one of these icons. Note: overwrites parameter 'icon_centered' if (!centered) - centered = (icon_name == NEUTRINO_ICON_BUTTON_OKAY || icon_name == NEUTRINO_ICON_BUTTON_HELP || icon_name == NEUTRINO_ICON_BUTTON_HOME); + centered = (icon_name == NEUTRINO_ICON_BUTTON_OKAY || icon_name == NEUTRINO_ICON_BUTTON_HELP || icon_name == NEUTRINO_ICON_BUTTON_HOME || icon_name == NEUTRINO_ICON_BUTTON_RIGHT); if (centered/* || icon_name == NEUTRINO_ICON_BUTTON_OKAY || icon_name == NEUTRINO_ICON_BUTTON_HELP || icon_name == NEUTRINO_ICON_BUTTON_HOME*/) icon_x = x+ ((icon_start_x-x)/2) - (icon_w/2); //centered diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index f864a64ca..a294033a2 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -758,14 +758,14 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/ } //menu->addItem(new CMenuForwarderNonLocalized(buf, true, NULL, selector, cnt), old_selected == i); - menu->addItem(new CMenuForwarderNonLocalized(buf, true, NULL, selector, cnt), false); + menu->addItem(new CMenuForwarderNonLocalized(buf, true, NULL, selector, NULL, CRCInput::RC_nokey, NULL), false); tmplist.insert(std::pair (i, tI->second)); i++; } if (i == 0) { - char text[255]; - sprintf(text, "No transponders found for %s\n", CNeutrinoApp::getInstance()->getScanSettings().satNameNoDiseqc); - ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, text, 450, 2); + std::string text = "No transponders found for "; + text += CNeutrinoApp::getInstance()->getScanSettings().satNameNoDiseqc; + ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, text.c_str(), 450, 2); return menu_return::RETURN_REPAINT; } menu->setSelected(old_selected);