mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 10:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/msgbox

Browse Source
This commit is contained in:
Thilo Graf
2016-10-26 09:56:49 +02:00
parent ca97793ef0 56e668ae95
commit ac59ce80b1
8 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/locale/deutsch.locale
View File

@@ -703,6 +703,7 @@ fontmenu.eventlist Event-Liste
fontmenu.head Schrift
fontmenu.infobar Infobar
fontmenu.menu Menü
fontmenu.moviebrowser Moviebrowser
fontmenu.other Andere
fontmenu.scaling Schriftgrößenfaktor
fontmenu.scaling_x Horizontal (in %)
@@ -735,6 +736,9 @@ fontsize.menu_foot Fußleiste (in allen GUI-Elementen)
fontsize.menu_hint Menü-Hilfe
fontsize.menu_info Menüinfo
fontsize.menu_title Menütitel
fontsize.moviebrowser_head Überschriften
fontsize.moviebrowser_info Info-Fenster
fontsize.moviebrowser_list Listen-Einträge
fontsize.subtitles Text Untertitel
fsk.all aus
fsk.from_12 ab 12
@@ -1188,6 +1192,7 @@ menu.hint_misc_general Standby-, Teletext- und Rotor-Einstellungen, Pluginverzei
menu.hint_misc_onlineservices Konfigurieren und steuern von Online-Diensten wie YouTube, SHOUTCast und TMDb
menu.hint_misc_zapit Verwaltung der Start-Kanäle für den TV/Radio-Modus
menu.hint_movie Wiedergabe von Filmen
menu.hint_moviebrowser_fonts Ändern Sie die Schriftgrößen im Moviebrowser (Meine Aufnahmen)
menu.hint_moviebrowser_setup Legen Sie Auswahl- und Anzeigeoptionen des MovieBrowsers fest
menu.hint_movieplayer_plugin Wählen Sie ein Plugin, das mit einer Schnellstart-Taste im Movieplayer-Modus gestartet wird
menu.hint_net_broadcast Ändern Sie die Broadcast-Adresse.\nWenn Sie unsicher sind, verwenden Sie zuletzt .255

5
data/locale/english.locale
View File

@@ -703,6 +703,7 @@ fontmenu.eventlist Eventlist
fontmenu.head Font settings
fontmenu.infobar Infobar
fontmenu.menu Menu
fontmenu.moviebrowser Moviebrowser
fontmenu.other Other
fontmenu.scaling Global Font Zoom Factor
fontmenu.scaling_x Horizontal (in %)
@@ -735,6 +736,9 @@ fontsize.menu_foot Footer (in all GUI elements)
fontsize.menu_hint Menu hints
fontsize.menu_info Menu Info
fontsize.menu_title Menu Title
fontsize.moviebrowser_head Headers
fontsize.moviebrowser_info Info window
fontsize.moviebrowser_list List items
fontsize.subtitles Text subtitles
fsk.all off
fsk.from_12 from 12
@@ -1188,6 +1192,7 @@ menu.hint_misc_general Start to standby, cache teletext, swp rotor\nplugin hdd d
menu.hint_misc_onlineservices Configure and control online services like YouTube, SHOUTCast and TMDb
menu.hint_misc_zapit Initial TV/Radio channels
menu.hint_movie Play movies
menu.hint_moviebrowser_fonts Change moviebrowser (My recordings) font sizes
menu.hint_moviebrowser_setup Set selection and display options.
menu.hint_movieplayer_plugin Choose a plugin that's executed with the one touch key in movieplayer mode
menu.hint_net_broadcast Enter broadcast address\nif unsure, use IP address with last .255

16
src/gui/followscreenings.cpp
View File

