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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff282cbad1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-08-27 23:56:52 +02:00
parent ee06650293 3287a5ded5
commit 4b44169b39
8 changed files with 0 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/locale/deutsch.locale
View File

@@ -920,11 +920,6 @@ infoicons_switch_off Infoicons ausblenden
infoicons_switch_on Infoicons einblenden
infoviewer.epgnotload Informationen noch nicht geladen ...
infoviewer.epgwait Warte auf EPG-Informationen ...
infoviewer.iconset Iconset
infoviewer.iconset_pkg0 NI-Material-Design
infoviewer.iconset_pkg1 NI-Dark
infoviewer.iconset_pkg2 NI-Bright
infoviewer.iconset_pkg3 NI-Flat
infoviewer.motor_moving Antennenpositionierung
infoviewer.next Später
infoviewer.nocurrent Keine Info zu laufendem Programm
@@ -1247,7 +1242,6 @@ menu.hint_infobar_dd Zeigt ein Dolby Digital Icon bei Verfügbarkeit
menu.hint_infobar_ecminfo Anzeigen der ECM-Info, während die Infobar eingeblendet ist
menu.hint_infobar_filesys Zeigen den vom Flash- und einer HDD verwendeten Speicherplatz
menu.hint_infobar_fonts Ändern Sie die Schriftgrößen in der Infobar
menu.hint_infobar_iconset Auswahl der Iconsets für die CA-Anzeige
menu.hint_infobar_logo Logo-, Kanalnummer- und Signal-Anzeige; Optionen in [Klammern] erscheinen in der kleinen Infobox
menu.hint_infobar_logo_dir Wählen Sie das externe Verzeichnis für die Senderlogos
menu.hint_infobar_on_epg Zeigt einen Hinweis bei EPG-Änderungen

6
data/locale/english.locale
View File

@@ -920,11 +920,6 @@ infoicons_switch_off Infoicons off
infoicons_switch_on Infoicons on
infoviewer.epgnotload EPG not loaded ...
infoviewer.epgwait waiting for EPG ...
infoviewer.iconset Iconset
infoviewer.iconset_pkg0 NI-Material-Design
infoviewer.iconset_pkg1 NI-Dark
infoviewer.iconset_pkg2 NI-Bright
infoviewer.iconset_pkg3 NI-Flat
infoviewer.motor_moving Antenna positioning
infoviewer.next next
infoviewer.nocurrent No info for current program available
@@ -1247,7 +1242,6 @@ menu.hint_infobar_dd Show DD icon
menu.hint_infobar_ecminfo Show ecm-info while infobar is displayed
menu.hint_infobar_filesys Show flash and HDD used space levels
menu.hint_infobar_fonts Change infobar font sizes
menu.hint_infobar_iconset Iconset selection for CA-Bar
menu.hint_infobar_logo Logo, channelnumber and signal display; Options in [brackets] will be displayed in small infobox
menu.hint_infobar_logo_dir Select external directory to search for channels logo
menu.hint_infobar_on_epg Show infobar on current EPG event change

72
src/gui/osd_setup.cpp
View File

