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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Commit: b2b789452a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)
This commit is contained in:
vanhofen
2016-11-17 01:48:51 +01:00
parent 8ef59f67c7 44c7c41e61
commit ff4fb2d640
3 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/locale/deutsch.locale
View File

@@ -1794,7 +1794,7 @@ moviebrowser.book_name Name:
moviebrowser.book_new Neue Markierung moviebrowser.book_new Neue Markierung
moviebrowser.book_no_end Keine Endmarkierung gefunden moviebrowser.book_no_end Keine Endmarkierung gefunden
moviebrowser.book_position Position: moviebrowser.book_position Position:
moviebrowser.book_type Sprung (<0 zurück, >0 vor): moviebrowser.book_type Sprung (<0: zurück, >0: vor):
moviebrowser.book_type_backward Wiederholung moviebrowser.book_type_backward Wiederholung
moviebrowser.book_type_forward Überspringen moviebrowser.book_type_forward Überspringen
moviebrowser.browser_additional Zusätzliche Informationen moviebrowser.browser_additional Zusätzliche Informationen
@@ -1817,13 +1817,13 @@ moviebrowser.delete_screenshot Lösche Screenshot?
moviebrowser.dir Pfad moviebrowser.dir Pfad
moviebrowser.directories Verzeichnisse moviebrowser.directories Verzeichnisse
moviebrowser.directories_additional Zusätzliche Verzeichnisse moviebrowser.directories_additional Zusätzliche Verzeichnisse
moviebrowser.edit_book Bookmark Ändern moviebrowser.edit_book Markierung ändern
moviebrowser.edit_book_name_info1 Neuer Markierungsname moviebrowser.edit_book_name_info1 Neuer Markierungsname
moviebrowser.edit_book_name_info2 Markierungsname info2 moviebrowser.edit_book_name_info2
moviebrowser.edit_book_pos_info1 Neue Position (s) moviebrowser.edit_book_pos_info1 Neue Position (s)
moviebrowser.edit_book_pos_info2 moviebrowser.edit_book_pos_info2
moviebrowser.edit_book_type_info1 Neue Sprunglänge (s) moviebrowser.edit_book_type_info1 Neue Sprunglänge (s)
moviebrowser.edit_book_type_info2 <0 zurück , >0 vor, 0: kein moviebrowser.edit_book_type_info2 <0: zurück, >0: vor, 0: kein
moviebrowser.edit_serie Name der Serie moviebrowser.edit_serie Name der Serie
moviebrowser.error_no_movies Keine Filme gefunden moviebrowser.error_no_movies Keine Filme gefunden
moviebrowser.filter_off Filter aus moviebrowser.filter_off Filter aus

20
data/locale/english.locale
View File

@@ -1789,14 +1789,14 @@ moviebrowser.book_clear_all Clear all
moviebrowser.book_head Bookmarks moviebrowser.book_head Bookmarks
moviebrowser.book_lastmoviestop Last play stop: moviebrowser.book_lastmoviestop Last play stop:
moviebrowser.book_movieend Movie end: moviebrowser.book_movieend Movie end:
moviebrowser.book_moviestart User Movie start: moviebrowser.book_moviestart Movie start:
moviebrowser.book_name Name: moviebrowser.book_name Name:
moviebrowser.book_new New Bookmark moviebrowser.book_new New bookmark
moviebrowser.book_no_end No end bookmark defined moviebrowser.book_no_end No end mark defined
moviebrowser.book_position Position: moviebrowser.book_position Position:
moviebrowser.book_type Jump (<0 back , >0 for): moviebrowser.book_type Jump (<0: backward, >0: forward):
moviebrowser.book_type_backward Repeat moviebrowser.book_type_backward Repeat
moviebrowser.book_type_forward jump over moviebrowser.book_type_forward Jump over
moviebrowser.browser_additional Additional informations moviebrowser.browser_additional Additional informations
moviebrowser.browser_frame_high Browser height [%] moviebrowser.browser_frame_high Browser height [%]
moviebrowser.browser_row_head Row settings moviebrowser.browser_row_head Row settings
@@ -1817,13 +1817,13 @@ moviebrowser.delete_screenshot Delete screenshot?
moviebrowser.dir Path moviebrowser.dir Path
moviebrowser.directories Directories moviebrowser.directories Directories
moviebrowser.directories_additional Additional directories moviebrowser.directories_additional Additional directories
moviebrowser.edit_book Bookmark change moviebrowser.edit_book Change bookmark
moviebrowser.edit_book_name_info1 Enter new Bookmark name moviebrowser.edit_book_name_info1 Enter new bookmark name
moviebrowser.edit_book_name_info2 book name info2 moviebrowser.edit_book_name_info2
moviebrowser.edit_book_pos_info1 Enter new Position (s) moviebrowser.edit_book_pos_info1 Enter new position (s)
moviebrowser.edit_book_pos_info2 moviebrowser.edit_book_pos_info2
moviebrowser.edit_book_type_info1 Enter new jump length (s) moviebrowser.edit_book_type_info1 Enter new jump length (s)
moviebrowser.edit_book_type_info2 <0 back , >0 for, 0: none moviebrowser.edit_book_type_info2 <0: backward, >0: forward, 0: none
moviebrowser.edit_serie Enter name of serie moviebrowser.edit_serie Enter name of serie
moviebrowser.error_no_movies No movies found moviebrowser.error_no_movies No movies found
moviebrowser.filter_off Filter off moviebrowser.filter_off Filter off

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

