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

glcdsetup: use beautiful material colors palette

Browse Source 
Origin commit data
------------------
Commit: 506f099ad9
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-06-13 (Sat, 13 Jun 2020)

Origin message was:
------------------
- glcdsetup: use beautiful material colors palette
This commit is contained in:
vanhofen
2020-06-13 12:56:03 +02:00
parent 24ce5b8e1e
commit acc71cfd40
6 changed files with 117 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
data/locale/deutsch.locale
View File

@@ -888,24 +888,27 @@ fsk.to_16 bis 16
fsk.to_7 bis 7
glcd.brightness Helligkeit
glcd.brightness_standby Helligkeit in Standby
glcd.color.amber Amber
glcd.color.black Schwarz
glcd.color.blue Blau
glcd.color.cyan Blaugrün
glcd.color.green Grün
glcd.color.magenta Magenta
glcd.color.red Rot
glcd.color.white Weiss
glcd.color.yellow Gelb
glcd.color.orange Orange
glcd.color.light_gray Hellgrau
glcd.color.bluegray Blaugrau
glcd.color.brown Braun
glcd.color.cyan Cyan
glcd.color.deeporange Dunkles Orange
glcd.color.deeppurple Dunkles Lila
glcd.color.gray Grau
glcd.color.dark_gray Dunkelgrau
glcd.color.dark_red Dunkelrot
glcd.color.dark_green Dunkelgrün
glcd.color.dark_blue Dunkelblau
glcd.color.purple Purple
glcd.color.mint Mint
glcd.color.golden Golden
glcd.color.green Grün
glcd.color.indigo Indigo
glcd.color.lightblue Helles Blau
glcd.color.lightgreen Helles Grün
glcd.color.lime Lime
glcd.color.orange Orange
glcd.color.pink Pink
glcd.color.purple Lila
glcd.color.red Rot
glcd.color.teal Teal
glcd.color.white Weiß
glcd.color.yellow Gelb
glcd.display Display-Typ
glcd.enable GraphLCD aktiv
glcd.font Schrift

27
data/locale/english.locale
View File

@@ -888,24 +888,27 @@ fsk.to_16 to 16
fsk.to_7 to 7
glcd.brightness Brightness
glcd.brightness_standby Brightness in standby
glcd.color.amber Amber
glcd.color.black Black
glcd.color.blue Blue
glcd.color.cyan Blue-Green
glcd.color.bluegray Bluegray
glcd.color.brown Brown
glcd.color.cyan Cyan
glcd.color.deeporange Deep Orange
glcd.color.deeppurple Deep Purple
glcd.color.gray Gray
glcd.color.green Green
glcd.color.magenta Magenta
glcd.color.indigo Indigo
glcd.color.lightblue Light Blau
glcd.color.lightgreen Light Green
glcd.color.lime Lime
glcd.color.orange Orange
glcd.color.pink Pink
glcd.color.purple Purple
glcd.color.red Red
glcd.color.teal Teal
glcd.color.white White
glcd.color.yellow Yellow
glcd.color.orange Orange
glcd.color.light_gray Light Gray
glcd.color.gray Gray
glcd.color.dark_gray Dark Gray
glcd.color.dark_red Dark Red
glcd.color.dark_green Dark Green
glcd.color.dark_blue Dark Blue
glcd.color.purple Purple
glcd.color.mint Mint
glcd.color.golden Golden
glcd.display Display type
glcd.enable GraphLCD enabled
glcd.font Font

99
src/gui/glcdsetup.cpp
View File

