sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NxWM: Add larger media player icon

Browse Source
This commit is contained in:
Gregory Nutt 2014-07-14 09:20:13 -06:00
parent de5c7fa462
commit dd47fa066a
6 changed files with 119 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nxwm/Makefile
View File

@ -86,7 +86,12 @@ CXXSRCS += glyph_minimize21x21.cxx glyph_play24x24.cxx glyph_stop21x21.cxx
endif
ifeq ($(CONFIG_NXWM_MEDIAPLAYER),y)
CXXSRCS += glyph_mediaplayer24x24.cxx cmediaplayer.cxx glyph_mplayer_controls32x32.cxx
CXXSRCS += cmediaplayer.cxx
ifeq ($(CONFIG_NXWM_LARGE_ICONS),y)
CXXSRCS += glyph_mediaplayer44x50.cxx glyph_mplayer_controls32x32.cxx
else
CXXSRCS += glyph_mediaplayer24x24.cxx glyph_mplayer_controls32x32.cxx
endif
endif
SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS)

BIN
nxwm/images/mediaplayer24x24.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
nxwm/images/mediaplayer44x50.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

2
nxwm/include/nxwmglyphs.hxx
View File

@ -1,7 +1,7 @@
/****************************************************************************
* NxWidgets/nxwm/include/nxwmconfig.hxx
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

20
nxwm/src/glyph_calibration24x21.cxx
View File

@ -144,11 +144,11 @@ static const nxgl_mxpixel_t g_calibrationSelectedLut[BITMAP_NLUTCODES] =
static const struct NXWidgets::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 */
{ 11, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 2, 1}, { 2, 2}, { 1, 3}, { 1, 2}, /* Row 2 */
{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 */
{11, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 2, 1}, { 2, 2}, { 1, 3}, { 1, 2}, /* Row 2 */
{ 3, 0},
{ 11, 0}, { 1, 1}, { 1, 3}, { 2, 1}, { 2, 2}, { 2, 0}, { 1, 3}, { 4, 0}, /* Row 3 */
{11, 0}, { 1, 1}, { 1, 3}, { 2, 1}, { 2, 2}, { 2, 0}, { 1, 3}, { 4, 0}, /* Row 3 */
{ 9, 0}, { 2, 1}, { 2, 3}, { 2, 2}, { 4, 0}, { 1, 3}, { 4, 0}, /* Row 4 */
{ 3, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 2, 1}, { 2, 2}, { 1, 1}, { 1, 2}, /* Row 5 */
{ 5, 0}, { 1, 1}, { 2, 3}, { 3, 0},
@ -167,14 +167,14 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_calibrationRleEntries[]
{ 1, 0}, { 1, 1}, { 1, 3}, { 2, 4}, { 1, 5}, { 2, 3}, { 3, 0}, { 1, 1}, /* Row 12 */
{ 1, 2}, { 2, 0}, { 9, 3},
{ 1, 0}, { 1, 1}, { 1, 0}, { 2, 4}, { 1, 5}, { 1, 0}, { 1, 3}, { 3, 0}, /* Row 13 */
{ 1, 1}, { 1, 2}, { 11, 0},
{ 1, 1}, { 1, 2}, {11, 0},
{ 1, 0}, { 1, 1}, { 1, 0}, { 2, 4}, { 1, 5}, { 1, 0}, { 1, 3}, { 3, 0}, /* Row 14 */
{ 1, 1}, { 1, 2}, { 11, 0},
{ 1, 1}, { 1, 2}, {11, 0},
{ 1, 0}, { 1, 1}, { 1, 0}, { 2, 4}, { 1, 5}, { 1, 0}, { 1, 3}, { 3, 0}, /* Row 15 */
{ 1, 1}, { 1, 2}, { 11, 0},
{ 9, 3}, { 2, 0}, { 1, 1}, { 1, 2}, { 11, 0}, /* Row 16 */
{ 11, 0}, { 1, 1}, { 1, 2}, { 11, 0}, /* Row 17 */
{ 10, 0}, { 1, 1}, { 2, 3}, { 1, 2}, { 10, 0}, /* Row 18 */
{ 1, 1}, { 1, 2}, {11, 0},
{ 9, 3}, { 2, 0}, { 1, 1}, { 1, 2}, {11, 0}, /* Row 16 */
{11, 0}, { 1, 1}, { 1, 2}, {11, 0}, /* Row 17 */
{10, 0}, { 1, 1}, { 2, 3}, { 1, 2}, {10, 0}, /* Row 18 */
{ 5, 0}, { 4, 1}, { 6, 3}, { 4, 2}, { 5, 0}, /* Row 19 */
{ 4, 0}, { 4, 1}, { 8, 3}, { 4, 2}, { 4, 0}, /* Row 20 */
};

16
nxwm/src/glyph_mediaplayer24x24.cxx
View File

@ -37,9 +37,6 @@
* Included Files
********************************************************************************************/
/* Automatically NuttX bitmap file. */
/* Generated from play_music.png by bitmap_converter.py. */
#include <nuttx/config.h>
#include <sys/types.h>
@ -55,7 +52,6 @@
#include "nxwmconfig.hxx"
#include "nxwmglyphs.hxx"
/********************************************************************************************
* Pre-Processor Definitions
********************************************************************************************/
@ -64,6 +60,10 @@
#define BITMAP_HEIGHT 24
#define BITMAP_PALETTESIZE 9
/********************************************************************************************
* Private Bitmap Data
********************************************************************************************/
using namespace NxWM;
/* RGB24 (8-8-8) Colors */
@ -142,12 +142,16 @@ static const NXWidgets::SRlePaletteBitmapEntry bitmap[] =
{ 1, 0}, { 1, 6}, { 1, 3}, { 1, 2}, { 9, 1}, { 1, 4},
{ 1, 5}, { 2, 8}, /* Row 19 */
{ 3, 8}, { 1, 5}, { 1, 4}, { 1, 1}, { 1, 3}, { 1, 5},
{ 1, 3}, { 10, 1}, { 1, 4}, { 1, 5}, { 3, 8}, /* Row 20 */
{ 4, 8}, { 2, 4}, { 12, 1}, { 2, 4}, { 4, 8}, /* Row 21 */
{ 1, 3}, {10, 1}, { 1, 4}, { 1, 5}, { 3, 8}, /* Row 20 */
{ 4, 8}, { 2, 4}, {12, 1}, { 2, 4}, { 4, 8}, /* Row 21 */
{ 6, 8}, { 2, 4}, { 8, 1}, { 2, 4}, { 6, 8}, /* Row 22 */
{ 8, 8}, { 8, 4}, { 8, 8}, /* Row 23 */
};
/********************************************************************************************
* Public Bitmap Structure Definitions
********************************************************************************************/
const struct NXWidgets::SRlePaletteBitmap NxWM::g_mediaplayerBitmap =
{
CONFIG_NXWIDGETS_BPP,