moviebrowser: small changes in menu locales; display hintbox while saving movie info

Origin commit data
------------------
Branch: ni/coolstream
Commit: 03937eeec9
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-17 (Tue, 17 Jul 2018)

Origin message was:
------------------
- moviebrowser: small changes in menu locales; display hintbox while saving movie info

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-07-17 00:04:12 +02:00
parent 90efda5d34
commit 5339024445
5 changed files with 17 additions and 8 deletions

View File

@@ -1978,7 +1978,7 @@ moviebrowser.menu_cut Film schneiden
moviebrowser.menu_cut_head Kopieren, Schneiden und Kürzen moviebrowser.menu_cut_head Kopieren, Schneiden und Kürzen
moviebrowser.menu_directories_head Verzeichnisse de/aktivieren moviebrowser.menu_directories_head Verzeichnisse de/aktivieren
moviebrowser.menu_main_bookmarks Markierungen moviebrowser.menu_main_bookmarks Markierungen
moviebrowser.menu_main_head Einstellungen moviebrowser.menu_main_head Film-Info und Einstellungen
moviebrowser.menu_nfs_head NFS Einstellung moviebrowser.menu_nfs_head NFS Einstellung
moviebrowser.menu_parental_lock_activated aktiviert moviebrowser.menu_parental_lock_activated aktiviert
moviebrowser.menu_parental_lock_activated_no nein moviebrowser.menu_parental_lock_activated_no nein
@@ -1988,6 +1988,7 @@ moviebrowser.menu_parental_lock_head Jugendschutz
moviebrowser.menu_parental_lock_rate_head Filme sperren ab moviebrowser.menu_parental_lock_rate_head Filme sperren ab
moviebrowser.menu_save Veränderungen speichern moviebrowser.menu_save Veränderungen speichern
moviebrowser.menu_save_all Starte Übernahme in allen sichtbaren Filminfos moviebrowser.menu_save_all Starte Übernahme in allen sichtbaren Filminfos
moviebrowser.menu_settings Einstellungen
moviebrowser.menu_truncate Film kürzen moviebrowser.menu_truncate Film kürzen
moviebrowser.option_browser Anzeigeoptionen moviebrowser.option_browser Anzeigeoptionen
moviebrowser.reload_at_start Filminfos neu laden bei Start moviebrowser.reload_at_start Filminfos neu laden bei Start

View File

@@ -1978,7 +1978,7 @@ moviebrowser.menu_cut Cut movie
moviebrowser.menu_cut_head Copy, cut and truncate moviebrowser.menu_cut_head Copy, cut and truncate
moviebrowser.menu_directories_head Directories de/activate moviebrowser.menu_directories_head Directories de/activate
moviebrowser.menu_main_bookmarks Bookmarks moviebrowser.menu_main_bookmarks Bookmarks
moviebrowser.menu_main_head Settings moviebrowser.menu_main_head Movie info and settings
moviebrowser.menu_nfs_head NFS settings moviebrowser.menu_nfs_head NFS settings
moviebrowser.menu_parental_lock_activated activated moviebrowser.menu_parental_lock_activated activated
moviebrowser.menu_parental_lock_activated_no no moviebrowser.menu_parental_lock_activated_no no
@@ -1988,6 +1988,7 @@ moviebrowser.menu_parental_lock_head Parental Lock
moviebrowser.menu_parental_lock_rate_head Lock movies from moviebrowser.menu_parental_lock_rate_head Lock movies from
moviebrowser.menu_save Save changes moviebrowser.menu_save Save changes
moviebrowser.menu_save_all Start update of movie info files moviebrowser.menu_save_all Start update of movie info files
moviebrowser.menu_settings Settings
moviebrowser.menu_truncate Truncate movie moviebrowser.menu_truncate Truncate movie
moviebrowser.option_browser Browser Options moviebrowser.option_browser Browser Options
moviebrowser.reload_at_start Reload movie info at start moviebrowser.reload_at_start Reload movie info at start

View File