@@ -39,42 +39,50 @@
#define KEY_GLCD_BLACK 0
#define KEY_GLCD_WHITE 1
#define KEY_GLCD_RED 2
#define KEY_GLCD_GREEN 3
#define KEY_GLCD_BLUE 4
#define KEY_GLCD_MAGENTA 5
#define KEY_GLCD_CYAN 6
#define KEY_GLCD_YELLOW 7
#define KEY_GLCD_ORANGE 8
#define KEY_GLCD_LIGHT_GRAY 9
#define KEY_GLCD_GRAY 10
#define KEY_GLCD_DARK_GRAY 11
#define KEY_GLCD_DARK_RED 12
#define KEY_GLCD_DARK_GREEN 13
#define KEY_GLCD_DARK_BLUE 14
#define KEY_GLCD_PURPLE 15
#define KEY_GLCD_MINT 16
#define KEY_GLCD_GOLDEN 17
#define GLCD_COLOR_OPTION_COUNT 18
#define KEY_GLCD_PINK 3
#define KEY_GLCD_PURPLE 4
#define KEY_GLCD_DEEPPURPLE 5
#define KEY_GLCD_INDIGO 6
#define KEY_GLCD_BLUE 7
#define KEY_GLCD_LIGHTBLUE 8
#define KEY_GLCD_CYAN 9
#define KEY_GLCD_TEAL 10
#define KEY_GLCD_GREEN 11
#define KEY_GLCD_LIGHTGREEN 12
#define KEY_GLCD_LIME 13
#define KEY_GLCD_YELLOW 14
#define KEY_GLCD_AMBER 15
#define KEY_GLCD_ORANGE 16
#define KEY_GLCD_DEEPORANGE 17
#define KEY_GLCD_BROWN 18
#define KEY_GLCD_GRAY 19
#define KEY_GLCD_BLUEGRAY 20
#define GLCD_COLOR_OPTION_COUNT 21
static const CMenuOptionChooser::keyval GLCD_COLOR_OPTIONS[GLCD_COLOR_OPTION_COUNT] =
{
{ KEY_GLCD_BLACK, LOCALE_GLCD_COLOR_BLACK },
{ KEY_GLCD_WHITE, LOCALE_GLCD_COLOR_WHITE },
{ KEY_GLCD_RED, LOCALE_GLCD_COLOR_RED },
{ KEY_GLCD_GREEN, LOCALE_GLCD_COLOR_GREEN },
{ KEY_GLCD_BLUE, LOCALE_GLCD_COLOR_BLUE },
{ KEY_GLCD_MAGENTA, LOCALE_GLCD_COLOR_MAGENTA },
{ KEY_GLCD_CYAN, LOCALE_GLCD_COLOR_CYAN },
{ KEY_GLCD_YELLOW, LOCALE_GLCD_COLOR_YELLOW },
{ KEY_GLCD_ORANGE, LOCALE_GLCD_COLOR_ORANGE },
{ KEY_GLCD_LIGHT_GRAY, LOCALE_GLCD_COLOR_LIGHT_GRAY },
{ KEY_GLCD_GRAY, LOCALE_GLCD_COLOR_GRAY },
{ KEY_GLCD_DARK_GRAY, LOCALE_GLCD_COLOR_DARK_GRAY },
{ KEY_GLCD_DARK_RED, LOCALE_GLCD_COLOR_DARK_RED },
{ KEY_GLCD_DARK_GREEN, LOCALE_GLCD_COLOR_DARK_GREEN },
{ KEY_GLCD_DARK_BLUE, LOCALE_GLCD_COLOR_DARK_BLUE },
{ KEY_GLCD_PINK, LOCALE_GLCD_COLOR_PINK },
{ KEY_GLCD_PURPLE, LOCALE_GLCD_COLOR_PURPLE },
{ KEY_GLCD_MINT, LOCALE_GLCD_COLOR_MINT },
{ KEY_GLCD_GOLDEN, LOCALE_GLCD_COLOR_GOLDEN }
{ KEY_GLCD_DEEPPURPLE, LOCALE_GLCD_COLOR_DEEPPURPLE },
{ KEY_GLCD_INDIGO, LOCALE_GLCD_COLOR_INDIGO },
{ KEY_GLCD_BLUE, LOCALE_GLCD_COLOR_BLUE },
{ KEY_GLCD_LIGHTBLUE, LOCALE_GLCD_COLOR_LIGHTBLUE },
{ KEY_GLCD_CYAN, LOCALE_GLCD_COLOR_CYAN },
{ KEY_GLCD_TEAL, LOCALE_GLCD_COLOR_TEAL },
{ KEY_GLCD_GREEN, LOCALE_GLCD_COLOR_GREEN },
{ KEY_GLCD_LIGHTGREEN, LOCALE_GLCD_COLOR_LIGHTGREEN },
{ KEY_GLCD_LIME, LOCALE_GLCD_COLOR_LIME },
{ KEY_GLCD_YELLOW, LOCALE_GLCD_COLOR_YELLOW },
{ KEY_GLCD_AMBER, LOCALE_GLCD_COLOR_AMBER },
{ KEY_GLCD_ORANGE, LOCALE_GLCD_COLOR_ORANGE },
{ KEY_GLCD_DEEPORANGE, LOCALE_GLCD_COLOR_DEEPORANGE },
{ KEY_GLCD_BROWN, LOCALE_GLCD_COLOR_BROWN },
{ KEY_GLCD_GRAY, LOCALE_GLCD_COLOR_GRAY },
{ KEY_GLCD_BLUEGRAY, LOCALE_GLCD_COLOR_BLUEGRAY },
};
static const uint32_t colormap[GLCD_COLOR_OPTION_COUNT] =
@@ -82,21 +90,24 @@ static const uint32_t colormap[GLCD_COLOR_OPTION_COUNT] =
GLCD::cColor::Black,
GLCD::cColor::White,
GLCD::cColor::Red,
GLCD::cColor::Green,
GLCD::cColor::Blue,
GLCD::cColor::Magenta,
GLCD::cColor::Cyan,
GLCD::cColor::Yellow,
GLCD::cColor::Orange,
GLCD::cColor::Light_Gray,
GLCD::cColor::Gray,
GLCD::cColor::Dark_Gray,
GLCD::cColor::Dark_Red,
GLCD::cColor::Dark_Green,
GLCD::cColor::Dark_Blue,
GLCD::cColor::Pink,
GLCD::cColor::Purple,
GLCD::cColor::Mint,
GLCD::cColor::Golden
GLCD::cColor::DeepPurple,
GLCD::cColor::Indigo,
GLCD::cColor::Blue,
GLCD::cColor::LightBlue,
GLCD::cColor::Cyan,
GLCD::cColor::Teal,
GLCD::cColor::Green,
GLCD::cColor::LightGreen,
GLCD::cColor::Lime,
GLCD::cColor::Yellow,
GLCD::cColor::Amber,
GLCD::cColor::Orange,
GLCD::cColor::DeepOrange,
GLCD::cColor::Brown,
GLCD::cColor::Gray,
GLCD::cColor::BlueGray
};
int GLCD_Menu::color2index(uint32_t color) {

2
src/neutrino.cpp
View File

@@ -687,7 +687,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.glcd_enable = configfile.getInt32("glcd_enable", 1);
g_settings.glcd_color_fg = configfile.getInt32("glcd_color_fg", GLCD::cColor::White);
g_settings.glcd_color_bg = configfile.getInt32("glcd_color_bg", GLCD::cColor::Black);
g_settings.glcd_color_bar = configfile.getInt32("glcd_color_bar", GLCD::cColor::Blue);
g_settings.glcd_color_bar = configfile.getInt32("glcd_color_bar", GLCD::cColor::Gray);
g_settings.glcd_percent_channel = configfile.getInt32("glcd_percent_channel", 22);
g_settings.glcd_percent_epg = configfile.getInt32("glcd_percent_epg", 16);
g_settings.glcd_percent_bar = configfile.getInt32("glcd_percent_bar", 8);

25
src/system/locals.h
View File

@@ -915,24 +915,27 @@ typedef enum
LOCALE_FSK_TO_7,
LOCALE_GLCD_BRIGHTNESS,
LOCALE_GLCD_BRIGHTNESS_STANDBY,
LOCALE_GLCD_COLOR_AMBER,
LOCALE_GLCD_COLOR_BLACK,
LOCALE_GLCD_COLOR_BLUE,
LOCALE_GLCD_COLOR_BLUEGRAY,
LOCALE_GLCD_COLOR_BROWN,
LOCALE_GLCD_COLOR_CYAN,
LOCALE_GLCD_COLOR_DEEPORANGE,
LOCALE_GLCD_COLOR_DEEPPURPLE,
LOCALE_GLCD_COLOR_GRAY,
LOCALE_GLCD_COLOR_GREEN,
LOCALE_GLCD_COLOR_MAGENTA,
LOCALE_GLCD_COLOR_INDIGO,
LOCALE_GLCD_COLOR_LIGHTBLUE,
LOCALE_GLCD_COLOR_LIGHTGREEN,
LOCALE_GLCD_COLOR_LIME,
LOCALE_GLCD_COLOR_ORANGE,
LOCALE_GLCD_COLOR_PINK,
LOCALE_GLCD_COLOR_PURPLE,
LOCALE_GLCD_COLOR_RED,
LOCALE_GLCD_COLOR_TEAL,
LOCALE_GLCD_COLOR_WHITE,
LOCALE_GLCD_COLOR_YELLOW,
LOCALE_GLCD_COLOR_ORANGE,
LOCALE_GLCD_COLOR_LIGHT_GRAY,
LOCALE_GLCD_COLOR_GRAY,
LOCALE_GLCD_COLOR_DARK_GRAY,
LOCALE_GLCD_COLOR_DARK_RED,
LOCALE_GLCD_COLOR_DARK_GREEN,
LOCALE_GLCD_COLOR_DARK_BLUE,
LOCALE_GLCD_COLOR_PURPLE,
LOCALE_GLCD_COLOR_MINT,
LOCALE_GLCD_COLOR_GOLDEN,
LOCALE_GLCD_DISPLAY,
LOCALE_GLCD_ENABLE,
LOCALE_GLCD_FONT,

25
src/system/locals_intern.h
View File

@@ -915,24 +915,27 @@ const char * locale_real_names[] =
"fsk.to_7",
"glcd.brightness",
"glcd.brightness_standby",
"glcd.color.amber",
"glcd.color.black",
"glcd.color.blue",
"glcd.color.bluegray",
"glcd.color.brown",
"glcd.color.cyan",
"glcd.color.deeporange",
"glcd.color.deeppurple",
"glcd.color.gray",
"glcd.color.green",
"glcd.color.magenta",
"glcd.color.indigo",
"glcd.color.lightblue",
"glcd.color.lightgreen",
"glcd.color.lime",
"glcd.color.orange",
"glcd.color.pink",
"glcd.color.purple",
"glcd.color.red",
"glcd.color.teal",
"glcd.color.white",
"glcd.color.yellow",
"glcd.color.orange",
"glcd.color.light_gray",
"glcd.color.gray",
"glcd.color.dark_gray",
"glcd.color.dark_red",
"glcd.color.dark_green",
"glcd.color.dark_blue",
"glcd.color.purple",
"glcd.color.mint",
"glcd.color.golden",
"glcd.display",
"glcd.enable",
"glcd.font",