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

change some hintboxes

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b43da640c5
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-09-30 (Thu, 30 Sep 2021)

Origin message was:
------------------
- change some hintboxes

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-09-30 22:56:15 +02:00
parent f0609fa301
commit 09e1980a07
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/miscsettings_menu.cpp
View File

@@ -91,7 +91,7 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
{ {
printf("init extended settings menu...\n"); printf("init extended settings menu...\n");
if(parent != NULL) if ((parent != NULL) && (actionKey.find("epg_read_now") == std::string::npos))
parent->hide(); parent->hide();
if(actionKey == "epgdir") if(actionKey == "epgdir")
@@ -162,6 +162,7 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
else if(actionKey == "epg_read_now" || actionKey == "epg_read_now_usermenu") else if(actionKey == "epg_read_now" || actionKey == "epg_read_now_usermenu")
{ {
CHint *hint = new CHint(LOCALE_MISCSETTINGS_EPG_READ); CHint *hint = new CHint(LOCALE_MISCSETTINGS_EPG_READ);
hint->setDelay(1);
hint->paint(); hint->paint();
struct stat my_stat; struct stat my_stat;
@@ -177,7 +178,6 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
g_Sectionsd->readSIfromXMLTV((*it).c_str()); g_Sectionsd->readSIfromXMLTV((*it).c_str());
} }
sleep(1); // small delay for very fast hardware
delete hint; delete hint;
if (actionKey == "epg_read_now_usermenu") if (actionKey == "epg_read_now_usermenu")

20
src/gui/moviebrowser/mb.cpp
View File

@@ -891,11 +891,13 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey)
} }
else if (actionKey == "save_movie_info") else if (actionKey == "save_movie_info")
{ {
CHintBox loadBox(LOCALE_MOVIEBROWSER_HEAD,g_Locale->getText(LOCALE_MOVIEBROWSER_MENU_SAVE)); CHint *loadBox = new CHint(LOCALE_MOVIEBROWSER_MENU_SAVE);
loadBox.paint(); loadBox->setDelay(1);
loadBox->paint();
m_movieInfo.saveMovieInfo(*m_movieSelectionHandler); m_movieInfo.saveMovieInfo(*m_movieSelectionHandler);
sleep(1); // small delay for very fast hardware
loadBox.hide(); delete loadBox;
} }
else if (actionKey == "save_movie_info_all") else if (actionKey == "save_movie_info_all")
{ {
@@ -908,8 +910,10 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey)
if (current_list == NULL || m_movieSelectionHandler == NULL) if (current_list == NULL || m_movieSelectionHandler == NULL)
return returnval; return returnval;
CHintBox loadBox(LOCALE_MOVIEBROWSER_HEAD,g_Locale->getText(LOCALE_MOVIEBROWSER_INFO_HEAD_UPDATE)); CHint *loadBox = new CHint(LOCALE_MOVIEBROWSER_INFO_HEAD_UPDATE);
loadBox.paint(); loadBox->setDelay(1);
loadBox->paint();
for (unsigned int i = 0; i< current_list->size();i++) for (unsigned int i = 0; i< current_list->size();i++)
{ {
if (!((*current_list)[i]->parentalLockAge != 0 && movieInfoUpdateAllIfDestEmptyOnly == true) && if (!((*current_list)[i]->parentalLockAge != 0 && movieInfoUpdateAllIfDestEmptyOnly == true) &&
@@ -938,8 +942,8 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey)
m_movieInfo.saveMovieInfo(*((*current_list)[i])); m_movieInfo.saveMovieInfo(*((*current_list)[i]));
} }
sleep(1); // small delay for very fast hardware
loadBox.hide(); delete loadBox;
} }
else if (actionKey == "reload_movie_info") else if (actionKey == "reload_movie_info")
{ {

4
src/neutrino.cpp
View File

@@ -5457,6 +5457,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
else if (actionKey=="savesettings") { else if (actionKey=="savesettings") {
CHint *hint = new CHint(LOCALE_MAINSETTINGS_SAVESETTINGSNOW_HINT); CHint *hint = new CHint(LOCALE_MAINSETTINGS_SAVESETTINGSNOW_HINT);
hint->setDelay(1);
hint->paint(); hint->paint();
saveSetup(NEUTRINO_SETTINGS_FILE); saveSetup(NEUTRINO_SETTINGS_FILE);
@@ -5469,7 +5470,6 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
//g_Sectionsd->setEventsAreOldInMinutes((unsigned short) (g_settings.epg_old_hours*60)); //g_Sectionsd->setEventsAreOldInMinutes((unsigned short) (g_settings.epg_old_hours*60));
//g_Sectionsd->setHoursToCache((unsigned short) (g_settings.epg_cache_days*24)); //g_Sectionsd->setHoursToCache((unsigned short) (g_settings.epg_cache_days*24));
sleep(1); // small delay for very fast hardware
delete hint; delete hint;
} }
else if (actionKey=="recording") { else if (actionKey=="recording") {
@@ -5500,13 +5500,13 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
else if (actionKey == "camd_reset") else if (actionKey == "camd_reset")
{ {
CHint *hint = new CHint(LOCALE_CAMD_MSG_RESET); CHint *hint = new CHint(LOCALE_CAMD_MSG_RESET);
hint->setDelay(1);
hint->paint(); hint->paint();
printf("[neutrino.cpp] executing \"service camd restart\"\n"); printf("[neutrino.cpp] executing \"service camd restart\"\n");
if (my_system(3, "service", "camd", "restart") != 0) if (my_system(3, "service", "camd", "restart") != 0)
printf("[neutrino.cpp] executing failed\n"); printf("[neutrino.cpp] executing failed\n");
sleep(1); // small delay for very fast hardware
delete hint; delete hint;
return menu_return::RETURN_EXIT_ALL; return menu_return::RETURN_EXIT_ALL;