mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-12-04 18:02:51 +01:00
parent 8f423715c2 d7d2ff51f9
commit 776aea7c95
135 changed files with 3933 additions and 3385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/system/locals.h
View File

@@ -730,6 +730,7 @@ typedef enum
LOCALE_FONTMENU_HEAD,
LOCALE_FONTMENU_INFOBAR,
LOCALE_FONTMENU_MENU,
LOCALE_FONTMENU_MESSAGES,
LOCALE_FONTMENU_MOVIEBROWSER,
LOCALE_FONTMENU_OTHER,
LOCALE_FONTMENU_SCALING,
@@ -763,6 +764,7 @@ typedef enum
LOCALE_FONTSIZE_MENU_HINT,
LOCALE_FONTSIZE_MENU_INFO,
LOCALE_FONTSIZE_MENU_TITLE,
LOCALE_FONTSIZE_MESSAGE_TEXT,
LOCALE_FONTSIZE_MOVIEBROWSER_HEAD,
LOCALE_FONTSIZE_MOVIEBROWSER_INFO,
LOCALE_FONTSIZE_MOVIEBROWSER_LIST,
@@ -811,6 +813,7 @@ typedef enum
LOCALE_HDD_UMOUNT,
LOCALE_HDD_UMOUNT_WARN,
LOCALE_HDD_UMOUNTED,
LOCALE_HELP_BOX_TITLE,
LOCALE_IMAGEINFO_API,
LOCALE_IMAGEINFO_CREATOR,
LOCALE_IMAGEINFO_DATE,
@@ -1064,6 +1067,7 @@ typedef enum
LOCALE_MENU_HINT_EPG_MAX_EVENTS,
LOCALE_MENU_HINT_EPG_OLD_EVENTS,
LOCALE_MENU_HINT_EPG_READ,
LOCALE_MENU_HINT_EPG_READ_FREQUENTLY,
LOCALE_MENU_HINT_EPG_SAVE,
LOCALE_MENU_HINT_EPG_SAVE_FREQUENTLY,
LOCALE_MENU_HINT_EPG_SAVE_MODE,
@@ -1209,6 +1213,7 @@ typedef enum
LOCALE_MENU_HINT_MENU_HINTS,
LOCALE_MENU_HINT_MENU_POS,
LOCALE_MENU_HINT_MENUS,
LOCALE_MENU_HINT_MESSAGE_FONTS,
LOCALE_MENU_HINT_MISC_CEC,
LOCALE_MENU_HINT_MISC_CHANNELLIST,
LOCALE_MENU_HINT_MISC_ENERGY,
@@ -1456,6 +1461,8 @@ typedef enum
LOCALE_MENU_HINT_SW_UPDATE,
LOCALE_MENU_HINT_THEME,
LOCALE_MENU_HINT_TIMEOUTS,
LOCALE_MENU_HINT_TIMEOUTS_STATIC_MESSAGES,
LOCALE_MENU_HINT_TIMER_FOLLOWSCREENINGS,
LOCALE_MENU_HINT_TIMERS,
LOCALE_MENU_HINT_TIMEZONE,
LOCALE_MENU_HINT_TMDB_API_KEY,
@@ -1536,6 +1543,7 @@ typedef enum
LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT1,
LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT2,
LOCALE_MISCSETTINGS_EPG_READ,
LOCALE_MISCSETTINGS_EPG_READ_FREQUENTLY,
LOCALE_MISCSETTINGS_EPG_SAVE,
LOCALE_MISCSETTINGS_EPG_SAVE_FREQUENTLY,
LOCALE_MISCSETTINGS_EPG_SAVE_MODE,
@@ -2408,6 +2416,7 @@ typedef enum
LOCALE_TIMERLIST_WEEKDAYS,
LOCALE_TIMERLIST_WEEKDAYS_HINT_1,
LOCALE_TIMERLIST_WEEKDAYS_HINT_2,
LOCALE_TIMERSETTINGS_FOLLOWSCREENINGS,
LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER,
LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER_HINT_1,
LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER_HINT_2,
@@ -2425,6 +2434,8 @@ typedef enum
LOCALE_TIMING_INFOBAR_RADIO,
LOCALE_TIMING_MENU,
LOCALE_TIMING_NUMERICZAP,
LOCALE_TIMING_POPUP_MESSAGES,
LOCALE_TIMING_STATIC_MESSAGES,
LOCALE_TIMING_VOLUMEBAR,
LOCALE_TMDB_API_KEY,
LOCALE_TMDB_ENABLED,

