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

- moviebrowser: clearify deletion-locale; add movie-title to menu

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2017-06-21 10:31:22 +02:00
committed by Thilo Graf
parent 8b4f34857f
commit 37f9306862
5 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -1669,6 +1669,7 @@ moviebrowser.cut_failed Fehler beim Schneiden. Sind Sprungmarken und genug freie
moviebrowser.cutting Schneide Film, bitte warten ... moviebrowser.cutting Schneide Film, bitte warten ...
moviebrowser.delete_all Alle markierten Filme ohne weitere Nachfrage löschen? moviebrowser.delete_all Alle markierten Filme ohne weitere Nachfrage löschen?
moviebrowser.delete_info Lösche Dateien, bitte warten ... moviebrowser.delete_info Lösche Dateien, bitte warten ...
moviebrowser.delete_movie Film löschen
moviebrowser.delete_screenshot Lösche Screenshot? moviebrowser.delete_screenshot Lösche Screenshot?
moviebrowser.dir Pfad moviebrowser.dir Pfad
moviebrowser.directories Verzeichnisse moviebrowser.directories Verzeichnisse

1
data/locale/english.locale
View File

@@ -1669,6 +1669,7 @@ moviebrowser.cut_failed Cut failed, are there jump bookmarks and enough free spa
moviebrowser.cutting Cutting movie, please wait ... moviebrowser.cutting Cutting movie, please wait ...
moviebrowser.delete_all Delete all selected movies without any questions? moviebrowser.delete_all Delete all selected movies without any questions?
moviebrowser.delete_info Delete files, please wait ... moviebrowser.delete_info Delete files, please wait ...
moviebrowser.delete_movie Delete movie
moviebrowser.delete_screenshot Delete screenshot? moviebrowser.delete_screenshot Delete screenshot?
moviebrowser.dir Path moviebrowser.dir Path
moviebrowser.directories Directories moviebrowser.directories Directories

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

@@ -3319,12 +3319,10 @@ int CMovieBrowser::showMovieCutMenu()
movieCutMenu.addIntroItems(LOCALE_MOVIEBROWSER_MENU_CUT_HEAD); movieCutMenu.addIntroItems(LOCALE_MOVIEBROWSER_MENU_CUT_HEAD);
CMenuForwarder *mf; CMenuForwarder *mf;
#if 0
mf = new CMenuForwarder(m_movieSelectionHandler->epgTitle, false); mf = new CMenuForwarder(m_movieSelectionHandler->epgTitle, false);
mf->setHint(NEUTRINO_ICON_HINT_MOVIE, NONEXISTANT_LOCALE); mf->setHint(NEUTRINO_ICON_HINT_MOVIE, NONEXISTANT_LOCALE);
movieCutMenu.addItem(mf); movieCutMenu.addItem(mf);
movieCutMenu.addItem(GenericMenuSeparator); movieCutMenu.addItem(GenericMenuSeparator);
#endif
mf = new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_COPY_ONEFILE, true, NULL, this, "copy_onefile", CRCInput::RC_red); mf = new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_COPY_ONEFILE, true, NULL, this, "copy_onefile", CRCInput::RC_red);
mf->setHint(NEUTRINO_ICON_HINT_MOVIE, LOCALE_MOVIEBROWSER_HINT_COPY_ONEFILE); mf->setHint(NEUTRINO_ICON_HINT_MOVIE, LOCALE_MOVIEBROWSER_HINT_COPY_ONEFILE);
@@ -3451,9 +3449,11 @@ 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);
mainMenu.addItem(new CMenuForwarder(m_movieSelectionHandler->epgTitle, false));
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_FILEBROWSER_DELETE, (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_EPGPLUS_OPTIONS, 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));

1
src/system/locals.h
View File

@@ -1696,6 +1696,7 @@ typedef enum
LOCALE_MOVIEBROWSER_CUTTING, LOCALE_MOVIEBROWSER_CUTTING,
LOCALE_MOVIEBROWSER_DELETE_ALL, LOCALE_MOVIEBROWSER_DELETE_ALL,
LOCALE_MOVIEBROWSER_DELETE_INFO, LOCALE_MOVIEBROWSER_DELETE_INFO,
LOCALE_MOVIEBROWSER_DELETE_MOVIE,
LOCALE_MOVIEBROWSER_DELETE_SCREENSHOT, LOCALE_MOVIEBROWSER_DELETE_SCREENSHOT,
LOCALE_MOVIEBROWSER_DIR, LOCALE_MOVIEBROWSER_DIR,
LOCALE_MOVIEBROWSER_DIRECTORIES, LOCALE_MOVIEBROWSER_DIRECTORIES,

1
src/system/locals_intern.h
View File

@@ -1696,6 +1696,7 @@ const char * locale_real_names[] =
"moviebrowser.cutting", "moviebrowser.cutting",
"moviebrowser.delete_all", "moviebrowser.delete_all",
"moviebrowser.delete_info", "moviebrowser.delete_info",
"moviebrowser.delete_movie",
"moviebrowser.delete_screenshot", "moviebrowser.delete_screenshot",
"moviebrowser.dir", "moviebrowser.dir",
"moviebrowser.directories", "moviebrowser.directories",