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

lcd4l: move user skin from value 4 to value 100

Browse Source 
Origin commit data
------------------
Commit: ad3a5403d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-07 (Mon, 07 Jan 2019)

Origin message was:
------------------
- lcd4l: move user skin from value 4 to value 100
This commit is contained in:
vanhofen
2019-01-07 00:15:39 +01:00
parent c829b7fc7b
commit 7506c197b8
8 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/lcd4l.cpp
View File

@@ -767,7 +767,7 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
{
switch (g_settings.lcd4l_skin)
{
case 4:
case 100:
Layout = DisplayType + "user";
break;
case 3:

4
src/gui/lcd4l_setup.cpp
View File

@@ -78,14 +78,14 @@ const CMenuOptionChooser::keyval LCD4L_PEARL_SKIN_OPTIONS[] =
{ 1, LOCALE_LCD4L_SKIN_1 },
{ 2, LOCALE_LCD4L_SKIN_2 },
{ 3, LOCALE_LCD4L_SKIN_3 },
{ 4, LOCALE_LCD4L_SKIN_4 }
{ 100, LOCALE_LCD4L_SKIN_100 }
};
#define LCD4L_PEARL_SKIN_OPTION_COUNT (sizeof(LCD4L_PEARL_SKIN_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
const CMenuOptionChooser::keyval LCD4L_SAMSUNG_SKIN_OPTIONS[] =
{
{ 0, LOCALE_LCD4L_SKIN_0 },
{ 4, LOCALE_LCD4L_SKIN_4 }
{ 100, LOCALE_LCD4L_SKIN_100 }
};
#define LCD4L_SAMSUNG_SKIN_OPTION_COUNT (sizeof(LCD4L_SAMSUNG_SKIN_OPTIONS)/sizeof(CMenuOptionChooser::keyval))

6
src/neutrino.cpp
View File

@@ -1309,6 +1309,12 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
if (g_settings.key_zaphistory == 174)
g_settings.key_zaphistory = 102;
}
if (g_settings.version_pseudo < "20190106000000")
{
// move lcd4linux user skin from value 4 to value 100
if (g_settings.lcd4l_skin == 4)
g_settings.lcd4l_skin = 100;
}
g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
configfile.setString("version_pseudo", g_settings.version_pseudo);

2
src/system/locals.h
View File

@@ -1072,7 +1072,7 @@ typedef enum
LOCALE_LCD4L_SKIN_1,
LOCALE_LCD4L_SKIN_2,
LOCALE_LCD4L_SKIN_3,
LOCALE_LCD4L_SKIN_4,
LOCALE_LCD4L_SKIN_100,
LOCALE_LCD4L_SKIN_RADIO,
LOCALE_LCD4L_SUPPORT,
LOCALE_LCD4L_SUPPORT_AUTO,

2
src/system/locals_intern.h
View File

@@ -1072,7 +1072,7 @@ const char * locale_real_names[] =
"lcd4l_skin_1",
"lcd4l_skin_2",
"lcd4l_skin_3",
"lcd4l_skin_4",
"lcd4l_skin_100",
"lcd4l_skin_radio",
"lcd4l_support",
"lcd4l_support_auto",