11
src/system/locals_intern.h
View File

@@ -730,6 +730,7 @@ const char * locale_real_names[] =
"fontmenu.head",
"fontmenu.infobar",
"fontmenu.menu",
"fontmenu.messages",
"fontmenu.moviebrowser",
"fontmenu.other",
"fontmenu.scaling",
@@ -763,6 +764,7 @@ const char * locale_real_names[] =
"fontsize.menu_hint",
"fontsize.menu_info",
"fontsize.menu_title",
"fontsize.message_text",
"fontsize.moviebrowser_head",
"fontsize.moviebrowser_info",
"fontsize.moviebrowser_list",
@@ -811,6 +813,7 @@ const char * locale_real_names[] =
"hdd_umount",
"hdd_umount_warn",
"hdd_umounted",
"help_box_title",
"imageinfo.api",
"imageinfo.creator",
"imageinfo.date",
@@ -1064,6 +1067,7 @@ const char * locale_real_names[] =
"menu.hint_epg_max_events",
"menu.hint_epg_old_events",
"menu.hint_epg_read",
"menu.hint_epg_read_frequently",
"menu.hint_epg_save",
"menu.hint_epg_save_frequently",
"menu.hint_epg_save_mode",
@@ -1209,6 +1213,7 @@ const char * locale_real_names[] =
"menu.hint_menu_hints",
"menu.hint_menu_pos",
"menu.hint_menus",
"menu.hint_message_fonts",
"menu.hint_misc_cec",
"menu.hint_misc_channellist",
"menu.hint_misc_energy",
@@ -1456,6 +1461,8 @@ const char * locale_real_names[] =
"menu.hint_sw_update",
"menu.hint_theme",
"menu.hint_timeouts",
"menu.hint_timeouts_static_messages",
"menu.hint_timer_followscreenings",
"menu.hint_timers",
"menu.hint_timezone",
"menu.hint_tmdb_api_key",
@@ -1536,6 +1543,7 @@ const char * locale_real_names[] =
"miscsettings.epg_old_events_hint1",
"miscsettings.epg_old_events_hint2",
"miscsettings.epg_read",
"miscsettings.epg_read_frequently",
"miscsettings.epg_save",
"miscsettings.epg_save_frequently",
"miscsettings.epg_save_mode",
@@ -2408,6 +2416,7 @@ const char * locale_real_names[] =
"timerlist.weekdays",
"timerlist.weekdays.hint_1",
"timerlist.weekdays.hint_2",
"timersettings.followscreenings",
"timersettings.record_safety_time_after",
"timersettings.record_safety_time_after.hint_1",
"timersettings.record_safety_time_after.hint_2",
@@ -2425,6 +2434,8 @@ const char * locale_real_names[] =
"timing.infobar_radio",
"timing.menu",
"timing.numericzap",
"timing.popup_messages",
"timing.static_messages",
"timing.volumebar",
"tmdb.api_key",
"tmdb.enabled",

6
src/system/setting_helpers.cpp
View File