@@ -51,7 +51,6 @@
#include <gui/color_custom.h>
#include <gui/infoclock.h>
#include <gui/timeosd.h>
#include <gui/infoviewer_bb.h> //NI
#include <gui/ni_menu.h> //NI
#include <gui/widget/icons.h>
#include <gui/widget/colorchooser.h>
@@ -98,8 +97,6 @@ COsdSetup::COsdSetup(int wizard_mode)
show_tuner_icon = 0;
//NI
infobarIconset = NULL;
infoviewer_icons = 0;
show_menu_hints_line = 0;
}
@@ -550,16 +547,6 @@ const CMenuOptionChooser::keyval PROGRESSBAR_COLOR_OPTIONS[PROGRESSBAR_COLOR_OPT
{ CProgressBar::PB_COLOR, _LOCALE_PROGRESSBAR_COLOR_FULL }
};
//NI iconsets
const CMenuOptionChooser::keyval INFOVIEWER_ICONSET_OPTIONS[] =
{
{ 0, LOCALE_INFOVIEWER_ICONSET_PKG0 },
{ 1, LOCALE_INFOVIEWER_ICONSET_PKG1 },
{ 2, LOCALE_INFOVIEWER_ICONSET_PKG2 },
{ 3, LOCALE_INFOVIEWER_ICONSET_PKG3 }
};
#define INFOVIEWER_ICONSET_OPTION_COUNT (sizeof(INFOVIEWER_ICONSET_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
//show osd setup
int COsdSetup::showOsdSetup()
{
@@ -769,27 +756,6 @@ int COsdSetup::showOsdSetup()
CAudioMute::getInstance()->enableMuteIcon(true);
}
//NI
if (g_settings.infoviewer_icons != infoviewer_icons)
{
std::ostringstream buf;
buf.str("");
buf << ICONSDIR << "/iconsPKG" << g_settings.infoviewer_icons << ".tar.gz";
printf("[osd_setup.cpp] change infoviewer iconset Name=%s PKG=%i\n", g_Locale->getText(INFOVIEWER_ICONSET_OPTIONS[g_settings.infoviewer_icons].value), g_settings.infoviewer_icons);
if (my_system(8, "tar", "-z", "-x", "-v", "-f", buf.str().c_str(), "-C", ICONSDIR) != 0)
{
printf("[osd_setup.cpp] change infoviewer iconset failed\n");
}
else
{
CFrameBuffer::getInstance()->clearIconCache();
g_InfoViewer->Init();
CInfoViewerBB::getInstance()->Init();
g_InfoViewer->start();
}
}
delete colorInfoclockNotifier;
delete screensaverNotifier;
delete channellistNotifier;
@@ -1364,12 +1330,6 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_DD);
menu_infobar->addItem(mc);
//NI iconsets
infoviewer_icons = g_settings.infoviewer_icons;
infobarIconset = new CMenuOptionChooser(LOCALE_INFOVIEWER_ICONSET, &g_settings.infoviewer_icons, INFOVIEWER_ICONSET_OPTIONS, INFOVIEWER_ICONSET_OPTION_COUNT, true, this);
changeNotify(LOCALE_INFOVIEWER_ICONSET, NULL); //setHint
menu_infobar->addItem(infobarIconset);
menu_infobar->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_PROGRESSBAR));
// progressbar position
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION, &g_settings.infobar_progressbar, PROGRESSBAR_INFOBAR_POSITION_OPTIONS, PROGRESSBAR_INFOBAR_POSITION_COUNT, true);
@@ -1639,38 +1599,6 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
g_settings.show_ecm = 1;
}
//NI iconsets
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_INFOVIEWER_ICONSET))
{
int value = g_settings.infoviewer_icons;
if (data)
value = (* (int *) data);
const char *icon = NEUTRINO_ICON_HINT_IMAGELOGO;
neutrino_locale_t txt = LOCALE_MENU_HINT_INFOBAR_ICONSET;
switch (value)
{
case 0:
icon = NEUTRINO_ICON_HINT_ICONSPKG0;
break;
case 1:
icon = NEUTRINO_ICON_HINT_ICONSPKG1;
break;
case 2:
icon = NEUTRINO_ICON_HINT_ICONSPKG2;
break;
case 3:
icon = NEUTRINO_ICON_HINT_ICONSPKG3;
break;
default:
break;
}
infobarIconset->setHint(icon, txt);
//return true for repaint hint
return true;
}
else if ((ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_INFOCLOCK)) ||
(ARE_LOCALES_EQUAL(OptionName, LOCALE_CLOCK_SIZE_HEIGHT)) ||
(ARE_LOCALES_EQUAL(OptionName, LOCALE_CLOCK_SECONDS))) {

2
src/gui/osd_setup.h
View File

@@ -66,8 +66,6 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
int show_tuner_icon;
//NI
CMenuOptionChooser *infobarIconset;
int infoviewer_icons;
int show_menu_hints_line;
int showOsdSetup();

2
src/neutrino.cpp
View File

@@ -371,7 +371,6 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.lcd4l_skin_radio = configfile.getInt32("lcd4l_skin_radio" , 0);
g_settings.lcd4l_convert = configfile.getInt32("lcd4l_convert", 1);
g_settings.show_menu_hints_line = configfile.getBool("show_menu_hints_line", false);
g_settings.infoviewer_icons = configfile.getInt32("infoviewer_icons" , 1);
g_settings.mode_icons = configfile.getInt32( "mode_icons", 0);
g_settings.mode_icons_background = configfile.getInt32( "mode_icons_background", 0);
g_settings.mode_icons_skin = configfile.getInt32( "mode_icons_skin", 0);
@@ -1212,7 +1211,6 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32("lcd4l_skin_radio" , g_settings.lcd4l_skin_radio);
configfile.setInt32("lcd4l_convert" , g_settings.lcd4l_convert);
configfile.setBool("show_menu_hints_line" , g_settings.show_menu_hints_line);
configfile.setInt32("infoviewer_icons" , g_settings.infoviewer_icons);
configfile.setInt32("mode_icons", g_settings.mode_icons );
configfile.setInt32("mode_icons_background", g_settings.mode_icons_background);
configfile.setInt32("mode_icons_skin", g_settings.mode_icons_skin);

6
src/system/locals.h
View File

@@ -947,11 +947,6 @@ typedef enum
LOCALE_INFOICONS_SWITCH_ON,
LOCALE_INFOVIEWER_EPGNOTLOAD,
LOCALE_INFOVIEWER_EPGWAIT,
LOCALE_INFOVIEWER_ICONSET,
LOCALE_INFOVIEWER_ICONSET_PKG0,
LOCALE_INFOVIEWER_ICONSET_PKG1,
LOCALE_INFOVIEWER_ICONSET_PKG2,
LOCALE_INFOVIEWER_ICONSET_PKG3,
LOCALE_INFOVIEWER_MOTOR_MOVING,
LOCALE_INFOVIEWER_NEXT,
LOCALE_INFOVIEWER_NOCURRENT,
@@ -1274,7 +1269,6 @@ typedef enum
LOCALE_MENU_HINT_INFOBAR_ECMINFO,
LOCALE_MENU_HINT_INFOBAR_FILESYS,
LOCALE_MENU_HINT_INFOBAR_FONTS,
LOCALE_MENU_HINT_INFOBAR_ICONSET,
LOCALE_MENU_HINT_INFOBAR_LOGO,
LOCALE_MENU_HINT_INFOBAR_LOGO_DIR,
LOCALE_MENU_HINT_INFOBAR_ON_EPG,

6
src/system/locals_intern.h
View File

@@ -947,11 +947,6 @@ const char * locale_real_names[] =
"infoicons_switch_on",
"infoviewer.epgnotload",
"infoviewer.epgwait",
"infoviewer.iconset",
"infoviewer.iconset_pkg0",
"infoviewer.iconset_pkg1",
"infoviewer.iconset_pkg2",
"infoviewer.iconset_pkg3",
"infoviewer.motor_moving",
"infoviewer.next",
"infoviewer.nocurrent",
@@ -1274,7 +1269,6 @@ const char * locale_real_names[] =
"menu.hint_infobar_ecminfo",
"menu.hint_infobar_filesys",
"menu.hint_infobar_fonts",
"menu.hint_infobar_iconset",
"menu.hint_infobar_logo",
"menu.hint_infobar_logo_dir",
"menu.hint_infobar_on_epg",

1
src/system/settings.h
View File

@@ -842,7 +842,6 @@ struct SNeutrinoSettings
int ca_init;
int show_menu_hints_line;
int inetradio_autostart;
int infoviewer_icons;
#define MODE_ICONS_NR_OF_ENTRIES 8
int mode_icons;
int mode_icons_background;