@@ -860,7 +860,11 @@ 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));
loadBox.paint();
m_movieInfo.saveMovieInfo(*m_movieSelectionHandler); m_movieInfo.saveMovieInfo(*m_movieSelectionHandler);
sleep(1); // small delay for very fast hardware
loadBox.hide();
} }
else if (actionKey == "save_movie_info_all") else if (actionKey == "save_movie_info_all")
{ {
@@ -903,6 +907,7 @@ 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(); loadBox.hide();
} }
else if (actionKey == "reload_movie_info") else if (actionKey == "reload_movie_info")
@@ -3547,8 +3552,7 @@ bool CMovieBrowser::showMenu(bool calledExternally)
/** options **************************************************/ /** options **************************************************/
CMenuWidget optionsMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER); CMenuWidget optionsMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER);
optionsMenu.addIntroItems(LOCALE_MOVIEBROWSER_MENU_SETTINGS);
optionsMenu.addIntroItems(LOCALE_EPGPLUS_OPTIONS);
optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_LOAD_DEFAULT, true, NULL, this, "loaddefault", CRCInput::RC_red)); optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_LOAD_DEFAULT, true, NULL, this, "loaddefault", CRCInput::RC_red));
optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_OPTION_BROWSER, true, NULL, &optionsMenuBrowser,NULL, CRCInput::RC_green)); optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_OPTION_BROWSER, true, NULL, &optionsMenuBrowser,NULL, CRCInput::RC_green));
optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_DIRECTORIES, true, NULL, &optionsMenuDir,NULL, CRCInput::RC_yellow)); optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_DIRECTORIES, true, NULL, &optionsMenuDir,NULL, CRCInput::RC_yellow));
@@ -3574,15 +3578,16 @@ bool CMovieBrowser::showMenu(bool calledExternally)
if (!calledExternally) { if (!calledExternally) {
CMenuWidget mainMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER); CMenuWidget mainMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER);
mainMenu.addIntroItems(LOCALE_MOVIEBROWSER_MENU_MAIN_HEAD); mainMenu.addIntroItems(LOCALE_MOVIEBROWSER_MENU_MAIN_HEAD);
if (m_movieSelectionHandler){ if (m_movieSelectionHandler)
{
mainMenu.addItem(new CMenuForwarder(m_movieSelectionHandler->epgTitle, false)); mainMenu.addItem(new CMenuForwarder(m_movieSelectionHandler->epgTitle, false));
}
mainMenu.addItem(GenericMenuSeparator); mainMenu.addItem(GenericMenuSeparator);
}
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_HEAD, (m_movieSelectionHandler != NULL), NULL, this, "show_movie_info_menu", CRCInput::RC_red)); mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_HEAD, (m_movieSelectionHandler != NULL), NULL, this, "show_movie_info_menu", CRCInput::RC_red));
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_CUT_HEAD, (m_movieSelectionHandler != NULL), NULL, this, "show_movie_cut_menu", CRCInput::RC_green)); mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_CUT_HEAD, (m_movieSelectionHandler != NULL), NULL, this, "show_movie_cut_menu", CRCInput::RC_green));
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_DELETE_MOVIE, (m_movieSelectionHandler != NULL), NULL, this, "delete_movie", CRCInput::RC_yellow)); mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_DELETE_MOVIE, (m_movieSelectionHandler != NULL), NULL, this, "delete_movie", CRCInput::RC_yellow));
mainMenu.addItem(GenericMenuSeparatorLine); mainMenu.addItem(GenericMenuSeparatorLine);
mainMenu.addItem(new CMenuForwarder(LOCALE_EPGPLUS_OPTIONS, true, NULL, &optionsMenu,NULL, CRCInput::RC_1)); mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_SETTINGS, true, NULL, &optionsMenu,NULL, CRCInput::RC_1));
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_DIRECTORIES_HEAD, true, NULL, &dirMenu, NULL, CRCInput::RC_2)); mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_DIRECTORIES_HEAD, true, NULL, &dirMenu, NULL, CRCInput::RC_2));
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES, true, NULL, this, "reload_movie_info", CRCInput::RC_3)); mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES, true, NULL, this, "reload_movie_info", CRCInput::RC_3));
//mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_NFS_HEAD, true, NULL, nfs, NULL, CRCInput::RC_setup)); //mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_NFS_HEAD, true, NULL, nfs, NULL, CRCInput::RC_setup));
@@ -4236,7 +4241,7 @@ bool CMovieBrowser::showYTMenu(bool calledExternally)
framebuffer->paintBackground(); framebuffer->paintBackground();
CMenuWidget mainMenu(LOCALE_MOVIEPLAYER_YTPLAYBACK, NEUTRINO_ICON_MOVIEPLAYER); CMenuWidget mainMenu(LOCALE_MOVIEPLAYER_YTPLAYBACK, NEUTRINO_ICON_MOVIEPLAYER);
mainMenu.addIntroItems(LOCALE_MOVIEBROWSER_OPTION_BROWSER); mainMenu.addIntroItems(LOCALE_MOVIEBROWSER_MENU_SETTINGS);
int select = -1; int select = -1;
CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select); CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select);

View File

@@ -2015,6 +2015,7 @@ typedef enum
LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_RATE_HEAD, LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_RATE_HEAD,
LOCALE_MOVIEBROWSER_MENU_SAVE, LOCALE_MOVIEBROWSER_MENU_SAVE,
LOCALE_MOVIEBROWSER_MENU_SAVE_ALL, LOCALE_MOVIEBROWSER_MENU_SAVE_ALL,
LOCALE_MOVIEBROWSER_MENU_SETTINGS,
LOCALE_MOVIEBROWSER_MENU_TRUNCATE, LOCALE_MOVIEBROWSER_MENU_TRUNCATE,
LOCALE_MOVIEBROWSER_OPTION_BROWSER, LOCALE_MOVIEBROWSER_OPTION_BROWSER,
LOCALE_MOVIEBROWSER_RELOAD_AT_START, LOCALE_MOVIEBROWSER_RELOAD_AT_START,

View File

@@ -2015,6 +2015,7 @@ const char * locale_real_names[] =
"moviebrowser.menu_parental_lock_rate_head", "moviebrowser.menu_parental_lock_rate_head",
"moviebrowser.menu_save", "moviebrowser.menu_save",
"moviebrowser.menu_save_all", "moviebrowser.menu_save_all",
"moviebrowser.menu_settings",
"moviebrowser.menu_truncate", "moviebrowser.menu_truncate",
"moviebrowser.option_browser", "moviebrowser.option_browser",
"moviebrowser.reload_at_start", "moviebrowser.reload_at_start",