mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +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: 87da827b30
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)
This commit is contained in:
vanhofen
2016-12-05 00:52:33 +01:00
parent 5986d733ee 6754ff3e61
commit 073d0d4ffb
7 changed files with 95 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
data/locale/deutsch.locale
View File

@@ -1991,22 +1991,25 @@ movieplayer.bookmarkname_hint2
movieplayer.chapters Kapitel
movieplayer.fileplayback Abspielen (Multiformat)
movieplayer.head Movieplayer
movieplayer.help_additional Weitere benutzerdefinierte Tastenbelegungen sind unter "Hauptmenü" > "Einstellungen" > "Tasten" > "Bearbeiten" > "Movieplayer" zu finden.
movieplayer.help_button_1 1 Minute zurück
movieplayer.help_button_2 Zum Filmanfang springen
movieplayer.help_button_3 1 Minute vor
movieplayer.help_button_4 3 Minuten zurück
movieplayer.help_button_5 Zur Filmmitte springen
movieplayer.help_button_6 3 Minuten vor
movieplayer.help_button_7 10 Minuten zurück
movieplayer.help_button_8 Zum Filmende springen
movieplayer.help_button_9 10 Minuten vor
movieplayer.help_button_backward Schneller Rücklauf
movieplayer.help_button_forward Schneller Vorlauf
movieplayer.help_button_menu Hauptmenü öffnen
movieplayer.help_button_pause Pause / Weiter
movieplayer.help_button_stop Stopp
movieplayer.plugin Movieplayer-Plugin
movieplayer.starting Wiedergabe starten ...
movieplayer.titles Titel
movieplayer.toomanybookmarks Sie haben bereits zu viele Lesezeichen angelegt.\nEs muß erst ein anderes gelöscht werden.
movieplayer.tshelp1 Stopp
movieplayer.tshelp10 ca. 10 Minuten zurück
movieplayer.tshelp11 ca. 10 Minuten vor
movieplayer.tshelp12 Hilfe: http://www.giggo.de/dbox2/movieplayer.html\n
movieplayer.tshelp2 Auswahl der Tonspur
movieplayer.tshelp3 Pause/Weiter
movieplayer.tshelp4 Bookmark setzen
movieplayer.tshelp5 Zeit einblenden
movieplayer.tshelp6 ca. 1 Minute zurück
movieplayer.tshelp7 ca. 1 Minute vor
movieplayer.tshelp8 ca. 5 Minuten zurück
movieplayer.tshelp9 ca. 5 Minuten vor
movieplayer.tsplayback TS Abspielen
movieplayer.ytplayback YouTube-Feed Wiedergabe
mpkey.audio Tonspuren

27
data/locale/english.locale
View File

@@ -1991,22 +1991,25 @@ movieplayer.bookmarkname_hint2
movieplayer.chapters Chapters
movieplayer.fileplayback File play
movieplayer.head Movieplayer
movieplayer.help_additional To find more user definable key bindings, see "Mainmenu" > "Settings" > "Keys" > "Edit" > "Movieplayer".
movieplayer.help_button_1 1 minute backward
movieplayer.help_button_2 Jump to movie's start
movieplayer.help_button_3 1 minute forward
movieplayer.help_button_4 3 minutes backward
movieplayer.help_button_5 Jump to movie's middle
movieplayer.help_button_6 3 minutes forward
movieplayer.help_button_7 10 minutes backward
movieplayer.help_button_8 Jump to movie's end
movieplayer.help_button_9 10 minutes forward
movieplayer.help_button_backward Fast rewind
movieplayer.help_button_forward Fast forward
movieplayer.help_button_menu Open main manu
movieplayer.help_button_pause Pause / Continue
movieplayer.help_button_stop Stop
movieplayer.plugin Movieplayer plugin
movieplayer.starting Starting playback ...
movieplayer.titles Titles
movieplayer.toomanybookmarks There are too many bookmarks.\nYou need to delete one of them first.
movieplayer.tshelp1 Stop
movieplayer.tshelp10 approx. 10 minutes back
movieplayer.tshelp11 skip approx. 10 minutes
movieplayer.tshelp12 Help: http://www.giggo.de/dbox2/movieplayer.html\n
movieplayer.tshelp2 Select audio track
movieplayer.tshelp3 Pause/Continue
movieplayer.tshelp4 Create bookmark
movieplayer.tshelp5 Show progress
movieplayer.tshelp6 approx. 1 minute back
movieplayer.tshelp7 skip approx. 1 minute
movieplayer.tshelp8 approx. 5 minutes back
movieplayer.tshelp9 skip approx. 5 minutes
movieplayer.tsplayback Play TS
movieplayer.ytplayback YouTube videoplayer
mpkey.audio Audiotracks