@@ -87,14 +87,12 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK
if (i->eventType == CTimerd::TIMER_RECORD) {
if (channel_id == i->channel_id && e->startTime == i->epg_starttime) {
Timer.removeTimerEvent(i->eventID);
#if 0
if (followlist.size() > 1)
if (!forwarders.empty())
forwarders[ix]->iconName_Info_right = "";
#if 0
else
ShowMsg(LOCALE_TIMER_EVENTREMOVED_TITLE, LOCALE_TIMER_EVENTREMOVED_MSG,
CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
#else
forwarders[ix]->iconName_Info_right = "";
#endif
return menu_return::RETURN_REPAINT;
}
@@ -108,14 +106,12 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK
e->startTime, e->startTime - (ANNOUNCETIME + 120 ), apids, true, e->startTime - (ANNOUNCETIME + 120) > time(NULL), recDir, true) == -1) {
//FIXME -- no error handling, but this shouldn't happen ...
} else {
#if 0
if (followlist.size() > 1)
if (!forwarders.empty())
forwarders[ix]->iconName_Info_right = NEUTRINO_ICON_REC;
#if 0
else
ShowMsg(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG,
CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
#else
forwarders[ix]->iconName_Info_right = NEUTRINO_ICON_REC;
#endif
return menu_return::RETURN_REPAINT;
}
@@ -152,12 +148,10 @@ void CFollowScreenings::show()
getFollowScreenings();
#if 0
if (followlist.size() == 1) {
snprintf(actionstr, sizeof(actionstr), "%lu", followlist.front().startTime);
exec(NULL, actionstr);
} else {
#endif
CMenuWidget m(LOCALE_EPGVIEWER_SELECT_SCREENING, NEUTRINO_ICON_SETTINGS);
const char *icon = NEUTRINO_ICON_BUTTON_RED;
neutrino_msg_t directKey = CRCInput::RC_red;
@@ -180,8 +174,6 @@ void CFollowScreenings::show()
}
m.enableSaveScreen(true);
m.exec(NULL, "");
#if 0
}
#endif
}

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

@@ -1088,20 +1088,22 @@ int CMovieBrowser::paint(void)
//CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD));
Font* font = NULL;
Font* font = g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_LIST];
m_movieSelectionHandler = NULL;
m_pcBrowser = new CListFrame(&m_browserListLines, font, CListFrame::SCROLL | CListFrame::HEADER_LINE,
&m_cBoxFrameBrowserList);
&m_cBoxFrameBrowserList, NULL,
g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_HEAD]);
m_pcLastPlay = new CListFrame(&m_playListLines, font, CListFrame::SCROLL | CListFrame::HEADER_LINE | CListFrame::TITLE,
&m_cBoxFrameLastPlayList, g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD_PLAYLIST),
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]);
g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_HEAD]);
m_pcLastRecord = new CListFrame(&m_recordListLines, font, CListFrame::SCROLL | CListFrame::HEADER_LINE | CListFrame::TITLE,
&m_cBoxFrameLastRecordList, g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD_RECORDLIST),
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]);
g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_HEAD]);
m_pcFilter = new CListFrame(&m_FilterLines, font, CListFrame::SCROLL | CListFrame::TITLE,
&m_cBoxFrameFilter, g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD_FILTER),
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]);
m_pcInfo = new CTextBox(" ", NULL, CTextBox::TOP | CTextBox::SCROLL, &m_cBoxFrameInfo);
g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_HEAD]);
m_pcInfo = new CTextBox(" ", g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_INFO], CTextBox::TOP | CTextBox::SCROLL, &m_cBoxFrameInfo);
if (m_pcBrowser == NULL || m_pcLastPlay == NULL ||

12
src/gui/osd_setup.cpp
View File

@@ -149,6 +149,14 @@ const SNeutrinoSettings::FONT_TYPES menu_font_sizes[] =
};
size_t menu_font_items = sizeof(menu_font_sizes)/sizeof(menu_font_sizes[0]);
const SNeutrinoSettings::FONT_TYPES moviebrowser_font_sizes[] =
{
SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_HEAD,
SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_LIST,
SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_INFO
};
size_t moviebrowser_font_items = sizeof(moviebrowser_font_sizes)/sizeof(moviebrowser_font_sizes[0]);
const SNeutrinoSettings::FONT_TYPES other_font_sizes[] =
{
SNeutrinoSettings::FONT_TYPE_SUBTITLES,
@@ -163,6 +171,7 @@ font_sizes_groups font_sizes_groups[] =
{LOCALE_FONTMENU_EVENTLIST , eventlist_font_items , eventlist_font_sizes , "fontsize.deve", LOCALE_MENU_HINT_EVENTLIST_FONTS },
{LOCALE_FONTMENU_EPG , epg_font_items , epg_font_sizes , "fontsize.depg", LOCALE_MENU_HINT_EPG_FONTS },
{LOCALE_FONTMENU_INFOBAR , infobar_font_items , infobar_font_sizes , "fontsize.dinf", LOCALE_MENU_HINT_INFOBAR_FONTS },
{LOCALE_FONTMENU_MOVIEBROWSER,moviebrowser_font_items,moviebrowser_font_sizes,"fontsize.dmbr", LOCALE_MENU_HINT_MOVIEBROWSER_FONTS },
{LOCALE_FONTMENU_OTHER , other_font_items , other_font_sizes , "fontsize.doth", LOCALE_MENU_HINT_OTHER_FONTS }
};
#define FONT_GROUP_COUNT (sizeof(font_sizes_groups)/sizeof(font_sizes_groups[0]))
@@ -193,6 +202,9 @@ font_sizes_struct neutrino_font[SNeutrinoSettings::FONT_TYPE_COUNT] =
{LOCALE_FONTSIZE_INFOBAR_SMALL , 14, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
{LOCALE_FONTSIZE_FILEBROWSER_ITEM , 16, CNeutrinoFonts::FONT_STYLE_BOLD , 1},
{LOCALE_FONTSIZE_MENU_HINT , 16, CNeutrinoFonts::FONT_STYLE_REGULAR, 0},
{LOCALE_FONTSIZE_MOVIEBROWSER_HEAD , 15, CNeutrinoFonts::FONT_STYLE_REGULAR, 2},
{LOCALE_FONTSIZE_MOVIEBROWSER_LIST , 17, CNeutrinoFonts::FONT_STYLE_REGULAR, 0},
{LOCALE_FONTSIZE_MOVIEBROWSER_INFO , 17, CNeutrinoFonts::FONT_STYLE_REGULAR, 0},
{LOCALE_FONTSIZE_SUBTITLES , 25, CNeutrinoFonts::FONT_STYLE_BOLD , 0}
};

