mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

- moviebrowser: sort column item option choosers alphabetically

Browse Source 
also add missing entry 'info2' to this option choosers and remove
  duplicate entry 'filename' from them

- english.locale: fix typo
This commit is contained in:
Christian Schuett
2014-12-15 08:50:22 +01:00
committed by svenhoefer
parent 598c79bd83
commit 4975b33dfd
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data/locale/deutsch.locale
View File

@@ -1544,12 +1544,13 @@ moviebrowser.hint_newbook_forward Neuer Werbesprung\n 'blue' für Endposition
moviebrowser.info_audio Audio moviebrowser.info_audio Audio
moviebrowser.info_channel Kanal moviebrowser.info_channel Kanal
moviebrowser.info_file Datei moviebrowser.info_file Datei
moviebrowser.info_filename Name moviebrowser.info_filename Dateiname
moviebrowser.info_genre_major Genre moviebrowser.info_genre_major Genre
moviebrowser.info_genre_minor Genre moviebrowser.info_genre_minor Genre (untergeordnet)
moviebrowser.info_head Film Informationen moviebrowser.info_head Film Informationen
moviebrowser.info_head_update Inhalte in allen sichtbaren Filminfos speichern moviebrowser.info_head_update Inhalte in allen sichtbaren Filminfos speichern
moviebrowser.info_info1 Info 1 moviebrowser.info_info1 Info 1
moviebrowser.info_info2 Info 2
moviebrowser.info_length Spieldauer (Min) moviebrowser.info_length Spieldauer (Min)
moviebrowser.info_parental_lockage FSK moviebrowser.info_parental_lockage FSK
moviebrowser.info_parental_lockage_0year immer moviebrowser.info_parental_lockage_0year immer
@@ -1567,7 +1568,7 @@ moviebrowser.info_recorddate Aufnahmedatum
moviebrowser.info_serie Serie moviebrowser.info_serie Serie
moviebrowser.info_size Dateigröße (MB) moviebrowser.info_size Dateigröße (MB)
moviebrowser.info_title Titel moviebrowser.info_title Titel
moviebrowser.info_videoformat Bild moviebrowser.info_videoformat Bildformat
moviebrowser.last_play_max_items Zeilen 'zuletzt aufgenommen' moviebrowser.last_play_max_items Zeilen 'zuletzt aufgenommen'
moviebrowser.last_record_max_items Zeilen 'zuletzt gesehen' moviebrowser.last_record_max_items Zeilen 'zuletzt gesehen'
moviebrowser.load_default Lade Voreinstellung moviebrowser.load_default Lade Voreinstellung

7
data/locale/english.locale
View File

@@ -1507,7 +1507,7 @@ moviebrowser.book_position Position:
moviebrowser.book_type Jump (<0 back , >0 for): moviebrowser.book_type Jump (<0 back , >0 for):
moviebrowser.book_type_backward Repeat moviebrowser.book_type_backward Repeat
moviebrowser.book_type_forward jump over moviebrowser.book_type_forward jump over
moviebrowser.browser_frame_high Browser hight [%] moviebrowser.browser_frame_high Browser height [%]
moviebrowser.browser_row_head Row settings moviebrowser.browser_row_head Row settings
moviebrowser.browser_row_item Row item moviebrowser.browser_row_item Row item
moviebrowser.browser_row_nr Number of rows moviebrowser.browser_row_nr Number of rows
@@ -1544,12 +1544,13 @@ moviebrowser.hint_newbook_forward New jump forward\n 'blue' for endposition
moviebrowser.info_audio Audio moviebrowser.info_audio Audio
moviebrowser.info_channel Channel moviebrowser.info_channel Channel
moviebrowser.info_file File moviebrowser.info_file File
moviebrowser.info_filename Name moviebrowser.info_filename Filename
moviebrowser.info_genre_major Genre moviebrowser.info_genre_major Genre
moviebrowser.info_genre_minor Genre moviebrowser.info_genre_minor Genre (minor)
moviebrowser.info_head Film Information moviebrowser.info_head Film Information
moviebrowser.info_head_update Save changes in all movie info files moviebrowser.info_head_update Save changes in all movie info files
moviebrowser.info_info1 Info 1 moviebrowser.info_info1 Info 1
moviebrowser.info_info2 Info 2
moviebrowser.info_length Length (Min) moviebrowser.info_length Length (Min)
moviebrowser.info_parental_lockage Parental Lock age moviebrowser.info_parental_lockage Parental Lock age
moviebrowser.info_parental_lockage_0year always moviebrowser.info_parental_lockage_0year always

8
src/gui/moviebrowser.cpp
View File

