From 65ec10fc43e61d77a16d76c7d0212a41c060d0bb Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Thu, 24 Mar 2011 10:13:39 +0000 Subject: [PATCH] neutrino scansetup: use unified menu width make width usable also for transponder selector git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1334 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/27dcf63884796ed09792a4e0f18107cfdb596f56 Author: Thilo Graf Date: 2011-03-24 (Thu, 24 Mar 2011) Origin message was: ------------------ *neutrino scansetup: use unified menu width make width usable also for transponder selector git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1334 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- src/gui/scan_setup.cpp | 2 +- src/gui/scan_setup.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 8752cc696..93c91ad5e 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -790,7 +790,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/ old_position = position; } - CMenuWidget menu(LOCALE_SCANTS_SELECT_TP, NEUTRINO_ICON_SETTINGS); + CMenuWidget menu(LOCALE_SCANTS_SELECT_TP, NEUTRINO_ICON_SETTINGS, width); CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select); menu.addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL); //add cancel button, ensures that we have enought space left from item caption diff --git a/src/gui/scan_setup.h b/src/gui/scan_setup.h index 4c82e19ea..88ede9320 100644 --- a/src/gui/scan_setup.h +++ b/src/gui/scan_setup.h @@ -45,6 +45,9 @@ class CScanSetup : public CMenuTarget { + protected: + int width; + private: CSatelliteSetupNotifier *satNotify; CAllUsalsNotifier *usalsNotify; @@ -53,7 +56,7 @@ class CScanSetup : public CMenuTarget bool is_wizard; - int width, selected; + int selected; int dmode; int sfound; int fec_count; @@ -100,7 +103,7 @@ class CScanSetup : public CMenuTarget int exec(CMenuTarget* parent, const std::string & actionKey = ""); }; -class CTPSelectHandler : public CMenuTarget +class CTPSelectHandler : public CScanSetup { public: int exec(CMenuTarget* parent, const std::string &actionkey);