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 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Commit: 6a196e6645
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
This commit is contained in:
vanhofen
2016-11-02 08:49:37 +01:00
parent 1bfaf6b895 329b279cad
commit e2c1dbc75b
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data/locale/deutsch.locale
View File

@@ -1826,11 +1826,12 @@ 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.foot_filter Filter: moviebrowser.foot_filter Filter:
moviebrowser.foot_focus Fenster umschalten moviebrowser.foot_focus Fenster wechseln
moviebrowser.foot_options Optionen moviebrowser.foot_options Optionen
moviebrowser.foot_play Film starten moviebrowser.foot_play Wiedergabe
moviebrowser.foot_refresh Liste neu laden moviebrowser.foot_refresh Neu laden
moviebrowser.foot_sort Sortieren: moviebrowser.foot_sort Sortieren:
moviebrowser.head Meine Aufnahmen moviebrowser.head Meine Aufnahmen
moviebrowser.head_filter Filme nach Kategorie filtern: moviebrowser.head_filter Filme nach Kategorie filtern:

3
data/locale/english.locale
View File

@@ -1826,10 +1826,11 @@ 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 back , >0 for, 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.foot_filter Filter: moviebrowser.foot_filter Filter:
moviebrowser.foot_focus Switch window moviebrowser.foot_focus Switch window
moviebrowser.foot_options Options moviebrowser.foot_options Options
moviebrowser.foot_play Start movie moviebrowser.foot_play Playback
moviebrowser.foot_refresh Refresh list moviebrowser.foot_refresh Refresh list
moviebrowser.foot_sort Sort: moviebrowser.foot_sort Sort:
moviebrowser.head My recordings moviebrowser.head My recordings

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