@@ -59,7 +59,7 @@
#include <system/helpers.h>
// obsolete #include <gui/streaminfo.h>
#include <gui/widget/messagebox.h>
#include <gui/widget/msgbox.h>
#include <gui/widget/hintbox.h>
#include <gui/plugins.h>
@@ -527,8 +527,8 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
/* no need to confirm if we only remove deleted channels */
if (!delete_removed) {
int result = ShowMsg(msg, g_Locale->getText(LOCALE_RESET_CONFIRM), CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo);
if (result != CMessageBox::mbrYes)
int result = ShowMsg(msg, g_Locale->getText(LOCALE_RESET_CONFIRM), CMsgBox::mbrNo, CMsgBox::mbYes | CMsgBox::mbNo);
if (result != CMsgBox::mbrYes)
return true;
}

26
src/system/settings.h
View File

@@ -284,6 +284,7 @@ struct SNeutrinoSettings
int epg_save_standby;
int epg_save_frequently;
int epg_read;
int epg_read_frequently;
int epg_cache;
int epg_old_events;
int epg_max_events;
@@ -408,6 +409,8 @@ struct SNeutrinoSettings
TIMING_VOLUMEBAR = 6,
TIMING_FILEBROWSER = 7,
TIMING_NUMERICZAP = 8,
TIMING_POPUP_MESSAGES = 9,
TIMING_STATIC_MESSAGES = 10,
TIMING_SETTING_COUNT
};
@@ -464,6 +467,7 @@ struct SNeutrinoSettings
int recording_startstop_msg;
int shutdown_timer_record_type;
std::vector<timer_remotebox_item> timer_remotebox_ip;
int timer_followscreenings;
std::string recording_filename_template;
int recording_already_found_check;
@@ -686,6 +690,7 @@ struct SNeutrinoSettings
FONT_TYPE_MOVIEBROWSER_LIST,
FONT_TYPE_MOVIEBROWSER_INFO,
FONT_TYPE_SUBTITLES,
FONT_TYPE_MESSAGE_TEXT,
FONT_TYPE_COUNT
};
@@ -862,19 +867,22 @@ typedef struct time_settings_t
{
const int default_timing;
const neutrino_locale_t name;
const neutrino_locale_t hint;
} time_settings_struct_t;
const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_COUNT] =
{
{ 240, LOCALE_TIMING_MENU },
{ 60, LOCALE_TIMING_CHANLIST },
{ 240, LOCALE_TIMING_EPG },
{ 6, LOCALE_TIMING_INFOBAR },
{ 0, LOCALE_TIMING_INFOBAR_RADIO },
{ 6, LOCALE_TIMING_INFOBAR_MOVIEPLAYER},
{ 3, LOCALE_TIMING_VOLUMEBAR },
{ 60, LOCALE_TIMING_FILEBROWSER },
{ 3, LOCALE_TIMING_NUMERICZAP }
{ 240, LOCALE_TIMING_MENU, LOCALE_MENU_HINT_OSD_TIMING},//TODO: add hint locales
{ 60, LOCALE_TIMING_CHANLIST, LOCALE_MENU_HINT_OSD_TIMING},
{ 240, LOCALE_TIMING_EPG, LOCALE_MENU_HINT_OSD_TIMING},
{ 6, LOCALE_TIMING_INFOBAR, LOCALE_MENU_HINT_OSD_TIMING},
{ 0, LOCALE_TIMING_INFOBAR_RADIO, LOCALE_MENU_HINT_OSD_TIMING},
{ 6, LOCALE_TIMING_INFOBAR_MOVIEPLAYER, LOCALE_MENU_HINT_OSD_TIMING},
{ 3, LOCALE_TIMING_VOLUMEBAR, LOCALE_MENU_HINT_OSD_TIMING},
{ 60, LOCALE_TIMING_FILEBROWSER, LOCALE_MENU_HINT_OSD_TIMING},
{ 3, LOCALE_TIMING_NUMERICZAP, LOCALE_MENU_HINT_OSD_TIMING},
{ 6, LOCALE_TIMING_POPUP_MESSAGES, LOCALE_MENU_HINT_OSD_TIMING},
{ 60, LOCALE_TIMING_STATIC_MESSAGES, LOCALE_MENU_HINT_TIMEOUTS_STATIC_MESSAGES}
};
// lcdd