diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-05-15 16:45:57 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-05-15 16:45:57 -0600 |
| commit | 34c08471a0ea3a1705e0f6244b318dcfe8f3090d (patch) | |
| tree | ece4f76d5892b2029e3e2ef7a5739c60fc10e67d /NxWidgets/nxwm/include | |
| parent | 1ca4adc13c09facc71524e80a0bb134c6921598c (diff) | |
| download | px4-nuttx-34c08471a0ea3a1705e0f6244b318dcfe8f3090d.tar.gz px4-nuttx-34c08471a0ea3a1705e0f6244b318dcfe8f3090d.tar.bz2 px4-nuttx-34c08471a0ea3a1705e0f6244b318dcfe8f3090d.zip | |
Add NxWdigets::CGlyphSliderHorizontal and associated grip widgets. From Ken Pettit.
Diffstat (limited to 'NxWidgets/nxwm/include')
| -rw-r--r-- | NxWidgets/nxwm/include/cmediaplayer.hxx | 7 | ||||
| -rw-r--r-- | NxWidgets/nxwm/include/nxwmconfig.hxx | 20 | ||||
| -rw-r--r-- | NxWidgets/nxwm/include/nxwmglyphs.hxx | 7 |
3 files changed, 33 insertions, 1 deletions
diff --git a/NxWidgets/nxwm/include/cmediaplayer.hxx b/NxWidgets/nxwm/include/cmediaplayer.hxx index 88143617e..81656c761 100644 --- a/NxWidgets/nxwm/include/cmediaplayer.hxx +++ b/NxWidgets/nxwm/include/cmediaplayer.hxx @@ -46,9 +46,10 @@ #include <nuttx/nx/nxtk.h> #include <nuttx/nx/nxconsole.h> -#include "cbuttonarray.hxx" +#include "cimage.hxx" #include "clabel.hxx" #include "cnxfont.hxx" +#include "cglyphsliderhorizontal.hxx" #include "iapplication.hxx" #include "capplicationwindow.hxx" @@ -105,6 +106,10 @@ namespace NxWM NXWidgets::CLabel *m_text; /**< Some text in the app for now */ NXWidgets::CNxFont *m_font; /**< The font used in the media player */ + NXWidgets::CImage *m_rew; /**< Rewind control */ + NXWidgets::CImage *m_playPause; /**< Play/Pause control */ + NXWidgets::CImage *m_fwd; /**< Forward control */ + NXWidgets::CGlyphSliderHorizontal *m_volume; /**< Volume control */ /** * Calculator geometry. This stuff does not really have to be retained diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx index d57b58b59..ad8e0e97d 100644 --- a/NxWidgets/nxwm/include/nxwmconfig.hxx +++ b/NxWidgets/nxwm/include/nxwmconfig.hxx @@ -552,6 +552,26 @@ # define CONFIG_NXWM_MEDIAPLAYER_ICON NxWM::g_mediaplayerBitmap #endif +#ifndef CONFIG_NXWM_MPLAYER_FWD_ICON +# define CONFIG_NXWM_MPLAYER_FWD_ICON NxWM::g_mplayerFwdBitmap +#endif + +#ifndef CONFIG_NXWM_MPLAYER_PLAY_ICON +# define CONFIG_NXWM_MPLAYER_PLAY_ICON NxWM::g_mplayerPlayBitmap +#endif + +#ifndef CONFIG_NXWM_MPLAYER_PAUSE_ICON +# define CONFIG_NXWM_MPLAYER_PAUSE_ICON NxWM::g_mplayerPauseBitmap +#endif + +#ifndef CONFIG_NXWM_MPLAYER_REW_ICON +# define CONFIG_NXWM_MPLAYER_REW_ICON NxWM::g_mplayerRewBitmap +#endif + +#ifndef CONFIG_NXWM_MPLAYER_VOL_ICON +# define CONFIG_NXWM_MPLAYER_VOL_ICON NxWM::g_mplayerVolBitmap +#endif + #ifndef CONFIG_NXWM_MEDIAPLAYER_FONTID # define CONFIG_NXWM_MEDIAPLAYER_FONTID CONFIG_NXWM_DEFAULT_FONTID #endif diff --git a/NxWidgets/nxwm/include/nxwmglyphs.hxx b/NxWidgets/nxwm/include/nxwmglyphs.hxx index 74b527611..5bcd4fb83 100644 --- a/NxWidgets/nxwm/include/nxwmglyphs.hxx +++ b/NxWidgets/nxwm/include/nxwmglyphs.hxx @@ -60,7 +60,14 @@ namespace NxWM extern const struct NXWidgets::SRlePaletteBitmap g_calculatorBitmap; extern const struct NXWidgets::SRlePaletteBitmap g_calibrationBitmap; extern const struct NXWidgets::SRlePaletteBitmap g_cmdBitmap; +#ifdef CONFIG_NXWM_MEDIAPLAYER extern const struct NXWidgets::SRlePaletteBitmap g_mediaplayerBitmap; + extern const struct NXWidgets::SRlePaletteBitmap g_mplayerFwdBitmap; + extern const struct NXWidgets::SRlePaletteBitmap g_mplayerPlayBitmap; + extern const struct NXWidgets::SRlePaletteBitmap g_mplayerPauseBitmap; + extern const struct NXWidgets::SRlePaletteBitmap g_mplayerRewBitmap; + extern const struct NXWidgets::SRlePaletteBitmap g_mplayerVolBitmap; +#endif extern const struct NXWidgets::SRlePaletteBitmap g_minimizeBitmap; extern const struct NXWidgets::SRlePaletteBitmap g_nshBitmap; extern const struct NXWidgets::SRlePaletteBitmap g_playBitmap; |