@@ -443,7 +443,7 @@ void CMovieBrowser::initGlobalSettings(void)
m_settings.sorting.direction = MB_DIRECTION_DOWN; m_settings.sorting.direction = MB_DIRECTION_DOWN;
m_settings.filter.item = MB_INFO_MAX_NUMBER; m_settings.filter.item = MB_INFO_MAX_NUMBER;
m_settings.filter.optionString = ""; m_settings.filter.optionString = g_Locale->getText(LOCALE_OPTIONS_OFF);
m_settings.filter.optionVar = 0; m_settings.filter.optionVar = 0;
m_settings.parentalLockAge = MI_PARENTAL_OVER18; m_settings.parentalLockAge = MI_PARENTAL_OVER18;
@@ -1691,7 +1691,7 @@ void CMovieBrowser::refreshFilterList(void)
} }
else else
{ {
std::string tmp = g_Locale->getText(LOCALE_MENU_BACK); std::string tmp = g_Locale->getText(LOCALE_MOVIEBROWSER_FILTER_OFF);
m_FilterLines.lineArray[0].push_back(tmp); m_FilterLines.lineArray[0].push_back(tmp);
if (m_settings.filter.item == MB_INFO_FILEPATH) if (m_settings.filter.item == MB_INFO_FILEPATH)
@@ -1950,17 +1950,19 @@ int CMovieBrowser::refreshFoot(bool show)
int ok_loc_len = std::max(FOOT_FONT->getRenderWidth(g_Locale->getText(LOCALE_BOOKMARKMANAGER_SELECT), true), int ok_loc_len = std::max(FOOT_FONT->getRenderWidth(g_Locale->getText(LOCALE_BOOKMARKMANAGER_SELECT), true),
FOOT_FONT->getRenderWidth(g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_PLAY), true)); FOOT_FONT->getRenderWidth(g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_PLAY), true));
std::string filter_text = g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_FILTER); std::string filter_text = g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_FILTER);
filter_text += " ";
filter_text += m_settings.filter.optionString; filter_text += m_settings.filter.optionString;
std::string sort_text = g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_SORT); std::string sort_text = g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_SORT);
sort_text += g_Locale->getText(m_localizedItemName[m_settings.sorting.item]); sort_text += " ";
int sort_text_len = FOOT_FONT->getRenderWidth(g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_SORT), true); int sort_text_len = FOOT_FONT->getRenderWidth(sort_text, true);
int len = 0; int len = 0;
for (int i = 0; m_localizedItemName[i] != NONEXISTANT_LOCALE; i++) for (int i = 0; m_localizedItemName[i] != NONEXISTANT_LOCALE; i++)
len = std::max(len, FOOT_FONT->getRenderWidth(g_Locale->getText(m_localizedItemName[i]), true)); len = std::max(len, FOOT_FONT->getRenderWidth(g_Locale->getText(m_localizedItemName[i]), true));
sort_text_len += len; sort_text_len += len;
sort_text += g_Locale->getText(m_localizedItemName[m_settings.sorting.item]);
button_label_ext footerButtons[] = { button_label_ext footerButtons[] = {
{ NEUTRINO_ICON_BUTTON_RED, NONEXISTANT_LOCALE, sort_text.c_str(), sort_text_len, false }, { NEUTRINO_ICON_BUTTON_RED, NONEXISTANT_LOCALE, sort_text.c_str(), sort_text_len, false },
{ NEUTRINO_ICON_BUTTON_GREEN, NONEXISTANT_LOCALE, filter_text.c_str(), 0, true }, { NEUTRINO_ICON_BUTTON_GREEN, NONEXISTANT_LOCALE, filter_text.c_str(), 0, true },
{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_MOVIEBROWSER_FOOT_FOCUS, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_MOVIEBROWSER_FOOT_FOCUS, NULL, 0, false },
{ NEUTRINO_ICON_BUTTON_BLUE, LOCALE_MOVIEBROWSER_FOOT_REFRESH, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_BLUE, LOCALE_MOVIEBROWSER_FOOT_REFRESH, NULL, 0, false },
@@ -2367,7 +2369,7 @@ bool CMovieBrowser::onButtonPressFilterList(neutrino_msg_t msg)
if (selected_line == 0) if (selected_line == 0)
{ {
m_settings.filter.item = MB_INFO_MAX_NUMBER; m_settings.filter.item = MB_INFO_MAX_NUMBER;
m_settings.filter.optionString = ""; m_settings.filter.optionString = g_Locale->getText(LOCALE_OPTIONS_OFF);
m_settings.filter.optionVar = 0; m_settings.filter.optionVar = 0;
refreshFilterList(); refreshFilterList();
m_pcFilter->setSelectedLine(0); m_pcFilter->setSelectedLine(0);

1
src/system/locals.h
View File

@@ -1853,6 +1853,7 @@ typedef enum
LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2,
LOCALE_MOVIEBROWSER_EDIT_SERIE, LOCALE_MOVIEBROWSER_EDIT_SERIE,
LOCALE_MOVIEBROWSER_ERROR_NO_MOVIES, LOCALE_MOVIEBROWSER_ERROR_NO_MOVIES,
LOCALE_MOVIEBROWSER_FILTER_OFF,
LOCALE_MOVIEBROWSER_FOOT_FILTER, LOCALE_MOVIEBROWSER_FOOT_FILTER,
LOCALE_MOVIEBROWSER_FOOT_FOCUS, LOCALE_MOVIEBROWSER_FOOT_FOCUS,
LOCALE_MOVIEBROWSER_FOOT_OPTIONS, LOCALE_MOVIEBROWSER_FOOT_OPTIONS,

1
src/system/locals_intern.h
View File

@@ -1853,6 +1853,7 @@ const char * locale_real_names[] =
"moviebrowser.edit_book_type_info2", "moviebrowser.edit_book_type_info2",
"moviebrowser.edit_serie", "moviebrowser.edit_serie",
"moviebrowser.error_no_movies", "moviebrowser.error_no_movies",
"moviebrowser.filter_off",
"moviebrowser.foot_filter", "moviebrowser.foot_filter",
"moviebrowser.foot_focus", "moviebrowser.foot_focus",
"moviebrowser.foot_options", "moviebrowser.foot_options",