Hook in NxWidgets configuration logic; Add a untested ADS7843E touchscreen support for the Shenzhou board; Complete the Shenzhou NxWM configuration (also untested).

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5190 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-09-25 22:04:51 +00:00
parent 5bd084b192
commit e13dbaa53f
3 changed files with 27 additions and 15 deletions

24
Kconfig
View File

@ -3,14 +3,14 @@
# see misc/tools/kconfig-language.txt. # see misc/tools/kconfig-language.txt.
# #
menuconfig NxWIDGETS menuconfig NXWIDGETS
bool "Enable NxWidgets" bool "Enable NxWidgets"
default n default n
depends on NX && HAVE_CXX depends on NX && HAVE_CXX
---help--- ---help---
Enable support for NxWidgets Enable support for NxWidgets
if NxWIDGETS if NXWIDGETS
comment "NX Server/Device Configuration" comment "NX Server/Device Configuration"
config NXWIDGETS_DEVNO config NXWIDGETS_DEVNO
@ -88,7 +88,7 @@ config NXWIDGETS_BPP
BPP configuration supported by NX. BPP configuration supported by NX.
config NXWIDGETS_SIZEOFCHAR config NXWIDGETS_SIZEOFCHAR
int "Size of a character (1 or 2 bytes) int "Size of a character (1 or 2 bytes)"
range 1 2 range 1 2
---help--- ---help---
Size of character {1 or 2 bytes}. Default Determined by Size of character {1 or 2 bytes}. Default Determined by
@ -116,12 +116,12 @@ config NXWIDGETS_TNXARRAY_SIZEINCREMENT
config NXWIDGETS_DEFAULT_BACKGROUNDCOLOR config NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
hex "Normal Background Color" hex "Normal Background Color"
---help--- ---help---
Normal background color. Default: RGB(160,160,160) Normal background color. Default: RGB(148,189,215)
config NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR config NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR
hex "Selected Background Color" hex "Selected Background Color"
---help--- ---help---
Default selected background color. Default: RGB(120,192,192) Default selected background color. Default: RGB(206,227,241)
config NXWIDGETS_DEFAULT_SHINEEDGECOLOR config NXWIDGETS_DEFAULT_SHINEEDGECOLOR
hex "Shiny Edge Color" hex "Shiny Edge Color"
@ -131,7 +131,7 @@ config NXWIDGETS_DEFAULT_SHINEEDGECOLOR
config NXWIDGETS_DEFAULT_SHADOWEDGECOLOR config NXWIDGETS_DEFAULT_SHADOWEDGECOLOR
hex "Shadow Edge Color" hex "Shadow Edge Color"
---help--- ---help---
Shadowed side border color. Default: RGB(0,0,0) Shadowed side border color. Default: RGB(35,58,73)
config NXWIDGETS_DEFAULT_HIGHLIGHTCOLOR config NXWIDGETS_DEFAULT_HIGHLIGHTCOLOR
hex "Highlight Color" hex "Highlight Color"
@ -203,14 +203,14 @@ config NXWIDGETS_CURSORCONTROL_SIZE
endif endif
menuconfig NxWM menuconfig NXWM
bool "Enable NxWM" bool "Enable NxWM"
default n default n
depends on NxWIDGETS && NX_MULTIUSER depends on NXWIDGETS && NX_MULTIUSER
---help--- ---help---
Enable support for the NuttX Tiny Window Manager (NxWM) Enable support for the NuttX Tiny Window Manager (NxWM)
if NxWM if NXWM
comment "General settings" comment "General settings"
config NXWM_DEFAULT_FONTID config NXWM_DEFAULT_FONTID
@ -218,6 +218,12 @@ config NXWM_DEFAULT_FONTID
---help--- ---help---
The NxWM default font ID. Default: NXFONT_DEFAULT The NxWM default font ID. Default: NXFONT_DEFAULT
config NXWM_UNITTEST
bool "NxWM Unit Test"
default n
---help---
Enable Hooks for the NxWM Unit Test
comment "Color configuration" comment "Color configuration"
config NXWM_DEFAULT_BACKGROUNDCOLOR config NXWM_DEFAULT_BACKGROUNDCOLOR

View File

@ -53,6 +53,12 @@ license. See the COPYING file for details.
Directory Structure Directory Structure
=================== ===================
Kconfig
This is a Kconfig file that should be provided at apps/NxWidgets/Kconfig.
When copied to that location, it will be used by the NuttX configuration
systems to configure settings for NxWidgets and NxWM
libnxwidgets libnxwidgets
The source code, header files, and build environment for NxWidgets is The source code, header files, and build environment for NxWidgets is

View File

@ -104,13 +104,13 @@
* Default dynamic array parameters. Default: 16, 8 * Default dynamic array parameters. Default: 16, 8
* *
* CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR - Normal background color. Default: * CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR - Normal background color. Default:
* MKRGB(160,160,160) * MKRGB(148,189,215)
* CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR - Default selected background * CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR - Default selected background
* color. Default: MKRGB(120,192,192) * color. Default: MKRGB(206,227,241)
* CONFIG_NXWIDGETS_DEFAULT_SHINEEDGECOLOR - Shiny side boarder color. Default * CONFIG_NXWIDGETS_DEFAULT_SHINEEDGECOLOR - Shiny side boarder color. Default
* MKRGB(248,248,248) * MKRGB(248,248,248)
* CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR - Shadowed side border color. * CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR - Shadowed side border color.
* Default: MKRGB(0,0,0) * Default: MKRGB(35,58,73)
* CONFIG_NXWIDGETS_DEFAULT_HIGHLIGHTCOLOR - Highlight color. Default: * CONFIG_NXWIDGETS_DEFAULT_HIGHLIGHTCOLOR - Highlight color. Default:
* MKRGB(192,192,192) * MKRGB(192,192,192)
* CONFIG_NXWIDGETS_DEFAULT_DISABLEDTEXTCOLOR - Text color on a disabled widget: * CONFIG_NXWIDGETS_DEFAULT_DISABLEDTEXTCOLOR - Text color on a disabled widget:
@ -362,7 +362,7 @@
*/ */
#ifndef CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR #ifndef CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
# define CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR MKRGB(160,160,160) # define CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR MKRGB(148,189,215)
#endif #endif
/** /**
@ -370,7 +370,7 @@
*/ */
#ifndef CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR #ifndef CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR
# define CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR MKRGB(120,192,192) # define CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR MKRGB(206,227,241)
#endif #endif
/** /**
@ -386,7 +386,7 @@
*/ */
#ifndef CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR #ifndef CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR
# define CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR MKRGB(0,0,0) # define CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR MKRGB(35,58,73)
#endif #endif
/** /**