diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index c4dcdd44c..f8348e7cb 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -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 diff --git a/data/locale/english.locale b/data/locale/english.locale index a06fd154d..261d2e6c8 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -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 diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 6ae03fe20..e85ba6d0a 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -50,8 +50,6 @@ #include #include #include -#include //NI -#include //NI #include #include #include @@ -96,8 +94,6 @@ COsdSetup::COsdSetup(int wizard_mode) show_tuner_icon = 0; //NI - infobarIconset = NULL; - infoviewer_icons = 0; show_menu_hints_line = 0; } @@ -548,16 +544,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() { @@ -762,27 +748,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; @@ -1349,12 +1314,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); @@ -1624,38 +1583,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))) { diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h index 0c5dd9587..d61080345 100644 --- a/src/gui/osd_setup.h +++ b/src/gui/osd_setup.h @@ -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(); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index ce45c54eb..1f535cd19 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -367,7 +367,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); @@ -1190,7 +1189,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); diff --git a/src/system/locals.h b/src/system/locals.h index 596726afe..2c4640ad6 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -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, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 74bd00449..c4da6bd05 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -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", diff --git a/src/system/settings.h b/src/system/settings.h index 782a50d2a..b9b6392b1 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -840,7 +840,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;