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

3 files changed, 27 insertions, 15 deletions

diff --git a/NxWidgets/Kconfig b/NxWidgets/Kconfig
index c89b4936f..1d7852507 100644
--- a/NxWidgets/Kconfig
+++ b/NxWidgets/Kconfig
@@ -3,14 +3,14 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-menuconfig NxWIDGETS
+menuconfig NXWIDGETS
 	bool "Enable NxWidgets"
 	default n
 	depends on NX && HAVE_CXX
 	---help---
 		Enable support for NxWidgets
 
-if NxWIDGETS
+if NXWIDGETS
 comment "NX Server/Device Configuration"
 
 config NXWIDGETS_DEVNO
@@ -88,7 +88,7 @@ config NXWIDGETS_BPP
 		BPP configuration supported by NX.
 
 config NXWIDGETS_SIZEOFCHAR
-	int "Size of a character (1 or 2 bytes)
+	int "Size of a character (1 or 2 bytes)"
 	range 1 2
 	---help---
 		Size of character {1 or 2 bytes}.  Default Determined by
@@ -116,12 +116,12 @@ config NXWIDGETS_TNXARRAY_SIZEINCREMENT
 config NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
 	hex "Normal Background Color"
 	---help---
-		Normal background color.  Default: RGB(160,160,160)
+		Normal background color.  Default: RGB(148,189,215)
 
 config NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR
 	hex "Selected Background Color"
 	---help---
-		Default selected background color. Default: RGB(120,192,192)
+		Default selected background color. Default: RGB(206,227,241)
 
 config NXWIDGETS_DEFAULT_SHINEEDGECOLOR
 	hex "Shiny Edge Color"
@@ -131,7 +131,7 @@ config NXWIDGETS_DEFAULT_SHINEEDGECOLOR
 config NXWIDGETS_DEFAULT_SHADOWEDGECOLOR
 	hex "Shadow Edge Color"
 	---help---
-		Shadowed side border color. Default: RGB(0,0,0)
+		Shadowed side border color. Default: RGB(35,58,73)
 
 config NXWIDGETS_DEFAULT_HIGHLIGHTCOLOR
 	hex "Highlight Color"
@@ -203,14 +203,14 @@ config NXWIDGETS_CURSORCONTROL_SIZE
 
 endif
 
-menuconfig NxWM
+menuconfig NXWM
 	bool "Enable NxWM"
 	default n
-	depends on NxWIDGETS && NX_MULTIUSER
+	depends on NXWIDGETS && NX_MULTIUSER
 	---help---
 		Enable support for the NuttX Tiny Window Manager (NxWM)
 
-if NxWM
+if NXWM
 comment "General settings"
 
 config NXWM_DEFAULT_FONTID
@@ -218,6 +218,12 @@ config NXWM_DEFAULT_FONTID
 	---help---
 		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"
 
 config NXWM_DEFAULT_BACKGROUNDCOLOR
diff --git a/NxWidgets/README.txt b/NxWidgets/README.txt
index 7bb16820c..81f100d3d 100644
--- a/NxWidgets/README.txt
+++ b/NxWidgets/README.txt
@@ -53,6 +53,12 @@ license.  See the COPYING file for details.
 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
 
   The source code, header files, and build environment for NxWidgets is
diff --git a/NxWidgets/libnxwidgets/include/nxconfig.hxx b/NxWidgets/libnxwidgets/include/nxconfig.hxx
index 67d359622..cd51229c2 100644
--- a/NxWidgets/libnxwidgets/include/nxconfig.hxx
+++ b/NxWidgets/libnxwidgets/include/nxconfig.hxx
@@ -104,13 +104,13 @@
  *   Default dynamic array parameters.  Default: 16, 8
  *
  * CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR - Normal background color.  Default:
- *   MKRGB(160,160,160)
+ *   MKRGB(148,189,215)
  * 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
  *   MKRGB(248,248,248)
  * 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:
  *   MKRGB(192,192,192)
  * CONFIG_NXWIDGETS_DEFAULT_DISABLEDTEXTCOLOR - Text color on a disabled widget:
@@ -362,7 +362,7 @@
  */
 
 #ifndef CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
-#  define CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR MKRGB(160,160,160)
+#  define CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR MKRGB(148,189,215)
 #endif
 
 /**
@@ -370,7 +370,7 @@
  */
 
 #ifndef CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR
-#  define CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR MKRGB(120,192,192)
+#  define CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR MKRGB(206,227,241)
 #endif
 
 /**
@@ -386,7 +386,7 @@
  */
 
 #ifndef CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR
-#  define CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR MKRGB(0,0,0)
+#  define CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR MKRGB(35,58,73)
 #endif
 
 /**