5
src/system/locals.h
View File

@@ -730,6 +730,7 @@ typedef enum
LOCALE_FONTMENU_HEAD,
LOCALE_FONTMENU_INFOBAR,
LOCALE_FONTMENU_MENU,
LOCALE_FONTMENU_MOVIEBROWSER,
LOCALE_FONTMENU_OTHER,
LOCALE_FONTMENU_SCALING,
LOCALE_FONTMENU_SCALING_X,
@@ -762,6 +763,9 @@ typedef enum
LOCALE_FONTSIZE_MENU_HINT,
LOCALE_FONTSIZE_MENU_INFO,
LOCALE_FONTSIZE_MENU_TITLE,
LOCALE_FONTSIZE_MOVIEBROWSER_HEAD,
LOCALE_FONTSIZE_MOVIEBROWSER_INFO,
LOCALE_FONTSIZE_MOVIEBROWSER_LIST,
LOCALE_FONTSIZE_SUBTITLES,
LOCALE_FSK_ALL,
LOCALE_FSK_FROM_12,
@@ -1215,6 +1219,7 @@ typedef enum
LOCALE_MENU_HINT_MISC_ONLINESERVICES,
LOCALE_MENU_HINT_MISC_ZAPIT,
LOCALE_MENU_HINT_MOVIE,
LOCALE_MENU_HINT_MOVIEBROWSER_FONTS,
LOCALE_MENU_HINT_MOVIEBROWSER_SETUP,
LOCALE_MENU_HINT_MOVIEPLAYER_PLUGIN,
LOCALE_MENU_HINT_NET_BROADCAST,

5
src/system/locals_intern.h
View File

@@ -730,6 +730,7 @@ const char * locale_real_names[] =
"fontmenu.head",
"fontmenu.infobar",
"fontmenu.menu",
"fontmenu.moviebrowser",
"fontmenu.other",
"fontmenu.scaling",
"fontmenu.scaling_x",
@@ -762,6 +763,9 @@ const char * locale_real_names[] =
"fontsize.menu_hint",
"fontsize.menu_info",
"fontsize.menu_title",
"fontsize.moviebrowser_head",
"fontsize.moviebrowser_info",
"fontsize.moviebrowser_list",
"fontsize.subtitles",
"fsk.all",
"fsk.from_12",
@@ -1215,6 +1219,7 @@ const char * locale_real_names[] =
"menu.hint_misc_onlineservices",
"menu.hint_misc_zapit",
"menu.hint_movie",
"menu.hint_moviebrowser_fonts",
"menu.hint_moviebrowser_setup",
"menu.hint_movieplayer_plugin",
"menu.hint_net_broadcast",

3
src/system/settings.h
View File

@@ -669,6 +669,9 @@ struct SNeutrinoSettings
FONT_TYPE_INFOBAR_SMALL,
FONT_TYPE_FILEBROWSER_ITEM,
FONT_TYPE_MENU_HINT,
FONT_TYPE_MOVIEBROWSER_HEAD,
FONT_TYPE_MOVIEBROWSER_LIST,
FONT_TYPE_MOVIEBROWSER_INFO,
FONT_TYPE_SUBTITLES,
FONT_TYPE_COUNT
};