mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

rework screen A/B settings

Browse Source 
Conflicts:
	src/neutrino.cpp
This commit is contained in:
BPanther
2021-03-31 22:15:28 +02:00
committed by Thilo Graf
parent fe71518e50
commit 0189205fd1
6 changed files with 112 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/locale/deutsch.locale
View File

@@ -360,7 +360,7 @@ colormenu.fade Ein-/Ausblenden
colormenu.font Verwendete Schriftart colormenu.font Verwendete Schriftart
colormenu.font_ttx Videotext Schriftart colormenu.font_ttx Videotext Schriftart
colormenu.menucolors Themes colormenu.menucolors Themes
colormenu.osd_preset Monitor Auswahl colormenu.osd_preset Bildschirm Auswahl
colormenu.osd_resolution OSD-Auflösung colormenu.osd_resolution OSD-Auflösung
colormenu.progressbar_active Farbe des aktiven Teil colormenu.progressbar_active Farbe des aktiven Teil
colormenu.progressbar_passive Hintergrundfarbe colormenu.progressbar_passive Hintergrundfarbe
@@ -1520,7 +1520,7 @@ menu.hint_opkg_upgrade Aktualisiert alle installierten Pakete auf die neueste ve
menu.hint_osd Farben, Schriftarten, Anzeigegröße, Ansichtsoptionen der Menüs usw. menu.hint_osd Farben, Schriftarten, Anzeigegröße, Ansichtsoptionen der Menüs usw.
menu.hint_osd_behavior_infobar Infobar nach Zeitvorgabe oder manuell ein- oder ausblenden. menu.hint_osd_behavior_infobar Infobar nach Zeitvorgabe oder manuell ein- oder ausblenden.
menu.hint_osd_language Wählen Sie ihre Menü-Sprache menu.hint_osd_language Wählen Sie ihre Menü-Sprache
menu.hint_osd_preset Wählen Sie zwischen Monitor 1 und 2 für unterschiedliche Bildbereiche menu.hint_osd_preset Wählen Sie zwischen Bildschirm 1 und 2 für unterschiedliche Bildbereiche
menu.hint_osd_resolution Wählen Sie eine OSD-Auflösung menu.hint_osd_resolution Wählen Sie eine OSD-Auflösung
menu.hint_osd_timing OSD-Element nach Zeitvorgabe oder manuell ein- oder ausblenden. menu.hint_osd_timing OSD-Element nach Zeitvorgabe oder manuell ein- oder ausblenden.
menu.hint_other_fonts Ändern Sie andere Schriftgrößen menu.hint_other_fonts Ändern Sie andere Schriftgrößen
@@ -2272,8 +2272,8 @@ options.on.without_messages ohne Msg
options.serial seriell options.serial seriell
options.start starten options.start starten
options.stop stoppen options.stop stoppen
osd.preset_screen_a Monitor 1 osd.preset_screen_a Bildschirm 1
osd.preset_screen_b Monitor 2 osd.preset_screen_b Bildschirm 2
parentallock.bouquetmode Bouquets sind standardmässig parentallock.bouquetmode Bouquets sind standardmässig
parentallock.changepin PIN-Code festlegen parentallock.changepin PIN-Code festlegen
parentallock.changepin_hint1 Geben Sie hier Ihren neuen PIN-Code ein! parentallock.changepin_hint1 Geben Sie hier Ihren neuen PIN-Code ein!

4
src/gui/osd_setup.cpp
View File

@@ -421,8 +421,8 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
#define OSD_PRESET_OPTIONS_COUNT 2 #define OSD_PRESET_OPTIONS_COUNT 2
const CMenuOptionChooser::keyval_ext OSD_PRESET_OPTIONS[] = const CMenuOptionChooser::keyval_ext OSD_PRESET_OPTIONS[] =
{ {
{ COsdSetup::PRESET_LCD, LOCALE_OSD_PRESET_SCREEN_A }, { COsdSetup::PRESET_LCD_A, LOCALE_OSD_PRESET_SCREEN_A },
{ COsdSetup::PRESET_CRT, LOCALE_OSD_PRESET_SCREEN_B } { COsdSetup::PRESET_LCD_B, LOCALE_OSD_PRESET_SCREEN_B }
}; };
#define INFOBAR_CASYSTEM_MODE_OPTION_COUNT 4 #define INFOBAR_CASYSTEM_MODE_OPTION_COUNT 4

