summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2017-11-06 17:23:49 +0800
committerGitHub <[email protected]>2017-11-06 17:23:49 +0800
commitdb162eea621512a79963b685b4b9023fe7e39cb0 (patch)
tree145e91ed0bdfb8f071fa6b0f55e98db2b0e08bcf /components
parentb5496deee45f1a883f2516e501878e40b87cae96 (diff)
parentd9032677ace728dac69a7a402c0d07432703b081 (diff)
Merge pull request #957 from enkiller/modify_gui_config
[gui]更改"JPEG"和"PNG"选项为多选一模式
Diffstat (limited to 'components')
-rw-r--r--components/gui/Kconfig36
1 files changed, 24 insertions, 12 deletions
diff --git a/components/gui/Kconfig b/components/gui/Kconfig
index 5d97211a5b..e180420c7e 100644
--- a/components/gui/Kconfig
+++ b/components/gui/Kconfig
@@ -36,21 +36,33 @@ config RTGUI_IMAGE_XPM
bool "Support XPM image format"
default n
-config RTGUI_IMAGE_JPEG
- bool "Support JPEG image format"
- default n
+choice
+ prompt "JPEG image format"
+ default RTGUI_IMAGE_JPEG_NONE
-config RTGUI_IMAGE_TJPGD
- bool "Use TJPGD for JPEG image"
- default n
+ config RTGUI_IMAGE_JPEG_NONE
+ bool "No PNG image format"
-config RTGUI_IMAGE_PNG
- bool "Support PNG image format"
- default n
+ config RTGUI_IMAGE_JPEG
+ bool "Use libjpeg"
-config RTGUI_IMAGE_LODEPNG
- bool "Use lodepng for PNG image"
- default n
+ config RTGUI_IMAGE_TJPGD
+ bool "Use TJPGD"
+endchoice
+
+choice
+ prompt "PNG image format"
+ default RTGUI_IMAGE_PNG_NONE
+
+ config RTGUI_IMAGE_PNG_NONE
+ bool "No PNG image format"
+
+ config RTGUI_IMAGE_PNG
+ bool "Use libpng"
+
+ config RTGUI_IMAGE_LODEPNG
+ bool "Use lodepng"
+endchoice
config RTGUI_IMAGE_BMP
bool "Support BMP image format"