42
src/gui/movieplayer.cpp
View File

@@ -1559,7 +1559,9 @@ void CMoviePlayerGui::PlayFileLoop(void)
if (!cancel && (3 == sscanf(Value.c_str(), "%d:%d:%d", &hh, &mm, &ss)))
SetPosition(1000 * (hh * 3600 + mm * 60 + ss), true);
} else if (msg == CRCInput::RC_help || msg == CRCInput::RC_info) {
} else if (msg == CRCInput::RC_help) {
showHelp();
} else if (msg == CRCInput::RC_info) {
if (fromInfoviewer) {
CTimeOSD::mode m_mode = FileTime.getMode();
bool restore = FileTime.IsVisible();
@@ -2234,22 +2236,34 @@ void CMoviePlayerGui::UpdatePosition()
}
}
void CMoviePlayerGui::showHelpTS()
void CMoviePlayerGui::showHelp()
{
Helpbox helpbox(g_Locale->getText(LOCALE_MESSAGEBOX_INFO));
helpbox.addLine(NEUTRINO_ICON_BUTTON_RED, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP1));
helpbox.addLine(NEUTRINO_ICON_BUTTON_GREEN, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP2));
helpbox.addLine(NEUTRINO_ICON_BUTTON_YELLOW, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP3));
helpbox.addLine(NEUTRINO_ICON_BUTTON_BLUE, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP4));
helpbox.addLine(NEUTRINO_ICON_BUTTON_MENU, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP5));
helpbox.addLine(NEUTRINO_ICON_BUTTON_1, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP6));
helpbox.addLine(NEUTRINO_ICON_BUTTON_3, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP7));
helpbox.addLine(NEUTRINO_ICON_BUTTON_4, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP8));
helpbox.addLine(NEUTRINO_ICON_BUTTON_6, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP9));
helpbox.addLine(NEUTRINO_ICON_BUTTON_7, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP10));
helpbox.addLine(NEUTRINO_ICON_BUTTON_9, g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP11));
helpbox.addLine(g_Locale->getText(LOCALE_MOVIEPLAYER_TSHELP12));
helpbox.addSeparator();
helpbox.addLine(NEUTRINO_ICON_BUTTON_PAUSE, g_Locale->getText(LOCALE_MOVIEPLAYER_HELP_BUTTON_PAUSE));
helpbox.addLine(NEUTRINO_ICON_BUTTON_FORWARD, g_Locale->getText(LOCALE_MOVIEPLAYER_HELP_BUTTON_FORWARD));
helpbox.addLine(NEUTRINO_ICON_BUTTON_BACKWARD, g_Locale->getText(LOCALE_MOVIEPLAYER_HELP_BUTTON_BACKWARD));
helpbox.addLine(NEUTRINO_ICON_BUTTON_STOP, g_Locale->getText(LOCALE_MOVIEPLAYER_HELP_BUTTON_STOP));
helpbox.addSeparatorLine();
helpbox.addLine(NEUTRINO_ICON_BUTTON_1, g_Locale->getText(LOCALE_MOVIEPLAYER_HELP_BUTTON_1));
helpbox.addLine(NEUTRINO_ICON_BUTTON_2, g_Locale->getText(LOCALE_MOVIEPLAYER_HELP_BUTTON_2));
helpbox.addLine(NEUTRINO_ICON_BUTTON_3, g_Locale->getText(LOCALE_MOVIEPLAYER_HELP_BUTTON_3));
helpbox.addLine(NEUTRINO_ICON_BUTTON_4, g_Locale->getText(LOCALE_MOVIEPLAYER_HELP_BUTTON_4));
helpbox.addLine(NEUTRINO_ICON_BUTTON_5, g_Locale->getText(LOCALE_MOVIEPLAYER_HELP_BUTTON_5));
helpbox.addLine(NEUTRINO_ICON_BUTTON_6, g_Locale->getText(LOCALE_MOVIEPLAYER_HELP_BUTTON_6));
helpbox.addLine(NEUTRINO_ICON_BUTTON_7, g_Locale->getText(LOCALE_MOVIEPLAYER_HELP_BUTTON_7));
helpbox.addLine(NEUTRINO_ICON_BUTTON_8, g_Locale->getText(LOCALE_MOVIEPLAYER_HELP_BUTTON_8));
helpbox.addLine(NEUTRINO_ICON_BUTTON_9, g_Locale->getText(LOCALE_MOVIEPLAYER_HELP_BUTTON_9));
helpbox.addSeparatorLine();
helpbox.addLine(NEUTRINO_ICON_BUTTON_MENU, g_Locale->getText(LOCALE_MOVIEPLAYER_HELP_BUTTON_MENU));
helpbox.addSeparator();
helpbox.addLine(g_Locale->getText(LOCALE_MOVIEPLAYER_HELP_ADDITIONAL));
helpbox.addExitKey(CRCInput::RC_ok);
helpbox.show();
helpbox.exec();
helpbox.hide();
}
void CMoviePlayerGui::selectChapter()