4
src/gui/osd_setup.h
View File

@@ -101,8 +101,8 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
enum enum
{ {
PRESET_LCD, PRESET_LCD_A,
PRESET_CRT PRESET_LCD_B
}; };
COsdSetup(int wizard_mode = SNeutrinoSettings::WIZARD_OFF); COsdSetup(int wizard_mode = SNeutrinoSettings::WIZARD_OFF);

44
src/gui/screensetup.cpp
View File

@@ -119,18 +119,18 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
case 1: case 1:
{ {
switch (g_settings.screen_preset) { switch (g_settings.screen_preset) {
case COsdSetup::PRESET_LCD: case COsdSetup::PRESET_LCD_B:
default: g_settings.screen_StartX_lcd_b_1 = g_settings.screen_StartX;
g_settings.screen_StartX_lcd_1 = g_settings.screen_StartX; g_settings.screen_StartY_lcd_b_1 = g_settings.screen_StartY;
g_settings.screen_StartY_lcd_1 = g_settings.screen_StartY; g_settings.screen_EndX_lcd_b_1 = g_settings.screen_EndX;
g_settings.screen_EndX_lcd_1 = g_settings.screen_EndX; g_settings.screen_EndY_lcd_b_1 = g_settings.screen_EndY;
g_settings.screen_EndY_lcd_1 = g_settings.screen_EndY;
break; break;
case COsdSetup::PRESET_CRT: case COsdSetup::PRESET_LCD_A:
g_settings.screen_StartX_crt_1 = g_settings.screen_StartX; default:
g_settings.screen_StartY_crt_1 = g_settings.screen_StartY; g_settings.screen_StartX_lcd_a_1 = g_settings.screen_StartX;
g_settings.screen_EndX_crt_1 = g_settings.screen_EndX; g_settings.screen_StartY_lcd_a_1 = g_settings.screen_StartY;
g_settings.screen_EndY_crt_1 = g_settings.screen_EndY; g_settings.screen_EndX_lcd_a_1 = g_settings.screen_EndX;
g_settings.screen_EndY_lcd_a_1 = g_settings.screen_EndY;
break; break;
} }
} }
@@ -140,18 +140,18 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
default: default:
{ {
switch (g_settings.screen_preset) { switch (g_settings.screen_preset) {
case COsdSetup::PRESET_LCD: case COsdSetup::PRESET_LCD_B:
default: g_settings.screen_StartX_lcd_b_0 = g_settings.screen_StartX;
g_settings.screen_StartX_lcd_0 = g_settings.screen_StartX; g_settings.screen_StartY_lcd_b_0 = g_settings.screen_StartY;
g_settings.screen_StartY_lcd_0 = g_settings.screen_StartY; g_settings.screen_EndX_lcd_b_0 = g_settings.screen_EndX;
g_settings.screen_EndX_lcd_0 = g_settings.screen_EndX; g_settings.screen_EndY_lcd_b_0 = g_settings.screen_EndY;
g_settings.screen_EndY_lcd_0 = g_settings.screen_EndY;
break; break;
case COsdSetup::PRESET_CRT: case COsdSetup::PRESET_LCD_A:
g_settings.screen_StartX_crt_0 = g_settings.screen_StartX; default:
g_settings.screen_StartY_crt_0 = g_settings.screen_StartY; g_settings.screen_StartX_lcd_a_0 = g_settings.screen_StartX;
g_settings.screen_EndX_crt_0 = g_settings.screen_EndX; g_settings.screen_StartY_lcd_a_0 = g_settings.screen_StartY;
g_settings.screen_EndY_crt_0 = g_settings.screen_EndY; g_settings.screen_EndX_lcd_a_0 = g_settings.screen_EndX;
g_settings.screen_EndY_lcd_a_0 = g_settings.screen_EndY;
break; break;
} }
} }

127
src/neutrino.cpp
View File