@@ -3253,26 +3253,30 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
CMenuWidget bookmarkMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER); CMenuWidget bookmarkMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER);
bookmarkMenu.addIntroItems(LOCALE_MOVIEBROWSER_BOOK_HEAD); bookmarkMenu.addIntroItems(LOCALE_MOVIEBROWSER_BOOK_HEAD);
bookmarkMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_CLEAR_ALL, true, NULL, this, "book_clear_all",CRCInput::RC_blue)); bookmarkMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_CLEAR_ALL, true, NULL, this, "book_clear_all", CRCInput::RC_red));
bookmarkMenu.addItem(GenericMenuSeparatorLine); bookmarkMenu.addItem(GenericMenuSeparatorLine);
bookmarkMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_MOVIESTART, true, bookStartIntInput.getValue(), &bookStartIntInput)); bookmarkMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_MOVIESTART, true, bookStartIntInput.getValue(), &bookStartIntInput));
bookmarkMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_MOVIEEND, true, bookEndIntInput.getValue(), &bookLastIntInput)); bookmarkMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_MOVIEEND, true, bookEndIntInput.getValue(), &bookEndIntInput));
bookmarkMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_LASTMOVIESTOP, true, bookLastIntInput.getValue(), &bookEndIntInput)); bookmarkMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_LASTMOVIESTOP, true, bookLastIntInput.getValue(), &bookLastIntInput));
bookmarkMenu.addItem(GenericMenuSeparatorLine); bookmarkMenu.addItem(GenericMenuSeparatorLine);
for (int li =0 ; li < MI_MOVIE_BOOK_USER_MAX && li < MAX_NUMBER_OF_BOOKMARK_ITEMS; li++) for (int li =0 ; li < MI_MOVIE_BOOK_USER_MAX && li < MAX_NUMBER_OF_BOOKMARK_ITEMS; li++)
{ {
CKeyboardInput * pBookNameInput = new CKeyboardInput(LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO1, &movie_info->bookmarks.user[li].name, 20); std::string bookmark_user_name = g_Locale->getText(LOCALE_MOVIEBROWSER_BOOK_NEW);
CIntInput *pBookPosIntInput = new CIntInput(LOCALE_MOVIEBROWSER_EDIT_BOOK, (int *)&movie_info->bookmarks.user[li].pos, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2); if (!movie_info->bookmarks.user[li].name.empty())
CIntInput *pBookTypeIntInput = new CIntInput(LOCALE_MOVIEBROWSER_EDIT_BOOK, (int *)&movie_info->bookmarks.user[li].length, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2); bookmark_user_name = movie_info->bookmarks.user[li].name;
CKeyboardInput *pBookNameInput = new CKeyboardInput(LOCALE_MOVIEBROWSER_EDIT_BOOK, &movie_info->bookmarks.user[li].name, 20, NULL, NULL, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO2);
CIntInput *pBookPosIntInput = new CIntInput(LOCALE_MOVIEBROWSER_EDIT_BOOK, (int *)&movie_info->bookmarks.user[li].pos, 5, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2);
CIntInput *pBookTypeIntInput = new CIntInput(LOCALE_MOVIEBROWSER_EDIT_BOOK, (int *)&movie_info->bookmarks.user[li].length, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2);
CMenuWidget* pBookItemMenu = new CMenuWidget(LOCALE_MOVIEBROWSER_BOOK_HEAD, NEUTRINO_ICON_MOVIEPLAYER); CMenuWidget* pBookItemMenu = new CMenuWidget(LOCALE_MOVIEBROWSER_BOOK_HEAD, NEUTRINO_ICON_MOVIEPLAYER);
pBookItemMenu->addItem(GenericMenuSeparator); pBookItemMenu->addItem(GenericMenuSeparator);
pBookItemMenu->addItem(new CMenuDForwarder(LOCALE_MOVIEBROWSER_BOOK_NAME, true, movie_info->bookmarks.user[li].name, pBookNameInput)); pBookItemMenu->addItem(new CMenuDForwarder(LOCALE_MOVIEBROWSER_BOOK_NAME, true, bookmark_user_name.c_str(), pBookNameInput));
pBookItemMenu->addItem(new CMenuDForwarder(LOCALE_MOVIEBROWSER_BOOK_POSITION, true, pBookPosIntInput->getValue(), pBookPosIntInput)); pBookItemMenu->addItem(new CMenuDForwarder(LOCALE_MOVIEBROWSER_BOOK_POSITION, true, pBookPosIntInput->getValue(), pBookPosIntInput));
pBookItemMenu->addItem(new CMenuDForwarder(LOCALE_MOVIEBROWSER_BOOK_TYPE, true, pBookTypeIntInput->getValue(), pBookTypeIntInput)); pBookItemMenu->addItem(new CMenuDForwarder(LOCALE_MOVIEBROWSER_BOOK_TYPE, true, pBookTypeIntInput->getValue(), pBookTypeIntInput));
bookmarkMenu.addItem(new CMenuDForwarder(movie_info->bookmarks.user[li].name.c_str(), true, pBookPosIntInput->getValue(), pBookItemMenu)); bookmarkMenu.addItem(new CMenuDForwarder(bookmark_user_name.c_str(), true, pBookPosIntInput->getValue(), pBookItemMenu));
} }
/********************************************************************/ /********************************************************************/