mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rework display LOCALE_SERVICEMENU_RELOAD_HINT message

Browse Source 
- remove the very short visible message in channelsInit()
- remove global reloadhintBox

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
M. Liebmann
2014-07-26 10:04:14 +02:00
committed by [CST] Focus
parent f902c7a1e3
commit 8eab1ca472
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/scan_setup.cpp
View File

@@ -65,8 +65,6 @@
extern Zapit_config zapitCfg; extern Zapit_config zapitCfg;
extern char zapit_lat[20]; extern char zapit_lat[20];
extern char zapit_long[20]; extern char zapit_long[20];
/* ugly */
extern CHintBox *reloadhintBox;
//static int all_usals = 1; //static int all_usals = 1;
//sat_iterator_t sit; //sat_iterator_t sit;
@@ -252,14 +250,13 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey)
else if(actionKey == "reloadchannels") else if(actionKey == "reloadchannels")
{ {
printf("[neutrino] CScanSetup::%s reloadchannels...\n", __FUNCTION__); printf("[neutrino] CScanSetup::%s reloadchannels...\n", __FUNCTION__);
if (reloadhintBox) CHintBox chb(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_SERVICEMENU_RELOAD_HINT));
reloadhintBox->paint(); chb.paint();
/* save if changed, to make sure NEW/REMOVED/... flags are updated */ /* save if changed, to make sure NEW/REMOVED/... flags are updated */
CServiceManager::getInstance()->SaveServices(true, true); CServiceManager::getInstance()->SaveServices(true, true);
/* Z->reinitChannels triggers EVT_SERVICESCHANGED and this triggers channelsInit() */ /* Z->reinitChannels triggers EVT_SERVICESCHANGED and this triggers channelsInit() */
g_Zapit->reinitChannels(); g_Zapit->reinitChannels();
if (reloadhintBox) chb.hide();
reloadhintBox->hide();
CNeutrinoApp::getInstance ()->SDTreloadChannels = false; CNeutrinoApp::getInstance ()->SDTreloadChannels = false;
if(file_exists(CURRENTSERVICES_XML)){ if(file_exists(CURRENTSERVICES_XML)){
unlink(CURRENTSERVICES_XML); unlink(CURRENTSERVICES_XML);

10
src/neutrino.cpp
View File

@@ -127,7 +127,6 @@
#include <eitd/sectionsd.h> #include <eitd/sectionsd.h>
int old_b_id = -1; int old_b_id = -1;
CHintBox * reloadhintBox = 0;
CInfoClock *InfoClock; CInfoClock *InfoClock;
int allow_flash = 1; int allow_flash = 1;
@@ -1336,10 +1335,6 @@ void CNeutrinoApp::channelsInit(bool bOnly)
printf("[neutrino] Creating channels lists...\n"); printf("[neutrino] Creating channels lists...\n");
TIMER_START(); TIMER_START();
if(!reloadhintBox)
reloadhintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_SERVICEMENU_RELOAD_HINT));
reloadhintBox->paint();
memset(tvsort, -1, sizeof(tvsort)); memset(tvsort, -1, sizeof(tvsort));
memset(radiosort, -1, sizeof(tvsort)); memset(radiosort, -1, sizeof(tvsort));
@@ -1513,7 +1508,6 @@ void CNeutrinoApp::channelsInit(bool bOnly)
SetChannelMode(lastChannelMode); SetChannelMode(lastChannelMode);
dprintf(DEBUG_DEBUG, "\nAll bouquets-channels received\n"); dprintf(DEBUG_DEBUG, "\nAll bouquets-channels received\n");
reloadhintBox->hide();
} }
void CNeutrinoApp::SetChannelMode(int newmode) void CNeutrinoApp::SetChannelMode(int newmode)
@@ -2480,12 +2474,14 @@ _repeat:
if(old_b_id < 0) old_b_id = old_b; if(old_b_id < 0) old_b_id = old_b;
//g_Zapit->saveBouquets(); //g_Zapit->saveBouquets();
/* lets do it in sync */ /* lets do it in sync */
reloadhintBox->paint(); CHintBox chb(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_SERVICEMENU_RELOAD_HINT));
chb.paint();
CServiceManager::getInstance()->SaveServices(true, true); CServiceManager::getInstance()->SaveServices(true, true);
g_bouquetManager->saveBouquets(); g_bouquetManager->saveBouquets();
g_bouquetManager->saveUBouquets(); g_bouquetManager->saveUBouquets();
g_bouquetManager->renumServices(); g_bouquetManager->renumServices();
channelsInit(/*true*/); channelsInit(/*true*/);
chb.hide();
t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID(); t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
channelList->adjustToChannelID(live_channel_id);//FIXME what if deleted ? channelList->adjustToChannelID(live_channel_id);//FIXME what if deleted ?
bouquetList->activateBouquet(old_b_id, false); bouquetList->activateBouquet(old_b_id, false);

9
src/system/setting_helpers.cpp
View File

@@ -82,8 +82,6 @@ extern cDemux *videoDemux;
extern cDemux *audioDemux; extern cDemux *audioDemux;
extern cDemux *pcrDemux; extern cDemux *pcrDemux;
extern CHintBox *reloadhintBox;
extern "C" int pinghost( const char *hostname ); extern "C" int pinghost( const char *hostname );
COnOffNotifier::COnOffNotifier(int OffValue) COnOffNotifier::COnOffNotifier(int OffValue)
@@ -562,12 +560,11 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
g_Zapit->reinitChannels(); g_Zapit->reinitChannels();
} }
if (delete_removed) { if (delete_removed) {
if (reloadhintBox) CHintBox chb(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_SERVICEMENU_RELOAD_HINT));
reloadhintBox->paint(); chb.paint();
CServiceManager::getInstance()->SaveServices(true, false, true); CServiceManager::getInstance()->SaveServices(true, false, true);
if (reloadhintBox)
reloadhintBox->hide(); /* reinitChannels also triggers a reloadhintbox */
g_Zapit->reinitChannels(); g_Zapit->reinitChannels();
chb.hide();
} }
return ret; return ret;
} }