@@ -935,23 +935,28 @@ int CNeutrinoApp::loadSetup(const char * fname)
#endif #endif
g_settings.osd_resolution = (osd_resolution_tmp == -1) ? configfile.getInt32("osd_resolution", osd_res) : osd_resolution_tmp; g_settings.osd_resolution = (osd_resolution_tmp == -1) ? configfile.getInt32("osd_resolution", osd_res) : osd_resolution_tmp;
COsdHelpers::getInstance()->g_settings_osd_resolution_save = g_settings.osd_resolution; COsdHelpers::getInstance()->g_settings_osd_resolution_save = g_settings.osd_resolution;
g_settings.screen_StartX_crt_0 = configfile.getInt32("screen_StartX_crt_0", 80);
g_settings.screen_StartY_crt_0 = configfile.getInt32("screen_StartY_crt_0", 45); // default for fullpixel
g_settings.screen_EndX_crt_0 = configfile.getInt32("screen_EndX_crt_0" , 1280 - g_settings.screen_StartX_crt_0 - 1); g_settings.screen_StartX_lcd_a_0 = configfile.getInt32("screen_StartX_lcd_a_0", 0);
g_settings.screen_EndY_crt_0 = configfile.getInt32("screen_EndY_crt_0" , 580 - g_settings.screen_StartY_crt_0 - 1); g_settings.screen_StartY_lcd_a_0 = configfile.getInt32("screen_StartY_lcd_a_0", 0);
g_settings.screen_StartX_lcd_0 = configfile.getInt32("screen_StartX_lcd_0", 40); g_settings.screen_EndX_lcd_a_0 = configfile.getInt32("screen_EndX_lcd_a_0" , 1280 - g_settings.screen_StartX_lcd_a_0 - 1);
g_settings.screen_StartY_lcd_0 = configfile.getInt32("screen_StartY_lcd_0", 25); g_settings.screen_EndY_lcd_a_0 = configfile.getInt32("screen_EndY_lcd_a_0" , 720 - g_settings.screen_StartY_lcd_a_0 - 1);
g_settings.screen_EndX_lcd_0 = configfile.getInt32("screen_EndX_lcd_0" , 1280 - g_settings.screen_StartX_lcd_0 - 1); g_settings.screen_StartX_lcd_a_1 = configfile.getInt32("screen_StartX_lcd_a_1", 0);
g_settings.screen_EndY_lcd_0 = configfile.getInt32("screen_EndY_lcd_0" , 720 - g_settings.screen_StartY_lcd_0 - 1); g_settings.screen_StartY_lcd_a_1 = configfile.getInt32("screen_StartY_lcd_a_1", 0);
g_settings.screen_StartX_crt_1 = configfile.getInt32("screen_StartX_crt_1", 80); g_settings.screen_EndX_lcd_a_1 = configfile.getInt32("screen_EndX_lcd_a_1" , 1920 - g_settings.screen_StartX_lcd_a_1 - 1);
g_settings.screen_StartY_crt_1 = configfile.getInt32("screen_StartY_crt_1", 45); g_settings.screen_EndY_lcd_a_1 = configfile.getInt32("screen_EndY_lcd_a_1" , 1080 - g_settings.screen_StartY_lcd_a_1 - 1);
g_settings.screen_EndX_crt_1 = configfile.getInt32("screen_EndX_crt_1" , 1920 - g_settings.screen_StartX_crt_1 - 1);
g_settings.screen_EndY_crt_1 = configfile.getInt32("screen_EndY_crt_1" , 870 - g_settings.screen_StartY_crt_1 - 1); // default for non fullpixel
g_settings.screen_StartX_lcd_1 = configfile.getInt32("screen_StartX_lcd_1", 40); g_settings.screen_StartX_lcd_b_0 = configfile.getInt32("screen_StartX_lcd_b_0", 22);
g_settings.screen_StartY_lcd_1 = configfile.getInt32("screen_StartY_lcd_1", 25); g_settings.screen_StartY_lcd_b_0 = configfile.getInt32("screen_StartY_lcd_b_0", 12);
g_settings.screen_EndX_lcd_1 = configfile.getInt32("screen_EndX_lcd_1" , 1920 - g_settings.screen_StartX_lcd_1 - 1); g_settings.screen_EndX_lcd_b_0 = configfile.getInt32("screen_EndX_lcd_b_0" , 1259 - g_settings.screen_StartX_lcd_b_0 - 1);
g_settings.screen_EndY_lcd_1 = configfile.getInt32("screen_EndY_lcd_1" , 1080 - g_settings.screen_StartY_lcd_1 - 1); g_settings.screen_EndY_lcd_b_0 = configfile.getInt32("screen_EndY_lcd_b_0" , 708 - g_settings.screen_StartY_lcd_b_0 - 1);
g_settings.screen_preset = configfile.getInt32("screen_preset", COsdSetup::PRESET_LCD); g_settings.screen_StartX_lcd_b_1 = configfile.getInt32("screen_StartX_lcd_b_1", 33);
g_settings.screen_StartY_lcd_b_1 = configfile.getInt32("screen_StartY_lcd_b_1", 18);
g_settings.screen_EndX_lcd_b_1 = configfile.getInt32("screen_EndX_lcd_b_1" , 1888 - g_settings.screen_StartX_lcd_b_1 - 1);
g_settings.screen_EndY_lcd_b_1 = configfile.getInt32("screen_EndY_lcd_b_1" , 1062 - g_settings.screen_StartY_lcd_b_1 - 1);
g_settings.screen_preset = configfile.getInt32("screen_preset", COsdSetup::PRESET_LCD_A);
setScreenSettings(); setScreenSettings();
// avoid configuration mismatch // avoid configuration mismatch
@@ -1235,18 +1240,18 @@ void CNeutrinoApp::setScreenSettings()
case 1: case 1:
{ {
switch (g_settings.screen_preset) { switch (g_settings.screen_preset) {
case COsdSetup::PRESET_CRT: case COsdSetup::PRESET_LCD_B:
g_settings.screen_StartX = g_settings.screen_StartX_crt_1; g_settings.screen_StartX = g_settings.screen_StartX_lcd_b_1;
g_settings.screen_StartY = g_settings.screen_StartY_crt_1; g_settings.screen_StartY = g_settings.screen_StartY_lcd_b_1;
g_settings.screen_EndX = g_settings.screen_EndX_crt_1; g_settings.screen_EndX = g_settings.screen_EndX_lcd_b_1;
g_settings.screen_EndY = g_settings.screen_EndY_crt_1; g_settings.screen_EndY = g_settings.screen_EndY_lcd_b_1;
break; break;
case COsdSetup::PRESET_LCD: case COsdSetup::PRESET_LCD_A:
default: default:
g_settings.screen_StartX = g_settings.screen_StartX_lcd_1; g_settings.screen_StartX = g_settings.screen_StartX_lcd_a_1;
g_settings.screen_StartY = g_settings.screen_StartY_lcd_1; g_settings.screen_StartY = g_settings.screen_StartY_lcd_a_1;
g_settings.screen_EndX = g_settings.screen_EndX_lcd_1; g_settings.screen_EndX = g_settings.screen_EndX_lcd_a_1;
g_settings.screen_EndY = g_settings.screen_EndY_lcd_1; g_settings.screen_EndY = g_settings.screen_EndY_lcd_a_1;
break; break;
} }
} }
@@ -1256,18 +1261,18 @@ void CNeutrinoApp::setScreenSettings()
default: default:
{ {
switch (g_settings.screen_preset) { switch (g_settings.screen_preset) {
case COsdSetup::PRESET_CRT: case COsdSetup::PRESET_LCD_B:
g_settings.screen_StartX = g_settings.screen_StartX_crt_0; g_settings.screen_StartX = g_settings.screen_StartX_lcd_b_0;
g_settings.screen_StartY = g_settings.screen_StartY_crt_0; g_settings.screen_StartY = g_settings.screen_StartY_lcd_b_0;
g_settings.screen_EndX = g_settings.screen_EndX_crt_0; g_settings.screen_EndX = g_settings.screen_EndX_lcd_b_0;
g_settings.screen_EndY = g_settings.screen_EndY_crt_0; g_settings.screen_EndY = g_settings.screen_EndY_lcd_b_0;
break; break;
case COsdSetup::PRESET_LCD: case COsdSetup::PRESET_LCD_A:
default: default:
g_settings.screen_StartX = g_settings.screen_StartX_lcd_0; g_settings.screen_StartX = g_settings.screen_StartX_lcd_a_0;
g_settings.screen_StartY = g_settings.screen_StartY_lcd_0; g_settings.screen_StartY = g_settings.screen_StartY_lcd_a_0;
g_settings.screen_EndX = g_settings.screen_EndX_lcd_0; g_settings.screen_EndX = g_settings.screen_EndX_lcd_a_0;
g_settings.screen_EndY = g_settings.screen_EndY_lcd_0; g_settings.screen_EndY = g_settings.screen_EndY_lcd_a_0;
break; break;
} }
} }
@@ -1820,22 +1825,22 @@ void CNeutrinoApp::saveSetup(const char * fname)
//screen configuration //screen configuration
configfile.setInt32("osd_resolution" , COsdHelpers::getInstance()->g_settings_osd_resolution_save); configfile.setInt32("osd_resolution" , COsdHelpers::getInstance()->g_settings_osd_resolution_save);
configfile.setInt32("screen_StartX_lcd_0", g_settings.screen_StartX_lcd_0); configfile.setInt32("screen_StartX_lcd_a_0", g_settings.screen_StartX_lcd_a_0);
configfile.setInt32("screen_StartY_lcd_0", g_settings.screen_StartY_lcd_0); configfile.setInt32("screen_StartY_lcd_a_0", g_settings.screen_StartY_lcd_a_0);
configfile.setInt32("screen_EndX_lcd_0" , g_settings.screen_EndX_lcd_0); configfile.setInt32("screen_EndX_lcd_a_0" , g_settings.screen_EndX_lcd_a_0);
configfile.setInt32("screen_EndY_lcd_0" , g_settings.screen_EndY_lcd_0); configfile.setInt32("screen_EndY_lcd_a_0" , g_settings.screen_EndY_lcd_a_0);
configfile.setInt32("screen_StartX_crt_0", g_settings.screen_StartX_crt_0); configfile.setInt32("screen_StartX_lcd_a_1", g_settings.screen_StartX_lcd_a_1);
configfile.setInt32("screen_StartY_crt_0", g_settings.screen_StartY_crt_0); configfile.setInt32("screen_StartY_lcd_a_1", g_settings.screen_StartY_lcd_a_1);
configfile.setInt32("screen_EndX_crt_0" , g_settings.screen_EndX_crt_0); configfile.setInt32("screen_EndX_lcd_a_1" , g_settings.screen_EndX_lcd_a_1);
configfile.setInt32("screen_EndY_crt_0" , g_settings.screen_EndY_crt_0); configfile.setInt32("screen_EndY_lcd_a_1" , g_settings.screen_EndY_lcd_a_1);
configfile.setInt32("screen_StartX_lcd_1", g_settings.screen_StartX_lcd_1); configfile.setInt32("screen_StartX_lcd_b_0", g_settings.screen_StartX_lcd_b_0);
configfile.setInt32("screen_StartY_lcd_1", g_settings.screen_StartY_lcd_1); configfile.setInt32("screen_StartY_lcd_b_0", g_settings.screen_StartY_lcd_b_0);
configfile.setInt32("screen_EndX_lcd_1" , g_settings.screen_EndX_lcd_1); configfile.setInt32("screen_EndX_lcd_b_0" , g_settings.screen_EndX_lcd_b_0);
configfile.setInt32("screen_EndY_lcd_1" , g_settings.screen_EndY_lcd_1); configfile.setInt32("screen_EndY_lcd_b_0" , g_settings.screen_EndY_lcd_b_0);
configfile.setInt32("screen_StartX_crt_1", g_settings.screen_StartX_crt_1); configfile.setInt32("screen_StartX_lcd_b_1", g_settings.screen_StartX_lcd_b_1);
configfile.setInt32("screen_StartY_crt_1", g_settings.screen_StartY_crt_1); configfile.setInt32("screen_StartY_lcd_b_1", g_settings.screen_StartY_lcd_b_1);
configfile.setInt32("screen_EndX_crt_1" , g_settings.screen_EndX_crt_1); configfile.setInt32("screen_EndX_lcd_b_1" , g_settings.screen_EndX_lcd_b_1);
configfile.setInt32("screen_EndY_crt_1" , g_settings.screen_EndY_crt_1); configfile.setInt32("screen_EndY_lcd_b_1" , g_settings.screen_EndY_lcd_b_1);
configfile.setInt32("screen_preset" , g_settings.screen_preset); configfile.setInt32("screen_preset" , g_settings.screen_preset);
//Software-update //Software-update
@@ -5895,14 +5900,14 @@ static struct __key_rename key_rename[] = {
{ "casystem_display", "infobar_casystem_display" }, { "casystem_display", "infobar_casystem_display" },
{ "casystem_dotmatrix", "infobar_casystem_dotmatrix"}, { "casystem_dotmatrix", "infobar_casystem_dotmatrix"},
{ "casystem_frame", "infobar_casystem_frame" }, { "casystem_frame", "infobar_casystem_frame" },
{ "screen_StartX_crt", "screen_StartX_crt_0" }, { "screen_StartX_lcd", "screen_StartX_lcd_a_0" },
{ "screen_StartY_crt", "screen_StartY_crt_0" }, { "screen_StartY_lcd", "screen_StartY_lcd_a_0" },
{ "screen_EndX_crt", "screen_EndX_crt_0" }, { "screen_EndX_lcd", "screen_EndX_lcd_a_0" },
{ "screen_EndY_crt", "screen_EndY_crt_0" }, { "screen_EndY_lcd", "screen_EndY_lcd_a_0" },
{ "screen_StartX_lcd", "screen_StartX_lcd_0" }, { "screen_StartX_crt", "screen_StartX_lcd_b_0" },
{ "screen_StartY_lcd", "screen_StartY_lcd_0" }, { "screen_StartY_crt", "screen_StartY_lcd_b_0" },
{ "screen_EndX_lcd", "screen_EndX_lcd_0" }, { "screen_EndX_crt", "screen_EndX_lcd_b_0" },
{ "screen_EndY_lcd", "screen_EndY_lcd_0" }, { "screen_EndY_crt", "screen_EndY_lcd_b_0" },
{ "timing.infobar_movieplayer", "timing.infobar_media_video" }, { "timing.infobar_movieplayer", "timing.infobar_media_video" },
{ "ci_clock", "ci_clock_0" }, { "ci_clock", "ci_clock_0" },
{ "ci_save_pincode", "ci_save_pincode_0" }, { "ci_save_pincode", "ci_save_pincode_0" },

32
src/system/settings.h
View File

@@ -801,22 +801,22 @@ struct SNeutrinoSettings
int screen_StartY; int screen_StartY;
int screen_EndX; int screen_EndX;
int screen_EndY; int screen_EndY;
int screen_StartX_crt_0; int screen_StartX_lcd_a_0;
int screen_StartY_crt_0; int screen_StartY_lcd_a_0;
int screen_EndX_crt_0; int screen_EndX_lcd_a_0;
int screen_EndY_crt_0; int screen_EndY_lcd_a_0;
int screen_StartX_lcd_0; int screen_StartX_lcd_a_1;
int screen_StartY_lcd_0; int screen_StartY_lcd_a_1;
int screen_EndX_lcd_0; int screen_EndX_lcd_a_1;
int screen_EndY_lcd_0; int screen_EndY_lcd_a_1;
int screen_StartX_crt_1; int screen_StartX_lcd_b_0;
int screen_StartY_crt_1; int screen_StartY_lcd_b_0;
int screen_EndX_crt_1; int screen_EndX_lcd_b_0;
int screen_EndY_crt_1; int screen_EndY_lcd_b_0;
int screen_StartX_lcd_1; int screen_StartX_lcd_b_1;
int screen_StartY_lcd_1; int screen_StartY_lcd_b_1;
int screen_EndX_lcd_1; int screen_EndX_lcd_b_1;
int screen_EndY_lcd_1; int screen_EndY_lcd_b_1;
int osd_resolution; int osd_resolution;
int screen_preset; int screen_preset;
int screen_width; int screen_width;