Squashed commit of the following:
apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems.
graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx.
apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces.
apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h
apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file.
Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
This commit is contained in:
Gregory Nutt
parent
61eb262142
commit
dee7f14b49
@ -1,38 +0,0 @@
|
||||
############################################################################
|
||||
# apps/graphics/NxWidgets/Makefile
|
||||
#
|
||||
# Copyright (C) 2018 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in
|
||||
# the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# 3. Neither the name NuttX nor the names of its contributors may be
|
||||
# used to endorse or promote products derived from this software
|
||||
# without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
# POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
############################################################################
|
||||
|
||||
MENUDESC = "NxWidgets/NxWM"
|
||||
|
||||
include $(APPDIR)/Directory.mk
|
||||
10
graphics/NxWidgets/UnitTests/nxwm/.gitignore
vendored
10
graphics/NxWidgets/UnitTests/nxwm/.gitignore
vendored
@ -1,10 +0,0 @@
|
||||
/Make.dep
|
||||
/.depend
|
||||
/.built
|
||||
/*.asm
|
||||
/*.rel
|
||||
/*.lst
|
||||
/*.sym
|
||||
/*.adb
|
||||
/*.lib
|
||||
/*.src
|
||||
@ -1,39 +0,0 @@
|
||||
############################################################################
|
||||
# apps/graphics/NxWidgets/UnitTests/nxwm/Make.defs
|
||||
# Adds selected applications to apps/ build
|
||||
#
|
||||
# Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in
|
||||
# the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# 3. Neither the name NuttX nor the names of its contributors may be
|
||||
# used to endorse or promote products derived from this software
|
||||
# without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
# POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_NXWM),y)
|
||||
CONFIGURED_APPS += graphics/NxWidgets/UnitTests/nxwm
|
||||
endif
|
||||
@ -1,51 +0,0 @@
|
||||
#################################################################################
|
||||
# apps/graphics/NxWidgets/Unitests/nxwm/Makefile
|
||||
#
|
||||
# Copyright (C) 2012-2013, 2018 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in
|
||||
# the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# 3. Neither the name NuttX, NxWidgets, nor the names of its contributors
|
||||
# me be used to endorse or promote products derived from this software
|
||||
# without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
# POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
#################################################################################
|
||||
|
||||
-include $(TOPDIR)/Make.defs
|
||||
|
||||
# NxWM unit test
|
||||
|
||||
ASRCS =
|
||||
CSRCS =
|
||||
CXXSRCS =
|
||||
MAINSRC = nxwm_main.cxx
|
||||
|
||||
APPNAME = nxwm
|
||||
PRIORITY = SCHED_PRIORITY_DEFAULT
|
||||
STACKSIZE = 2048
|
||||
|
||||
MODULE = CONFIG_NXWIDGETS_UNITTEST_NXWM
|
||||
|
||||
include $(APPDIR)/Application.mk
|
||||
8
graphics/nxglyphs/Kconfig
Normal file
8
graphics/nxglyphs/Kconfig
Normal file
@ -0,0 +1,8 @@
|
||||
#
|
||||
# For a description of the syntax of this configuration file,
|
||||
# see the file kconfig-language.txt in the NuttX tools repository.
|
||||
#
|
||||
|
||||
config NXGLPYHS_LARGE_ICONS
|
||||
bool
|
||||
default n
|
||||
@ -1,8 +1,8 @@
|
||||
############################################################################
|
||||
# apps/graphics/NxWidgets/UnitTests/Make.defs
|
||||
# apps/graphics/tiff/Make.defs
|
||||
# Adds selected applications to apps/ build
|
||||
#
|
||||
# Copyright (C) 2018 Gregory Nutt. All rights reserved.
|
||||
# Copyright (C) 2019 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
@ -34,4 +34,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
include $(wildcard graphics/NxWidgets/UnitTests/*/Make.defs)
|
||||
ifeq ($(CONFIG_NXWIDGETS),y)
|
||||
CONFIGURED_APPS += graphics/nxglyphs
|
||||
endif
|
||||
81
graphics/nxglyphs/Makefile
Normal file
81
graphics/nxglyphs/Makefile
Normal file
@ -0,0 +1,81 @@
|
||||
############################################################################
|
||||
# apps/graphics/tiff/Makefile
|
||||
#
|
||||
# Copyright (C) 2019 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in
|
||||
# the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# 3. Neither the name NuttX nor the names of its contributors may be
|
||||
# used to endorse or promote products derived from this software
|
||||
# without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
# POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
############################################################################
|
||||
|
||||
-include $(TOPDIR)/Make.defs
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS),y)
|
||||
# Glyphs used by NxWidgets
|
||||
|
||||
CXXSRCS += glyph_nxlogo160x160.cxx glyph_nxlogo320x320.cxx
|
||||
CXXSRCS += glyph_arrowdown.cxx glyph_checkboxon.cxx glyph_screendepthup.cxx
|
||||
CXXSRCS += glyph_arrowleft.cxx glyph_control.cxx glyph_screenflipdown.cxx
|
||||
CXXSRCS += glyph_arrowright.cxx glyph_cycle.cxx glyph_screenflipup.cxx
|
||||
CXXSRCS += glyph_arrowup.cxx glyph_radiobuttonoff.cxx glyph_shift.cxx
|
||||
CXXSRCS += glyph_backspace.cxx glyph_radiobuttonmu.cxx glyph_windowclose.cxx
|
||||
CXXSRCS += glyph_capslock.cxx glyph_radiobuttonon.cxx glyph_windowdepthdown.cxx
|
||||
CXXSRCS += glyph_checkboxmu.cxx glyph_return.cxx glyph_windowdepthup.cxx
|
||||
CXXSRCS += glyph_checkboxoff.cxx glyph_screendepthdown.cxx
|
||||
|
||||
# Glyphs used by NxWM
|
||||
|
||||
ifeq ($(CONFIG_NXGLPYHS_LARGE_ICONS),y)
|
||||
# Large icons
|
||||
|
||||
CXXSRCS += glyph_calculator47x49.cxx glyph_calibration48x42.cxx glyph_cmd49x43.cxx
|
||||
CXXSRCS += glyph_minimize42x42.cxx glyph_play48x48.cxx glyph_stop42x42.cxx
|
||||
|
||||
else
|
||||
# Small icons
|
||||
|
||||
CXXSRCS += glyph_calculator24x25.cxx glyph_calibration24x21.cxx glyph_cmd25x22.cxx
|
||||
CXXSRCS += glyph_minimize21x21.cxx glyph_play24x24.cxx glyph_stop21x21.cxx
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXGLPYHS_LARGE_ICONS),y)
|
||||
# Large icons
|
||||
|
||||
CXXSRCS += glyph_mediaplayer44x50.cxx glyph_mplayer_controls43x41.cxx
|
||||
CXXSRCS += glyph_mediagrip60x30.cxx
|
||||
|
||||
else
|
||||
# Small icons
|
||||
|
||||
CXXSRCS += glyph_mediaplayer24x24.cxx glyph_mplayer_controls32x32.cxx
|
||||
endif
|
||||
|
||||
VPATH = src
|
||||
|
||||
include $(APPDIR)/Application.mk
|
||||
endif # CONFIG_NXWIDGETS
|
||||
|
Before Width: | Height: | Size: 263 B After Width: | Height: | Size: 263 B |
|
Before Width: | Height: | Size: 444 B After Width: | Height: | Size: 444 B |
|
Before Width: | Height: | Size: 415 B After Width: | Height: | Size: 415 B |
|
Before Width: | Height: | Size: 575 B After Width: | Height: | Size: 575 B |
|
Before Width: | Height: | Size: 264 B After Width: | Height: | Size: 264 B |
|
Before Width: | Height: | Size: 358 B After Width: | Height: | Size: 358 B |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 363 B |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 283 B After Width: | Height: | Size: 283 B |
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 222 B After Width: | Height: | Size: 222 B |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 332 B After Width: | Height: | Size: 332 B |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 359 B After Width: | Height: | Size: 359 B |
|
Before Width: | Height: | Size: 284 B After Width: | Height: | Size: 284 B |
|
Before Width: | Height: | Size: 420 B After Width: | Height: | Size: 420 B |
|
Before Width: | Height: | Size: 233 B After Width: | Height: | Size: 233 B |
|
Before Width: | Height: | Size: 374 B After Width: | Height: | Size: 374 B |
|
Before Width: | Height: | Size: 381 B After Width: | Height: | Size: 381 B |
|
Before Width: | Height: | Size: 486 B After Width: | Height: | Size: 486 B |
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_arrowdown.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_arrowdown.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_glypharrowleft.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_glypharrowleft.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_arrowright.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_arrowright.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_arrowup.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_arrowup.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_backspace.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_backspace.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_calculator24x25.cxx
|
||||
* apps/graphics/nxwm/src/glyph_calculator24x25.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -50,7 +50,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -64,7 +64,7 @@
|
||||
* Private Bitmap Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
@ -131,7 +131,7 @@ static const nxgl_mxpixel_t g_calculatorBrightLut[BITMAP_NLUTCODES] =
|
||||
# error "Unsupport pixel format"
|
||||
#endif
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_calculatorRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_calculatorRleEntries[] =
|
||||
{
|
||||
{ 23, 0}, { 1, 1}, /* Row 0 */
|
||||
{ 1, 0}, { 21, 1}, { 1, 2}, { 1, 1}, /* Row 1 */
|
||||
@ -176,7 +176,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_calculatorRleEntries[] =
|
||||
* Public Bitmap Structure Definitions
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_calculatorBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_calculatorBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_calculator47x47.cxx
|
||||
* apps/graphics/nxwm/src/glyph_calculator47x47.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -50,7 +50,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -66,7 +66,7 @@
|
||||
* Private Bitmap Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
@ -205,7 +205,7 @@ static const nxgl_mxpixel_t g_calculatorBrightLut[BITMAP_NLUTCODES] =
|
||||
# error Unsupported pixel format
|
||||
#endif
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_calculatorRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_calculatorRleEntries[] =
|
||||
{
|
||||
{46, 0}, { 1, 1}, /* Row 0 */
|
||||
{ 1, 0}, {45, 2}, { 1, 1}, /* Row 1 */
|
||||
@ -360,7 +360,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_calculatorRleEntries[] =
|
||||
* Public Bitmap Structure Definitions
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_calculatorBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_calculatorBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_calibration24x21.cxx
|
||||
* apps/graphics/nxwm/src/glyph_calibration24x21.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -50,7 +50,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -64,7 +64,7 @@
|
||||
* Private Bitmap Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
@ -142,7 +142,7 @@ static const nxgl_mxpixel_t g_calibrationSelectedLut[BITMAP_NLUTCODES] =
|
||||
# error "Unsupport pixel format"
|
||||
#endif
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_calibrationRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_calibrationRleEntries[] =
|
||||
{
|
||||
{11, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 1, 3}, { 1, 2}, { 3, 0}, /* Row 0 */
|
||||
{11, 0}, { 1, 1}, { 1, 2}, { 4, 0}, { 2, 1}, { 1, 3}, { 2, 1}, { 2, 0}, /* Row 1 */
|
||||
@ -183,7 +183,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_calibrationRleEntries[]
|
||||
* Public Bitmap Structure Definitions
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_calibrationBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_calibrationBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_calibration48x42.cxx
|
||||
* apps/graphics/nxwm/src/glyph_calibration48x42.cxx
|
||||
*
|
||||
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -50,7 +50,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -66,7 +66,7 @@
|
||||
* Private Bitmap Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
@ -213,7 +213,7 @@ static const nxgl_mxpixel_t g_calibrationBrightLut[BITMAP_NLUTCODES] =
|
||||
# error Unsupported pixel format
|
||||
#endif
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_calibrationRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_calibrationRleEntries[] =
|
||||
{
|
||||
{22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {12, 0}, { 2, 1}, { 8, 0}, /* Row 0 */
|
||||
{22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {11, 0}, { 1, 2}, { 2, 1}, { 1, 3}, /* Row 1 */
|
||||
@ -301,7 +301,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_calibrationRleEntries[]
|
||||
* Public Bitmap Structure Definitions
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_calibrationBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_calibrationBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_capslock.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_capslock.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_checkboxmu.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_checkboxmu.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_checkboxoff.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_checkboxoff.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -82,7 +82,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_checkboxon.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_checkboxon.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_cmd24x22.cxx
|
||||
* apps/graphics/nxwm/src/glyph_cmd24x22.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -50,7 +50,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -64,7 +64,7 @@
|
||||
* Private Bitmap Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
@ -134,7 +134,7 @@ static const nxgl_mxpixel_t g_cmdBrightLut[BITMAP_NLUTCODES] =
|
||||
# error "Unsupport pixel format"
|
||||
#endif
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_cmdRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_cmdRleEntries[] =
|
||||
{
|
||||
{ 24, 0}, { 1, 1}, /* Row 0 */
|
||||
{ 24, 0}, { 1, 1}, /* Row 1 */
|
||||
@ -166,7 +166,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_cmdRleEntries[] =
|
||||
* Public Bitmap Structure Definitions
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_cmdBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_cmdBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_cmd49x43.cxx
|
||||
* apps/graphics/nxwm/src/glyph_cmd49x43.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -50,7 +50,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -66,7 +66,7 @@
|
||||
* Private Bitmap Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
@ -201,7 +201,7 @@ static const nxgl_mxpixel_t g_cmdBrightLut[BITMAP_NLUTCODES] =
|
||||
# error Unsupported pixel format
|
||||
#endif
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_cmdRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_cmdRleEntries[] =
|
||||
{
|
||||
{47, 0}, { 1, 1}, { 1, 2}, /* Row 0 */
|
||||
{ 1, 0}, {46, 3}, { 1, 1}, { 1, 2}, /* Row 1 */
|
||||
@ -265,7 +265,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_cmdRleEntries[] =
|
||||
* Public Bitmap Structure Definitions
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_cmdBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_cmdBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_control.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_control.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_cycle.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_cycle.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/mediagrip60x30.cxx
|
||||
* apps/graphics/nxwm/src/mediagrip60x30.cxx
|
||||
*
|
||||
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -50,7 +50,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -66,7 +66,7 @@
|
||||
* Private Bitmap Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
@ -213,7 +213,7 @@ static const nxgl_mxpixel_t g_gripBrightLut[BITMAP_NLUTCODES] =
|
||||
# error Unsupported pixel format
|
||||
#endif
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_gripRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_gripRleEntries[] =
|
||||
{
|
||||
{ 1, 0}, { 1, 1}, {56, 2}, { 1, 1}, { 1, 0}, /* Row 0 */
|
||||
{ 1, 1}, {58, 2}, { 1, 1}, /* Row 1 */
|
||||
@ -253,7 +253,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_gripRleEntries[] =
|
||||
* Public Bitmap Structure Definitions
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerVolBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_mplayerVolBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_mediaplayer24x24.cxx
|
||||
* apps/graphics/nxwm/src/glyph_mediaplayer24x24.cxx
|
||||
*
|
||||
* Copyright (C) 2013 Ken Pettit. All rights reserved.
|
||||
* Author: Ken Pettit <pettitkd@gmail.com>
|
||||
@ -50,7 +50,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -64,25 +64,25 @@
|
||||
* Private Bitmap Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
static const NXWidgets::nxwidget_pixel_t palette[BITMAP_PALETTESIZE] =
|
||||
static const nxwidget_pixel_t palette[BITMAP_PALETTESIZE] =
|
||||
{
|
||||
MKRGB(248,252,251), MKRGB(120,198,241), MKRGB( 97,177,228), MKRGB( 31,104,177),
|
||||
MKRGB( 73,153,213), MKRGB( 46,122,193), MKRGB(140,196,230), MKRGB( 9, 77,154),
|
||||
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR
|
||||
};
|
||||
|
||||
static const NXWidgets::nxwidget_pixel_t hilight_palette[BITMAP_PALETTESIZE] =
|
||||
static const nxwidget_pixel_t hilight_palette[BITMAP_PALETTESIZE] =
|
||||
{
|
||||
MKRGB(255,255,255), MKRGB(170,248,255), MKRGB(147,227,255), MKRGB( 81,154,227),
|
||||
MKRGB(123,203,255), MKRGB( 96,172,243), MKRGB(190,246,255), MKRGB( 59,127,204),
|
||||
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR
|
||||
};
|
||||
|
||||
static const NXWidgets::SRlePaletteBitmapEntry bitmap[] =
|
||||
static const SRlePaletteBitmapEntry bitmap[] =
|
||||
{
|
||||
{ 8, 8}, { 8, 7}, { 8, 8}, /* Row 0 */
|
||||
{ 6, 8}, { 1, 7}, { 1, 3}, { 1, 5}, { 2, 2}, { 2, 1},
|
||||
@ -152,7 +152,7 @@ static const NXWidgets::SRlePaletteBitmapEntry bitmap[] =
|
||||
* Public Bitmap Structure Definitions
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_mediaplayerBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_mediaplayerBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP,
|
||||
CONFIG_NXWIDGETS_FMT,
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_mediaplayer44x50.cxx
|
||||
* apps/graphics/nxwm/src/glyph_mediaplayer44x50.cxx
|
||||
*
|
||||
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -50,7 +50,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -66,7 +66,7 @@
|
||||
* Private Bitmap Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
@ -213,7 +213,7 @@ static const nxgl_mxpixel_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] =
|
||||
# error Unsupported pixel format
|
||||
#endif
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_mediaplayerRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_mediaplayerRleEntries[] =
|
||||
{
|
||||
{44, 0}, /* Row 0 */
|
||||
{44, 0}, /* Row 1 */
|
||||
@ -287,7 +287,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_mediaplayerRleEntries[]
|
||||
* Public Bitmap Structure Definitions
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_mediaplayerBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_mediaplayerBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_minimize21x21.cxx
|
||||
* apps/graphics/nxwm/src/glyph_minimize21x21.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -50,7 +50,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -64,7 +64,7 @@
|
||||
* Private Bitmap Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
@ -135,7 +135,7 @@ static const uint8_t g_minimizeBrightLut[BITMAP_NLUTCODES] =
|
||||
# error "Unsupport pixel format"
|
||||
#endif
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_minimizeRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_minimizeRleEntries[] =
|
||||
{
|
||||
{ 1, 0}, { 20, 1}, /* Row 0 */
|
||||
{ 1, 1}, { 5, 2}, { 5, 3}, { 8, 2}, { 1, 4}, { 1, 0}, /* Row 1 */
|
||||
@ -164,7 +164,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_minimizeRleEntries[] =
|
||||
* Public Bitmap Structure Definitions
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_minimizeBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_minimizeBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_minimize42x42.cxx
|
||||
* apps/graphics/nxwm/src/glyph_minimize42x42.cxx
|
||||
*
|
||||
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -50,7 +50,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -66,7 +66,7 @@
|
||||
* Private Bitmap Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
@ -197,7 +197,7 @@ static const nxgl_mxpixel_t g_minimizeBrightLut[BITMAP_NLUTCODES] =
|
||||
# error Unsupported pixel format
|
||||
#endif
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_minimizeRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_minimizeRleEntries[] =
|
||||
{
|
||||
{42, 0}, /* Row 0 */
|
||||
{ 1, 0}, {11, 1}, {10, 2}, {19, 1}, { 1, 0}, /* Row 1 */
|
||||
@ -247,7 +247,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_minimizeRleEntries[] =
|
||||
* Public Bitmap Structure Definitions
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_minimizeBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_minimizeBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_mediaplayer32x32.cxx
|
||||
* apps/graphics/nxwm/src/glyph_mediaplayer32x32.cxx
|
||||
*
|
||||
* Copyright (C) 2013 Ken Pettit. All rights reserved.
|
||||
* Author: Ken Pettit <pettitkd@gmail.com>
|
||||
@ -53,7 +53,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
|
||||
/********************************************************************************************
|
||||
@ -64,17 +64,17 @@
|
||||
#define BITMAP_HEIGHT 32
|
||||
#define BITMAP_PALETTESIZE 8
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
static const NXWidgets::nxwidget_pixel_t palette[BITMAP_PALETTESIZE] =
|
||||
static const nxwidget_pixel_t palette[BITMAP_PALETTESIZE] =
|
||||
{
|
||||
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 11, 24,108), MKRGB( 63, 90,192), MKRGB(121,136,250),
|
||||
MKRGB(224,234,244), MKRGB( 69, 80,149), MKRGB(127,169,239), MKRGB(152,174,207),
|
||||
};
|
||||
|
||||
static const NXWidgets::nxwidget_pixel_t hilight_palette[BITMAP_PALETTESIZE] =
|
||||
static const nxwidget_pixel_t hilight_palette[BITMAP_PALETTESIZE] =
|
||||
{
|
||||
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 61, 74,158), MKRGB(113,140,242), MKRGB(171,186,255),
|
||||
MKRGB(255,255,255), MKRGB(119,130,199), MKRGB(177,219,255), MKRGB(202,224,255),
|
||||
@ -82,7 +82,7 @@ static const NXWidgets::nxwidget_pixel_t hilight_palette[BITMAP_PALETTESIZE] =
|
||||
|
||||
/* Bitmap definition for the "Play" button */
|
||||
|
||||
static const NXWidgets::SRlePaletteBitmapEntry play_bitmap[] =
|
||||
static const SRlePaletteBitmapEntry play_bitmap[] =
|
||||
{
|
||||
{ 32, 0}, /* Row 0 */
|
||||
{ 14, 0}, { 4, 7}, { 14, 0}, /* Row 1 */
|
||||
@ -133,7 +133,7 @@ static const NXWidgets::SRlePaletteBitmapEntry play_bitmap[] =
|
||||
{ 32, 0}, /* Row 31 */
|
||||
};
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerPlayBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_mplayerPlayBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP,
|
||||
CONFIG_NXWIDGETS_FMT,
|
||||
@ -146,7 +146,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerPlayBitmap =
|
||||
|
||||
/* Bitmap definition for the "Pause" button */
|
||||
|
||||
static const NXWidgets::SRlePaletteBitmapEntry pause_bitmap[] =
|
||||
static const SRlePaletteBitmapEntry pause_bitmap[] =
|
||||
{
|
||||
{ 32, 0}, /* Row 0 */
|
||||
{ 14, 0}, { 4, 7}, { 14, 0}, /* Row 1 */
|
||||
@ -203,7 +203,7 @@ static const NXWidgets::SRlePaletteBitmapEntry pause_bitmap[] =
|
||||
{ 32, 0}, /* Row 31 */
|
||||
};
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerPauseBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_mplayerPauseBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP,
|
||||
CONFIG_NXWIDGETS_FMT,
|
||||
@ -216,7 +216,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerPauseBitmap =
|
||||
|
||||
/* Bitmap definition for "Rewind" control */
|
||||
|
||||
static const NXWidgets::SRlePaletteBitmapEntry rew_bitmap[] =
|
||||
static const SRlePaletteBitmapEntry rew_bitmap[] =
|
||||
{
|
||||
{ 32, 0}, /* Row 0 */
|
||||
// { 14, 0}, { 3, 4}, { 1, 7}, { 14, 0}, /* Row 1 */
|
||||
@ -275,7 +275,7 @@ static const NXWidgets::SRlePaletteBitmapEntry rew_bitmap[] =
|
||||
{ 32, 0}, /* Row 31 */
|
||||
};
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerRewBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_mplayerRewBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP,
|
||||
CONFIG_NXWIDGETS_FMT,
|
||||
@ -288,7 +288,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerRewBitmap =
|
||||
|
||||
/* Bitmap definition for "Forward" control */
|
||||
|
||||
static const NXWidgets::SRlePaletteBitmapEntry fwd_bitmap[] =
|
||||
static const SRlePaletteBitmapEntry fwd_bitmap[] =
|
||||
{
|
||||
{ 32, 0}, /* Row 0 */
|
||||
{ 14, 0}, { 4, 7}, { 14, 0}, /* Row 1 */
|
||||
@ -347,7 +347,7 @@ static const NXWidgets::SRlePaletteBitmapEntry fwd_bitmap[] =
|
||||
{ 32, 0}, /* Row 31 */
|
||||
};
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerFwdBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_mplayerFwdBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP,
|
||||
CONFIG_NXWIDGETS_FMT,
|
||||
@ -358,7 +358,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerFwdBitmap =
|
||||
fwd_bitmap
|
||||
};
|
||||
|
||||
static const NXWidgets::SRlePaletteBitmapEntry vol_bitmap[] =
|
||||
static const SRlePaletteBitmapEntry vol_bitmap[] =
|
||||
{
|
||||
{ 22, 0}, /* Row 0 */
|
||||
{ 9, 0}, { 5, 7}, { 8, 0}, /* Row 1 */
|
||||
@ -386,7 +386,7 @@ static const NXWidgets::SRlePaletteBitmapEntry vol_bitmap[] =
|
||||
{ 22, 0}, /* Row 21 */
|
||||
};
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerVolBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_mplayerVolBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP,
|
||||
CONFIG_NXWIDGETS_FMT,
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_mediaplayer43x41.cxx
|
||||
* apps/graphics/nxwm/src/glyph_mediaplayer43x41.cxx
|
||||
*
|
||||
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -53,7 +53,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -77,11 +77,11 @@
|
||||
* Private Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB Colors */
|
||||
|
||||
static const NXWidgets::nxwidget_pixel_t g_normalLut[BITMAP_NLUTCODES] =
|
||||
static const nxwidget_pixel_t g_normalLut[BITMAP_NLUTCODES] =
|
||||
{
|
||||
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
|
||||
MKRGB(54,99,171), /* Code 1 */
|
||||
@ -89,7 +89,7 @@ static const NXWidgets::nxwidget_pixel_t g_normalLut[BITMAP_NLUTCODES] =
|
||||
MKRGB(12,16,120) /* Code 3 */
|
||||
};
|
||||
|
||||
static const NXWidgets::nxwidget_pixel_t g_brightLut[BITMAP_NLUTCODES] =
|
||||
static const nxwidget_pixel_t g_brightLut[BITMAP_NLUTCODES] =
|
||||
{
|
||||
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
|
||||
#if 1 // Red
|
||||
@ -105,7 +105,7 @@ static const NXWidgets::nxwidget_pixel_t g_brightLut[BITMAP_NLUTCODES] =
|
||||
|
||||
/* Bitmap definition for the "Forward" button */
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_forwardRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_forwardRleEntries[] =
|
||||
{
|
||||
{ 1, 1}, {21, 0}, { 1, 1}, {20, 0}, /* Row 0 */
|
||||
{ 1, 1}, { 1, 2}, {20, 0}, { 1, 1}, { 1, 2}, {19, 0}, /* Row 1 */
|
||||
@ -152,7 +152,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_forwardRleEntries[] =
|
||||
|
||||
/* Bitmap definition for the "Play" button */
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_playRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_playRleEntries[] =
|
||||
{
|
||||
{13, 0}, { 1, 1}, {29, 0}, /* Row 0 */
|
||||
{13, 0}, { 1, 1}, { 1, 2}, {28, 0}, /* Row 1 */
|
||||
@ -199,7 +199,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_playRleEntries[] =
|
||||
|
||||
/* Bitmap definition for "Rewind" control */
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_rewindRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_rewindRleEntries[] =
|
||||
{
|
||||
{20, 0}, { 1, 1}, {21, 0}, { 1, 1}, /* Row 0 */
|
||||
{19, 0}, { 1, 1}, { 1, 2}, {20, 0}, { 1, 1}, { 1, 2}, /* Row 1 */
|
||||
@ -246,7 +246,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_rewindRleEntries[] =
|
||||
|
||||
/* Bitmap definition for the "Pause" button */
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_pauseRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_pauseRleEntries[] =
|
||||
{
|
||||
{12, 0}, { 6, 1}, { 7, 0}, { 6, 1}, {12, 0}, /* Row 0 */
|
||||
{11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 1 */
|
||||
@ -334,7 +334,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_pauseRleEntries[] =
|
||||
* Public Data
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerFwdBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_mplayerFwdBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -348,7 +348,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerFwdBitmap =
|
||||
g_forwardRleEntries // data - Pointer to the beginning of the RLE data
|
||||
};
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerPlayBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_mplayerPlayBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -362,7 +362,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerPlayBitmap =
|
||||
g_playRleEntries // data - Pointer to the beginning of the RLE data
|
||||
};
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerRewBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_mplayerRewBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -376,7 +376,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerRewBitmap =
|
||||
g_rewindRleEntries // data - Pointer to the beginning of the RLE data
|
||||
};
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_mplayerPauseBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_mplayerPauseBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_nxlogo160x160.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_nxlogo160x160.cxx
|
||||
*
|
||||
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -49,7 +49,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_nxlogo320x320.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_nxlogo320x320.cxx
|
||||
*
|
||||
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -49,7 +49,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_play24x24.cxx
|
||||
* apps/graphics/nxwm/src/glyph_play24x24.cxx
|
||||
*
|
||||
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -50,7 +50,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -66,7 +66,7 @@
|
||||
* Private Bitmap Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
@ -211,7 +211,7 @@ static const nxgl_mxpixel_t g_playBrightLut[BITMAP_NLUTCODES] =
|
||||
# error "Unsupport pixel format"
|
||||
#endif
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_playRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_playRleEntries[] =
|
||||
{
|
||||
{ 2, 1}, { 22, 0}, /* Row 0 */
|
||||
{ 2, 2}, { 2, 1}, { 20, 0}, /* Row 1 */
|
||||
@ -243,7 +243,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_playRleEntries[] =
|
||||
* Public Bitmap Structure Definitions
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_playBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_playBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_play24x24.cxx
|
||||
* apps/graphics/nxwm/src/glyph_play24x24.cxx
|
||||
*
|
||||
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -50,7 +50,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -66,7 +66,7 @@
|
||||
* Private Bitmap Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
@ -213,7 +213,7 @@ static const nxgl_mxpixel_t g_playBrightLut[BITMAP_NLUTCODES] =
|
||||
# error "Unsupport pixel format"
|
||||
#endif
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_playRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_playRleEntries[] =
|
||||
{
|
||||
{ 1, 0}, { 2, 1}, { 45, 2}, /* Row 0 */
|
||||
{ 2, 3}, { 1, 0}, { 2, 1}, { 43, 2}, /* Row 1 */
|
||||
@ -269,7 +269,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_playRleEntries[] =
|
||||
* Public Bitmap Structure Definitions
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_playBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_playBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonmu.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_radiobuttonmu.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonoff.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_radiobuttonoff.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonon.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_radiobuttonon.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_return.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_return.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_screendepthdown.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_screendepthdown.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_screendepthup.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_screendepthup.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_screenflipdown.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_screenflipdown.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_screenflipup.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_screenflipup.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_shift.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_shift.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_stop21x21.cxx
|
||||
* apps/graphics/nxwm/src/glyph_stop21x21.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -50,7 +50,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -64,7 +64,7 @@
|
||||
* Private Bitmap Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
@ -139,7 +139,7 @@ static const uint8_t g_stopBrightLut[BITMAP_NLUTCODES] =
|
||||
# error "Unsupport pixel format"
|
||||
#endif
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_stopRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_stopRleEntries[] =
|
||||
{
|
||||
{ 1, 0}, { 1, 1}, { 17, 2}, { 1, 1}, { 1, 2}, /* Row 0 */
|
||||
{ 1, 1}, { 4, 3}, { 6, 4}, { 9, 3}, { 1, 1}, /* Row 1 */
|
||||
@ -179,7 +179,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_stopRleEntries[] =
|
||||
* Public Bitmap Structure Definitions
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_stopBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_stopBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -1,5 +1,5 @@
|
||||
/********************************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwm/src/glyph_stop42x42.cxx
|
||||
* apps/graphics/nxwm/src/glyph_stop42x42.cxx
|
||||
*
|
||||
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -50,7 +50,7 @@
|
||||
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
|
||||
|
||||
#include "graphics/nxwm/nxwmconfig.hxx"
|
||||
#include "graphics/nxwm/nxwmglyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
/********************************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
@ -66,7 +66,7 @@
|
||||
* Private Bitmap Data
|
||||
********************************************************************************************/
|
||||
|
||||
using namespace NxWM;
|
||||
using namespace NXWidgets;
|
||||
|
||||
/* RGB24 (8-8-8) Colors */
|
||||
|
||||
@ -197,7 +197,7 @@ static const nxgl_mxpixel_t g_stopBrightLut[BITMAP_NLUTCODES] =
|
||||
# error Unsupported pixel format
|
||||
#endif
|
||||
|
||||
static const struct NXWidgets::SRlePaletteBitmapEntry g_stopRleEntries[] =
|
||||
static const struct SRlePaletteBitmapEntry g_stopRleEntries[] =
|
||||
{
|
||||
{42, 0}, /* Row 0 */
|
||||
{ 1, 0}, {13, 1}, { 7, 2}, {20, 1}, { 1, 0}, /* Row 1 */
|
||||
@ -270,7 +270,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_stopRleEntries[] =
|
||||
* Public Bitmap Structure Definitions
|
||||
********************************************************************************************/
|
||||
|
||||
const struct NXWidgets::SRlePaletteBitmap NxWM::g_stopBitmap =
|
||||
const struct SRlePaletteBitmap NXWidgets::g_stopBitmap =
|
||||
{
|
||||
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
|
||||
CONFIG_NXWIDGETS_FMT, // fmt - Color format
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_windowclose.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_windowclose.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_windowdepthdown.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_windowdepthdown.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* apps/graphics/NxWidgets/nxwidgets/src/glyph_windowdepthup.cxx
|
||||
* apps/graphics/nxglyphs/src/glyph_windowdepthup.cxx
|
||||
*
|
||||
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbitmap.hxx"
|
||||
#include "graphics/nxwidgets/glyphs.hxx"
|
||||
#include "graphics/nxglyphs.hxx"
|
||||
|
||||
#if CONFIG_NXWIDGETS_BPP != 8 // No support for 8-bit color format
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
#################################################################################
|
||||
# apps/graphics/NxWidgets/Doxygen/gendoc.sh
|
||||
# apps/graphics/nxwidgets/Doxygen/gendoc.sh
|
||||
#
|
||||
# Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
# Author: Jose Pablo Carballo <jcarballo@nx-engineering.com>
|
||||
@ -1,5 +1,5 @@
|
||||
############################################################################
|
||||
# apps/graphics/NxWidgets/nxwidgets/Make.defs
|
||||
# apps/graphics/nxwidgets/Make.defs
|
||||
# Adds selected applications to apps/ build
|
||||
#
|
||||
# Copyright (C) 2018 Gregory Nutt. All rights reserved.
|
||||
@ -35,6 +35,6 @@
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS),y)
|
||||
CONFIGURED_APPS += graphics/NxWidgets/nxwidgets
|
||||
CONFIGURED_APPS += graphics/nxwidgets
|
||||
endif
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#################################################################################
|
||||
# appx/graphics/NxWidgets/nxwidgets/Makefile
|
||||
# appx/graphics/nxwidgets/Makefile
|
||||
#
|
||||
# Copyright (C) 2012-2014, 2018 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -61,19 +61,6 @@ CXXSRCS += csliderhorizontalgrip.cxx cslidervertical.cxx csliderverticalgrip.cxx
|
||||
CXXSRCS += cstickybutton.cxx cstickybuttonarray.cxx cstickyimage.cxx ctabpanel.cxx
|
||||
CXXSRCS += ctextbox.cxx
|
||||
|
||||
# Images
|
||||
|
||||
CXXSRCS += glyph_nxlogo160x160.cxx glyph_nxlogo320x320.cxx
|
||||
CXXSRCS += glyph_arrowdown.cxx glyph_checkboxon.cxx glyph_screendepthup.cxx
|
||||
CXXSRCS += glyph_arrowleft.cxx glyph_control.cxx glyph_screenflipdown.cxx
|
||||
CXXSRCS += glyph_arrowright.cxx glyph_cycle.cxx glyph_screenflipup.cxx
|
||||
CXXSRCS += glyph_arrowup.cxx glyph_radiobuttonoff.cxx glyph_shift.cxx
|
||||
CXXSRCS += glyph_backspace.cxx glyph_radiobuttonmu.cxx glyph_windowclose.cxx
|
||||
CXXSRCS += glyph_capslock.cxx glyph_radiobuttonon.cxx glyph_windowdepthdown.cxx
|
||||
CXXSRCS += glyph_checkboxmu.cxx glyph_return.cxx glyph_windowdepthup.cxx
|
||||
CXXSRCS += glyph_checkboxoff.cxx glyph_screendepthdown.cxx
|
||||
|
||||
VPATH = src
|
||||
|
||||
include $(APPDIR)/Application.mk
|
||||
|
||||
@ -69,32 +69,3 @@ UnitTests
|
||||
Provides a collection of unit-level tests for many of the individual
|
||||
widgets provided by nxwidgets.
|
||||
|
||||
nxwm
|
||||
|
||||
This directory holds a tiny desktop for small embedded devices with a
|
||||
touchscreen,. NxWM. NxWM is true multiple window manager but only one
|
||||
window is displayed at a time. This simplification helps performance on
|
||||
LCD based products (in the same way that a tiled window manager helps)
|
||||
and also makes the best use of small displays. It is awkward from a
|
||||
human factors point-of-view trying to manage multiple windows on a
|
||||
small display.
|
||||
|
||||
The window manager consists of a task bar with icons representing the
|
||||
running tasks. If you touch the task's icon, it comes to the top. Each
|
||||
window has a toolbar with (1) a title, (2) a minimize button, and (3) a
|
||||
stop application button using the standard icons for these things.
|
||||
|
||||
There is always a start window that is available in the task bar. When
|
||||
you touch the start window icon, it brings up the start window containing
|
||||
icons representing all of the available applications. If you touch an
|
||||
icon in the start window, it will be started and added to the task bar.
|
||||
|
||||
There is a base class that defines an add-on application and an
|
||||
interface that supports incorporation of new application. The only
|
||||
application that is provided is NxTerm. This is an NSH session
|
||||
running in a window. You should be able to select the NX icon in the start
|
||||
menu and create as many NSH sessions in windows as you want. (keybard input
|
||||
still comes through serial).
|
||||
|
||||
Note 1: NwWM requires NuttX-7.19 or above to work with the current
|
||||
NxWidgets-1.18 release.
|
||||
44
graphics/nxwidgets/TODO.txt
Normal file
44
graphics/nxwidgets/TODO.txt
Normal file
@ -0,0 +1,44 @@
|
||||
NxWidgets
|
||||
---------
|
||||
|
||||
Title: LARGE BITMAP SUPPORT
|
||||
Description: In CImage, m_origin.x and .y need to be allowed to go
|
||||
negative so that you can pan through a large image.
|
||||
Status: Open
|
||||
Priority: Low
|
||||
|
||||
Title: GLYPH BACKGROUNDS
|
||||
Description: For most glyphs, background could is set to the currently
|
||||
selected background color. An option should be to set the
|
||||
background of glyphs (only) to transparent.
|
||||
Status: Open
|
||||
Priority: Low for now
|
||||
|
||||
Title: MESSAGE BOX
|
||||
Description: Need the moral equivalent of a Windows message box: A
|
||||
simple, model window that provides a message a button to
|
||||
dismiss the message. This would be helpful, for example,
|
||||
to handle behaviors on errors instead of just failing
|
||||
quietly.
|
||||
Status: Open
|
||||
Priority: Low. Nothing depends on this now.
|
||||
Priority: Medium. That is big functional limitation.
|
||||
|
||||
o Platform specific Issues
|
||||
------------------------
|
||||
|
||||
Title: BUGS WHEN CANNOT READ FROM LCD
|
||||
Description: There is a kludge in the code to handle the case where we cannot
|
||||
read the background data because the LCD does not support read
|
||||
operations. You cannot read from the STM3240G-EVAL LCD right
|
||||
now (it might be possible, but I have not figured out how yet).
|
||||
|
||||
In that case, we just use the default background color. However,
|
||||
that doesn't work either for the case where the background color
|
||||
changes when the widget is selected. Then the background color
|
||||
in the font is wrong. There is a hack in in CButtonArrary that
|
||||
fixed this problem, but the problem certainly exists in other
|
||||
places as well and begs for a better solution.
|
||||
Status: Open
|
||||
Priority: Medium-Low
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
############################################################################
|
||||
# apps/graphics/NxWidgets/UnitTests/CButton/Make.defs
|
||||
# apps/graphics/nxwidgets/UnitTests/CButton/Make.defs
|
||||
# Adds selected applications to apps/ build
|
||||
#
|
||||
# Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved.
|
||||
@ -35,6 +35,6 @@
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CBUTTON),y)
|
||||
CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CButton
|
||||
CONFIGURED_APPS += graphics/nxwidget/UnitTests/CButton
|
||||
endif
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#################################################################################
|
||||
# apps/graphics/NxWidgets/Unitests/CButton/Makefile
|
||||
# apps/graphics/nxwidgets/Unitests/CButton/Makefile
|
||||
#
|
||||
# Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// apps/graphics/NxWidgets/UnitTests/CButton/cbutton_main.cxx
|
||||
// apps/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx
|
||||
//
|
||||
// Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
// Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -46,7 +46,7 @@
|
||||
|
||||
#include <nuttx/nx/nx.h>
|
||||
|
||||
#include "nxwidgets/cbuttontest.hxx"
|
||||
#include "graphics/nxwidgets/cbuttontest.hxx"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Definitions
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// apps/graphics/NxWidgets/UnitTests/CButton/cbuttontest.cxx
|
||||
// apps/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx
|
||||
//
|
||||
// Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
// Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -47,9 +47,9 @@
|
||||
#include <nuttx/nx/nx.h>
|
||||
#include <nuttx/nx/nxfonts.h>
|
||||
|
||||
#include "nxwidgets/nxconfig.hxx"
|
||||
#include "nxwidgets/cbuttontest.hxx"
|
||||
#include "nxwidgets/cbgwindow.hxx"
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbuttontest.hxx"
|
||||
#include "graphics/nxwidgets/cbgwindow.hxx"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Definitions
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// apps/graphics/NxWidgets/UnitTests/CButton/cbuttontest.hxx
|
||||
// apps/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx
|
||||
//
|
||||
// Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
// Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -49,14 +49,14 @@
|
||||
|
||||
#include <nuttx/nx/nx.h>
|
||||
|
||||
#include "nxwidgets/nxconfig.hxx"
|
||||
#include "nxwidgets/cwidgetcontrol.hxx"
|
||||
#include "nxwidgets/ccallback.hxx"
|
||||
#include "nxwidgets/cbgwindow.hxx"
|
||||
#include "nxwidgets/cnxserver.hxx"
|
||||
#include "nxwidgets/cnxfont.hxx"
|
||||
#include "nxwidgets/cnxstring.hxx"
|
||||
#include "nxwidgets/cbutton.hxx"
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cwidgetcontrol.hxx"
|
||||
#include "graphics/nxwidgets/ccallback.hxx"
|
||||
#include "graphics/nxwidgets/cbgwindow.hxx"
|
||||
#include "graphics/nxwidgets/cnxserver.hxx"
|
||||
#include "graphics/nxwidgets/cnxfont.hxx"
|
||||
#include "graphics/nxwidgets/cnxstring.hxx"
|
||||
#include "graphics/nxwidgets/cbutton.hxx"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Definitions
|
||||
@ -1,5 +1,5 @@
|
||||
############################################################################
|
||||
# apps/graphics/NxWidgets/UnitTests/CButtonArray/Make.defs
|
||||
# apps/graphics/nxwidgets/UnitTests/CButtonArray/Make.defs
|
||||
# Adds selected applications to apps/ build
|
||||
#
|
||||
# Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved.
|
||||
@ -35,6 +35,6 @@
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CBUTTONARRAY),y)
|
||||
CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CButtonArray
|
||||
CONFIGURED_APPS += graphics/nxwidget/UnitTests/CButtonArray
|
||||
endif
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#################################################################################
|
||||
# apps/graphics/NxWidgets/UnitTests/CButtonArray/Makefile
|
||||
# apps/graphics/nxwidgets/UnitTests/CButtonArray/Makefile
|
||||
#
|
||||
# Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// apps/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
|
||||
// apps/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
|
||||
//
|
||||
// Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
// Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -47,8 +47,8 @@
|
||||
|
||||
#include <nuttx/nx/nx.h>
|
||||
|
||||
#include "nxwidgets/cnxstring.hxx"
|
||||
#include "nxwidgets/cbuttonarraytest.hxx"
|
||||
#include "graphics/nxwidgets/cnxstring.hxx"
|
||||
#include "graphics/nxwidgets/cbuttonarraytest.hxx"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Definitions
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// apps/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx
|
||||
// apps/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx
|
||||
//
|
||||
// Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
// Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -47,9 +47,9 @@
|
||||
#include <nuttx/nx/nx.h>
|
||||
#include <nuttx/nx/nxfonts.h>
|
||||
|
||||
#include "nxwidgets/nxconfig.hxx"
|
||||
#include "nxwidgets/cbuttonarraytest.hxx"
|
||||
#include "nxwidgets/cbgwindow.hxx"
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cbuttonarraytest.hxx"
|
||||
#include "graphics/nxwidgets/cbgwindow.hxx"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Definitions
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// apps/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
|
||||
// apps/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
|
||||
//
|
||||
// Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
||||
// Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
@ -49,14 +49,14 @@
|
||||
|
||||
#include <nuttx/nx/nx.h>
|
||||
|
||||
#include "nxwidgets/nxconfig.hxx"
|
||||
#include "nxwidgets/cwidgetcontrol.hxx"
|
||||
#include "nxwidgets/ccallback.hxx"
|
||||
#include "nxwidgets/cbgwindow.hxx"
|
||||
#include "nxwidgets/cnxserver.hxx"
|
||||
#include "nxwidgets/cnxfont.hxx"
|
||||
#include "nxwidgets/cnxstring.hxx"
|
||||
#include "nxwidgets/cbuttonarray.hxx"
|
||||
#include "graphics/nxwidgets/nxconfig.hxx"
|
||||
#include "graphics/nxwidgets/cwidgetcontrol.hxx"
|
||||
#include "graphics/nxwidgets/ccallback.hxx"
|
||||
#include "graphics/nxwidgets/cbgwindow.hxx"
|
||||
#include "graphics/nxwidgets/cnxserver.hxx"
|
||||
#include "graphics/nxwidgets/cnxfont.hxx"
|
||||
#include "graphics/nxwidgets/cnxstring.hxx"
|
||||
#include "graphics/nxwidgets/cbuttonarray.hxx"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Definitions
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user