Skip to content

Commit db162ee

Browse files
authored
Merge pull request #957 from enkiller/modify_gui_config
[gui]更改"JPEG"和"PNG"选项为多选一模式
2 parents b5496de + d903267 commit db162ee

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

components/gui/Kconfig

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,33 @@ config RTGUI_IMAGE_XPM
3636
bool "Support XPM image format"
3737
default n
3838

39-
config RTGUI_IMAGE_JPEG
40-
bool "Support JPEG image format"
41-
default n
39+
choice
40+
prompt "JPEG image format"
41+
default RTGUI_IMAGE_JPEG_NONE
4242

43-
config RTGUI_IMAGE_TJPGD
44-
bool "Use TJPGD for JPEG image"
45-
default n
43+
config RTGUI_IMAGE_JPEG_NONE
44+
bool "No PNG image format"
4645

47-
config RTGUI_IMAGE_PNG
48-
bool "Support PNG image format"
49-
default n
46+
config RTGUI_IMAGE_JPEG
47+
bool "Use libjpeg"
5048

51-
config RTGUI_IMAGE_LODEPNG
52-
bool "Use lodepng for PNG image"
53-
default n
49+
config RTGUI_IMAGE_TJPGD
50+
bool "Use TJPGD"
51+
endchoice
52+
53+
choice
54+
prompt "PNG image format"
55+
default RTGUI_IMAGE_PNG_NONE
56+
57+
config RTGUI_IMAGE_PNG_NONE
58+
bool "No PNG image format"
59+
60+
config RTGUI_IMAGE_PNG
61+
bool "Use libpng"
62+
63+
config RTGUI_IMAGE_LODEPNG
64+
bool "Use lodepng"
65+
endchoice
5466

5567
config RTGUI_IMAGE_BMP
5668
bool "Support BMP image format"

0 commit comments

Comments
 (0)