From d90aa919c15a30dd549ed77765c78b94e615acd1 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 17 Jun 2015 21:36:42 +0200 Subject: [PATCH] infoviewer_bb: show/hide dotmatrix in CA-bar; default show Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/59e2143e001419af72121abc7b9a919f5a9228e1 Author: vanhofen Date: 2015-06-17 (Wed, 17 Jun 2015) Origin message was: ------------------ - infoviewer_bb: show/hide dotmatrix in CA-bar; default show ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 2 ++ data/locale/english.locale | 2 ++ src/gui/infoviewer_bb.cpp | 3 +++ src/gui/osd_setup.cpp | 5 +++++ src/neutrino.cpp | 2 ++ src/system/locals.h | 2 ++ src/system/locals_intern.h | 2 ++ src/system/settings.h | 1 + 8 files changed, 19 insertions(+) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index bcb7275fc..0e64321c2 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1002,6 +1002,7 @@ menu.hint_inet_radio Internetradio menu.hint_info Informationen über das Image, CPU, Arbeitsspeicher und Stream und mehr menu.hint_infobar_back Ändern Sie die Hintergrundfarbe für die Infobar menu.hint_infobar_casys ein: zeigt alle Aktiven farbig, Mini: einzelnes Symbol ob gespeert, Diskret: alle Aktiven CA-Systeme +menu.hint_infobar_casys_dotmatrix ein: CA-Systemanzeige mit Punktematrix im Hintergrund menu.hint_infobar_casys_frame ein: CA-Systemanzeige mit Rahmen menu.hint_infobar_dd Zeigt ein Dolby Digital Icon bei Verfügbarkeit menu.hint_infobar_filesys Zeigen den vom Flash- und einer HDD verwendeten Speicherplatz @@ -1425,6 +1426,7 @@ miscsettings.general Allgemein miscsettings.head Erweitert miscsettings.infobar Infobar miscsettings.infobar_casystem_display CA-System Anzeige +miscsettings.infobar_casystem_dotmatrix CA-Anzeige mit Punktematrix miscsettings.infobar_casystem_frame CA-Anzeige mit Rahmen miscsettings.infobar_casystem_mini Mini miscsettings.infobar_casystem_mode Diskret diff --git a/data/locale/english.locale b/data/locale/english.locale index 76d0cc1a8..90659566a 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1004,6 +1004,7 @@ menu.hint_inet_radio Internet radio menu.hint_info Information about image, box cpu and storage,\nstream information menu.hint_infobar_back Change infobar background color menu.hint_infobar_casys On: display all with colored active, mini: single\nlocked icon, descreet: all active ca-sys +menu.hint_infobar_casys_dotmatrix on: CA-System with dot matrix in background menu.hint_infobar_casys_frame on: CA-System with frame menu.hint_infobar_dd Show DD icon menu.hint_infobar_filesys Show flash and HDD used space levels @@ -1427,6 +1428,7 @@ miscsettings.general General miscsettings.head Extended settings miscsettings.infobar Infobar miscsettings.infobar_casystem_display CA-System Display +miscsettings.infobar_casystem_dotmatrix CA-Display with dot matrix miscsettings.infobar_casystem_frame CA-Display with frame miscsettings.infobar_casystem_mini mini miscsettings.infobar_casystem_mode discreet diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 0b18bc733..c45f80551 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -841,6 +841,9 @@ void CInfoViewerBB::paintCA_bar(int left, int right) else frameBuffer->paintBox(g_InfoViewer->ChanInfoX + (right*4), g_InfoViewer->BoxEndY, g_InfoViewer->BoxEndX - (left*4), g_InfoViewer->BoxEndY + bottom_bar_offset, COL_BLACK); + if (!g_settings.casystem_dotmatrix) //don't show dotmatrix + return; + if (left) left -= 1; diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 9291716c3..6d7b1c514 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -996,6 +996,11 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) mc->setHint("", LOCALE_MENU_HINT_INFOBAR_CASYS); menu_infobar->addItem(mc); + // CA system dotmatrix + mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DOTMATRIX, &g_settings.casystem_dotmatrix, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.casystem_display < 2); + mc->setHint("", LOCALE_MENU_HINT_INFOBAR_CASYS_DOTMATRIX); + menu_infobar->addItem(mc); + // CA system frame mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_FRAME, &g_settings.casystem_frame, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.casystem_display < 2); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_CASYS_FRAME); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 197587457..427d7d97d 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -473,6 +473,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.infobar_show_channellogo = configfile.getInt32("infobar_show_channellogo" , 3 ); g_settings.infobar_progressbar = configfile.getInt32("infobar_progressbar" , 1 ); // below channel name g_settings.casystem_display = configfile.getInt32("casystem_display", 1 );//discreet ca mode default + g_settings.casystem_dotmatrix = configfile.getInt32("casystem_dotmatrix", 1 ); g_settings.casystem_frame = configfile.getInt32("casystem_frame", 0 ); g_settings.scrambled_message = configfile.getBool("scrambled_message", true ); g_settings.volume_pos = configfile.getInt32("volume_pos", CVolumeBar::VOLUMEBAR_POS_TOP_RIGHT ); @@ -1007,6 +1008,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32("infobar_show_channellogo" , g_settings.infobar_show_channellogo ); configfile.setInt32("infobar_progressbar" , g_settings.infobar_progressbar ); configfile.setInt32("casystem_display" , g_settings.casystem_display ); + configfile.setInt32("casystem_dotmatrix" , g_settings.casystem_dotmatrix ); configfile.setInt32("casystem_frame" , g_settings.casystem_frame ); configfile.setBool("scrambled_message" , g_settings.scrambled_message ); configfile.setInt32("volume_pos" , g_settings.volume_pos ); diff --git a/src/system/locals.h b/src/system/locals.h index 4b630469b..c9442bc76 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1031,6 +1031,7 @@ typedef enum LOCALE_MENU_HINT_INFO, LOCALE_MENU_HINT_INFOBAR_BACK, LOCALE_MENU_HINT_INFOBAR_CASYS, + LOCALE_MENU_HINT_INFOBAR_CASYS_DOTMATRIX, LOCALE_MENU_HINT_INFOBAR_CASYS_FRAME, LOCALE_MENU_HINT_INFOBAR_DD, LOCALE_MENU_HINT_INFOBAR_FILESYS, @@ -1454,6 +1455,7 @@ typedef enum LOCALE_MISCSETTINGS_HEAD, LOCALE_MISCSETTINGS_INFOBAR, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, + LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DOTMATRIX, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_FRAME, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MINI, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 649debff3..e018ee172 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1031,6 +1031,7 @@ const char * locale_real_names[] = "menu.hint_info", "menu.hint_infobar_back", "menu.hint_infobar_casys", + "menu.hint_infobar_casys_dotmatrix", "menu.hint_infobar_casys_frame", "menu.hint_infobar_dd", "menu.hint_infobar_filesys", @@ -1454,6 +1455,7 @@ const char * locale_real_names[] = "miscsettings.head", "miscsettings.infobar", "miscsettings.infobar_casystem_display", + "miscsettings.infobar_casystem_dotmatrix", "miscsettings.infobar_casystem_frame", "miscsettings.infobar_casystem_mini", "miscsettings.infobar_casystem_mode", diff --git a/src/system/settings.h b/src/system/settings.h index 2424cedb5..c5ce5bf31 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -167,6 +167,7 @@ struct SNeutrinoSettings int progressbar_timescale_yellow; int progressbar_timescale_invert; int casystem_display; + int casystem_dotmatrix; int casystem_frame; int scrambled_message; int volume_pos;