From bd9a4f50b6b151ba761a44ebadeff6b3cbf37ab1 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Sat, 26 Jul 2014 10:04:14 +0200 Subject: [PATCH] Rework display LOCALE_SERVICEMENU_RELOAD_HINT message - remove the very short visible message in channelsInit() - remove global reloadhintBox Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8eab1ca472cb7e15a9ee08adddb72e903ed3d8ff Author: Michael Liebmann Date: 2014-07-26 (Sat, 26 Jul 2014) ------------------ This commit was generated by Migit --- src/gui/scan_setup.cpp | 9 +++------ src/neutrino.cpp | 10 +++------- src/system/setting_helpers.cpp | 9 +++------ 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 03ba13859..cac8942d5 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -65,8 +65,6 @@ extern Zapit_config zapitCfg; extern char zapit_lat[20]; extern char zapit_long[20]; -/* ugly */ -extern CHintBox *reloadhintBox; //static int all_usals = 1; //sat_iterator_t sit; @@ -252,14 +250,13 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey) else if(actionKey == "reloadchannels") { printf("[neutrino] CScanSetup::%s reloadchannels...\n", __FUNCTION__); - if (reloadhintBox) - reloadhintBox->paint(); + CHintBox chb(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_SERVICEMENU_RELOAD_HINT)); + chb.paint(); /* save if changed, to make sure NEW/REMOVED/... flags are updated */ CServiceManager::getInstance()->SaveServices(true, true); /* Z->reinitChannels triggers EVT_SERVICESCHANGED and this triggers channelsInit() */ g_Zapit->reinitChannels(); - if (reloadhintBox) - reloadhintBox->hide(); + chb.hide(); CNeutrinoApp::getInstance ()->SDTreloadChannels = false; if(file_exists(CURRENTSERVICES_XML)){ unlink(CURRENTSERVICES_XML); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 7e9ef1cd6..84d680e7b 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -127,7 +127,6 @@ #include int old_b_id = -1; -CHintBox * reloadhintBox = 0; CInfoClock *InfoClock; int allow_flash = 1; @@ -1336,10 +1335,6 @@ void CNeutrinoApp::channelsInit(bool bOnly) printf("[neutrino] Creating channels lists...\n"); 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(radiosort, -1, sizeof(tvsort)); @@ -1513,7 +1508,6 @@ void CNeutrinoApp::channelsInit(bool bOnly) SetChannelMode(lastChannelMode); dprintf(DEBUG_DEBUG, "\nAll bouquets-channels received\n"); - reloadhintBox->hide(); } void CNeutrinoApp::SetChannelMode(int newmode) @@ -2480,12 +2474,14 @@ _repeat: if(old_b_id < 0) old_b_id = old_b; //g_Zapit->saveBouquets(); /* 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); g_bouquetManager->saveBouquets(); g_bouquetManager->saveUBouquets(); g_bouquetManager->renumServices(); channelsInit(/*true*/); + chb.hide(); t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID(); channelList->adjustToChannelID(live_channel_id);//FIXME what if deleted ? bouquetList->activateBouquet(old_b_id, false); diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 97015f403..d61f57a6f 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -82,8 +82,6 @@ extern cDemux *videoDemux; extern cDemux *audioDemux; extern cDemux *pcrDemux; -extern CHintBox *reloadhintBox; - extern "C" int pinghost( const char *hostname ); COnOffNotifier::COnOffNotifier(int OffValue) @@ -562,12 +560,11 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK g_Zapit->reinitChannels(); } if (delete_removed) { - if (reloadhintBox) - reloadhintBox->paint(); + CHintBox chb(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_SERVICEMENU_RELOAD_HINT)); + chb.paint(); CServiceManager::getInstance()->SaveServices(true, false, true); - if (reloadhintBox) - reloadhintBox->hide(); /* reinitChannels also triggers a reloadhintbox */ g_Zapit->reinitChannels(); + chb.hide(); } return ret; }