mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

- movieplayer: show correct key in bookmark hints; smoother locales

Browse Source
This commit is contained in:
svenhoefer
2015-12-16 11:34:09 +01:00
parent 37e8c328c5
commit eb7c044b05
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/locale/deutsch.locale
View File

@@ -1603,11 +1603,11 @@ moviebrowser.hide_series Verstecke Serien
moviebrowser.hint_copy_onefile moviebrowser.hint_copy_onefile
moviebrowser.hint_copy_several moviebrowser.hint_copy_several
moviebrowser.hint_cut moviebrowser.hint_cut
moviebrowser.hint_jumpbackward Rücksprung in 5 s\n '0' zum Weitersehen moviebrowser.hint_jumpbackward Rücksprung in 5 Sekunden\n'0' zum Weitersehen
moviebrowser.hint_jumpforward Werbung überspringen in 5 s\n '0' zum Ansehen moviebrowser.hint_jumpforward Werbung überspringen in 5 Sekunden\n'0' zum Ansehen
moviebrowser.hint_movieend Filmende in 5 s\n '0' zum Weitersehen moviebrowser.hint_movieend Filmende in 5 Sekunden\n'0' zum Weitersehen
moviebrowser.hint_newbook_backward Neue Wiederholung\n 'blue' für Endposition moviebrowser.hint_newbook_backward Neue Wiederholung gestartet.\n'%s' bestimmt die Endposition, '0' bricht ab.
moviebrowser.hint_newbook_forward Neuer Werbesprung\n 'blue' für Endposition moviebrowser.hint_newbook_forward Neuer Werbesprung gestartet.\n'%s' bestimmt die Endposition, '0' bricht ab.
moviebrowser.hint_truncate moviebrowser.hint_truncate
moviebrowser.info_audio Audio moviebrowser.info_audio Audio
moviebrowser.info_channel Kanal moviebrowser.info_channel Kanal

10
data/locale/english.locale
View File

@@ -1605,11 +1605,11 @@ moviebrowser.hide_series Hide series
moviebrowser.hint_copy_onefile moviebrowser.hint_copy_onefile
moviebrowser.hint_copy_several moviebrowser.hint_copy_several
moviebrowser.hint_cut moviebrowser.hint_cut
moviebrowser.hint_jumpbackward Jump back in 5 s\n '0' to cancel moviebrowser.hint_jumpbackward Jump back in 5 seconds\n'0' to cancel
moviebrowser.hint_jumpforward Jump forward in 5 s\n '0' to cancel moviebrowser.hint_jumpforward Jump forward in 5 seconds\n'0' to cancel
moviebrowser.hint_movieend Film end in 5 s\n '0' to cancel moviebrowser.hint_movieend Film end in 5 seconds\n'0' to cancel
moviebrowser.hint_newbook_backward New jump back\n 'blue' for endposition moviebrowser.hint_newbook_backward New jump back started\n'%s' to define endposition, '0' to cancel
moviebrowser.hint_newbook_forward New jump forward\n 'blue' for endposition moviebrowser.hint_newbook_forward New jump forward started\n'%s' to define endposition, '0' to cancel
moviebrowser.hint_truncate moviebrowser.hint_truncate
moviebrowser.info_audio Audio moviebrowser.info_audio Audio
moviebrowser.info_channel Channel moviebrowser.info_channel Channel

14
src/gui/movieplayer.cpp
View File

@@ -1432,7 +1432,11 @@ void CMoviePlayerGui::handleMovieBrowser(neutrino_msg_t msg, int /*position*/)
static int jump_not_until = 0; // any jump shall be avoided until this time (in seconds from moviestart) static int jump_not_until = 0; // any jump shall be avoided until this time (in seconds from moviestart)
static MI_BOOKMARK new_bookmark; // used for new movie info bookmarks created from the movieplayer static MI_BOOKMARK new_bookmark; // used for new movie info bookmarks created from the movieplayer
static int width = 280; std::string key_bookmark = CRCInput::getKeyName((neutrino_msg_t) g_settings.mpkey_bookmark);
char txt[1024];
//TODO: width and height could be more flexible
static int width = frameBuffer->getScreenWidth() / 2;
static int height = 65; static int height = 65;
static int x = frameBuffer->getScreenX() + (frameBuffer->getScreenWidth() - width) / 2; static int x = frameBuffer->getScreenX() + (frameBuffer->getScreenWidth() - width) / 2;
@@ -1443,8 +1447,12 @@ void CMoviePlayerGui::handleMovieBrowser(neutrino_msg_t msg, int /*position*/)
static CTextBox endHintBox(g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_MOVIEEND), NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition); static CTextBox endHintBox(g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_MOVIEEND), NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition);
static CTextBox comHintBox(g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_JUMPFORWARD), NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition); static CTextBox comHintBox(g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_JUMPFORWARD), NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition);
static CTextBox loopHintBox(g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_JUMPBACKWARD), NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition); static CTextBox loopHintBox(g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_JUMPBACKWARD), NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition);
static CTextBox newLoopHintBox(g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_NEWBOOK_BACKWARD), NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition);
static CTextBox newComHintBox(g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_NEWBOOK_FORWARD), NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition); snprintf(txt, sizeof(txt)-1, g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_NEWBOOK_BACKWARD), key_bookmark.c_str());
static CTextBox newLoopHintBox(txt, NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition);
snprintf(txt, sizeof(txt)-1, g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_NEWBOOK_FORWARD), key_bookmark.c_str());
static CTextBox newComHintBox(txt, NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition);
static bool showEndHintBox = false; // flag to check whether the box shall be painted static bool showEndHintBox = false; // flag to check whether the box shall be painted
static bool showComHintBox = false; // flag to check whether the box shall be painted static bool showComHintBox = false; // flag to check whether the box shall be painted