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 endif
ifeq ($(CONFIG_NXWM_MEDIAPLAYER),y) 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 endif
SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS) 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 * 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> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without

12
nxwm/src/glyph_mediaplayer24x24.cxx
View File

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