2
src/gui/movieplayer.h
View File

@@ -198,7 +198,7 @@ class CMoviePlayerGui : public CMenuTarget
bool StartWebtv();
void quickZap(neutrino_msg_t msg);
void showHelpTS(void);
void showHelp(void);
void callInfoViewer(bool init_vzap_it = true);
void fillPids();
bool getAudioName(int pid, std::string &apidtitle);

10
src/gui/widget/helpbox.cpp
View File

@@ -88,18 +88,20 @@ void Helpbox::addLine(const std::string& icon, const std::string& text, const in
CComponentsPicture *picon = NULL;
int w_picon = 0;
int h_picon = 0;
if (!icon.empty()){
picon = new CComponentsPicture (0, 0, icon);
w_picon = picon->getHeight();
w_picon = picon->getWidth();
h_picon = picon->getHeight();
picon->doPaintBg(false);
picon->setYPos(line->getHeight()/2 - w_picon/2);
picon->setYPos(line->getHeight()/2 - h_picon/2);
picon->SetTransparent(CFrameBuffer::TM_BLACK);
line->addCCItem(picon);
}
if (!text.empty()){
int x_text = w_picon + (picon ? 10 : 0);
CComponentsText * txt = new CComponentsText(x_text, 0, line->getWidth()-x_text, line_height, text, text_mode, font);
int x_text = w_picon + (picon ? OFFSET_INNER_MID : 0);
CComponentsText * txt = new CComponentsText(x_text, 0, line->getWidth()-x_text, line->getHeight(), text, text_mode, font);
#if 0 //"contrast agent", if you want to see where the text items are drawn.
txt->setColorBody(COL_RED);
txt->doPaintBg(true);

27
src/system/locals.h
View File

@@ -2018,22 +2018,25 @@ typedef enum
LOCALE_MOVIEPLAYER_CHAPTERS,
LOCALE_MOVIEPLAYER_FILEPLAYBACK,
LOCALE_MOVIEPLAYER_HEAD,
LOCALE_MOVIEPLAYER_HELP_ADDITIONAL,
LOCALE_MOVIEPLAYER_HELP_BUTTON_1,
LOCALE_MOVIEPLAYER_HELP_BUTTON_2,
LOCALE_MOVIEPLAYER_HELP_BUTTON_3,
LOCALE_MOVIEPLAYER_HELP_BUTTON_4,
LOCALE_MOVIEPLAYER_HELP_BUTTON_5,
LOCALE_MOVIEPLAYER_HELP_BUTTON_6,
LOCALE_MOVIEPLAYER_HELP_BUTTON_7,
LOCALE_MOVIEPLAYER_HELP_BUTTON_8,
LOCALE_MOVIEPLAYER_HELP_BUTTON_9,
LOCALE_MOVIEPLAYER_HELP_BUTTON_BACKWARD,
LOCALE_MOVIEPLAYER_HELP_BUTTON_FORWARD,
LOCALE_MOVIEPLAYER_HELP_BUTTON_MENU,
LOCALE_MOVIEPLAYER_HELP_BUTTON_PAUSE,
LOCALE_MOVIEPLAYER_HELP_BUTTON_STOP,
LOCALE_MOVIEPLAYER_PLUGIN,
LOCALE_MOVIEPLAYER_STARTING,
LOCALE_MOVIEPLAYER_TITLES,
LOCALE_MOVIEPLAYER_TOOMANYBOOKMARKS,
LOCALE_MOVIEPLAYER_TSHELP1,
LOCALE_MOVIEPLAYER_TSHELP10,
LOCALE_MOVIEPLAYER_TSHELP11,
LOCALE_MOVIEPLAYER_TSHELP12,
LOCALE_MOVIEPLAYER_TSHELP2,
LOCALE_MOVIEPLAYER_TSHELP3,
LOCALE_MOVIEPLAYER_TSHELP4,
LOCALE_MOVIEPLAYER_TSHELP5,
LOCALE_MOVIEPLAYER_TSHELP6,
LOCALE_MOVIEPLAYER_TSHELP7,
LOCALE_MOVIEPLAYER_TSHELP8,
LOCALE_MOVIEPLAYER_TSHELP9,
LOCALE_MOVIEPLAYER_TSPLAYBACK,
LOCALE_MOVIEPLAYER_YTPLAYBACK,
LOCALE_MPKEY_AUDIO,

27
src/system/locals_intern.h
View File

@@ -2018,22 +2018,25 @@ const char * locale_real_names[] =
"movieplayer.chapters",
"movieplayer.fileplayback",
"movieplayer.head",
"movieplayer.help_additional",
"movieplayer.help_button_1",
"movieplayer.help_button_2",
"movieplayer.help_button_3",
"movieplayer.help_button_4",
"movieplayer.help_button_5",
"movieplayer.help_button_6",
"movieplayer.help_button_7",
"movieplayer.help_button_8",
"movieplayer.help_button_9",
"movieplayer.help_button_backward",
"movieplayer.help_button_forward",
"movieplayer.help_button_menu",
"movieplayer.help_button_pause",
"movieplayer.help_button_stop",
"movieplayer.plugin",
"movieplayer.starting",
"movieplayer.titles",
"movieplayer.toomanybookmarks",
"movieplayer.tshelp1",
"movieplayer.tshelp10",
"movieplayer.tshelp11",
"movieplayer.tshelp12",
"movieplayer.tshelp2",
"movieplayer.tshelp3",
"movieplayer.tshelp4",
"movieplayer.tshelp5",
"movieplayer.tshelp6",
"movieplayer.tshelp7",
"movieplayer.tshelp8",
"movieplayer.tshelp9",
"movieplayer.tsplayback",
"movieplayer.ytplayback",
"mpkey.audio",