@@ -98,8 +98,10 @@ const CMenuOptionChooser::keyval MESSAGEBOX_BROWSER_ROW_ITEM[MESSAGEBOX_BROWSER_
{ MB_INFO_INFO1, LOCALE_MOVIEBROWSER_INFO_INFO1 }, { MB_INFO_INFO1, LOCALE_MOVIEBROWSER_INFO_INFO1 },
{ MB_INFO_MAJOR_GENRE, LOCALE_MOVIEBROWSER_INFO_GENRE_MAJOR }, { MB_INFO_MAJOR_GENRE, LOCALE_MOVIEBROWSER_INFO_GENRE_MAJOR },
{ MB_INFO_MINOR_GENRE, LOCALE_MOVIEBROWSER_INFO_GENRE_MINOR }, { MB_INFO_MINOR_GENRE, LOCALE_MOVIEBROWSER_INFO_GENRE_MINOR },
{ MB_INFO_INFO2, LOCALE_MOVIEBROWSER_INFO_INFO2 },
{ MB_INFO_PARENTAL_LOCKAGE, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE }, { MB_INFO_PARENTAL_LOCKAGE, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE },
{ MB_INFO_CHANNEL, LOCALE_MOVIEBROWSER_INFO_CHANNEL }, { MB_INFO_CHANNEL, LOCALE_MOVIEBROWSER_INFO_CHANNEL },
{ MB_INFO_BOOKMARK, LOCALE_MOVIEBROWSER_MENU_MAIN_BOOKMARKS },
{ MB_INFO_QUALITY, LOCALE_MOVIEBROWSER_INFO_QUALITY }, { MB_INFO_QUALITY, LOCALE_MOVIEBROWSER_INFO_QUALITY },
{ MB_INFO_PREVPLAYDATE, LOCALE_MOVIEBROWSER_INFO_PREVPLAYDATE }, { MB_INFO_PREVPLAYDATE, LOCALE_MOVIEBROWSER_INFO_PREVPLAYDATE },
{ MB_INFO_RECORDDATE, LOCALE_MOVIEBROWSER_INFO_RECORDDATE }, { MB_INFO_RECORDDATE, LOCALE_MOVIEBROWSER_INFO_RECORDDATE },
@@ -108,9 +110,7 @@ const CMenuOptionChooser::keyval MESSAGEBOX_BROWSER_ROW_ITEM[MESSAGEBOX_BROWSER_
{ MB_INFO_GEOMETRIE, LOCALE_MOVIEBROWSER_INFO_VIDEOFORMAT }, { MB_INFO_GEOMETRIE, LOCALE_MOVIEBROWSER_INFO_VIDEOFORMAT },
{ MB_INFO_AUDIO, LOCALE_MOVIEBROWSER_INFO_AUDIO }, { MB_INFO_AUDIO, LOCALE_MOVIEBROWSER_INFO_AUDIO },
{ MB_INFO_LENGTH, LOCALE_MOVIEBROWSER_INFO_LENGTH }, { MB_INFO_LENGTH, LOCALE_MOVIEBROWSER_INFO_LENGTH },
{ MB_INFO_SIZE, LOCALE_MOVIEBROWSER_INFO_SIZE }, { MB_INFO_SIZE, LOCALE_MOVIEBROWSER_INFO_SIZE }
{ MB_INFO_BOOKMARK, LOCALE_MOVIEBROWSER_MENU_MAIN_BOOKMARKS },
{ MB_INFO_FILENAME, LOCALE_MOVIEBROWSER_INFO_FILENAME }
}; };
#define MESSAGEBOX_YES_NO_OPTIONS_COUNT 2 #define MESSAGEBOX_YES_NO_OPTIONS_COUNT 2
@@ -2829,7 +2829,7 @@ bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /* movie_info */, bool calledExterna
for (i = 0; i < MB_MAX_ROWS; i++) for (i = 0; i < MB_MAX_ROWS; i++)
{ {
CIntInput* browserRowWidthIntInput = new CIntInput(LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH,(int *)&m_settings.browserRowWidth[i], 3, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE); CIntInput* browserRowWidthIntInput = new CIntInput(LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH,(int *)&m_settings.browserRowWidth[i], 3, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE);
optionsMenuBrowser.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_BROWSER_ROW_ITEM, (int*)(&m_settings.browserRowItem[i]), MESSAGEBOX_BROWSER_ROW_ITEM, MESSAGEBOX_BROWSER_ROW_ITEM_COUNT, true, NULL, CRCInput::convertDigitToKey(i+1), NULL, true)); optionsMenuBrowser.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_BROWSER_ROW_ITEM, (int*)(&m_settings.browserRowItem[i]), MESSAGEBOX_BROWSER_ROW_ITEM, MESSAGEBOX_BROWSER_ROW_ITEM_COUNT, true, NULL, CRCInput::convertDigitToKey(i+1), NULL, true, true));
optionsMenuBrowser.addItem(new CMenuDForwarder(LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH, true, browserRowWidthIntInput->getValue(), browserRowWidthIntInput)); optionsMenuBrowser.addItem(new CMenuDForwarder(LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH, true, browserRowWidthIntInput->getValue(), browserRowWidthIntInput));
if (i < MB_MAX_ROWS-1) if (i < MB_MAX_ROWS-1)
optionsMenuBrowser.addItem(GenericMenuSeparator); optionsMenuBrowser.addItem(GenericMenuSeparator);

1
src/system/locals.h
View File

@@ -1577,6 +1577,7 @@ typedef enum
LOCALE_MOVIEBROWSER_INFO_HEAD, LOCALE_MOVIEBROWSER_INFO_HEAD,
LOCALE_MOVIEBROWSER_INFO_HEAD_UPDATE, LOCALE_MOVIEBROWSER_INFO_HEAD_UPDATE,
LOCALE_MOVIEBROWSER_INFO_INFO1, LOCALE_MOVIEBROWSER_INFO_INFO1,
LOCALE_MOVIEBROWSER_INFO_INFO2,
LOCALE_MOVIEBROWSER_INFO_LENGTH, LOCALE_MOVIEBROWSER_INFO_LENGTH,
LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE,
LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_0YEAR, LOCALE_MOVIEBROWSER_INFO_PARENTAL_LOCKAGE_0YEAR,

1
src/system/locals_intern.h
View File

@@ -1577,6 +1577,7 @@ const char * locale_real_names[] =
"moviebrowser.info_head", "moviebrowser.info_head",
"moviebrowser.info_head_update", "moviebrowser.info_head_update",
"moviebrowser.info_info1", "moviebrowser.info_info1",
"moviebrowser.info_info2",
"moviebrowser.info_length", "moviebrowser.info_length",
"moviebrowser.info_parental_lockage", "moviebrowser.info_parental_lockage",
"moviebrowser.info_parental_lockage_0year", "moviebrowser.info_parental_lockage_0year",