Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-29 22:56:58 +08:00
Code Issues Actions 200 Packages Projects Releases Wiki Activity

chore(font) code clean up (#2821)

Browse Source 
* fix(lv_symbol_def.h): LV_SYMBOL_xxx by the encode order

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

* fix(lv_symbol_def.h): change the hex number to upper case

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

* fix(font): Keep the LV_FONT_DECLARE order same as LV_FONT_xxxx

and correct the comment and format

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2021-11-22 02:47:22 -06:00
committed by GitHub
parent bfc428ecd1
commit 425455d20f
5 changed files with 100 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/built_in_font/built_in_font_gen.py
+4 -5
View File
@@ -37,9 +37,9 @@ parser.add_argument('-o', '--output',
metavar='file', metavar='file',
help='Output file name. E.g. my_font_20.c') help='Output file name. E.g. my_font_20.c')
parser.add_argument('--compressed', action='store_true', parser.add_argument('--compressed', action='store_true',
help='Compress the bitmaps') help='Compress the bitmaps')
parser.add_argument('--subpx', action='store_true', parser.add_argument('--subpx', action='store_true',
help='3 times wider letters for sub pixel rendering') help='3 times wider letters for sub pixel rendering')
args = parser.parse_args() args = parser.parse_args()
@@ -49,15 +49,14 @@ else:
compr = "" compr = ""
if len(args.symbols[0]) != 0: if len(args.symbols[0]) != 0:
args.symbols[0] = "--symbols " + args.symbols[0] args.symbols[0] = "--symbols " + args.symbols[0]
subpx = "" subpx = ""
if args.subpx: subpx = "--lcd" if args.subpx: subpx = "--lcd"
#Built in symbols #Built in symbols
syms = "61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650" syms = "61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650"
#Run the command (Add degree and bbullet symbol) #Run the command (Add degree and bullet symbol)
cmd = "lv_font_conv {} {} --bpp {} --size {} --font {} -r {} {} --font FontAwesome5-Solid+Brands+Regular.woff -r {} --format bin -o {} --force-fast-kern-format".format(subpx, compr, args.bpp, args.size, args.font, args.range[0], args.symbols[0], syms, args.output) cmd = "lv_font_conv {} {} --bpp {} --size {} --font {} -r {} {} --font FontAwesome5-Solid+Brands+Regular.woff -r {} --format bin -o {} --force-fast-kern-format".format(subpx, compr, args.bpp, args.size, args.font, args.range[0], args.symbols[0], syms, args.output)
os.system(cmd) os.system(cmd)
scripts/built_in_font/generate_all.py
+4 -6
View File
File diff suppressed because one or more lines are too long
src/font/lv_font.c
+1
View File
@@ -57,6 +57,7 @@ const uint8_t * lv_font_get_glyph_bitmap(const lv_font_t * font_p, uint32_t lett
* @param font_p pointer to font * @param font_p pointer to font
* @param dsc_out store the result descriptor here * @param dsc_out store the result descriptor here
* @param letter an UNICODE letter code * @param letter an UNICODE letter code
* @param letter_next the next letter after `letter`. Used for kerning
* @return true: descriptor is successfully loaded into `dsc_out`. * @return true: descriptor is successfully loaded into `dsc_out`.
* false: the letter was not found, no data is loaded to `dsc_out` * false: the letter was not found, no data is loaded to `dsc_out`
*/ */
src/font/lv_font.h
+16 -18
View File
@@ -36,11 +36,11 @@ extern "C" {
/** Describes the properties of a glyph.*/ /** Describes the properties of a glyph.*/
typedef struct { typedef struct {
uint16_t adv_w; /**< The glyph needs this space. Draw the next glyph after this width.*/ uint16_t adv_w; /**< The glyph needs this space. Draw the next glyph after this width.*/
uint16_t box_w; /**< Width of the glyph's bounding box*/ uint16_t box_w; /**< Width of the glyph's bounding box*/
uint16_t box_h; /**< Height of the glyph's bounding box*/ uint16_t box_h; /**< Height of the glyph's bounding box*/
int16_t ofs_x; /**< x offset of the bounding box*/ int16_t ofs_x; /**< x offset of the bounding box*/
int16_t ofs_y; /**< y offset of the bounding box*/ int16_t ofs_y; /**< y offset of the bounding box*/
uint8_t bpp; /**< Bit-per-pixel: 1, 2, 4, 8*/ uint8_t bpp; /**< Bit-per-pixel: 1, 2, 4, 8*/
} lv_font_glyph_dsc_t; } lv_font_glyph_dsc_t;
/** The bitmaps might be upscaled by 3 to achieve subpixel rendering.*/ /** The bitmaps might be upscaled by 3 to achieve subpixel rendering.*/
@@ -53,8 +53,6 @@ enum {
typedef uint8_t lv_font_subpx_t; typedef uint8_t lv_font_subpx_t;
struct _lv_font_t;
/** Describe the properties of a font*/ /** Describe the properties of a font*/
typedef struct _lv_font_t { typedef struct _lv_font_t {
/** Get a glyph's descriptor from a font*/ /** Get a glyph's descriptor from a font*/
@@ -71,11 +69,10 @@ typedef struct _lv_font_t {
int8_t underline_position; /**< Distance between the top of the underline and base line (< 0 means below the base line)*/ int8_t underline_position; /**< Distance between the top of the underline and base line (< 0 means below the base line)*/
int8_t underline_thickness; /**< Thickness of the underline*/ int8_t underline_thickness; /**< Thickness of the underline*/
const void * dsc; /**< Store implementation specific or run_time data or caching here*/ const void * dsc; /**< Store implementation specific or run_time data or caching here*/
#if LV_USE_USER_DATA #if LV_USE_USER_DATA
void * user_data; /**< Custom user data for font.*/ void * user_data; /**< Custom user data for font.*/
#endif #endif
} lv_font_t; } lv_font_t;
/********************** /**********************
@@ -95,6 +92,7 @@ const uint8_t * lv_font_get_glyph_bitmap(const lv_font_t * font_p, uint32_t lett
* @param font_p pointer to font * @param font_p pointer to font
* @param dsc_out store the result descriptor here * @param dsc_out store the result descriptor here
* @param letter an UNICODE letter code * @param letter an UNICODE letter code
* @param letter_next the next letter after `letter`. Used for kerning
* @return true: descriptor is successfully loaded into `dsc_out`. * @return true: descriptor is successfully loaded into `dsc_out`.
* false: the letter was not found, no data is loaded to `dsc_out` * false: the letter was not found, no data is loaded to `dsc_out`
*/ */
@@ -210,20 +208,12 @@ LV_FONT_DECLARE(lv_font_montserrat_46)
LV_FONT_DECLARE(lv_font_montserrat_48) LV_FONT_DECLARE(lv_font_montserrat_48)
#endif #endif
#if LV_FONT_MONTSERRAT_28_COMPRESSED
LV_FONT_DECLARE(lv_font_montserrat_28_compressed)
#endif
#if LV_FONT_MONTSERRAT_12_SUBPX #if LV_FONT_MONTSERRAT_12_SUBPX
LV_FONT_DECLARE(lv_font_montserrat_12_subpx) LV_FONT_DECLARE(lv_font_montserrat_12_subpx)
#endif #endif
#if LV_FONT_UNSCII_8 #if LV_FONT_MONTSERRAT_28_COMPRESSED
LV_FONT_DECLARE(lv_font_unscii_8) LV_FONT_DECLARE(lv_font_montserrat_28_compressed)
#endif
#if LV_FONT_UNSCII_16
LV_FONT_DECLARE(lv_font_unscii_16)
#endif #endif
#if LV_FONT_DEJAVU_16_PERSIAN_HEBREW #if LV_FONT_DEJAVU_16_PERSIAN_HEBREW
@@ -234,6 +224,14 @@ LV_FONT_DECLARE(lv_font_dejavu_16_persian_hebrew)
LV_FONT_DECLARE(lv_font_simsun_16_cjk) LV_FONT_DECLARE(lv_font_simsun_16_cjk)
#endif #endif
#if LV_FONT_UNSCII_8
LV_FONT_DECLARE(lv_font_unscii_8)
#endif
#if LV_FONT_UNSCII_16
LV_FONT_DECLARE(lv_font_unscii_16)
#endif
/*Declare the custom (user defined) fonts*/ /*Declare the custom (user defined) fonts*/
#ifdef LV_FONT_CUSTOM_DECLARE #ifdef LV_FONT_CUSTOM_DECLARE
LV_FONT_CUSTOM_DECLARE LV_FONT_CUSTOM_DECLARE
src/font/lv_symbol_def.h
+75 -72
View File
@@ -7,93 +7,94 @@ extern "C" {
#include "../lv_conf_internal.h" #include "../lv_conf_internal.h"
/*-------------------------------
* Symbols from "normal" font
*-----------------------------*/
#define LV_SYMBOL_BULLET "\xE2\x80\xA2" /*20042, 0x2022*/
/*------------------------------- /*-------------------------------
* Symbols from FontAwesome font * Symbols from FontAwesome font
*-----------------------------*/ *-----------------------------*/
/*In the font converter use this list as range: /*In the font converter use this list as range:
61441, 61448, 61451, 61452, 61453, 61457, 61459, 61461, 61465, 61468, 61441, 61448, 61451, 61452, 61453, 61457, 61459, 61461, 61465, 61468,
61473, 61478, 61479, 61480, 61502, 61512, 61515, 61516, 61517, 61521, 61473, 61478, 61479, 61480, 61502, 61507, 61512, 61515, 61516, 61517,
61522, 61523, 61524, 61543, 61544, 61550, 61552, 61553, 61556, 61559, 61521, 61522, 61523, 61524, 61543, 61544, 61550, 61552, 61553, 61556,
61560, 61561, 61563, 61587, 61589, 61636, 61637, 61639, 61671, 61674, 61559, 61560, 61561, 61563, 61587, 61589, 61636, 61637, 61639, 61641,
61683, 61724, 61732, 61787, 61931, 62016, 62017, 62018, 62019, 62020, 61664, 61671, 61674, 61683, 61724, 61732, 61787, 61931, 62016, 62017,
62087, 62099, 62212, 62189, 62810, 63426, 63650 62018, 62019, 62020, 62087, 62099, 62189, 62212, 62810, 63426, 63650
*/ */
#define LV_SYMBOL_AUDIO "\xef\x80\x81" /*61441, 0xF001*/ #define LV_SYMBOL_AUDIO "\xEF\x80\x81" /*61441, 0xF001*/
#define LV_SYMBOL_VIDEO "\xef\x80\x88" /*61448, 0xF008*/ #define LV_SYMBOL_VIDEO "\xEF\x80\x88" /*61448, 0xF008*/
#define LV_SYMBOL_LIST "\xef\x80\x8b" /*61451, 0xF00B*/ #define LV_SYMBOL_LIST "\xEF\x80\x8B" /*61451, 0xF00B*/
#define LV_SYMBOL_OK "\xef\x80\x8c" /*61452, 0xF00C*/ #define LV_SYMBOL_OK "\xEF\x80\x8C" /*61452, 0xF00C*/
#define LV_SYMBOL_CLOSE "\xef\x80\x8d" /*61453, 0xF00D*/ #define LV_SYMBOL_CLOSE "\xEF\x80\x8D" /*61453, 0xF00D*/
#define LV_SYMBOL_POWER "\xef\x80\x91" /*61457, 0xF011*/ #define LV_SYMBOL_POWER "\xEF\x80\x91" /*61457, 0xF011*/
#define LV_SYMBOL_SETTINGS "\xef\x80\x93" /*61459, 0xF013*/ #define LV_SYMBOL_SETTINGS "\xEF\x80\x93" /*61459, 0xF013*/
#define LV_SYMBOL_HOME "\xef\x80\x95" /*61461, 0xF015*/ #define LV_SYMBOL_HOME "\xEF\x80\x95" /*61461, 0xF015*/
#define LV_SYMBOL_DOWNLOAD "\xef\x80\x99" /*61465, 0xF019*/ #define LV_SYMBOL_DOWNLOAD "\xEF\x80\x99" /*61465, 0xF019*/
#define LV_SYMBOL_DRIVE "\xef\x80\x9c" /*61468, 0xF01C*/ #define LV_SYMBOL_DRIVE "\xEF\x80\x9C" /*61468, 0xF01C*/
#define LV_SYMBOL_REFRESH "\xef\x80\xa1" /*61473, 0xF021*/ #define LV_SYMBOL_REFRESH "\xEF\x80\xA1" /*61473, 0xF021*/
#define LV_SYMBOL_MUTE "\xef\x80\xa6" /*61478, 0xF026*/ #define LV_SYMBOL_MUTE "\xEF\x80\xA6" /*61478, 0xF026*/
#define LV_SYMBOL_VOLUME_MID "\xef\x80\xa7" /*61479, 0xF027*/ #define LV_SYMBOL_VOLUME_MID "\xEF\x80\xA7" /*61479, 0xF027*/
#define LV_SYMBOL_VOLUME_MAX "\xef\x80\xa8" /*61480, 0xF028*/ #define LV_SYMBOL_VOLUME_MAX "\xEF\x80\xA8" /*61480, 0xF028*/
#define LV_SYMBOL_IMAGE "\xef\x80\xbe" /*61502, 0xF03E*/ #define LV_SYMBOL_IMAGE "\xEF\x80\xBE" /*61502, 0xF03E*/
#define LV_SYMBOL_ENVELOPE "\xef\x83\xa0" /*61664, 0xF0E0*/ #define LV_SYMBOL_TINT "\xEF\x81\x83" /*61507, 0xF043*/
#define LV_SYMBOL_EDIT "\xef\x8C\x84" /*62212, 0xF304*/ #define LV_SYMBOL_PREV "\xEF\x81\x88" /*61512, 0xF048*/
#define LV_SYMBOL_TINT "\xef\x81\x83" /*61507, 0xF043*/ #define LV_SYMBOL_PLAY "\xEF\x81\x8B" /*61515, 0xF04B*/
#define LV_SYMBOL_PREV "\xef\x81\x88" /*61512, 0xF048*/ #define LV_SYMBOL_PAUSE "\xEF\x81\x8C" /*61516, 0xF04C*/
#define LV_SYMBOL_PLAY "\xef\x81\x8b" /*61515, 0xF04B*/ #define LV_SYMBOL_STOP "\xEF\x81\x8D" /*61517, 0xF04D*/
#define LV_SYMBOL_PAUSE "\xef\x81\x8c" /*61516, 0xF04C*/ #define LV_SYMBOL_NEXT "\xEF\x81\x91" /*61521, 0xF051*/
#define LV_SYMBOL_STOP "\xef\x81\x8d" /*61517, 0xF04D*/ #define LV_SYMBOL_EJECT "\xEF\x81\x92" /*61522, 0xF052*/
#define LV_SYMBOL_NEXT "\xef\x81\x91" /*61521, 0xF051*/ #define LV_SYMBOL_LEFT "\xEF\x81\x93" /*61523, 0xF053*/
#define LV_SYMBOL_EJECT "\xef\x81\x92" /*61522, 0xF052*/ #define LV_SYMBOL_RIGHT "\xEF\x81\x94" /*61524, 0xF054*/
#define LV_SYMBOL_LEFT "\xef\x81\x93" /*61523, 0xF053*/ #define LV_SYMBOL_PLUS "\xEF\x81\xA7" /*61543, 0xF067*/
#define LV_SYMBOL_RIGHT "\xef\x81\x94" /*61524, 0xF054*/ #define LV_SYMBOL_MINUS "\xEF\x81\xA8" /*61544, 0xF068*/
#define LV_SYMBOL_PLUS "\xef\x81\xa7" /*61543, 0xF067*/ #define LV_SYMBOL_EYE_OPEN "\xEF\x81\xAE" /*61550, 0xF06E*/
#define LV_SYMBOL_MINUS "\xef\x81\xa8" /*61544, 0xF068*/ #define LV_SYMBOL_EYE_CLOSE "\xEF\x81\xB0" /*61552, 0xF070*/
#define LV_SYMBOL_EYE_OPEN "\xef\x81\xae" /*61550, 0xF06E*/ #define LV_SYMBOL_WARNING "\xEF\x81\xB1" /*61553, 0xF071*/
#define LV_SYMBOL_EYE_CLOSE "\xef\x81\xb0" /*61552, 0xF070*/ #define LV_SYMBOL_SHUFFLE "\xEF\x81\xB4" /*61556, 0xF074*/
#define LV_SYMBOL_WARNING "\xef\x81\xb1" /*61553, 0xF071*/ #define LV_SYMBOL_UP "\xEF\x81\xB7" /*61559, 0xF077*/
#define LV_SYMBOL_SHUFFLE "\xef\x81\xb4" /*61556, 0xF074*/ #define LV_SYMBOL_DOWN "\xEF\x81\xB8" /*61560, 0xF078*/
#define LV_SYMBOL_UP "\xef\x81\xb7" /*61559, 0xF077*/ #define LV_SYMBOL_LOOP "\xEF\x81\xB9" /*61561, 0xF079*/
#define LV_SYMBOL_DOWN "\xef\x81\xb8" /*61560, 0xF078*/ #define LV_SYMBOL_DIRECTORY "\xEF\x81\xBB" /*61563, 0xF07B*/
#define LV_SYMBOL_LOOP "\xef\x81\xb9" /*61561, 0xF079*/ #define LV_SYMBOL_UPLOAD "\xEF\x82\x93" /*61587, 0xF093*/
#define LV_SYMBOL_DIRECTORY "\xef\x81\xbb" /*61563, 0xF07B*/ #define LV_SYMBOL_CALL "\xEF\x82\x95" /*61589, 0xF095*/
#define LV_SYMBOL_UPLOAD "\xef\x82\x93" /*61587, 0xF093*/ #define LV_SYMBOL_CUT "\xEF\x83\x84" /*61636, 0xF0C4*/
#define LV_SYMBOL_CALL "\xef\x82\x95" /*61589, 0xF095*/ #define LV_SYMBOL_COPY "\xEF\x83\x85" /*61637, 0xF0C5*/
#define LV_SYMBOL_CUT "\xef\x83\x84" /*61636, 0xF0C4*/ #define LV_SYMBOL_SAVE "\xEF\x83\x87" /*61639, 0xF0C7*/
#define LV_SYMBOL_COPY "\xef\x83\x85" /*61637, 0xF0C5*/ #define LV_SYMBOL_BARS "\xEF\x83\x89" /*61641, 0xF0C9*/
#define LV_SYMBOL_SAVE "\xef\x83\x87" /*61639, 0xF0C7*/ #define LV_SYMBOL_ENVELOPE "\xEF\x83\xA0" /*61664, 0xF0E0*/
#define LV_SYMBOL_BARS "\xef\x83\x89" /*61641, 0xF0C9*/ #define LV_SYMBOL_CHARGE "\xEF\x83\xA7" /*61671, 0xF0E7*/
#define LV_SYMBOL_CHARGE "\xef\x83\xa7" /*61671, 0xF0E7*/ #define LV_SYMBOL_PASTE "\xEF\x83\xAA" /*61674, 0xF0EA*/
#define LV_SYMBOL_PASTE "\xef\x83\xAA" /*61674, 0xF0EA*/ #define LV_SYMBOL_BELL "\xEF\x83\xB3" /*61683, 0xF0F3*/
#define LV_SYMBOL_BELL "\xef\x83\xb3" /*61683, 0xF0F3*/ #define LV_SYMBOL_KEYBOARD "\xEF\x84\x9C" /*61724, 0xF11C*/
#define LV_SYMBOL_KEYBOARD "\xef\x84\x9c" /*61724, 0xF11C*/ #define LV_SYMBOL_GPS "\xEF\x84\xA4" /*61732, 0xF124*/
#define LV_SYMBOL_GPS "\xef\x84\xa4" /*61732, 0xF124*/ #define LV_SYMBOL_FILE "\xEF\x85\x9B" /*61787, 0xF158*/
#define LV_SYMBOL_FILE "\xef\x85\x9b" /*61787, 0xF158*/ #define LV_SYMBOL_WIFI "\xEF\x87\xAB" /*61931, 0xF1EB*/
#define LV_SYMBOL_WIFI "\xef\x87\xab" /*61931, 0xF1EB*/ #define LV_SYMBOL_BATTERY_FULL "\xEF\x89\x80" /*62016, 0xF240*/
#define LV_SYMBOL_BATTERY_FULL "\xef\x89\x80" /*62016, 0xF240*/ #define LV_SYMBOL_BATTERY_3 "\xEF\x89\x81" /*62017, 0xF241*/
#define LV_SYMBOL_BATTERY_3 "\xef\x89\x81" /*62017, 0xF241*/ #define LV_SYMBOL_BATTERY_2 "\xEF\x89\x82" /*62018, 0xF242*/
#define LV_SYMBOL_BATTERY_2 "\xef\x89\x82" /*62018, 0xF242*/ #define LV_SYMBOL_BATTERY_1 "\xEF\x89\x83" /*62019, 0xF243*/
#define LV_SYMBOL_BATTERY_1 "\xef\x89\x83" /*62019, 0xF243*/ #define LV_SYMBOL_BATTERY_EMPTY "\xEF\x89\x84" /*62020, 0xF244*/
#define LV_SYMBOL_BATTERY_EMPTY "\xef\x89\x84" /*62020, 0xF244*/ #define LV_SYMBOL_USB "\xEF\x8a\x87" /*62087, 0xF287*/
#define LV_SYMBOL_USB "\xef\x8a\x87" /*62087, 0xF287*/ #define LV_SYMBOL_BLUETOOTH "\xEF\x8a\x93" /*62099, 0xF293*/
#define LV_SYMBOL_BLUETOOTH "\xef\x8a\x93" /*62099, 0xF293*/ #define LV_SYMBOL_TRASH "\xEF\x8B\xAD" /*62189, 0xF2ED*/
#define LV_SYMBOL_TRASH "\xef\x8B\xad" /*62189, 0xF2ED*/ #define LV_SYMBOL_EDIT "\xEF\x8C\x84" /*62212, 0xF304*/
#define LV_SYMBOL_BACKSPACE "\xef\x95\x9A" /*62810, 0xF55A*/ #define LV_SYMBOL_BACKSPACE "\xEF\x95\x9A" /*62810, 0xF55A*/
#define LV_SYMBOL_SD_CARD "\xef\x9F\x82" /*63426, 0xF7C2*/ #define LV_SYMBOL_SD_CARD "\xEF\x9F\x82" /*63426, 0xF7C2*/
#define LV_SYMBOL_NEW_LINE "\xef\xA2\xA2" /*63650, 0xF8A2*/ #define LV_SYMBOL_NEW_LINE "\xEF\xA2\xA2" /*63650, 0xF8A2*/
/** Invalid symbol at (U+F8FF). If written before a string then `lv_img` will show it as a label*/ /** Invalid symbol at (U+F8FF). If written before a string then `lv_img` will show it as a label*/
#define LV_SYMBOL_DUMMY "\xEF\xA3\xBF" #define LV_SYMBOL_DUMMY "\xEF\xA3\xBF"
/*-------------------------------
* Symbols from "normal" font
*-----------------------------*/
#define LV_SYMBOL_BULLET "\xE2\x80\xA2" /*20042, 0x2022*/
/* /*
* The following list is generated using * The following list is generated using
* cat src/font/lv_symbol_def.h | sed -E -n 's/^#define\s+LV_(SYMBOL_\w+).*".*$/ _LV_STR_\1,/p' * cat src/font/lv_symbol_def.h | sed -E -n 's/^#define\s+LV_(SYMBOL_\w+).*".*$/ _LV_STR_\1,/p'
*/ */
enum { enum {
_LV_STR_SYMBOL_BULLET,
_LV_STR_SYMBOL_AUDIO, _LV_STR_SYMBOL_AUDIO,
_LV_STR_SYMBOL_VIDEO, _LV_STR_SYMBOL_VIDEO,
_LV_STR_SYMBOL_LIST, _LV_STR_SYMBOL_LIST,
@@ -109,7 +110,7 @@ enum {
_LV_STR_SYMBOL_VOLUME_MID, _LV_STR_SYMBOL_VOLUME_MID,
_LV_STR_SYMBOL_VOLUME_MAX, _LV_STR_SYMBOL_VOLUME_MAX,
_LV_STR_SYMBOL_IMAGE, _LV_STR_SYMBOL_IMAGE,
_LV_STR_SYMBOL_EDIT, _LV_STR_SYMBOL_TINT,
_LV_STR_SYMBOL_PREV, _LV_STR_SYMBOL_PREV,
_LV_STR_SYMBOL_PLAY, _LV_STR_SYMBOL_PLAY,
_LV_STR_SYMBOL_PAUSE, _LV_STR_SYMBOL_PAUSE,
@@ -133,6 +134,8 @@ enum {
_LV_STR_SYMBOL_CUT, _LV_STR_SYMBOL_CUT,
_LV_STR_SYMBOL_COPY, _LV_STR_SYMBOL_COPY,
_LV_STR_SYMBOL_SAVE, _LV_STR_SYMBOL_SAVE,
_LV_STR_SYMBOL_BARS,
_LV_STR_SYMBOL_ENVELOPE,
_LV_STR_SYMBOL_CHARGE, _LV_STR_SYMBOL_CHARGE,
_LV_STR_SYMBOL_PASTE, _LV_STR_SYMBOL_PASTE,
_LV_STR_SYMBOL_BELL, _LV_STR_SYMBOL_BELL,
@@ -148,11 +151,11 @@ enum {
_LV_STR_SYMBOL_USB, _LV_STR_SYMBOL_USB,
_LV_STR_SYMBOL_BLUETOOTH, _LV_STR_SYMBOL_BLUETOOTH,
_LV_STR_SYMBOL_TRASH, _LV_STR_SYMBOL_TRASH,
_LV_STR_SYMBOL_EDIT,
_LV_STR_SYMBOL_BACKSPACE, _LV_STR_SYMBOL_BACKSPACE,
_LV_STR_SYMBOL_SD_CARD, _LV_STR_SYMBOL_SD_CARD,
_LV_STR_SYMBOL_NEW_LINE, _LV_STR_SYMBOL_NEW_LINE,
_LV_STR_SYMBOL_DUMMY, _LV_STR_SYMBOL_DUMMY,
_LV_STR_SYMBOL_BULLET,
}; };
#ifdef __cplusplus #ifdef __cplusplus