diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 1584dbbca..636bf110b 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1045,7 +1045,7 @@ lcd4l_skin_0 Standard lcd4l_skin_1 Groß lcd4l_skin_2 Klein (SysInfo) lcd4l_skin_3 d-box2 -lcd4l_skin_4 Benutzer +lcd4l_skin_100 Benutzer lcd4l_skin_radio Radio-Style aktivieren lcd4l_support LCD4Linux-Unterstützung lcd4l_support_auto automatisch diff --git a/data/locale/english.locale b/data/locale/english.locale index b74fb6063..cb6600b74 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1045,7 +1045,7 @@ lcd4l_skin_0 Standard lcd4l_skin_1 Large lcd4l_skin_2 Small (SysInfo) lcd4l_skin_3 d-box2 -lcd4l_skin_4 User +lcd4l_skin_100 User lcd4l_skin_radio Activate radio style lcd4l_support LCD4Linux support lcd4l_support_auto automatic diff --git a/src/driver/lcd4l.cpp b/src/driver/lcd4l.cpp index 001c604f8..acb8c9932 100644 --- a/src/driver/lcd4l.cpp +++ b/src/driver/lcd4l.cpp @@ -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: diff --git a/src/gui/lcd4l_setup.cpp b/src/gui/lcd4l_setup.cpp index 0637ab439..23c0f9cc8 100644 --- a/src/gui/lcd4l_setup.cpp +++ b/src/gui/lcd4l_setup.cpp @@ -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)) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 2f87ef19e..7a9a2deaa 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -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); diff --git a/src/system/locals.h b/src/system/locals.h index 524633fb9..672d15edf 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -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, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 54f30e420..3badd8ec6 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -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", diff --git a/version_pseudo.h b/version_pseudo.h index a537bcba7..98d5e6f7d 100644 --- a/version_pseudo.h +++ b/version_pseudo.h @@ -1 +1 @@ -#define NEUTRINO_VERSION_PSEUDO "20181216000000" +#define NEUTRINO_VERSION_PSEUDO "20190106000000"