mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino scan_setup: leave menue on menu key

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1974 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: da0889afd4
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-12-15 (Thu, 15 Dec 2011)

Origin message was:
------------------
*neutrino scan_setup: leave menue on menu key

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1974 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2011-12-15 08:22:30 +00:00
parent 6d371d39fa
commit 48e0b5f759
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/scan_setup.cpp
View File

@@ -259,7 +259,7 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey)
printf("[neutrino] CScanSetup %s: init scan setup (Mode: %d)...\n",__FUNCTION__ , is_wizard); printf("[neutrino] CScanSetup %s: init scan setup (Mode: %d)...\n",__FUNCTION__ , is_wizard);
CZapit::getInstance()->GetConfig(zapitCfg); CZapit::getInstance()->GetConfig(zapitCfg);
showScanMenu(); res = showScanMenu();
return res; return res;
} }
@@ -306,7 +306,7 @@ unsigned int CScanSetup::getSatMenuListWidth()
return max_txt_w; return max_txt_w;
} }
void CScanSetup::showScanMenu() int CScanSetup::showScanMenu()
{ {
printf("[neutrino] CScanSetup call %s...\n", __FUNCTION__); printf("[neutrino] CScanSetup call %s...\n", __FUNCTION__);
int shortcut = 1; int shortcut = 1;
@@ -449,13 +449,14 @@ void CScanSetup::showScanMenu()
} }
#endif /*ENABLE_FASTSCAN*/ #endif /*ENABLE_FASTSCAN*/
settings->exec(NULL, ""); int res = settings->exec(NULL, "");
settings->hide(); settings->hide();
selected = settings->getSelected(); selected = settings->getSelected();
delete satNotify; delete satNotify;
delete usalsNotify; delete usalsNotify;
delete satSelect; delete satSelect;
delete settings; delete settings;
return res;
} }
//init sat setup menu //init sat setup menu

2
src/gui/scan_setup.h
View File

@@ -68,7 +68,7 @@ class CScanSetup : public CMenuTarget
uint getSatMenuListWidth(); uint getSatMenuListWidth();
void showScanMenu(); int showScanMenu();
void addScanMenuLnbSetup(CMenuWidget *sat_setup); void addScanMenuLnbSetup(CMenuWidget *sat_setup);
void addScanMenuProvider(CMenuWidget *provider_setup); void addScanMenuProvider(CMenuWidget *provider_setup);