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

infoviewer_bb: show/hide dotmatrix in CA-bar; default show

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59e2143e00
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2015-06-17 21:36:42 +02:00
parent f942f65e70
commit d90aa919c1
8 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -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

2
data/locale/english.locale
View File

@@ -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

3
src/gui/infoviewer_bb.cpp
View File

@@ -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;

5
src/gui/osd_setup.cpp
View File

@@ -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);

2
src/neutrino.cpp
View File

@@ -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 );

2
src/system/locals.h
View File

@@ -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,

2
src/system/locals_intern.h
View File

@@ -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",

1
src/system/settings.h
View File

@@ -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;