From dee7f14b492cb27a132b241d20638dbf6d37e1a7 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 4 Apr 2019 18:53:29 -0600 Subject: [PATCH] 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. --- graphics/NxWidgets/Makefile | 38 - graphics/NxWidgets/UnitTests/nxwm/.gitignore | 10 - graphics/NxWidgets/UnitTests/nxwm/Make.defs | 39 - graphics/NxWidgets/UnitTests/nxwm/Makefile | 51 - graphics/nxglyphs/Kconfig | 8 + .../UnitTests => nxglyphs}/Make.defs | 8 +- graphics/nxglyphs/Makefile | 81 + .../images/calculator24x25.png | Bin .../images/calculator47x49.png | Bin .../images/calibration24x21.png | Bin .../images/calibration48x42.png | Bin .../nxwm => nxglyphs}/images/cmd25x22.png | Bin .../nxwm => nxglyphs}/images/cmd49x43.png | Bin .../images/mediaforward32x32.png | Bin .../images/mediaforward43x41.png | Bin .../images/mediagrip22x22.png | Bin .../images/mediagrip60x30.png | Bin .../images/mediapause32x32.png | Bin .../images/mediapause43x41.png | Bin .../images/mediaplay32x32.png | Bin .../images/mediaplay43x41.png | Bin .../images/mediaplayer24x24.png | Bin .../images/mediaplayer44x50.png | Bin .../images/mediarewind32x32.png | Bin .../images/mediarewind43x41.png | Bin .../images/minimize21x21.png | Bin .../images/minimize42x42.png | Bin .../nxwm => nxglyphs}/images/play24x24.png | Bin .../nxwm => nxglyphs}/images/play48x48.png | Bin .../nxwm => nxglyphs}/images/stop21x21.png | Bin .../nxwm => nxglyphs}/images/stop42x42.png | Bin .../src/glyph_arrowdown.cxx | 4 +- .../src/glyph_arrowleft.cxx | 4 +- .../src/glyph_arrowright.cxx | 4 +- .../src/glyph_arrowup.cxx | 4 +- .../src/glyph_backspace.cxx | 4 +- .../src/glyph_calculator24x25.cxx | 10 +- .../src/glyph_calculator47x49.cxx | 10 +- .../src/glyph_calibration24x21.cxx | 10 +- .../src/glyph_calibration48x42.cxx | 10 +- .../src/glyph_capslock.cxx | 4 +- .../src/glyph_checkboxmu.cxx | 4 +- .../src/glyph_checkboxoff.cxx | 4 +- .../src/glyph_checkboxon.cxx | 4 +- .../nxwm => nxglyphs}/src/glyph_cmd25x22.cxx | 10 +- .../nxwm => nxglyphs}/src/glyph_cmd49x43.cxx | 10 +- .../src/glyph_control.cxx | 4 +- .../src/glyph_cycle.cxx | 4 +- .../src/glyph_mediagrip60x30.cxx | 10 +- .../src/glyph_mediaplayer24x24.cxx | 14 +- .../src/glyph_mediaplayer44x50.cxx | 10 +- .../src/glyph_minimize21x21.cxx | 10 +- .../src/glyph_minimize42x42.cxx | 10 +- .../src/glyph_mplayer_controls32x32.cxx | 30 +- .../src/glyph_mplayer_controls43x41.cxx | 26 +- .../src/glyph_nxlogo160x160.cxx | 4 +- .../src/glyph_nxlogo320x320.cxx | 4 +- .../nxwm => nxglyphs}/src/glyph_play24x24.cxx | 10 +- .../nxwm => nxglyphs}/src/glyph_play48x48.cxx | 10 +- .../src/glyph_radiobuttonmu.cxx | 4 +- .../src/glyph_radiobuttonoff.cxx | 4 +- .../src/glyph_radiobuttonon.cxx | 4 +- .../src/glyph_return.cxx | 4 +- .../src/glyph_screendepthdown.cxx | 4 +- .../src/glyph_screendepthup.cxx | 4 +- .../src/glyph_screenflipdown.cxx | 4 +- .../src/glyph_screenflipup.cxx | 4 +- .../src/glyph_shift.cxx | 4 +- .../nxwm => nxglyphs}/src/glyph_stop21x21.cxx | 10 +- .../nxwm => nxglyphs}/src/glyph_stop42x42.cxx | 10 +- .../src/glyph_windowclose.cxx | 4 +- .../src/glyph_windowdepthdown.cxx | 4 +- .../src/glyph_windowdepthup.cxx | 4 +- graphics/{NxWidgets => }/nxwidgets/.gitignore | 0 graphics/{NxWidgets => }/nxwidgets/COPYING | 0 .../{NxWidgets => nxwidgets}/ChangeLog.txt | 0 .../{NxWidgets => nxwidgets}/Doxygen/Doxyfile | 0 .../Doxygen/README.txt | 0 .../Doxygen/gendoc.sh | 2 +- graphics/{NxWidgets => }/nxwidgets/Kconfig | 0 graphics/{NxWidgets => }/nxwidgets/Make.defs | 4 +- graphics/{NxWidgets => }/nxwidgets/Makefile | 15 +- graphics/{NxWidgets => nxwidgets}/README.txt | 29 - .../{NxWidgets => nxwidgets}/ReleaseNotes.txt | 0 graphics/nxwidgets/TODO.txt | 44 + .../UnitTests/CButton/.gitignore | 0 .../UnitTests/CButton/Make.defs | 4 +- .../UnitTests/CButton/Makefile | 2 +- .../UnitTests/CButton/cbutton-pushed.png | Bin .../UnitTests/CButton/cbutton-released.png | Bin .../UnitTests/CButton/cbutton_main.cxx | 4 +- .../UnitTests/CButton/cbuttontest.cxx | 8 +- .../UnitTests/CButton/cbuttontest.hxx | 18 +- .../UnitTests/CButtonArray/.gitignore | 0 .../UnitTests/CButtonArray/Make.defs | 4 +- .../UnitTests/CButtonArray/Makefile | 2 +- .../UnitTests/CButtonArray/cbuttonarray.png | Bin .../CButtonArray/cbuttonarray_main.cxx | 6 +- .../CButtonArray/cbuttonarraytest.cxx | 8 +- .../CButtonArray/cbuttonarraytest.hxx | 18 +- .../UnitTests/CCheckBox/.gitignore | 0 .../UnitTests/CCheckBox/Make.defs | 4 +- .../UnitTests/CCheckBox/Makefile | 2 +- .../UnitTests/CCheckBox/ccheckbox.png | Bin .../UnitTests/CCheckBox/ccheckbox_main.cxx | 8 +- .../UnitTests/CCheckBox/ccheckboxtest.cxx | 12 +- .../UnitTests/CCheckBox/ccheckboxtest.hxx | 14 +- .../UnitTests/CGlyphButton/.gitignore | 0 .../UnitTests/CGlyphButton/Make.defs | 4 +- .../UnitTests/CGlyphButton/Makefile | 2 +- .../CGlyphButton/cglyphbutton_main.cxx | 6 +- .../CGlyphButton/cglyphbuttontest.cxx | 8 +- .../CGlyphButton/cglyphbuttontest.hxx | 20 +- .../CGlyphSliderHorizontal/.gitignore | 0 .../CGlyphSliderHorizontal/Make.defs | 4 +- .../UnitTests/CGlyphSliderHorizontal/Makefile | 2 +- .../cglyphsliderhorizontal_main.cxx | 4 +- .../cglyphsliderhorizontaltest.cxx | 10 +- .../cglyphsliderhorizontaltest.hxx | 14 +- .../UnitTests/CImage/.gitignore | 0 .../UnitTests/CImage/Make.defs | 4 +- .../UnitTests/CImage/Makefile | 2 +- .../UnitTests/CImage/cimage_main.cxx | 8 +- .../UnitTests/CImage/cimagetest.cxx | 10 +- .../UnitTests/CImage/cimagetest.hxx | 18 +- .../UnitTests/CKeypad/.gitignore | 0 .../UnitTests/CKeypad/Make.defs | 4 +- .../UnitTests/CKeypad/Makefile | 2 +- .../UnitTests/CKeypad/ckeypad_main.cxx | 6 +- .../UnitTests/CKeypad/ckeypadtest.cxx | 14 +- .../UnitTests/CKeypad/ckeypadtest.hxx | 20 +- .../UnitTests/CLabel/.gitignore | 0 .../UnitTests/CLabel/Make.defs | 4 +- .../UnitTests/CLabel/Makefile | 2 +- .../UnitTests/CLabel/clabel.png | Bin .../UnitTests/CLabel/clabel_main.cxx | 4 +- .../UnitTests/CLabel/clabeltest.cxx | 8 +- .../UnitTests/CLabel/clabeltest.hxx | 18 +- .../UnitTests/CLatchButton/.gitignore | 0 .../UnitTests/CLatchButton/Make.defs | 4 +- .../UnitTests/CLatchButton/Makefile | 2 +- .../CLatchButton/clatchbutton_main.cxx | 4 +- .../CLatchButton/clatchbuttontest.cxx | 8 +- .../CLatchButton/clatchbuttontest.hxx | 18 +- .../UnitTests/CLatchButtonArray/.gitignore | 0 .../UnitTests/CLatchButtonArray/Make.defs | 4 +- .../UnitTests/CLatchButtonArray/Makefile | 2 +- .../clatchbuttonarray_main.cxx | 6 +- .../clatchbuttonarraytest.cxx | 8 +- .../clatchbuttonarraytest.hxx | 18 +- .../UnitTests/CListBox/.gitignore | 0 .../UnitTests/CListBox/Make.defs | 4 +- .../UnitTests/CListBox/Makefile | 2 +- .../UnitTests/CListBox/clistbox_main.cxx | 4 +- .../UnitTests/CListBox/clistboxtest.cxx | 8 +- .../UnitTests/CListBox/clistboxtest.hxx | 14 +- .../UnitTests/CProgressBar/.gitignore | 0 .../UnitTests/CProgressBar/Make.defs | 4 +- .../UnitTests/CProgressBar/Makefile | 2 +- .../UnitTests/CProgressBar/cprogressbar.png | Bin .../CProgressBar/cprogressbar_main.cxx | 4 +- .../CProgressBar/cprogressbartest.cxx | 8 +- .../CProgressBar/cprogressbartest.hxx | 14 +- .../UnitTests/CRadioButton/.gitignore | 0 .../UnitTests/CRadioButton/Make.defs | 4 +- .../UnitTests/CRadioButton/Makefile | 2 +- .../UnitTests/CRadioButton/cradiobutton.png | Bin .../CRadioButton/cradiobutton_main.cxx | 8 +- .../CRadioButton/cradiobuttontest.cxx | 12 +- .../CRadioButton/cradiobuttontest.hxx | 16 +- .../UnitTests/CScrollbarHorizontal/.gitignore | 0 .../UnitTests/CScrollbarHorizontal/Make.defs | 4 +- .../UnitTests/CScrollbarHorizontal/Makefile | 2 +- .../cscrollbarhorizontal.png | Bin .../cscrollbarhorizontal_main.cxx | 4 +- .../cscrollbarhorizontaltest.cxx | 8 +- .../cscrollbarhorizontaltest.hxx | 14 +- .../UnitTests/CScrollbarVertical/.gitignore | 0 .../UnitTests/CScrollbarVertical/Make.defs | 4 +- .../UnitTests/CScrollbarVertical/Makefile | 2 +- .../CScrollbarVertical/cscrollbarvertical.png | Bin .../cscrollbarvertical_main.cxx | 4 +- .../cscrollbarverticaltest.cxx | 8 +- .../cscrollbarverticaltest.hxx | 14 +- .../UnitTests/CSliderHorizonal/.gitignore | 0 .../UnitTests/CSliderHorizonal/Make.defs | 4 +- .../UnitTests/CSliderHorizonal/Makefile | 2 +- .../CSliderHorizonal/csliderhorizontal.png | Bin .../csliderhorizontal_main.cxx | 4 +- .../csliderhorizontaltest.cxx | 8 +- .../csliderhorizontaltest.hxx | 14 +- .../UnitTests/CSliderVertical/.gitignore | 0 .../UnitTests/CSliderVertical/Make.defs | 4 +- .../UnitTests/CSliderVertical/Makefile | 2 +- .../CSliderVertical/cslidervertical.png | Bin .../CSliderVertical/cslidervertical_main.cxx | 4 +- .../CSliderVertical/csliderverticaltest.cxx | 8 +- .../CSliderVertical/csliderverticaltest.hxx | 14 +- .../UnitTests/CTextBox/.gitignore | 0 .../UnitTests/CTextBox/Make.defs | 4 +- .../UnitTests/CTextBox/Makefile | 2 +- .../UnitTests/CTextBox/ctextbox.png | Bin .../UnitTests/CTextBox/ctextbox_main.cxx | 4 +- .../UnitTests/CTextBox/ctextboxtest.cxx | 8 +- .../UnitTests/CTextBox/ctextboxtest.hxx | 18 +- .../UnitTests/Kconfig | 6 +- .../UnitTests}/Make.defs | 4 +- .../UnitTests/Makefile | 2 +- .../UnitTests/README.txt | 4 - .../UnitTests/TestStatus.txt | 0 .../{NxWidgets => }/nxwidgets/doc/mainpage.h | 0 .../nxwidgets/src/cbgwindow.cxx | 2 +- .../{NxWidgets => }/nxwidgets/src/cbitmap.cxx | 2 +- .../{NxWidgets => }/nxwidgets/src/cbutton.cxx | 2 +- .../nxwidgets/src/cbuttonarray.cxx | 2 +- .../nxwidgets/src/ccallback.cxx | 2 +- .../nxwidgets/src/ccheckbox.cxx | 4 +- .../nxwidgets/src/ccyclebutton.cxx | 4 +- .../nxwidgets/src/cglyphbutton.cxx | 2 +- .../nxwidgets/src/cglyphsliderhorizontal.cxx | 2 +- .../src/cglyphsliderhorizontalgrip.cxx | 2 +- .../nxwidgets/src/cgraphicsport.cxx | 2 +- .../{NxWidgets => }/nxwidgets/src/cimage.cxx | 2 +- .../{NxWidgets => }/nxwidgets/src/ckeypad.cxx | 2 +- .../{NxWidgets => }/nxwidgets/src/clabel.cxx | 2 +- .../nxwidgets/src/clabelgrid.cxx | 0 .../nxwidgets/src/clatchbutton.cxx | 2 +- .../nxwidgets/src/clatchbuttonarray.cxx | 2 +- .../nxwidgets/src/clistbox.cxx | 2 +- .../nxwidgets/src/clistboxdataitem.cxx | 2 +- .../nxwidgets/src/clistdata.cxx | 2 +- .../nxwidgets/src/clistdataitem.cxx | 2 +- .../nxwidgets/src/cmultilinetextbox.cxx | 2 +- .../nxwidgets/src/cnumericedit.cxx | 2 +- .../{NxWidgets => }/nxwidgets/src/cnxfont.cxx | 2 +- .../nxwidgets/src/cnxserver.cxx | 2 +- .../nxwidgets/src/cnxstring.cxx | 2 +- .../nxwidgets/src/cnxtimer.cxx | 2 +- .../nxwidgets/src/cnxtkwindow.cxx | 2 +- .../nxwidgets/src/cnxtoolbar.cxx | 2 +- .../nxwidgets/src/cnxwidget.cxx | 2 +- .../nxwidgets/src/cnxwindow.cxx | 2 +- .../nxwidgets/src/cprogressbar.cxx | 2 +- .../nxwidgets/src/cradiobutton.cxx | 4 +- .../nxwidgets/src/cradiobuttongroup.cxx | 2 +- .../{NxWidgets => }/nxwidgets/src/crect.cxx | 2 +- .../nxwidgets/src/crlepalettebitmap.cxx | 2 +- .../nxwidgets/src/cscaledbitmap.cxx | 2 +- .../nxwidgets/src/cscrollbarhorizontal.cxx | 4 +- .../nxwidgets/src/cscrollbarpanel.cxx | 2 +- .../nxwidgets/src/cscrollbarvertical.cxx | 4 +- .../nxwidgets/src/cscrollinglistbox.cxx | 2 +- .../nxwidgets/src/cscrollingpanel.cxx | 2 +- .../nxwidgets/src/cscrollingtextbox.cxx | 2 +- .../nxwidgets/src/csliderhorizontal.cxx | 2 +- .../nxwidgets/src/csliderhorizontalgrip.cxx | 2 +- .../nxwidgets/src/cslidervertical.cxx | 2 +- .../nxwidgets/src/csliderverticalgrip.cxx | 2 +- .../nxwidgets/src/cstickybutton.cxx | 2 +- .../nxwidgets/src/cstickybuttonarray.cxx | 2 +- .../nxwidgets/src/cstickyimage.cxx | 2 +- .../nxwidgets/src/cstringiterator.cxx | 2 +- .../nxwidgets/src/ctabpanel.cxx | 2 +- .../{NxWidgets => }/nxwidgets/src/ctext.cxx | 2 +- .../nxwidgets/src/ctextbox.cxx | 2 +- .../nxwidgets/src/cwidgetcontrol.cxx | 2 +- .../nxwidgets/src/cwidgeteventhandlerlist.cxx | 2 +- .../nxwidgets/src/cwindoweventhandlerlist.cxx | 2 +- .../nxwidgets/src/singletons.cxx | 2 +- graphics/{NxWidgets => }/nxwm/.gitignore | 0 graphics/{NxWidgets => }/nxwm/COPYING | 0 graphics/nxwm/ChangeLog.txt | 652 +++++++ graphics/nxwm/Doxygen/Doxyfile | 1551 +++++++++++++++++ graphics/nxwm/Doxygen/README.txt | 64 + graphics/nxwm/Doxygen/gendoc.sh | 94 + graphics/{NxWidgets => }/nxwm/Kconfig | 41 +- graphics/{NxWidgets => }/nxwm/Make.defs | 4 +- graphics/{NxWidgets => }/nxwm/Makefile | 24 +- graphics/nxwm/README.txt | 30 + graphics/nxwm/ReleaseNotes.txt | 642 +++++++ graphics/{NxWidgets => nxwm}/TODO.txt | 47 - .../nxwm/doc/NxWM-ThreadingModel.ppt | Bin .../nxwm/src/capplicationwindow.cxx | 8 +- .../{NxWidgets => }/nxwm/src/ccalibration.cxx | 4 +- .../nxwm/src/cfullscreenwindow.cxx | 4 +- .../nxwm/src/chexcalculator.cxx | 4 +- .../{NxWidgets => }/nxwm/src/ckeyboard.cxx | 2 +- .../{NxWidgets => }/nxwm/src/cmediaplayer.cxx | 6 +- graphics/{NxWidgets => }/nxwm/src/cnxterm.cxx | 4 +- .../{NxWidgets => }/nxwm/src/cstartwindow.cxx | 4 +- .../{NxWidgets => }/nxwm/src/ctaskbar.cxx | 2 +- .../{NxWidgets => }/nxwm/src/ctouchscreen.cxx | 4 +- .../nxwm/src/cwindowmessenger.cxx | 2 +- .../UnitTests/nxwm => nxwm/src}/nxwm_main.cxx | 4 +- graphics/{NxWidgets => save}/.gitignore | 0 .../{nxwidgets/glyphs.hxx => nxglyphs.hxx} | 32 +- include/graphics/nxwm/ctaskbar.hxx | 4 +- include/graphics/nxwm/nxwmconfig.hxx | 26 +- include/graphics/nxwm/nxwmglyphs.hxx | 77 - system/embedlog/Makefile | 1 + system/nxplayer/Makefile | 43 +- .../NxWidgets/tools => tools}/README.txt | 0 .../tools => tools}/bitmap_converter.py | 0 303 files changed, 3846 insertions(+), 969 deletions(-) delete mode 100644 graphics/NxWidgets/Makefile delete mode 100644 graphics/NxWidgets/UnitTests/nxwm/.gitignore delete mode 100644 graphics/NxWidgets/UnitTests/nxwm/Make.defs delete mode 100644 graphics/NxWidgets/UnitTests/nxwm/Makefile create mode 100644 graphics/nxglyphs/Kconfig rename graphics/{NxWidgets/UnitTests => nxglyphs}/Make.defs (91%) create mode 100644 graphics/nxglyphs/Makefile rename graphics/{NxWidgets/nxwm => nxglyphs}/images/calculator24x25.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/calculator47x49.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/calibration24x21.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/calibration48x42.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/cmd25x22.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/cmd49x43.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/mediaforward32x32.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/mediaforward43x41.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/mediagrip22x22.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/mediagrip60x30.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/mediapause32x32.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/mediapause43x41.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/mediaplay32x32.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/mediaplay43x41.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/mediaplayer24x24.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/mediaplayer44x50.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/mediarewind32x32.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/mediarewind43x41.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/minimize21x21.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/minimize42x42.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/play24x24.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/play48x48.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/stop21x21.png (100%) rename graphics/{NxWidgets/nxwm => nxglyphs}/images/stop42x42.png (100%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_arrowdown.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_arrowleft.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_arrowright.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_arrowup.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_backspace.cxx (98%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_calculator24x25.cxx (97%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_calculator47x49.cxx (98%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_calibration24x21.cxx (96%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_calibration48x42.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_capslock.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_checkboxmu.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_checkboxoff.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_checkboxon.cxx (98%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_cmd25x22.cxx (96%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_cmd49x43.cxx (97%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_control.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_cycle.cxx (98%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_mediagrip60x30.cxx (97%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_mediaplayer24x24.cxx (94%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_mediaplayer44x50.cxx (97%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_minimize21x21.cxx (96%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_minimize42x42.cxx (97%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_mplayer_controls32x32.cxx (96%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_mplayer_controls43x41.cxx (95%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_nxlogo160x160.cxx (99%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_nxlogo320x320.cxx (99%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_play24x24.cxx (97%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_play48x48.cxx (97%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_radiobuttonmu.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_radiobuttonoff.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_radiobuttonon.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_return.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_screendepthdown.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_screendepthup.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_screenflipdown.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_screenflipup.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_shift.cxx (98%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_stop21x21.cxx (97%) rename graphics/{NxWidgets/nxwm => nxglyphs}/src/glyph_stop42x42.cxx (97%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_windowclose.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_windowdepthdown.cxx (98%) rename graphics/{NxWidgets/nxwidgets => nxglyphs}/src/glyph_windowdepthup.cxx (98%) rename graphics/{NxWidgets => }/nxwidgets/.gitignore (100%) rename graphics/{NxWidgets => }/nxwidgets/COPYING (100%) rename graphics/{NxWidgets => nxwidgets}/ChangeLog.txt (100%) rename graphics/{NxWidgets => nxwidgets}/Doxygen/Doxyfile (100%) rename graphics/{NxWidgets => nxwidgets}/Doxygen/README.txt (100%) rename graphics/{NxWidgets => nxwidgets}/Doxygen/gendoc.sh (98%) rename graphics/{NxWidgets => }/nxwidgets/Kconfig (100%) rename graphics/{NxWidgets => }/nxwidgets/Make.defs (95%) rename graphics/{NxWidgets => }/nxwidgets/Makefile (81%) rename graphics/{NxWidgets => nxwidgets}/README.txt (62%) rename graphics/{NxWidgets => nxwidgets}/ReleaseNotes.txt (100%) create mode 100644 graphics/nxwidgets/TODO.txt rename graphics/{NxWidgets => nxwidgets}/UnitTests/CButton/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CButton/Make.defs (94%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CButton/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CButton/cbutton-pushed.png (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CButton/cbutton-released.png (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CButton/cbutton_main.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CButton/cbuttontest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CButton/cbuttontest.hxx (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CButtonArray/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CButtonArray/Make.defs (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CButtonArray/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CButtonArray/cbuttonarray.png (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CButtonArray/cbuttonarray_main.cxx (98%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CButtonArray/cbuttonarraytest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CButtonArray/cbuttonarraytest.hxx (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CCheckBox/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CCheckBox/Make.defs (94%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CCheckBox/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CCheckBox/ccheckbox.png (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CCheckBox/ccheckbox_main.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CCheckBox/ccheckboxtest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CCheckBox/ccheckboxtest.hxx (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CGlyphButton/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CGlyphButton/Make.defs (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CGlyphButton/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CGlyphButton/cglyphbutton_main.cxx (98%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CGlyphButton/cglyphbuttontest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CGlyphButton/cglyphbuttontest.hxx (92%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CGlyphSliderHorizontal/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CGlyphSliderHorizontal/Make.defs (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CGlyphSliderHorizontal/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx (98%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CImage/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CImage/Make.defs (94%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CImage/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CImage/cimage_main.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CImage/cimagetest.cxx (96%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CImage/cimagetest.hxx (91%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CKeypad/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CKeypad/Make.defs (94%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CKeypad/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CKeypad/ckeypad_main.cxx (98%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CKeypad/ckeypadtest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CKeypad/ckeypadtest.hxx (92%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLabel/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLabel/Make.defs (94%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLabel/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLabel/clabel.png (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLabel/clabel_main.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLabel/clabeltest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLabel/clabeltest.hxx (92%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLatchButton/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLatchButton/Make.defs (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLatchButton/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLatchButton/clatchbutton_main.cxx (98%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLatchButton/clatchbuttontest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLatchButton/clatchbuttontest.hxx (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLatchButtonArray/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLatchButtonArray/Make.defs (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLatchButtonArray/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx (98%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CListBox/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CListBox/Make.defs (94%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CListBox/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CListBox/clistbox_main.cxx (99%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CListBox/clistboxtest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CListBox/clistboxtest.hxx (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CProgressBar/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CProgressBar/Make.defs (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CProgressBar/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CProgressBar/cprogressbar.png (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CProgressBar/cprogressbar_main.cxx (98%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CProgressBar/cprogressbartest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CProgressBar/cprogressbartest.hxx (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CRadioButton/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CRadioButton/Make.defs (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CRadioButton/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CRadioButton/cradiobutton.png (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CRadioButton/cradiobutton_main.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CRadioButton/cradiobuttontest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CRadioButton/cradiobuttontest.hxx (92%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CScrollbarHorizontal/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CScrollbarHorizontal/Make.defs (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CScrollbarHorizontal/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal.png (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx (98%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CScrollbarVertical/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CScrollbarVertical/Make.defs (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CScrollbarVertical/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CScrollbarVertical/cscrollbarvertical.png (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx (98%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CSliderHorizonal/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CSliderHorizonal/Make.defs (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CSliderHorizonal/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CSliderHorizonal/csliderhorizontal.png (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx (98%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CSliderVertical/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CSliderVertical/Make.defs (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CSliderVertical/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CSliderVertical/cslidervertical.png (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CSliderVertical/cslidervertical_main.cxx (98%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CSliderVertical/csliderverticaltest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CSliderVertical/csliderverticaltest.hxx (93%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CTextBox/.gitignore (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CTextBox/Make.defs (94%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CTextBox/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CTextBox/ctextbox.png (100%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CTextBox/ctextbox_main.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CTextBox/ctextboxtest.cxx (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/CTextBox/ctextboxtest.hxx (92%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/Kconfig (96%) rename graphics/{NxWidgets => nxwidgets/UnitTests}/Make.defs (94%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/Makefile (97%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/README.txt (98%) rename graphics/{NxWidgets => nxwidgets}/UnitTests/TestStatus.txt (100%) rename graphics/{NxWidgets => }/nxwidgets/doc/mainpage.h (100%) rename graphics/{NxWidgets => }/nxwidgets/src/cbgwindow.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cbitmap.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cbutton.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cbuttonarray.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/ccallback.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/ccheckbox.cxx (98%) rename graphics/{NxWidgets => }/nxwidgets/src/ccyclebutton.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cglyphbutton.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cglyphsliderhorizontal.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cglyphsliderhorizontalgrip.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cgraphicsport.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cimage.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/ckeypad.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/clabel.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/clabelgrid.cxx (100%) rename graphics/{NxWidgets => }/nxwidgets/src/clatchbutton.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/clatchbuttonarray.cxx (98%) rename graphics/{NxWidgets => }/nxwidgets/src/clistbox.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/clistboxdataitem.cxx (98%) rename graphics/{NxWidgets => }/nxwidgets/src/clistdata.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/clistdataitem.cxx (98%) rename graphics/{NxWidgets => }/nxwidgets/src/cmultilinetextbox.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cnumericedit.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cnxfont.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cnxserver.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cnxstring.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cnxtimer.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cnxtkwindow.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cnxtoolbar.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cnxwidget.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cnxwindow.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cprogressbar.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cradiobutton.cxx (98%) rename graphics/{NxWidgets => }/nxwidgets/src/cradiobuttongroup.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/crect.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/crlepalettebitmap.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cscaledbitmap.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cscrollbarhorizontal.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cscrollbarpanel.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cscrollbarvertical.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cscrollinglistbox.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cscrollingpanel.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cscrollingtextbox.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/csliderhorizontal.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/csliderhorizontalgrip.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cslidervertical.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/csliderverticalgrip.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cstickybutton.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cstickybuttonarray.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cstickyimage.cxx (98%) rename graphics/{NxWidgets => }/nxwidgets/src/cstringiterator.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/ctabpanel.cxx (98%) rename graphics/{NxWidgets => }/nxwidgets/src/ctext.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/ctextbox.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cwidgetcontrol.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cwidgeteventhandlerlist.cxx (99%) rename graphics/{NxWidgets => }/nxwidgets/src/cwindoweventhandlerlist.cxx (98%) rename graphics/{NxWidgets => }/nxwidgets/src/singletons.cxx (99%) rename graphics/{NxWidgets => }/nxwm/.gitignore (100%) rename graphics/{NxWidgets => }/nxwm/COPYING (100%) create mode 100644 graphics/nxwm/ChangeLog.txt create mode 100644 graphics/nxwm/Doxygen/Doxyfile create mode 100644 graphics/nxwm/Doxygen/README.txt create mode 100644 graphics/nxwm/Doxygen/gendoc.sh rename graphics/{NxWidgets => }/nxwm/Kconfig (96%) rename graphics/{NxWidgets => }/nxwm/Make.defs (95%) rename graphics/{NxWidgets => }/nxwm/Makefile (78%) create mode 100644 graphics/nxwm/README.txt create mode 100644 graphics/nxwm/ReleaseNotes.txt rename graphics/{NxWidgets => nxwm}/TODO.txt (65%) rename graphics/{NxWidgets => }/nxwm/doc/NxWM-ThreadingModel.ppt (100%) rename graphics/{NxWidgets => }/nxwm/src/capplicationwindow.cxx (98%) rename graphics/{NxWidgets => }/nxwm/src/ccalibration.cxx (99%) rename graphics/{NxWidgets => }/nxwm/src/cfullscreenwindow.cxx (98%) rename graphics/{NxWidgets => }/nxwm/src/chexcalculator.cxx (99%) rename graphics/{NxWidgets => }/nxwm/src/ckeyboard.cxx (99%) rename graphics/{NxWidgets => }/nxwm/src/cmediaplayer.cxx (99%) rename graphics/{NxWidgets => }/nxwm/src/cnxterm.cxx (99%) rename graphics/{NxWidgets => }/nxwm/src/cstartwindow.cxx (99%) rename graphics/{NxWidgets => }/nxwm/src/ctaskbar.cxx (99%) rename graphics/{NxWidgets => }/nxwm/src/ctouchscreen.cxx (99%) rename graphics/{NxWidgets => }/nxwm/src/cwindowmessenger.cxx (99%) rename graphics/{NxWidgets/UnitTests/nxwm => nxwm/src}/nxwm_main.cxx (99%) rename graphics/{NxWidgets => save}/.gitignore (100%) rename include/graphics/{nxwidgets/glyphs.hxx => nxglyphs.hxx} (83%) delete mode 100644 include/graphics/nxwm/nxwmglyphs.hxx rename {graphics/NxWidgets/tools => tools}/README.txt (100%) rename {graphics/NxWidgets/tools => tools}/bitmap_converter.py (100%) diff --git a/graphics/NxWidgets/Makefile b/graphics/NxWidgets/Makefile deleted file mode 100644 index cdff5bb2f..000000000 --- a/graphics/NxWidgets/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -############################################################################ -# apps/graphics/NxWidgets/Makefile -# -# Copyright (C) 2018 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt -# -# 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 diff --git a/graphics/NxWidgets/UnitTests/nxwm/.gitignore b/graphics/NxWidgets/UnitTests/nxwm/.gitignore deleted file mode 100644 index b14460823..000000000 --- a/graphics/NxWidgets/UnitTests/nxwm/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -/Make.dep -/.depend -/.built -/*.asm -/*.rel -/*.lst -/*.sym -/*.adb -/*.lib -/*.src diff --git a/graphics/NxWidgets/UnitTests/nxwm/Make.defs b/graphics/NxWidgets/UnitTests/nxwm/Make.defs deleted file mode 100644 index 20b1e0483..000000000 --- a/graphics/NxWidgets/UnitTests/nxwm/Make.defs +++ /dev/null @@ -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 -# -# 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 diff --git a/graphics/NxWidgets/UnitTests/nxwm/Makefile b/graphics/NxWidgets/UnitTests/nxwm/Makefile deleted file mode 100644 index b96cf1f38..000000000 --- a/graphics/NxWidgets/UnitTests/nxwm/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################# -# apps/graphics/NxWidgets/Unitests/nxwm/Makefile -# -# Copyright (C) 2012-2013, 2018 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt -# -# 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 diff --git a/graphics/nxglyphs/Kconfig b/graphics/nxglyphs/Kconfig new file mode 100644 index 000000000..3a0679a5d --- /dev/null +++ b/graphics/nxglyphs/Kconfig @@ -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 diff --git a/graphics/NxWidgets/UnitTests/Make.defs b/graphics/nxglyphs/Make.defs similarity index 91% rename from graphics/NxWidgets/UnitTests/Make.defs rename to graphics/nxglyphs/Make.defs index 176372f1d..aa0f2fe02 100644 --- a/graphics/NxWidgets/UnitTests/Make.defs +++ b/graphics/nxglyphs/Make.defs @@ -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 # # 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 diff --git a/graphics/nxglyphs/Makefile b/graphics/nxglyphs/Makefile new file mode 100644 index 000000000..d55030605 --- /dev/null +++ b/graphics/nxglyphs/Makefile @@ -0,0 +1,81 @@ +############################################################################ +# apps/graphics/tiff/Makefile +# +# Copyright (C) 2019 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# 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 diff --git a/graphics/NxWidgets/nxwm/images/calculator24x25.png b/graphics/nxglyphs/images/calculator24x25.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/calculator24x25.png rename to graphics/nxglyphs/images/calculator24x25.png diff --git a/graphics/NxWidgets/nxwm/images/calculator47x49.png b/graphics/nxglyphs/images/calculator47x49.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/calculator47x49.png rename to graphics/nxglyphs/images/calculator47x49.png diff --git a/graphics/NxWidgets/nxwm/images/calibration24x21.png b/graphics/nxglyphs/images/calibration24x21.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/calibration24x21.png rename to graphics/nxglyphs/images/calibration24x21.png diff --git a/graphics/NxWidgets/nxwm/images/calibration48x42.png b/graphics/nxglyphs/images/calibration48x42.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/calibration48x42.png rename to graphics/nxglyphs/images/calibration48x42.png diff --git a/graphics/NxWidgets/nxwm/images/cmd25x22.png b/graphics/nxglyphs/images/cmd25x22.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/cmd25x22.png rename to graphics/nxglyphs/images/cmd25x22.png diff --git a/graphics/NxWidgets/nxwm/images/cmd49x43.png b/graphics/nxglyphs/images/cmd49x43.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/cmd49x43.png rename to graphics/nxglyphs/images/cmd49x43.png diff --git a/graphics/NxWidgets/nxwm/images/mediaforward32x32.png b/graphics/nxglyphs/images/mediaforward32x32.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/mediaforward32x32.png rename to graphics/nxglyphs/images/mediaforward32x32.png diff --git a/graphics/NxWidgets/nxwm/images/mediaforward43x41.png b/graphics/nxglyphs/images/mediaforward43x41.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/mediaforward43x41.png rename to graphics/nxglyphs/images/mediaforward43x41.png diff --git a/graphics/NxWidgets/nxwm/images/mediagrip22x22.png b/graphics/nxglyphs/images/mediagrip22x22.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/mediagrip22x22.png rename to graphics/nxglyphs/images/mediagrip22x22.png diff --git a/graphics/NxWidgets/nxwm/images/mediagrip60x30.png b/graphics/nxglyphs/images/mediagrip60x30.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/mediagrip60x30.png rename to graphics/nxglyphs/images/mediagrip60x30.png diff --git a/graphics/NxWidgets/nxwm/images/mediapause32x32.png b/graphics/nxglyphs/images/mediapause32x32.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/mediapause32x32.png rename to graphics/nxglyphs/images/mediapause32x32.png diff --git a/graphics/NxWidgets/nxwm/images/mediapause43x41.png b/graphics/nxglyphs/images/mediapause43x41.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/mediapause43x41.png rename to graphics/nxglyphs/images/mediapause43x41.png diff --git a/graphics/NxWidgets/nxwm/images/mediaplay32x32.png b/graphics/nxglyphs/images/mediaplay32x32.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/mediaplay32x32.png rename to graphics/nxglyphs/images/mediaplay32x32.png diff --git a/graphics/NxWidgets/nxwm/images/mediaplay43x41.png b/graphics/nxglyphs/images/mediaplay43x41.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/mediaplay43x41.png rename to graphics/nxglyphs/images/mediaplay43x41.png diff --git a/graphics/NxWidgets/nxwm/images/mediaplayer24x24.png b/graphics/nxglyphs/images/mediaplayer24x24.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/mediaplayer24x24.png rename to graphics/nxglyphs/images/mediaplayer24x24.png diff --git a/graphics/NxWidgets/nxwm/images/mediaplayer44x50.png b/graphics/nxglyphs/images/mediaplayer44x50.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/mediaplayer44x50.png rename to graphics/nxglyphs/images/mediaplayer44x50.png diff --git a/graphics/NxWidgets/nxwm/images/mediarewind32x32.png b/graphics/nxglyphs/images/mediarewind32x32.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/mediarewind32x32.png rename to graphics/nxglyphs/images/mediarewind32x32.png diff --git a/graphics/NxWidgets/nxwm/images/mediarewind43x41.png b/graphics/nxglyphs/images/mediarewind43x41.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/mediarewind43x41.png rename to graphics/nxglyphs/images/mediarewind43x41.png diff --git a/graphics/NxWidgets/nxwm/images/minimize21x21.png b/graphics/nxglyphs/images/minimize21x21.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/minimize21x21.png rename to graphics/nxglyphs/images/minimize21x21.png diff --git a/graphics/NxWidgets/nxwm/images/minimize42x42.png b/graphics/nxglyphs/images/minimize42x42.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/minimize42x42.png rename to graphics/nxglyphs/images/minimize42x42.png diff --git a/graphics/NxWidgets/nxwm/images/play24x24.png b/graphics/nxglyphs/images/play24x24.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/play24x24.png rename to graphics/nxglyphs/images/play24x24.png diff --git a/graphics/NxWidgets/nxwm/images/play48x48.png b/graphics/nxglyphs/images/play48x48.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/play48x48.png rename to graphics/nxglyphs/images/play48x48.png diff --git a/graphics/NxWidgets/nxwm/images/stop21x21.png b/graphics/nxglyphs/images/stop21x21.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/stop21x21.png rename to graphics/nxglyphs/images/stop21x21.png diff --git a/graphics/NxWidgets/nxwm/images/stop42x42.png b/graphics/nxglyphs/images/stop42x42.png similarity index 100% rename from graphics/NxWidgets/nxwm/images/stop42x42.png rename to graphics/nxglyphs/images/stop42x42.png diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_arrowdown.cxx b/graphics/nxglyphs/src/glyph_arrowdown.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_arrowdown.cxx rename to graphics/nxglyphs/src/glyph_arrowdown.cxx index d4dc2db39..40c55526d 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_arrowdown.cxx +++ b/graphics/nxglyphs/src/glyph_arrowdown.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_arrowleft.cxx b/graphics/nxglyphs/src/glyph_arrowleft.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_arrowleft.cxx rename to graphics/nxglyphs/src/glyph_arrowleft.cxx index fa2026a4c..c66d309b9 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_arrowleft.cxx +++ b/graphics/nxglyphs/src/glyph_arrowleft.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_arrowright.cxx b/graphics/nxglyphs/src/glyph_arrowright.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_arrowright.cxx rename to graphics/nxglyphs/src/glyph_arrowright.cxx index 234119596..41e1b2b61 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_arrowright.cxx +++ b/graphics/nxglyphs/src/glyph_arrowright.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_arrowup.cxx b/graphics/nxglyphs/src/glyph_arrowup.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_arrowup.cxx rename to graphics/nxglyphs/src/glyph_arrowup.cxx index 6e4a994a3..97f853987 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_arrowup.cxx +++ b/graphics/nxglyphs/src/glyph_arrowup.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_backspace.cxx b/graphics/nxglyphs/src/glyph_backspace.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_backspace.cxx rename to graphics/nxglyphs/src/glyph_backspace.cxx index 23e8c2147..20c4cf27a 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_backspace.cxx +++ b/graphics/nxglyphs/src/glyph_backspace.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwm/src/glyph_calculator24x25.cxx b/graphics/nxglyphs/src/glyph_calculator24x25.cxx similarity index 97% rename from graphics/NxWidgets/nxwm/src/glyph_calculator24x25.cxx rename to graphics/nxglyphs/src/glyph_calculator24x25.cxx index 553584187..779a2453e 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_calculator24x25.cxx +++ b/graphics/nxglyphs/src/glyph_calculator24x25.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwm/src/glyph_calculator47x49.cxx b/graphics/nxglyphs/src/glyph_calculator47x49.cxx similarity index 98% rename from graphics/NxWidgets/nxwm/src/glyph_calculator47x49.cxx rename to graphics/nxglyphs/src/glyph_calculator47x49.cxx index d51047005..44f9240fd 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_calculator47x49.cxx +++ b/graphics/nxglyphs/src/glyph_calculator47x49.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwm/src/glyph_calibration24x21.cxx b/graphics/nxglyphs/src/glyph_calibration24x21.cxx similarity index 96% rename from graphics/NxWidgets/nxwm/src/glyph_calibration24x21.cxx rename to graphics/nxglyphs/src/glyph_calibration24x21.cxx index f26069d6a..11ca0dd90 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_calibration24x21.cxx +++ b/graphics/nxglyphs/src/glyph_calibration24x21.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwm/src/glyph_calibration48x42.cxx b/graphics/nxglyphs/src/glyph_calibration48x42.cxx similarity index 98% rename from graphics/NxWidgets/nxwm/src/glyph_calibration48x42.cxx rename to graphics/nxglyphs/src/glyph_calibration48x42.cxx index 4947992e3..424aa5f00 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_calibration48x42.cxx +++ b/graphics/nxglyphs/src/glyph_calibration48x42.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_capslock.cxx b/graphics/nxglyphs/src/glyph_capslock.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_capslock.cxx rename to graphics/nxglyphs/src/glyph_capslock.cxx index 096ee5931..325ca7115 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_capslock.cxx +++ b/graphics/nxglyphs/src/glyph_capslock.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_checkboxmu.cxx b/graphics/nxglyphs/src/glyph_checkboxmu.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_checkboxmu.cxx rename to graphics/nxglyphs/src/glyph_checkboxmu.cxx index 91aa9c58c..e96ce5ca4 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_checkboxmu.cxx +++ b/graphics/nxglyphs/src/glyph_checkboxmu.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_checkboxoff.cxx b/graphics/nxglyphs/src/glyph_checkboxoff.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_checkboxoff.cxx rename to graphics/nxglyphs/src/glyph_checkboxoff.cxx index 3ae09b77c..b200ebfd4 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_checkboxoff.cxx +++ b/graphics/nxglyphs/src/glyph_checkboxoff.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_checkboxon.cxx b/graphics/nxglyphs/src/glyph_checkboxon.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_checkboxon.cxx rename to graphics/nxglyphs/src/glyph_checkboxon.cxx index 93340cad8..ded5f1efe 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_checkboxon.cxx +++ b/graphics/nxglyphs/src/glyph_checkboxon.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwm/src/glyph_cmd25x22.cxx b/graphics/nxglyphs/src/glyph_cmd25x22.cxx similarity index 96% rename from graphics/NxWidgets/nxwm/src/glyph_cmd25x22.cxx rename to graphics/nxglyphs/src/glyph_cmd25x22.cxx index b41f6d5c7..30e9661f8 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_cmd25x22.cxx +++ b/graphics/nxglyphs/src/glyph_cmd25x22.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwm/src/glyph_cmd49x43.cxx b/graphics/nxglyphs/src/glyph_cmd49x43.cxx similarity index 97% rename from graphics/NxWidgets/nxwm/src/glyph_cmd49x43.cxx rename to graphics/nxglyphs/src/glyph_cmd49x43.cxx index 581159a97..19170f469 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_cmd49x43.cxx +++ b/graphics/nxglyphs/src/glyph_cmd49x43.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_control.cxx b/graphics/nxglyphs/src/glyph_control.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_control.cxx rename to graphics/nxglyphs/src/glyph_control.cxx index 885eaef7d..d56e870cf 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_control.cxx +++ b/graphics/nxglyphs/src/glyph_control.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_cycle.cxx b/graphics/nxglyphs/src/glyph_cycle.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_cycle.cxx rename to graphics/nxglyphs/src/glyph_cycle.cxx index e81b4b0f5..f22662c69 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_cycle.cxx +++ b/graphics/nxglyphs/src/glyph_cycle.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwm/src/glyph_mediagrip60x30.cxx b/graphics/nxglyphs/src/glyph_mediagrip60x30.cxx similarity index 97% rename from graphics/NxWidgets/nxwm/src/glyph_mediagrip60x30.cxx rename to graphics/nxglyphs/src/glyph_mediagrip60x30.cxx index c8fe6a7a5..720317ca5 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_mediagrip60x30.cxx +++ b/graphics/nxglyphs/src/glyph_mediagrip60x30.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwm/src/glyph_mediaplayer24x24.cxx b/graphics/nxglyphs/src/glyph_mediaplayer24x24.cxx similarity index 94% rename from graphics/NxWidgets/nxwm/src/glyph_mediaplayer24x24.cxx rename to graphics/nxglyphs/src/glyph_mediaplayer24x24.cxx index 8cd7e04b5..1a620d2f4 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_mediaplayer24x24.cxx +++ b/graphics/nxglyphs/src/glyph_mediaplayer24x24.cxx @@ -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 @@ -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, diff --git a/graphics/NxWidgets/nxwm/src/glyph_mediaplayer44x50.cxx b/graphics/nxglyphs/src/glyph_mediaplayer44x50.cxx similarity index 97% rename from graphics/NxWidgets/nxwm/src/glyph_mediaplayer44x50.cxx rename to graphics/nxglyphs/src/glyph_mediaplayer44x50.cxx index c84a27512..6b254df13 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_mediaplayer44x50.cxx +++ b/graphics/nxglyphs/src/glyph_mediaplayer44x50.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwm/src/glyph_minimize21x21.cxx b/graphics/nxglyphs/src/glyph_minimize21x21.cxx similarity index 96% rename from graphics/NxWidgets/nxwm/src/glyph_minimize21x21.cxx rename to graphics/nxglyphs/src/glyph_minimize21x21.cxx index 9a54c8740..ba2820a64 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_minimize21x21.cxx +++ b/graphics/nxglyphs/src/glyph_minimize21x21.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwm/src/glyph_minimize42x42.cxx b/graphics/nxglyphs/src/glyph_minimize42x42.cxx similarity index 97% rename from graphics/NxWidgets/nxwm/src/glyph_minimize42x42.cxx rename to graphics/nxglyphs/src/glyph_minimize42x42.cxx index a54ff5690..1021bd166 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_minimize42x42.cxx +++ b/graphics/nxglyphs/src/glyph_minimize42x42.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwm/src/glyph_mplayer_controls32x32.cxx b/graphics/nxglyphs/src/glyph_mplayer_controls32x32.cxx similarity index 96% rename from graphics/NxWidgets/nxwm/src/glyph_mplayer_controls32x32.cxx rename to graphics/nxglyphs/src/glyph_mplayer_controls32x32.cxx index 8f69586b8..96c7df3b3 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_mplayer_controls32x32.cxx +++ b/graphics/nxglyphs/src/glyph_mplayer_controls32x32.cxx @@ -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 @@ -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, diff --git a/graphics/NxWidgets/nxwm/src/glyph_mplayer_controls43x41.cxx b/graphics/nxglyphs/src/glyph_mplayer_controls43x41.cxx similarity index 95% rename from graphics/NxWidgets/nxwm/src/glyph_mplayer_controls43x41.cxx rename to graphics/nxglyphs/src/glyph_mplayer_controls43x41.cxx index 6f9584f6a..4095c03f1 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_mplayer_controls43x41.cxx +++ b/graphics/nxglyphs/src/glyph_mplayer_controls43x41.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_nxlogo160x160.cxx b/graphics/nxglyphs/src/glyph_nxlogo160x160.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/glyph_nxlogo160x160.cxx rename to graphics/nxglyphs/src/glyph_nxlogo160x160.cxx index c429346d9..0fdcdb26c 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_nxlogo160x160.cxx +++ b/graphics/nxglyphs/src/glyph_nxlogo160x160.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_nxlogo320x320.cxx b/graphics/nxglyphs/src/glyph_nxlogo320x320.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/glyph_nxlogo320x320.cxx rename to graphics/nxglyphs/src/glyph_nxlogo320x320.cxx index 0df35ebf0..3daceb8fc 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_nxlogo320x320.cxx +++ b/graphics/nxglyphs/src/glyph_nxlogo320x320.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwm/src/glyph_play24x24.cxx b/graphics/nxglyphs/src/glyph_play24x24.cxx similarity index 97% rename from graphics/NxWidgets/nxwm/src/glyph_play24x24.cxx rename to graphics/nxglyphs/src/glyph_play24x24.cxx index 2c0ff0672..a7b977039 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_play24x24.cxx +++ b/graphics/nxglyphs/src/glyph_play24x24.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwm/src/glyph_play48x48.cxx b/graphics/nxglyphs/src/glyph_play48x48.cxx similarity index 97% rename from graphics/NxWidgets/nxwm/src/glyph_play48x48.cxx rename to graphics/nxglyphs/src/glyph_play48x48.cxx index e3333cc59..5b6404b75 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_play48x48.cxx +++ b/graphics/nxglyphs/src/glyph_play48x48.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonmu.cxx b/graphics/nxglyphs/src/glyph_radiobuttonmu.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonmu.cxx rename to graphics/nxglyphs/src/glyph_radiobuttonmu.cxx index 8e0497b4a..17d9bbea3 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonmu.cxx +++ b/graphics/nxglyphs/src/glyph_radiobuttonmu.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonoff.cxx b/graphics/nxglyphs/src/glyph_radiobuttonoff.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonoff.cxx rename to graphics/nxglyphs/src/glyph_radiobuttonoff.cxx index 18c60bac5..2fdfa00c5 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonoff.cxx +++ b/graphics/nxglyphs/src/glyph_radiobuttonoff.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonon.cxx b/graphics/nxglyphs/src/glyph_radiobuttonon.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonon.cxx rename to graphics/nxglyphs/src/glyph_radiobuttonon.cxx index 51e5c061b..7fb3b01ab 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_radiobuttonon.cxx +++ b/graphics/nxglyphs/src/glyph_radiobuttonon.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_return.cxx b/graphics/nxglyphs/src/glyph_return.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_return.cxx rename to graphics/nxglyphs/src/glyph_return.cxx index 9ff121aa2..5f4231ec8 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_return.cxx +++ b/graphics/nxglyphs/src/glyph_return.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_screendepthdown.cxx b/graphics/nxglyphs/src/glyph_screendepthdown.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_screendepthdown.cxx rename to graphics/nxglyphs/src/glyph_screendepthdown.cxx index 3848348fc..173ec69e3 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_screendepthdown.cxx +++ b/graphics/nxglyphs/src/glyph_screendepthdown.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_screendepthup.cxx b/graphics/nxglyphs/src/glyph_screendepthup.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_screendepthup.cxx rename to graphics/nxglyphs/src/glyph_screendepthup.cxx index c3f4e5352..2e46ef901 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_screendepthup.cxx +++ b/graphics/nxglyphs/src/glyph_screendepthup.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_screenflipdown.cxx b/graphics/nxglyphs/src/glyph_screenflipdown.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_screenflipdown.cxx rename to graphics/nxglyphs/src/glyph_screenflipdown.cxx index a67d3ccc6..fc35f3cd5 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_screenflipdown.cxx +++ b/graphics/nxglyphs/src/glyph_screenflipdown.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_screenflipup.cxx b/graphics/nxglyphs/src/glyph_screenflipup.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_screenflipup.cxx rename to graphics/nxglyphs/src/glyph_screenflipup.cxx index fd22e9b1c..3e39df48b 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_screenflipup.cxx +++ b/graphics/nxglyphs/src/glyph_screenflipup.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_shift.cxx b/graphics/nxglyphs/src/glyph_shift.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_shift.cxx rename to graphics/nxglyphs/src/glyph_shift.cxx index 89be845fa..e207a079b 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_shift.cxx +++ b/graphics/nxglyphs/src/glyph_shift.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwm/src/glyph_stop21x21.cxx b/graphics/nxglyphs/src/glyph_stop21x21.cxx similarity index 97% rename from graphics/NxWidgets/nxwm/src/glyph_stop21x21.cxx rename to graphics/nxglyphs/src/glyph_stop21x21.cxx index e96745fee..72fcd018a 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_stop21x21.cxx +++ b/graphics/nxglyphs/src/glyph_stop21x21.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwm/src/glyph_stop42x42.cxx b/graphics/nxglyphs/src/glyph_stop42x42.cxx similarity index 97% rename from graphics/NxWidgets/nxwm/src/glyph_stop42x42.cxx rename to graphics/nxglyphs/src/glyph_stop42x42.cxx index 63759e454..6115b4ed0 100644 --- a/graphics/NxWidgets/nxwm/src/glyph_stop42x42.cxx +++ b/graphics/nxglyphs/src/glyph_stop42x42.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_windowclose.cxx b/graphics/nxglyphs/src/glyph_windowclose.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_windowclose.cxx rename to graphics/nxglyphs/src/glyph_windowclose.cxx index 26f21f40a..c297d172c 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_windowclose.cxx +++ b/graphics/nxglyphs/src/glyph_windowclose.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_windowdepthdown.cxx b/graphics/nxglyphs/src/glyph_windowdepthdown.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_windowdepthdown.cxx rename to graphics/nxglyphs/src/glyph_windowdepthdown.cxx index 45eb4b720..0e374d3cf 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_windowdepthdown.cxx +++ b/graphics/nxglyphs/src/glyph_windowdepthdown.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/src/glyph_windowdepthup.cxx b/graphics/nxglyphs/src/glyph_windowdepthup.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/glyph_windowdepthup.cxx rename to graphics/nxglyphs/src/glyph_windowdepthup.cxx index e88b39bbf..51ea4db8b 100644 --- a/graphics/NxWidgets/nxwidgets/src/glyph_windowdepthup.cxx +++ b/graphics/nxglyphs/src/glyph_windowdepthup.cxx @@ -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 @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/.gitignore b/graphics/nxwidgets/.gitignore similarity index 100% rename from graphics/NxWidgets/nxwidgets/.gitignore rename to graphics/nxwidgets/.gitignore diff --git a/graphics/NxWidgets/nxwidgets/COPYING b/graphics/nxwidgets/COPYING similarity index 100% rename from graphics/NxWidgets/nxwidgets/COPYING rename to graphics/nxwidgets/COPYING diff --git a/graphics/NxWidgets/ChangeLog.txt b/graphics/nxwidgets/ChangeLog.txt similarity index 100% rename from graphics/NxWidgets/ChangeLog.txt rename to graphics/nxwidgets/ChangeLog.txt diff --git a/graphics/NxWidgets/Doxygen/Doxyfile b/graphics/nxwidgets/Doxygen/Doxyfile similarity index 100% rename from graphics/NxWidgets/Doxygen/Doxyfile rename to graphics/nxwidgets/Doxygen/Doxyfile diff --git a/graphics/NxWidgets/Doxygen/README.txt b/graphics/nxwidgets/Doxygen/README.txt similarity index 100% rename from graphics/NxWidgets/Doxygen/README.txt rename to graphics/nxwidgets/Doxygen/README.txt diff --git a/graphics/NxWidgets/Doxygen/gendoc.sh b/graphics/nxwidgets/Doxygen/gendoc.sh similarity index 98% rename from graphics/NxWidgets/Doxygen/gendoc.sh rename to graphics/nxwidgets/Doxygen/gendoc.sh index d190031cd..eeb55d74e 100755 --- a/graphics/NxWidgets/Doxygen/gendoc.sh +++ b/graphics/nxwidgets/Doxygen/gendoc.sh @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/Kconfig b/graphics/nxwidgets/Kconfig similarity index 100% rename from graphics/NxWidgets/nxwidgets/Kconfig rename to graphics/nxwidgets/Kconfig diff --git a/graphics/NxWidgets/nxwidgets/Make.defs b/graphics/nxwidgets/Make.defs similarity index 95% rename from graphics/NxWidgets/nxwidgets/Make.defs rename to graphics/nxwidgets/Make.defs index 8a8468c81..64e6f88bd 100644 --- a/graphics/NxWidgets/nxwidgets/Make.defs +++ b/graphics/nxwidgets/Make.defs @@ -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 diff --git a/graphics/NxWidgets/nxwidgets/Makefile b/graphics/nxwidgets/Makefile similarity index 81% rename from graphics/NxWidgets/nxwidgets/Makefile rename to graphics/nxwidgets/Makefile index a88d1279f..75b0c8363 100644 --- a/graphics/NxWidgets/nxwidgets/Makefile +++ b/graphics/nxwidgets/Makefile @@ -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 @@ -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 - diff --git a/graphics/NxWidgets/README.txt b/graphics/nxwidgets/README.txt similarity index 62% rename from graphics/NxWidgets/README.txt rename to graphics/nxwidgets/README.txt index 0d864afd7..e745b257b 100644 --- a/graphics/NxWidgets/README.txt +++ b/graphics/nxwidgets/README.txt @@ -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. diff --git a/graphics/NxWidgets/ReleaseNotes.txt b/graphics/nxwidgets/ReleaseNotes.txt similarity index 100% rename from graphics/NxWidgets/ReleaseNotes.txt rename to graphics/nxwidgets/ReleaseNotes.txt diff --git a/graphics/nxwidgets/TODO.txt b/graphics/nxwidgets/TODO.txt new file mode 100644 index 000000000..270838817 --- /dev/null +++ b/graphics/nxwidgets/TODO.txt @@ -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 + diff --git a/graphics/NxWidgets/UnitTests/CButton/.gitignore b/graphics/nxwidgets/UnitTests/CButton/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CButton/.gitignore rename to graphics/nxwidgets/UnitTests/CButton/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CButton/Make.defs b/graphics/nxwidgets/UnitTests/CButton/Make.defs similarity index 94% rename from graphics/NxWidgets/UnitTests/CButton/Make.defs rename to graphics/nxwidgets/UnitTests/CButton/Make.defs index 487651aa1..0fa701cd9 100644 --- a/graphics/NxWidgets/UnitTests/CButton/Make.defs +++ b/graphics/nxwidgets/UnitTests/CButton/Make.defs @@ -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 diff --git a/graphics/NxWidgets/UnitTests/CButton/Makefile b/graphics/nxwidgets/UnitTests/CButton/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CButton/Makefile rename to graphics/nxwidgets/UnitTests/CButton/Makefile index d6bb0a2d5..905fd190c 100644 --- a/graphics/NxWidgets/UnitTests/CButton/Makefile +++ b/graphics/nxwidgets/UnitTests/CButton/Makefile @@ -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 diff --git a/graphics/NxWidgets/UnitTests/CButton/cbutton-pushed.png b/graphics/nxwidgets/UnitTests/CButton/cbutton-pushed.png similarity index 100% rename from graphics/NxWidgets/UnitTests/CButton/cbutton-pushed.png rename to graphics/nxwidgets/UnitTests/CButton/cbutton-pushed.png diff --git a/graphics/NxWidgets/UnitTests/CButton/cbutton-released.png b/graphics/nxwidgets/UnitTests/CButton/cbutton-released.png similarity index 100% rename from graphics/NxWidgets/UnitTests/CButton/cbutton-released.png rename to graphics/nxwidgets/UnitTests/CButton/cbutton-released.png diff --git a/graphics/NxWidgets/UnitTests/CButton/cbutton_main.cxx b/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CButton/cbutton_main.cxx rename to graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx index bba1a7d1a..f1d95cc86 100644 --- a/graphics/NxWidgets/UnitTests/CButton/cbutton_main.cxx +++ b/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx @@ -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 @@ -46,7 +46,7 @@ #include -#include "nxwidgets/cbuttontest.hxx" +#include "graphics/nxwidgets/cbuttontest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CButton/cbuttontest.cxx b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CButton/cbuttontest.cxx rename to graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx index 9992882c7..4a500db59 100644 --- a/graphics/NxWidgets/UnitTests/CButton/cbuttontest.cxx +++ b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx @@ -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 @@ -47,9 +47,9 @@ #include #include -#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 diff --git a/graphics/NxWidgets/UnitTests/CButton/cbuttontest.hxx b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx similarity index 93% rename from graphics/NxWidgets/UnitTests/CButton/cbuttontest.hxx rename to graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx index 6424a69a3..9a4156d54 100644 --- a/graphics/NxWidgets/UnitTests/CButton/cbuttontest.hxx +++ b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx @@ -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 @@ -49,14 +49,14 @@ #include -#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 diff --git a/graphics/NxWidgets/UnitTests/CButtonArray/.gitignore b/graphics/nxwidgets/UnitTests/CButtonArray/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CButtonArray/.gitignore rename to graphics/nxwidgets/UnitTests/CButtonArray/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CButtonArray/Make.defs b/graphics/nxwidgets/UnitTests/CButtonArray/Make.defs similarity index 93% rename from graphics/NxWidgets/UnitTests/CButtonArray/Make.defs rename to graphics/nxwidgets/UnitTests/CButtonArray/Make.defs index d23838eab..d9dc77ce0 100644 --- a/graphics/NxWidgets/UnitTests/CButtonArray/Make.defs +++ b/graphics/nxwidgets/UnitTests/CButtonArray/Make.defs @@ -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 diff --git a/graphics/NxWidgets/UnitTests/CButtonArray/Makefile b/graphics/nxwidgets/UnitTests/CButtonArray/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CButtonArray/Makefile rename to graphics/nxwidgets/UnitTests/CButtonArray/Makefile index 8e05fa088..33c16f216 100644 --- a/graphics/NxWidgets/UnitTests/CButtonArray/Makefile +++ b/graphics/nxwidgets/UnitTests/CButtonArray/Makefile @@ -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 diff --git a/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarray.png b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray.png similarity index 100% rename from graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarray.png rename to graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray.png diff --git a/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx similarity index 98% rename from graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx rename to graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx index 76090db5d..627900578 100644 --- a/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx +++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx @@ -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 @@ -47,8 +47,8 @@ #include -#include "nxwidgets/cnxstring.hxx" -#include "nxwidgets/cbuttonarraytest.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/cbuttonarraytest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx rename to graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx index 09625da88..f194b4790 100644 --- a/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx +++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx @@ -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 @@ -47,9 +47,9 @@ #include #include -#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 diff --git a/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx similarity index 93% rename from graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx rename to graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx index 593c52a7b..5a5bdfb47 100644 --- a/graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx +++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx @@ -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 @@ -49,14 +49,14 @@ #include -#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 diff --git a/graphics/NxWidgets/UnitTests/CCheckBox/.gitignore b/graphics/nxwidgets/UnitTests/CCheckBox/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CCheckBox/.gitignore rename to graphics/nxwidgets/UnitTests/CCheckBox/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CCheckBox/Make.defs b/graphics/nxwidgets/UnitTests/CCheckBox/Make.defs similarity index 94% rename from graphics/NxWidgets/UnitTests/CCheckBox/Make.defs rename to graphics/nxwidgets/UnitTests/CCheckBox/Make.defs index 49efa4bfc..4727553cf 100644 --- a/graphics/NxWidgets/UnitTests/CCheckBox/Make.defs +++ b/graphics/nxwidgets/UnitTests/CCheckBox/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CCheckBox/Make.defs +# apps/graphics/nxwidgets/UnitTests/CCheckBox/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_CCHECKBOX),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CCheckBox +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CCheckBox endif diff --git a/graphics/NxWidgets/UnitTests/CCheckBox/Makefile b/graphics/nxwidgets/UnitTests/CCheckBox/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CCheckBox/Makefile rename to graphics/nxwidgets/UnitTests/CCheckBox/Makefile index 8b9a01432..d2e3bc421 100644 --- a/graphics/NxWidgets/UnitTests/CCheckBox/Makefile +++ b/graphics/nxwidgets/UnitTests/CCheckBox/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CCheckBox/Makefile +# apps/graphics/nxwidgets/UnitTests/CCheckBox/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CCheckBox/ccheckbox.png b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox.png similarity index 100% rename from graphics/NxWidgets/UnitTests/CCheckBox/ccheckbox.png rename to graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox.png diff --git a/graphics/NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx rename to graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx index 99d3f6ec4..642e6a0d5 100644 --- a/graphics/NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx +++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx +// apps/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -48,9 +48,9 @@ #include -#include "nxwidgets/crlepalettebitmap.hxx" -#include "nxwidgets/glyphs.hxx" -#include "nxwidgets/ccheckboxtest.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" +#include "graphics/nxglyphs.hxx" +#include "graphics/nxwidgets/ccheckboxtest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.cxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.cxx rename to graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx index 0d26e56b2..2f10ee9a9 100644 --- a/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.cxx +++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.cxx +// apps/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,11 +47,11 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/ccheckboxtest.hxx" -#include "nxwidgets/cbitmap.hxx" -#include "nxwidgets/glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/ccheckboxtest.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxglyphs.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.hxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx similarity index 93% rename from graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.hxx rename to graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx index 586ebe6e3..4cec99e02 100644 --- a/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.hxx +++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.hxx +// apps/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,12 +49,12 @@ #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cwidgetcontrol.hxx" -#include "nxwidgets/ccallback.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cnxserver.hxx" -#include "nxwidgets/ccheckbox.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/ccheckbox.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CGlyphButton/.gitignore b/graphics/nxwidgets/UnitTests/CGlyphButton/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CGlyphButton/.gitignore rename to graphics/nxwidgets/UnitTests/CGlyphButton/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CGlyphButton/Make.defs b/graphics/nxwidgets/UnitTests/CGlyphButton/Make.defs similarity index 93% rename from graphics/NxWidgets/UnitTests/CGlyphButton/Make.defs rename to graphics/nxwidgets/UnitTests/CGlyphButton/Make.defs index 9bb8c01fb..7c6f70c5c 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphButton/Make.defs +++ b/graphics/nxwidgets/UnitTests/CGlyphButton/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CGlyphButton/Make.defs +# apps/graphics/nxwidgets/UnitTests/CGlyphButton/Make.defs # Adds selected applications to apps/ build # # Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. @@ -35,5 +35,5 @@ ############################################################################ ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CGLYPHBUTTON),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CGlyphButton +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CGlyphButton endif diff --git a/graphics/NxWidgets/UnitTests/CGlyphButton/Makefile b/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CGlyphButton/Makefile rename to graphics/nxwidgets/UnitTests/CGlyphButton/Makefile index bcd18c32f..c59a06fa9 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphButton/Makefile +++ b/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CGlyphButton/Makefile +# apps/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx similarity index 98% rename from graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx rename to graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx index 712241ded..9f59e9d48 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx +++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx +// apps/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -48,8 +48,8 @@ #include -#include "nxwidgets/cglyphbuttontest.hxx" -#include "nxwidgets/glyphs.hxx" +#include "graphics/nxwidgets/cglyphbuttontest.hxx" +#include "graphics/nxglyphs.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx rename to graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx index e7ed69383..8bc5d3bf0 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx +++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx +// apps/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,9 +47,9 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cglyphbuttontest.hxx" -#include "nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cglyphbuttontest.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx similarity index 92% rename from graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx rename to graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx index 3db971112..07a65b5b0 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx +++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx +// apps/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,15 +49,15 @@ #include -#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/cglyphbutton.hxx" -#include "nxwidgets/cbitmap.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/cglyphbutton.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/.gitignore b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/.gitignore rename to graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Make.defs b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Make.defs similarity index 93% rename from graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Make.defs rename to graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Make.defs index db69abb2d..802441f3e 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Make.defs +++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Make.defs +# apps/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/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_CGLYPHSLIDERHORIZONTAL),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CGlyphSliderHorizontal endif diff --git a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile rename to graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile index 4d43f43d4..3f95b417d 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile +++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile +# apps/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx similarity index 98% rename from graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx rename to graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx index 21010f153..282691ac0 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx +++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx +// apps/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx // // Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -48,7 +48,7 @@ #include -#include "nxwidgets/cglyphsliderhorizontaltest.hxx" +#include "graphics/nxwidgets/cglyphsliderhorizontaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx rename to graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx index 98d790b25..9eb781a3d 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx +++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx +// apps/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx // // Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,10 +47,10 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/crlepalettebitmap.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cglyphsliderhorizontaltest.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/cglyphsliderhorizontaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx similarity index 93% rename from graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx rename to graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx index aa0e8a984..0d6a3a9c1 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx +++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx +// apps/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx // // Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,12 +49,12 @@ #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cwidgetcontrol.hxx" -#include "nxwidgets/ccallback.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cnxserver.hxx" -#include "nxwidgets/cglyphsliderhorizontal.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/cglyphsliderhorizontal.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CImage/.gitignore b/graphics/nxwidgets/UnitTests/CImage/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CImage/.gitignore rename to graphics/nxwidgets/UnitTests/CImage/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CImage/Make.defs b/graphics/nxwidgets/UnitTests/CImage/Make.defs similarity index 94% rename from graphics/NxWidgets/UnitTests/CImage/Make.defs rename to graphics/nxwidgets/UnitTests/CImage/Make.defs index 0a47854d4..ececac33f 100644 --- a/graphics/NxWidgets/UnitTests/CImage/Make.defs +++ b/graphics/nxwidgets/UnitTests/CImage/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CImage/Make.defs +# apps/graphics/nxwidgets/UnitTests/CImage/Make.defs # Adds selected applications to apps/ build # # Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. @@ -35,5 +35,5 @@ ############################################################################ ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CIMAGE),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CImage +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CImage endif diff --git a/graphics/NxWidgets/UnitTests/CImage/Makefile b/graphics/nxwidgets/UnitTests/CImage/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CImage/Makefile rename to graphics/nxwidgets/UnitTests/CImage/Makefile index 8f714b9ad..7ec32d756 100644 --- a/graphics/NxWidgets/UnitTests/CImage/Makefile +++ b/graphics/nxwidgets/UnitTests/CImage/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CImage/Makefile +# apps/graphics/nxwidgets/UnitTests/CImage/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CImage/cimage_main.cxx b/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CImage/cimage_main.cxx rename to graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx index 5f8fd5831..e2b921ddf 100644 --- a/graphics/NxWidgets/UnitTests/CImage/cimage_main.cxx +++ b/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CImage/cimage_main.cxx +// apps/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -48,9 +48,9 @@ #include -#include "nxwidgets/crlepalettebitmap.hxx" -#include "nxwidgets/glyphs.hxx" -#include "nxwidgets/cimagetest.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" +#include "graphics/nxglyphs.hxx" +#include "graphics/nxwidgets/cimagetest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CImage/cimagetest.cxx b/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx similarity index 96% rename from graphics/NxWidgets/UnitTests/CImage/cimagetest.cxx rename to graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx index 65eebb358..59154d715 100644 --- a/graphics/NxWidgets/UnitTests/CImage/cimagetest.cxx +++ b/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CImage/cimagetest.cxx +// apps/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,10 +47,10 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/ibitmap.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cimagetest.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/ibitmap.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/cimagetest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CImage/cimagetest.hxx b/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx similarity index 91% rename from graphics/NxWidgets/UnitTests/CImage/cimagetest.hxx rename to graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx index c7ff9dd08..eca34f8c2 100644 --- a/graphics/NxWidgets/UnitTests/CImage/cimagetest.hxx +++ b/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CImage/cimagetest.hxx +// apps/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,14 +49,14 @@ #include -#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/cimage.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/cimage.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CKeypad/.gitignore b/graphics/nxwidgets/UnitTests/CKeypad/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CKeypad/.gitignore rename to graphics/nxwidgets/UnitTests/CKeypad/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CKeypad/Make.defs b/graphics/nxwidgets/UnitTests/CKeypad/Make.defs similarity index 94% rename from graphics/NxWidgets/UnitTests/CKeypad/Make.defs rename to graphics/nxwidgets/UnitTests/CKeypad/Make.defs index 5a51a7dcc..ce2dcec0d 100644 --- a/graphics/NxWidgets/UnitTests/CKeypad/Make.defs +++ b/graphics/nxwidgets/UnitTests/CKeypad/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CKeypad/Make.defs +# apps/graphics/nxwidgets/UnitTests/CKeypad/Make.defs # Adds selected applications to apps/ build # # Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. @@ -35,5 +35,5 @@ ############################################################################ ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CKEYPAD),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CKeypad +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CKeypad endif diff --git a/graphics/NxWidgets/UnitTests/CKeypad/Makefile b/graphics/nxwidgets/UnitTests/CKeypad/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CKeypad/Makefile rename to graphics/nxwidgets/UnitTests/CKeypad/Makefile index ccad82e9b..6b52fec41 100644 --- a/graphics/NxWidgets/UnitTests/CKeypad/Makefile +++ b/graphics/nxwidgets/UnitTests/CKeypad/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CKeyPad/Makefile +# apps/graphics/nxwidgets/UnitTests/CKeyPad/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx similarity index 98% rename from graphics/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx rename to graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx index 2c40b1c27..5c28d1b6c 100644 --- a/graphics/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx +++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx +// apps/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,8 +47,8 @@ #include -#include "nxwidgets/cnxstring.hxx" -#include "nxwidgets/ckeypadtest.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/ckeypadtest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.cxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.cxx rename to graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx index 7cdaab2d3..8ce3c5d74 100644 --- a/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.cxx +++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.cxx +// apps/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,12 +47,12 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/ckeypadtest.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cnxstring.hxx" -#include "nxwidgets/cnxfont.hxx" -#include "nxwidgets/crect.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/ckeypadtest.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/cnxfont.hxx" +#include "graphics/nxwidgets/crect.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx similarity index 92% rename from graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx rename to graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx index 9d8ac76ff..9f2f0aaa0 100644 --- a/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx +++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx +// apps/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,15 +49,15 @@ #include -#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/ctextbox.hxx" -#include "nxwidgets/ckeypad.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/ctextbox.hxx" +#include "graphics/nxwidgets/ckeypad.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLabel/.gitignore b/graphics/nxwidgets/UnitTests/CLabel/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CLabel/.gitignore rename to graphics/nxwidgets/UnitTests/CLabel/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CLabel/Make.defs b/graphics/nxwidgets/UnitTests/CLabel/Make.defs similarity index 94% rename from graphics/NxWidgets/UnitTests/CLabel/Make.defs rename to graphics/nxwidgets/UnitTests/CLabel/Make.defs index 87f71cece..e5a552504 100644 --- a/graphics/NxWidgets/UnitTests/CLabel/Make.defs +++ b/graphics/nxwidgets/UnitTests/CLabel/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CLabel/Make.defs +# apps/graphics/nxwidgets/UnitTests/CLabel/Make.defs # Adds selected applications to apps/ build # # Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. @@ -35,5 +35,5 @@ ############################################################################ ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CLABEL),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CLabel +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CLabel endif diff --git a/graphics/NxWidgets/UnitTests/CLabel/Makefile b/graphics/nxwidgets/UnitTests/CLabel/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CLabel/Makefile rename to graphics/nxwidgets/UnitTests/CLabel/Makefile index ae7709c28..2a4395192 100644 --- a/graphics/NxWidgets/UnitTests/CLabel/Makefile +++ b/graphics/nxwidgets/UnitTests/CLabel/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CLabel/Makefile +# apps/graphics/nxwidgets/UnitTests/CLabel/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CLabel/clabel.png b/graphics/nxwidgets/UnitTests/CLabel/clabel.png similarity index 100% rename from graphics/NxWidgets/UnitTests/CLabel/clabel.png rename to graphics/nxwidgets/UnitTests/CLabel/clabel.png diff --git a/graphics/NxWidgets/UnitTests/CLabel/clabel_main.cxx b/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CLabel/clabel_main.cxx rename to graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx index b74c55473..77f894f5f 100644 --- a/graphics/NxWidgets/UnitTests/CLabel/clabel_main.cxx +++ b/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CLabel/clabel_main.cxx +// apps/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -46,7 +46,7 @@ #include -#include "nxwidgets/clabeltest.hxx" +#include "graphics/nxwidgets/clabeltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLabel/clabeltest.cxx b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CLabel/clabeltest.cxx rename to graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx index de63a01ad..d1679af60 100644 --- a/graphics/NxWidgets/UnitTests/CLabel/clabeltest.cxx +++ b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CLabel/clabeltest.cxx +// apps/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,9 +47,9 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/clabeltest.hxx" -#include "nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/clabeltest.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLabel/clabeltest.hxx b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx similarity index 92% rename from graphics/NxWidgets/UnitTests/CLabel/clabeltest.hxx rename to graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx index fe7558b2e..22f526491 100644 --- a/graphics/NxWidgets/UnitTests/CLabel/clabeltest.hxx +++ b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CLabel/clabeltest.hxx +// apps/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,14 +49,14 @@ #include -#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/clabel.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/clabel.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLatchButton/.gitignore b/graphics/nxwidgets/UnitTests/CLatchButton/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CLatchButton/.gitignore rename to graphics/nxwidgets/UnitTests/CLatchButton/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CLatchButton/Make.defs b/graphics/nxwidgets/UnitTests/CLatchButton/Make.defs similarity index 93% rename from graphics/NxWidgets/UnitTests/CLatchButton/Make.defs rename to graphics/nxwidgets/UnitTests/CLatchButton/Make.defs index e3784690f..b48d6362e 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButton/Make.defs +++ b/graphics/nxwidgets/UnitTests/CLatchButton/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CLatchButton/Make.defs +# apps/graphics/nxwidgets/UnitTests/CLatchButton/Make.defs # Adds selected applications to apps/ build # # Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. @@ -35,5 +35,5 @@ ############################################################################ ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTON),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CLatchButton +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CLatchButton endif diff --git a/graphics/NxWidgets/UnitTests/CLatchButton/Makefile b/graphics/nxwidgets/UnitTests/CLatchButton/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CLatchButton/Makefile rename to graphics/nxwidgets/UnitTests/CLatchButton/Makefile index 25cf23d40..e4d0e2b43 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButton/Makefile +++ b/graphics/nxwidgets/UnitTests/CLatchButton/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CLatchButton/Makefile +# apps/graphics/nxwidgets/UnitTests/CLatchButton/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx similarity index 98% rename from graphics/NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx rename to graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx index 7ff5d3390..ea19a3641 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx +++ b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx +// apps/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -46,7 +46,7 @@ #include -#include "nxwidgets/clatchbuttontest.hxx" +#include "graphics/nxwidgets/clatchbuttontest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.cxx b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.cxx rename to graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx index 43c96f27a..0f040914f 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.cxx +++ b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.cxx +// apps/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,9 +47,9 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/clatchbuttontest.hxx" -#include "nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/clatchbuttontest.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.hxx b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx similarity index 93% rename from graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.hxx rename to graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx index 5ee6a6fb3..1d8ff2e30 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.hxx +++ b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.hxx +// apps/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,14 +49,14 @@ #include -#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/clatchbutton.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/clatchbutton.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLatchButtonArray/.gitignore b/graphics/nxwidgets/UnitTests/CLatchButtonArray/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CLatchButtonArray/.gitignore rename to graphics/nxwidgets/UnitTests/CLatchButtonArray/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CLatchButtonArray/Make.defs b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Make.defs similarity index 93% rename from graphics/NxWidgets/UnitTests/CLatchButtonArray/Make.defs rename to graphics/nxwidgets/UnitTests/CLatchButtonArray/Make.defs index a2ec346cc..6c3024ac3 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButtonArray/Make.defs +++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CLatchButtonArray/Make.defs +# apps/graphics/nxwidgets/UnitTests/CLatchButtonArray/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_CLATCHBUTTONARRAY),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CLatchButtonArray +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CLatchButtonArray endif diff --git a/graphics/NxWidgets/UnitTests/CLatchButtonArray/Makefile b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CLatchButtonArray/Makefile rename to graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile index a43bf3997..78f05624b 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButtonArray/Makefile +++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CLatchButtonArray/Makefile +# apps/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx similarity index 98% rename from graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx rename to graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx index a541a393e..161b86d16 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx +++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarry_main.cxx +// apps/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarry_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,8 +47,8 @@ #include -#include "nxwidgets/cnxstring.hxx" -#include "nxwidgets/clatchbuttonarraytest.hxx" +#include "graphics/nxwidgets/cnxstring.hxx" +#include "graphics/nxwidgets/clatchbuttonarraytest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx rename to graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx index 85acebe3a..f8257c32b 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx +++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx +// apps/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,9 +47,9 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/clatchbuttonarraytest.hxx" -#include "nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/clatchbuttonarraytest.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx similarity index 93% rename from graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx rename to graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx index 59be6b3c2..633c6e7a2 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx +++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx +// apps/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,14 +49,14 @@ #include -#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/clatchbuttonarray.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/clatchbuttonarray.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CListBox/.gitignore b/graphics/nxwidgets/UnitTests/CListBox/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CListBox/.gitignore rename to graphics/nxwidgets/UnitTests/CListBox/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CListBox/Make.defs b/graphics/nxwidgets/UnitTests/CListBox/Make.defs similarity index 94% rename from graphics/NxWidgets/UnitTests/CListBox/Make.defs rename to graphics/nxwidgets/UnitTests/CListBox/Make.defs index 7a1b64bcc..47074eef8 100644 --- a/graphics/NxWidgets/UnitTests/CListBox/Make.defs +++ b/graphics/nxwidgets/UnitTests/CListBox/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CListBox/Make.defs +# apps/graphics/nxwidgets/UnitTests/CListBox/Make.defs # Adds selected applications to apps/ build # # Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. @@ -35,5 +35,5 @@ ############################################################################ ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CLISTBOX),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CListBox +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CListBox endif diff --git a/graphics/NxWidgets/UnitTests/CListBox/Makefile b/graphics/nxwidgets/UnitTests/CListBox/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CListBox/Makefile rename to graphics/nxwidgets/UnitTests/CListBox/Makefile index 78e8ede0d..68be3dedb 100644 --- a/graphics/NxWidgets/UnitTests/CListBox/Makefile +++ b/graphics/nxwidgets/UnitTests/CListBox/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CListBox/Makefile +# apps/graphics/nxwidgets/UnitTests/CListBox/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CListBox/clistbox_main.cxx b/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx similarity index 99% rename from graphics/NxWidgets/UnitTests/CListBox/clistbox_main.cxx rename to graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx index ec682cd8d..d652c18a2 100644 --- a/graphics/NxWidgets/UnitTests/CListBox/clistbox_main.cxx +++ b/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CListBox/clistbox_main.cxx +// apps/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -48,7 +48,7 @@ #include -#include "nxwidgets/clistboxtest.hxx" +#include "graphics/nxwidgets/clistboxtest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.cxx b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CListBox/clistboxtest.cxx rename to graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx index 0c56eb199..52a893484 100644 --- a/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.cxx +++ b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.cxx +// apps/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,9 +47,9 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/clistboxtest.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/clistboxtest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.hxx b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx similarity index 93% rename from graphics/NxWidgets/UnitTests/CListBox/clistboxtest.hxx rename to graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx index ce457de14..ef742ee58 100644 --- a/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.hxx +++ b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CListBox/clistboxtest.hxx +// apps/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,12 +49,12 @@ #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cwidgetcontrol.hxx" -#include "nxwidgets/ccallback.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cnxserver.hxx" -#include "nxwidgets/clistbox.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/clistbox.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CProgressBar/.gitignore b/graphics/nxwidgets/UnitTests/CProgressBar/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CProgressBar/.gitignore rename to graphics/nxwidgets/UnitTests/CProgressBar/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CProgressBar/Make.defs b/graphics/nxwidgets/UnitTests/CProgressBar/Make.defs similarity index 93% rename from graphics/NxWidgets/UnitTests/CProgressBar/Make.defs rename to graphics/nxwidgets/UnitTests/CProgressBar/Make.defs index e7b4f004f..942ea5080 100644 --- a/graphics/NxWidgets/UnitTests/CProgressBar/Make.defs +++ b/graphics/nxwidgets/UnitTests/CProgressBar/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CProgressBar/Make.defs +# apps/graphics/nxwidgets/UnitTests/CProgressBar/Make.defs # Adds selected applications to apps/ build # # Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. @@ -35,5 +35,5 @@ ############################################################################ ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CPROGRESSBAR),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CProgressBar +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CProgressBar endif diff --git a/graphics/NxWidgets/UnitTests/CProgressBar/Makefile b/graphics/nxwidgets/UnitTests/CProgressBar/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CProgressBar/Makefile rename to graphics/nxwidgets/UnitTests/CProgressBar/Makefile index d85ddd0c6..758405dbf 100644 --- a/graphics/NxWidgets/UnitTests/CProgressBar/Makefile +++ b/graphics/nxwidgets/UnitTests/CProgressBar/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CProgressBar/Makefile +# apps/graphics/nxwidgets/UnitTests/CProgressBar/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbar.png b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar.png similarity index 100% rename from graphics/NxWidgets/UnitTests/CProgressBar/cprogressbar.png rename to graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar.png diff --git a/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx similarity index 98% rename from graphics/NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx rename to graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx index 4d50b7ae1..fd436a58e 100644 --- a/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx +++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx +// apps/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -48,7 +48,7 @@ #include -#include "nxwidgets/cprogressbartest.hxx" +#include "graphics/nxwidgets/cprogressbartest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.cxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.cxx rename to graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx index aa392ecfa..a91d5de9c 100644 --- a/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.cxx +++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/ProgressBar/cprogressbartest.cxx +// apps/graphics/nxwidgets/UnitTests/ProgressBar/cprogressbartest.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,9 +47,9 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cprogressbartest.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/cprogressbartest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.hxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx similarity index 93% rename from graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.hxx rename to graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx index 2cd079330..b6e41251f 100644 --- a/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.hxx +++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.hxx +// apps/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,12 +49,12 @@ #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cwidgetcontrol.hxx" -#include "nxwidgets/ccallback.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cnxserver.hxx" -#include "nxwidgets/cprogressbar.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/cprogressbar.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CRadioButton/.gitignore b/graphics/nxwidgets/UnitTests/CRadioButton/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CRadioButton/.gitignore rename to graphics/nxwidgets/UnitTests/CRadioButton/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CRadioButton/Make.defs b/graphics/nxwidgets/UnitTests/CRadioButton/Make.defs similarity index 93% rename from graphics/NxWidgets/UnitTests/CRadioButton/Make.defs rename to graphics/nxwidgets/UnitTests/CRadioButton/Make.defs index 762432c4b..c51c75894 100644 --- a/graphics/NxWidgets/UnitTests/CRadioButton/Make.defs +++ b/graphics/nxwidgets/UnitTests/CRadioButton/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CRadioButton/Make.defs +# apps/graphics/nxwidgets/UnitTests/CRadioButton/Make.defs # Adds selected applications to apps/ build # # Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. @@ -35,5 +35,5 @@ ############################################################################ ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CRADIOBUTTON),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CRadioButton +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CRadioButton endif diff --git a/graphics/NxWidgets/UnitTests/CRadioButton/Makefile b/graphics/nxwidgets/UnitTests/CRadioButton/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CRadioButton/Makefile rename to graphics/nxwidgets/UnitTests/CRadioButton/Makefile index fa8a0407c..017e1185b 100644 --- a/graphics/NxWidgets/UnitTests/CRadioButton/Makefile +++ b/graphics/nxwidgets/UnitTests/CRadioButton/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CRadioButton/Makefile +# apps/graphics/nxwidgets/UnitTests/CRadioButton/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CRadioButton/cradiobutton.png b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton.png similarity index 100% rename from graphics/NxWidgets/UnitTests/CRadioButton/cradiobutton.png rename to graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton.png diff --git a/graphics/NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx rename to graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx index 5217c47f2..b89f8555a 100644 --- a/graphics/NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx +++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx +// apps/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -48,9 +48,9 @@ #include -#include "nxwidgets/crlepalettebitmap.hxx" -#include "nxwidgets/glyphs.hxx" -#include "nxwidgets/cradiobuttontest.hxx" +#include "graphics/nxwidgets/crlepalettebitmap.hxx" +#include "graphics/nxglyphs.hxx" +#include "graphics/nxwidgets/cradiobuttontest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.cxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.cxx rename to graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx index 6196aa352..3fdf7abd1 100644 --- a/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.cxx +++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.cxx +// apps/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,11 +47,11 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cradiobuttontest.hxx" -#include "nxwidgets/cbitmap.hxx" -#include "nxwidgets/glyphs.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/cradiobuttontest.hxx" +#include "graphics/nxwidgets/cbitmap.hxx" +#include "graphics/nxglyphs.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.hxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx similarity index 92% rename from graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.hxx rename to graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx index 65e574bdb..90f893950 100644 --- a/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.hxx +++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.hxx +// apps/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,13 +49,13 @@ #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cwidgetcontrol.hxx" -#include "nxwidgets/ccallback.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cnxserver.hxx" -#include "nxwidgets/cradiobutton.hxx" -#include "nxwidgets/cradiobuttongroup.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/cradiobutton.hxx" +#include "graphics/nxwidgets/cradiobuttongroup.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/.gitignore b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CScrollbarHorizontal/.gitignore rename to graphics/nxwidgets/UnitTests/CScrollbarHorizontal/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Make.defs b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Make.defs similarity index 93% rename from graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Make.defs rename to graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Make.defs index 7d4587a24..e690e80a7 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Make.defs +++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Make.defs +# apps/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Make.defs # Adds selected applications to apps/ build # # Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. @@ -35,5 +35,5 @@ ############################################################################ ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARHORIZONTAL),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CScrollbarHorizontal +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CScrollbarHorizontal endif diff --git a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile rename to graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile index c0944ad1f..1a81080ad 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile +++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile +# apps/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal.png b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal.png similarity index 100% rename from graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal.png rename to graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal.png diff --git a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx similarity index 98% rename from graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx rename to graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx index 2f1f7bca3..4b163f69f 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx +++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx +// apps/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -48,7 +48,7 @@ #include -#include "nxwidgets/cscrollbarhorizontaltest.hxx" +#include "graphics/nxwidgets/cscrollbarhorizontaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx rename to graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx index f08a2712a..d31e7a90e 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx +++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx +// apps/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,9 +47,9 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cscrollbarhorizontaltest.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/cscrollbarhorizontaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx similarity index 93% rename from graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx rename to graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx index b3d9729cc..1a30b8594 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx +++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx +// apps/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,12 +49,12 @@ #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cwidgetcontrol.hxx" -#include "nxwidgets/ccallback.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cnxserver.hxx" -#include "nxwidgets/cscrollbarhorizontal.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/cscrollbarhorizontal.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CScrollbarVertical/.gitignore b/graphics/nxwidgets/UnitTests/CScrollbarVertical/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CScrollbarVertical/.gitignore rename to graphics/nxwidgets/UnitTests/CScrollbarVertical/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CScrollbarVertical/Make.defs b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Make.defs similarity index 93% rename from graphics/NxWidgets/UnitTests/CScrollbarVertical/Make.defs rename to graphics/nxwidgets/UnitTests/CScrollbarVertical/Make.defs index 86d68f904..5a46617c8 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarVertical/Make.defs +++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CScrollbarVertical/Make.defs +# apps/graphics/nxwidgets/UnitTests/CScrollbarVertical/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_CSCROLLBARVERTICAL),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CScrollbarVertical +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CScrollbarVertical endif diff --git a/graphics/NxWidgets/UnitTests/CScrollbarVertical/Makefile b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CScrollbarVertical/Makefile rename to graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile index e9c677a0a..991f01d50 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarVertical/Makefile +++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CScrollbarVertical/Makefile +# apps/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical.png b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical.png similarity index 100% rename from graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical.png rename to graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical.png diff --git a/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx similarity index 98% rename from graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx rename to graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx index f24ebebc5..6dc61bf9f 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx +++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx +// apps/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -48,7 +48,7 @@ #include -#include "nxwidgets/cscrollbarverticaltest.hxx" +#include "graphics/nxwidgets/cscrollbarverticaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx rename to graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx index 321b08f7c..3ea360042 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx +++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx +// apps/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,9 +47,9 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cscrollbarverticaltest.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/cscrollbarverticaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx similarity index 93% rename from graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx rename to graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx index aada208fe..916d3b98b 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx +++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx +// apps/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,12 +49,12 @@ #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cwidgetcontrol.hxx" -#include "nxwidgets/ccallback.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cnxserver.hxx" -#include "nxwidgets/cscrollbarvertical.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/cscrollbarvertical.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CSliderHorizonal/.gitignore b/graphics/nxwidgets/UnitTests/CSliderHorizonal/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CSliderHorizonal/.gitignore rename to graphics/nxwidgets/UnitTests/CSliderHorizonal/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CSliderHorizonal/Make.defs b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Make.defs similarity index 93% rename from graphics/NxWidgets/UnitTests/CSliderHorizonal/Make.defs rename to graphics/nxwidgets/UnitTests/CSliderHorizonal/Make.defs index 73125b5fd..1d24b1d4c 100644 --- a/graphics/NxWidgets/UnitTests/CSliderHorizonal/Make.defs +++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CSliderHorizonal/Make.defs +# apps/graphics/nxwidgets/UnitTests/CSliderHorizonal/Make.defs # Adds selected applications to apps/ build # # Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. @@ -35,5 +35,5 @@ ############################################################################ ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CSLIDERHORIZONAL),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CSliderHorizonal +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CSliderHorizonal endif diff --git a/graphics/NxWidgets/UnitTests/CSliderHorizonal/Makefile b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CSliderHorizonal/Makefile rename to graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile index 048416bd6..242aeac5a 100644 --- a/graphics/NxWidgets/UnitTests/CSliderHorizonal/Makefile +++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CSliderHorizontal/Makefile +# apps/graphics/nxwidgets/UnitTests/CSliderHorizontal/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal.png b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal.png similarity index 100% rename from graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal.png rename to graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal.png diff --git a/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx similarity index 98% rename from graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx rename to graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx index f1c2191fb..676f33ec6 100644 --- a/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx +++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CSliderHorizontal/csliderhorizontal_main.cxx +// apps/graphics/nxwidgets/UnitTests/CSliderHorizontal/csliderhorizontal_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -48,7 +48,7 @@ #include -#include "nxwidgets/csliderhorizontaltest.hxx" +#include "graphics/nxwidgets/csliderhorizontaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx rename to graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx index 80e2583f0..4b8f812bd 100644 --- a/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx +++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CSliderHorizontal/csliderhorizontaltest.cxx +// apps/graphics/nxwidgets/UnitTests/CSliderHorizontal/csliderhorizontaltest.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -47,9 +47,9 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/csliderhorizontaltest.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/csliderhorizontaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx similarity index 93% rename from graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx rename to graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx index 8fd656f86..1441ed5ec 100644 --- a/graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx +++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CSliderHorizontal/csliderhorizontaltest.hxx +// apps/graphics/nxwidgets/UnitTests/CSliderHorizontal/csliderhorizontaltest.hxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,12 +49,12 @@ #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cwidgetcontrol.hxx" -#include "nxwidgets/ccallback.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cnxserver.hxx" -#include "nxwidgets/csliderhorizontal.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/csliderhorizontal.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CSliderVertical/.gitignore b/graphics/nxwidgets/UnitTests/CSliderVertical/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CSliderVertical/.gitignore rename to graphics/nxwidgets/UnitTests/CSliderVertical/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CSliderVertical/Make.defs b/graphics/nxwidgets/UnitTests/CSliderVertical/Make.defs similarity index 93% rename from graphics/NxWidgets/UnitTests/CSliderVertical/Make.defs rename to graphics/nxwidgets/UnitTests/CSliderVertical/Make.defs index 503310226..2da731361 100644 --- a/graphics/NxWidgets/UnitTests/CSliderVertical/Make.defs +++ b/graphics/nxwidgets/UnitTests/CSliderVertical/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CSliderVertical/Make.defs +# apps/graphics/nxwidgets/UnitTests/CSliderVertical/Make.defs # Adds selected applications to apps/ build # # Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. @@ -35,5 +35,5 @@ ############################################################################ ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CSLIDERVERTICAL),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CSliderVertical +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CSliderVertical endif diff --git a/graphics/NxWidgets/UnitTests/CSliderVertical/Makefile b/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CSliderVertical/Makefile rename to graphics/nxwidgets/UnitTests/CSliderVertical/Makefile index e8d2412fd..a49740ec8 100644 --- a/graphics/NxWidgets/UnitTests/CSliderVertical/Makefile +++ b/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CSliderVertical/Makefile +# apps/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CSliderVertical/cslidervertical.png b/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical.png similarity index 100% rename from graphics/NxWidgets/UnitTests/CSliderVertical/cslidervertical.png rename to graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical.png diff --git a/graphics/NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx b/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx similarity index 98% rename from graphics/NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx rename to graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx index c90e828e0..14abe2efc 100644 --- a/graphics/NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx +++ b/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx +// apps/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -48,7 +48,7 @@ #include -#include "nxwidgets/csliderverticaltest.hxx" +#include "graphics/nxwidgets/csliderverticaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx rename to graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx index d6f6f6802..d58bd85e6 100644 --- a/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx +++ b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx +// apps/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -48,9 +48,9 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/csliderverticaltest.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/csliderverticaltest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx similarity index 93% rename from graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx rename to graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx index 01a7c35dd..c75b76329 100644 --- a/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx +++ b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx +// apps/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,12 +49,12 @@ #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/cwidgetcontrol.hxx" -#include "nxwidgets/ccallback.hxx" -#include "nxwidgets/cbgwindow.hxx" -#include "nxwidgets/cnxserver.hxx" -#include "nxwidgets/cslidervertical.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/cslidervertical.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CTextBox/.gitignore b/graphics/nxwidgets/UnitTests/CTextBox/.gitignore similarity index 100% rename from graphics/NxWidgets/UnitTests/CTextBox/.gitignore rename to graphics/nxwidgets/UnitTests/CTextBox/.gitignore diff --git a/graphics/NxWidgets/UnitTests/CTextBox/Make.defs b/graphics/nxwidgets/UnitTests/CTextBox/Make.defs similarity index 94% rename from graphics/NxWidgets/UnitTests/CTextBox/Make.defs rename to graphics/nxwidgets/UnitTests/CTextBox/Make.defs index 6615201da..114889cd7 100644 --- a/graphics/NxWidgets/UnitTests/CTextBox/Make.defs +++ b/graphics/nxwidgets/UnitTests/CTextBox/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/CTextBox/Make.defs +# apps/graphics/nxwidgets/UnitTests/CTextBox/Make.defs # Adds selected applications to apps/ build # # Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. @@ -35,5 +35,5 @@ ############################################################################ ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CTEXTBOX),y) -CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CTextBox +CONFIGURED_APPS += graphics/nxwidget/UnitTests/CTextBox endif diff --git a/graphics/NxWidgets/UnitTests/CTextBox/Makefile b/graphics/nxwidgets/UnitTests/CTextBox/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/CTextBox/Makefile rename to graphics/nxwidgets/UnitTests/CTextBox/Makefile index a18ac1616..40b3effea 100644 --- a/graphics/NxWidgets/UnitTests/CTextBox/Makefile +++ b/graphics/nxwidgets/UnitTests/CTextBox/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/UnitTests/CTextBox/Makefile +# apps/graphics/nxwidgets/UnitTests/CTextBox/Makefile # # Copyright (C) 2012-2013, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/CTextBox/ctextbox.png b/graphics/nxwidgets/UnitTests/CTextBox/ctextbox.png similarity index 100% rename from graphics/NxWidgets/UnitTests/CTextBox/ctextbox.png rename to graphics/nxwidgets/UnitTests/CTextBox/ctextbox.png diff --git a/graphics/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx b/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx rename to graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx index 0478f346d..64d24b8b0 100644 --- a/graphics/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx +++ b/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx +// apps/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -46,7 +46,7 @@ #include -#include "nxwidgets/ctextboxtest.hxx" +#include "graphics/nxwidgets/ctextboxtest.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.cxx b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx similarity index 97% rename from graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.cxx rename to graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx index 3f6879ded..77bfb0006 100644 --- a/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.cxx +++ b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.cxx +// apps/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -48,9 +48,9 @@ #include #include -#include "nxwidgets/nxconfig.hxx" -#include "nxwidgets/ctextboxtest.hxx" -#include "nxwidgets/cbgwindow.hxx" +#include "graphics/nxwidgets/nxconfig.hxx" +#include "graphics/nxwidgets/ctextboxtest.hxx" +#include "graphics/nxwidgets/cbgwindow.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx similarity index 92% rename from graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx rename to graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx index bf458cd4e..502ecfb55 100644 --- a/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx +++ b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx +// apps/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt @@ -49,14 +49,14 @@ #include -#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/ctextbox.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/ctextbox.hxx" ///////////////////////////////////////////////////////////////////////////// // Definitions diff --git a/graphics/NxWidgets/UnitTests/Kconfig b/graphics/nxwidgets/UnitTests/Kconfig similarity index 96% rename from graphics/NxWidgets/UnitTests/Kconfig rename to graphics/nxwidgets/UnitTests/Kconfig index 8d160feeb..37a735bf8 100644 --- a/graphics/NxWidgets/UnitTests/Kconfig +++ b/graphics/nxwidgets/UnitTests/Kconfig @@ -95,9 +95,5 @@ config NXWIDGETS_UNITTEST_CTEXTBOX default n depends on NXWIDGETS -config NXWIDGETS_UNITTEST_NXWM - tristate "NxWM" - default y - depends on NXWM - endmenu # Unit Tests + diff --git a/graphics/NxWidgets/Make.defs b/graphics/nxwidgets/UnitTests/Make.defs similarity index 94% rename from graphics/NxWidgets/Make.defs rename to graphics/nxwidgets/UnitTests/Make.defs index 16a42e33a..d73af406d 100644 --- a/graphics/NxWidgets/Make.defs +++ b/graphics/nxwidgets/UnitTests/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/Make.defs +# apps/graphics/nxwidgets/UnitTests/Make.defs # Adds selected applications to apps/ build # # Copyright (C) 2018 Gregory Nutt. All rights reserved. @@ -34,4 +34,4 @@ # ############################################################################ -include $(wildcard graphics/NxWidgets/*/Make.defs) +include $(wildcard graphics/nxwidget/UnitTests/*/Make.defs) diff --git a/graphics/NxWidgets/UnitTests/Makefile b/graphics/nxwidgets/UnitTests/Makefile similarity index 97% rename from graphics/NxWidgets/UnitTests/Makefile rename to graphics/nxwidgets/UnitTests/Makefile index b909e4fc8..b4dc6391e 100644 --- a/graphics/NxWidgets/UnitTests/Makefile +++ b/graphics/nxwidgets/UnitTests/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/UnitTests/Makefile +# apps/graphics/nxwidgets/UnitTests/Makefile # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/README.txt b/graphics/nxwidgets/UnitTests/README.txt similarity index 98% rename from graphics/NxWidgets/UnitTests/README.txt rename to graphics/nxwidgets/UnitTests/README.txt index d0bda82fd..37197ef60 100644 --- a/graphics/NxWidgets/UnitTests/README.txt +++ b/graphics/nxwidgets/UnitTests/README.txt @@ -241,7 +241,3 @@ CTextBox Exercises the CTextBox widget Depends on CLabel -nxwm - Exercises the NxWM window manager. - Use the special configurations nuttx/configs/sim/nxwm or nuttx/configs/stm3240g-eval/nxwm. - diff --git a/graphics/NxWidgets/UnitTests/TestStatus.txt b/graphics/nxwidgets/UnitTests/TestStatus.txt similarity index 100% rename from graphics/NxWidgets/UnitTests/TestStatus.txt rename to graphics/nxwidgets/UnitTests/TestStatus.txt diff --git a/graphics/NxWidgets/nxwidgets/doc/mainpage.h b/graphics/nxwidgets/doc/mainpage.h similarity index 100% rename from graphics/NxWidgets/nxwidgets/doc/mainpage.h rename to graphics/nxwidgets/doc/mainpage.h diff --git a/graphics/NxWidgets/nxwidgets/src/cbgwindow.cxx b/graphics/nxwidgets/src/cbgwindow.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cbgwindow.cxx rename to graphics/nxwidgets/src/cbgwindow.cxx index 57c5a90fe..7d3adfc7c 100644 --- a/graphics/NxWidgets/nxwidgets/src/cbgwindow.cxx +++ b/graphics/nxwidgets/src/cbgwindow.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cbgwindow.cxx + * apps/graphics/nxwidgets/src/cbgwindow.cxx * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cbitmap.cxx b/graphics/nxwidgets/src/cbitmap.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cbitmap.cxx rename to graphics/nxwidgets/src/cbitmap.cxx index 326ff8ee8..76fccd17b 100644 --- a/graphics/NxWidgets/nxwidgets/src/cbitmap.cxx +++ b/graphics/nxwidgets/src/cbitmap.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cbitmap.hxx + * apps/graphics/nxwidgets/src/cbitmap.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cbutton.cxx b/graphics/nxwidgets/src/cbutton.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cbutton.cxx rename to graphics/nxwidgets/src/cbutton.cxx index 714c8af36..41c8ed6c4 100644 --- a/graphics/NxWidgets/nxwidgets/src/cbutton.cxx +++ b/graphics/nxwidgets/src/cbutton.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cbutton.cxx + * apps/graphics/nxwidgets/src/cbutton.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cbuttonarray.cxx b/graphics/nxwidgets/src/cbuttonarray.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cbuttonarray.cxx rename to graphics/nxwidgets/src/cbuttonarray.cxx index c33549e82..769555eac 100644 --- a/graphics/NxWidgets/nxwidgets/src/cbuttonarray.cxx +++ b/graphics/nxwidgets/src/cbuttonarray.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/include/cbuttonarray.cxx + * apps/graphics/nxwidgets/include/cbuttonarray.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/ccallback.cxx b/graphics/nxwidgets/src/ccallback.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/ccallback.cxx rename to graphics/nxwidgets/src/ccallback.cxx index 27e8ea3ac..da11c6b38 100644 --- a/graphics/NxWidgets/nxwidgets/src/ccallback.cxx +++ b/graphics/nxwidgets/src/ccallback.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/ccallback.cxx + * apps/graphics/nxwidgets/src/ccallback.cxx * * Copyright (C) 2012-2013, 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/ccheckbox.cxx b/graphics/nxwidgets/src/ccheckbox.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/ccheckbox.cxx rename to graphics/nxwidgets/src/ccheckbox.cxx index d6b28cf2f..63d189ee6 100644 --- a/graphics/NxWidgets/nxwidgets/src/ccheckbox.cxx +++ b/graphics/nxwidgets/src/ccheckbox.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/ccheckbox.cxx + * apps/graphics/nxwidgets/src/ccheckbox.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -82,7 +82,7 @@ #include "graphics/nxwidgets/cgraphicsport.hxx" #include "graphics/nxwidgets/cbitmap.hxx" #include "graphics/nxwidgets/singletons.hxx" -#include "graphics/nxwidgets/glyphs.hxx" +#include "graphics/nxglyphs.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwidgets/src/ccyclebutton.cxx b/graphics/nxwidgets/src/ccyclebutton.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/ccyclebutton.cxx rename to graphics/nxwidgets/src/ccyclebutton.cxx index c92701ada..ff2c2da7b 100644 --- a/graphics/NxWidgets/nxwidgets/src/ccyclebutton.cxx +++ b/graphics/nxwidgets/src/ccyclebutton.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/ccyclebutton.cxx + * apps/graphics/nxwidgets/src/ccyclebutton.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -82,7 +82,7 @@ #include "graphics/nxwidgets/ccyclebutton.hxx" #include "graphics/nxwidgets/cgraphicsport.hxx" #include "graphics/nxwidgets/cbitmap.hxx" -#include "graphics/nxwidgets/glyphs.hxx" +#include "graphics/nxglyphs.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwidgets/src/cglyphbutton.cxx b/graphics/nxwidgets/src/cglyphbutton.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cglyphbutton.cxx rename to graphics/nxwidgets/src/cglyphbutton.cxx index 870ae77a5..a616297d6 100644 --- a/graphics/NxWidgets/nxwidgets/src/cglyphbutton.cxx +++ b/graphics/nxwidgets/src/cglyphbutton.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cglyphbutton.cxx + * apps/graphics/nxwidgets/src/cglyphbutton.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontal.cxx b/graphics/nxwidgets/src/cglyphsliderhorizontal.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontal.cxx rename to graphics/nxwidgets/src/cglyphsliderhorizontal.cxx index b731ec7de..e89f38f31 100644 --- a/graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontal.cxx +++ b/graphics/nxwidgets/src/cglyphsliderhorizontal.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontal.cxx + * apps/graphics/nxwidgets/src/cglyphsliderhorizontal.cxx * * Copyright (C) 2013 Ken Pettit. All rights reserved. * Author: Ken Pettit diff --git a/graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontalgrip.cxx b/graphics/nxwidgets/src/cglyphsliderhorizontalgrip.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontalgrip.cxx rename to graphics/nxwidgets/src/cglyphsliderhorizontalgrip.cxx index 50ff5a0d1..6b8b07a78 100644 --- a/graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontalgrip.cxx +++ b/graphics/nxwidgets/src/cglyphsliderhorizontalgrip.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontalgrip.cxx + * apps/graphics/nxwidgets/src/cglyphsliderhorizontalgrip.cxx * * Copyright (C) 2013 Ken Pettit. All rights reserved. * Author: Ken Pettit diff --git a/graphics/NxWidgets/nxwidgets/src/cgraphicsport.cxx b/graphics/nxwidgets/src/cgraphicsport.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cgraphicsport.cxx rename to graphics/nxwidgets/src/cgraphicsport.cxx index d5c7c6457..755bb126d 100644 --- a/graphics/NxWidgets/nxwidgets/src/cgraphicsport.cxx +++ b/graphics/nxwidgets/src/cgraphicsport.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cgraphicsport.cxx + * apps/graphics/nxwidgets/src/cgraphicsport.cxx * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cimage.cxx b/graphics/nxwidgets/src/cimage.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cimage.cxx rename to graphics/nxwidgets/src/cimage.cxx index ddb5794e0..2a53a6b87 100644 --- a/graphics/NxWidgets/nxwidgets/src/cimage.cxx +++ b/graphics/nxwidgets/src/cimage.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/include/cimage.cxx + * apps/graphics/nxwidgets/include/cimage.cxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/ckeypad.cxx b/graphics/nxwidgets/src/ckeypad.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/ckeypad.cxx rename to graphics/nxwidgets/src/ckeypad.cxx index aaf13b50f..93f64c601 100644 --- a/graphics/NxWidgets/nxwidgets/src/ckeypad.cxx +++ b/graphics/nxwidgets/src/ckeypad.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/ckeypad.cxx + * apps/graphics/nxwidgets/src/ckeypad.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/clabel.cxx b/graphics/nxwidgets/src/clabel.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/clabel.cxx rename to graphics/nxwidgets/src/clabel.cxx index f7654571c..5db9d7eb7 100644 --- a/graphics/NxWidgets/nxwidgets/src/clabel.cxx +++ b/graphics/nxwidgets/src/clabel.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/clabel.cxx + * apps/graphics/nxwidgets/src/clabel.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/clabelgrid.cxx b/graphics/nxwidgets/src/clabelgrid.cxx similarity index 100% rename from graphics/NxWidgets/nxwidgets/src/clabelgrid.cxx rename to graphics/nxwidgets/src/clabelgrid.cxx diff --git a/graphics/NxWidgets/nxwidgets/src/clatchbutton.cxx b/graphics/nxwidgets/src/clatchbutton.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/clatchbutton.cxx rename to graphics/nxwidgets/src/clatchbutton.cxx index 6f5b47ec3..74ac496bc 100644 --- a/graphics/NxWidgets/nxwidgets/src/clatchbutton.cxx +++ b/graphics/nxwidgets/src/clatchbutton.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/clatchbutton.cxx + * apps/graphics/nxwidgets/src/clatchbutton.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/clatchbuttonarray.cxx b/graphics/nxwidgets/src/clatchbuttonarray.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/clatchbuttonarray.cxx rename to graphics/nxwidgets/src/clatchbuttonarray.cxx index 96d85f41d..1fbeea04b 100644 --- a/graphics/NxWidgets/nxwidgets/src/clatchbuttonarray.cxx +++ b/graphics/nxwidgets/src/clatchbuttonarray.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/clatchbuttonarray.cxx + * apps/graphics/nxwidgets/src/clatchbuttonarray.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/clistbox.cxx b/graphics/nxwidgets/src/clistbox.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/clistbox.cxx rename to graphics/nxwidgets/src/clistbox.cxx index 4410a16c5..b5ed2a0dc 100644 --- a/graphics/NxWidgets/nxwidgets/src/clistbox.cxx +++ b/graphics/nxwidgets/src/clistbox.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/clistbox.cxx + * apps/graphics/nxwidgets/src/clistbox.cxx * * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/clistboxdataitem.cxx b/graphics/nxwidgets/src/clistboxdataitem.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/clistboxdataitem.cxx rename to graphics/nxwidgets/src/clistboxdataitem.cxx index 113a1495f..8373695a6 100644 --- a/graphics/NxWidgets/nxwidgets/src/clistboxdataitem.cxx +++ b/graphics/nxwidgets/src/clistboxdataitem.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/clistboxdataitem.cxx + * apps/graphics/nxwidgets/src/clistboxdataitem.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/clistdata.cxx b/graphics/nxwidgets/src/clistdata.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/clistdata.cxx rename to graphics/nxwidgets/src/clistdata.cxx index 4ce860ea5..cae85746e 100644 --- a/graphics/NxWidgets/nxwidgets/src/clistdata.cxx +++ b/graphics/nxwidgets/src/clistdata.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/clistdata.cxx + * apps/graphics/nxwidgets/src/clistdata.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/clistdataitem.cxx b/graphics/nxwidgets/src/clistdataitem.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/clistdataitem.cxx rename to graphics/nxwidgets/src/clistdataitem.cxx index 9bb20ec50..c02f26e6e 100644 --- a/graphics/NxWidgets/nxwidgets/src/clistdataitem.cxx +++ b/graphics/nxwidgets/src/clistdataitem.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/clistdataitem.cxx + * apps/graphics/nxwidgets/src/clistdataitem.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cmultilinetextbox.cxx b/graphics/nxwidgets/src/cmultilinetextbox.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cmultilinetextbox.cxx rename to graphics/nxwidgets/src/cmultilinetextbox.cxx index 7dbf52c7c..85cfb8e51 100644 --- a/graphics/NxWidgets/nxwidgets/src/cmultilinetextbox.cxx +++ b/graphics/nxwidgets/src/cmultilinetextbox.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cmultilinetextbox.cxx + * apps/graphics/nxwidgets/src/cmultilinetextbox.cxx * * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cnumericedit.cxx b/graphics/nxwidgets/src/cnumericedit.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cnumericedit.cxx rename to graphics/nxwidgets/src/cnumericedit.cxx index 8475ad66d..d3b6dae18 100644 --- a/graphics/NxWidgets/nxwidgets/src/cnumericedit.cxx +++ b/graphics/nxwidgets/src/cnumericedit.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/include/cnumericedit.cxx + * apps/graphics/nxwidgets/include/cnumericedit.cxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cnxfont.cxx b/graphics/nxwidgets/src/cnxfont.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cnxfont.cxx rename to graphics/nxwidgets/src/cnxfont.cxx index 629505916..75fb80f0a 100644 --- a/graphics/NxWidgets/nxwidgets/src/cnxfont.cxx +++ b/graphics/nxwidgets/src/cnxfont.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cnxfont.cxx + * apps/graphics/nxwidgets/src/cnxfont.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cnxserver.cxx b/graphics/nxwidgets/src/cnxserver.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cnxserver.cxx rename to graphics/nxwidgets/src/cnxserver.cxx index f6a2ed815..2c2304b66 100644 --- a/graphics/NxWidgets/nxwidgets/src/cnxserver.cxx +++ b/graphics/nxwidgets/src/cnxserver.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cnxserver.cxx + * apps/graphics/nxwidgets/src/cnxserver.cxx * * Copyright (C) 2012, 2013, 2015-2016, 2019 Gregory Nutt. All rights * reserved. diff --git a/graphics/NxWidgets/nxwidgets/src/cnxstring.cxx b/graphics/nxwidgets/src/cnxstring.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cnxstring.cxx rename to graphics/nxwidgets/src/cnxstring.cxx index 01ed9f622..1504083ce 100644 --- a/graphics/NxWidgets/nxwidgets/src/cnxstring.cxx +++ b/graphics/nxwidgets/src/cnxstring.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cnxstring.cxx + * apps/graphics/nxwidgets/src/cnxstring.cxx * * Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cnxtimer.cxx b/graphics/nxwidgets/src/cnxtimer.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cnxtimer.cxx rename to graphics/nxwidgets/src/cnxtimer.cxx index 555f6b84d..01683a291 100644 --- a/graphics/NxWidgets/nxwidgets/src/cnxtimer.cxx +++ b/graphics/nxwidgets/src/cnxtimer.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cnxtimer.cxx + * apps/graphics/nxwidgets/src/cnxtimer.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cnxtkwindow.cxx b/graphics/nxwidgets/src/cnxtkwindow.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cnxtkwindow.cxx rename to graphics/nxwidgets/src/cnxtkwindow.cxx index c7a4b05b0..a7338977a 100644 --- a/graphics/NxWidgets/nxwidgets/src/cnxtkwindow.cxx +++ b/graphics/nxwidgets/src/cnxtkwindow.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cnxtkwindow.cxx + * apps/graphics/nxwidgets/src/cnxtkwindow.cxx * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cnxtoolbar.cxx b/graphics/nxwidgets/src/cnxtoolbar.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cnxtoolbar.cxx rename to graphics/nxwidgets/src/cnxtoolbar.cxx index a47916380..92053ea69 100644 --- a/graphics/NxWidgets/nxwidgets/src/cnxtoolbar.cxx +++ b/graphics/nxwidgets/src/cnxtoolbar.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cnxtoolbar.cxx + * apps/graphics/nxwidgets/src/cnxtoolbar.cxx * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cnxwidget.cxx b/graphics/nxwidgets/src/cnxwidget.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cnxwidget.cxx rename to graphics/nxwidgets/src/cnxwidget.cxx index f999aab72..6005623fe 100644 --- a/graphics/NxWidgets/nxwidgets/src/cnxwidget.cxx +++ b/graphics/nxwidgets/src/cnxwidget.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cnxwidget.cxx + * apps/graphics/nxwidgets/src/cnxwidget.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cnxwindow.cxx b/graphics/nxwidgets/src/cnxwindow.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cnxwindow.cxx rename to graphics/nxwidgets/src/cnxwindow.cxx index 7385dfd60..060ea7be3 100644 --- a/graphics/NxWidgets/nxwidgets/src/cnxwindow.cxx +++ b/graphics/nxwidgets/src/cnxwindow.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cnxwindow.cxx + * apps/graphics/nxwidgets/src/cnxwindow.cxx * * Copyright (C) 2012, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cprogressbar.cxx b/graphics/nxwidgets/src/cprogressbar.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cprogressbar.cxx rename to graphics/nxwidgets/src/cprogressbar.cxx index e7b8251f5..8c868805c 100644 --- a/graphics/NxWidgets/nxwidgets/src/cprogressbar.cxx +++ b/graphics/nxwidgets/src/cprogressbar.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cprogressbar.cxx + * apps/graphics/nxwidgets/src/cprogressbar.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cradiobutton.cxx b/graphics/nxwidgets/src/cradiobutton.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/cradiobutton.cxx rename to graphics/nxwidgets/src/cradiobutton.cxx index 676938839..14c7fea83 100644 --- a/graphics/NxWidgets/nxwidgets/src/cradiobutton.cxx +++ b/graphics/nxwidgets/src/cradiobutton.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cradiobutton.cxx + * apps/graphics/nxwidgets/src/cradiobutton.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -84,7 +84,7 @@ #include "graphics/nxwidgets/cradiobuttongroup.hxx" #include "graphics/nxwidgets/cgraphicsport.hxx" #include "graphics/nxwidgets/cbitmap.hxx" -#include "graphics/nxwidgets/glyphs.hxx" +#include "graphics/nxglyphs.hxx" #include "graphics/nxwidgets/singletons.hxx" /**************************************************************************** diff --git a/graphics/NxWidgets/nxwidgets/src/cradiobuttongroup.cxx b/graphics/nxwidgets/src/cradiobuttongroup.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cradiobuttongroup.cxx rename to graphics/nxwidgets/src/cradiobuttongroup.cxx index 7ee4a8763..d3d35edd9 100644 --- a/graphics/NxWidgets/nxwidgets/src/cradiobuttongroup.cxx +++ b/graphics/nxwidgets/src/cradiobuttongroup.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cradiobutton.cxx + * apps/graphics/nxwidgets/src/cradiobutton.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/crect.cxx b/graphics/nxwidgets/src/crect.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/crect.cxx rename to graphics/nxwidgets/src/crect.cxx index 5944f3d58..d67826259 100644 --- a/graphics/NxWidgets/nxwidgets/src/crect.cxx +++ b/graphics/nxwidgets/src/crect.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cbgwindow.cxx + * apps/graphics/nxwidgets/src/cbgwindow.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/crlepalettebitmap.cxx b/graphics/nxwidgets/src/crlepalettebitmap.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/crlepalettebitmap.cxx rename to graphics/nxwidgets/src/crlepalettebitmap.cxx index 855693d11..492a081a9 100644 --- a/graphics/NxWidgets/nxwidgets/src/crlepalettebitmap.cxx +++ b/graphics/nxwidgets/src/crlepalettebitmap.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/crlepalettebitmap.hxx + * apps/graphics/nxwidgets/src/crlepalettebitmap.hxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cscaledbitmap.cxx b/graphics/nxwidgets/src/cscaledbitmap.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cscaledbitmap.cxx rename to graphics/nxwidgets/src/cscaledbitmap.cxx index f20fce23f..4ea5fd40a 100644 --- a/graphics/NxWidgets/nxwidgets/src/cscaledbitmap.cxx +++ b/graphics/nxwidgets/src/cscaledbitmap.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cscaledbitmap.hxx + * apps/graphics/nxwidgets/src/cscaledbitmap.hxx * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cscrollbarhorizontal.cxx b/graphics/nxwidgets/src/cscrollbarhorizontal.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cscrollbarhorizontal.cxx rename to graphics/nxwidgets/src/cscrollbarhorizontal.cxx index 9ccf40026..ebcc05bfb 100644 --- a/graphics/NxWidgets/nxwidgets/src/cscrollbarhorizontal.cxx +++ b/graphics/nxwidgets/src/cscrollbarhorizontal.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/include/cscrollbarhorizontal.hxx + * apps/graphics/nxwidgets/include/cscrollbarhorizontal.hxx * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -86,7 +86,7 @@ #include "graphics/nxwidgets/cglyphbutton.hxx" #include "graphics/nxwidgets/csliderhorizontal.hxx" #include "graphics/nxwidgets/cnxtimer.hxx" -#include "graphics/nxwidgets/glyphs.hxx" +#include "graphics/nxglyphs.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwidgets/src/cscrollbarpanel.cxx b/graphics/nxwidgets/src/cscrollbarpanel.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cscrollbarpanel.cxx rename to graphics/nxwidgets/src/cscrollbarpanel.cxx index 3b179d1c7..daa168317 100644 --- a/graphics/NxWidgets/nxwidgets/src/cscrollbarpanel.cxx +++ b/graphics/nxwidgets/src/cscrollbarpanel.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cscrollbarpanel.cxx + * apps/graphics/nxwidgets/src/cscrollbarpanel.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cscrollbarvertical.cxx b/graphics/nxwidgets/src/cscrollbarvertical.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cscrollbarvertical.cxx rename to graphics/nxwidgets/src/cscrollbarvertical.cxx index 0ca6dd5ec..5551af439 100644 --- a/graphics/NxWidgets/nxwidgets/src/cscrollbarvertical.cxx +++ b/graphics/nxwidgets/src/cscrollbarvertical.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/include/cscrollbarhorizontal.hxx + * apps/graphics/nxwidgets/include/cscrollbarhorizontal.hxx * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -83,7 +83,7 @@ #include "graphics/nxwidgets/cglyphbutton.hxx" #include "graphics/nxwidgets/cslidervertical.hxx" #include "graphics/nxwidgets/cnxtimer.hxx" -#include "graphics/nxwidgets/glyphs.hxx" +#include "graphics/nxglyphs.hxx" /**************************************************************************** * Pre-Processor Definitions diff --git a/graphics/NxWidgets/nxwidgets/src/cscrollinglistbox.cxx b/graphics/nxwidgets/src/cscrollinglistbox.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cscrollinglistbox.cxx rename to graphics/nxwidgets/src/cscrollinglistbox.cxx index a6fe8c23d..4087ba7ce 100644 --- a/graphics/NxWidgets/nxwidgets/src/cscrollinglistbox.cxx +++ b/graphics/nxwidgets/src/cscrollinglistbox.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cscrollinglistbox.cxx + * apps/graphics/nxwidgets/src/cscrollinglistbox.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cscrollingpanel.cxx b/graphics/nxwidgets/src/cscrollingpanel.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cscrollingpanel.cxx rename to graphics/nxwidgets/src/cscrollingpanel.cxx index e17735dca..e65c3246d 100644 --- a/graphics/NxWidgets/nxwidgets/src/cscrollingpanel.cxx +++ b/graphics/nxwidgets/src/cscrollingpanel.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cscrollingpanel.cxx + * apps/graphics/nxwidgets/src/cscrollingpanel.cxx * * Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cscrollingtextbox.cxx b/graphics/nxwidgets/src/cscrollingtextbox.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cscrollingtextbox.cxx rename to graphics/nxwidgets/src/cscrollingtextbox.cxx index 4de9fdb1d..944a47cd6 100644 --- a/graphics/NxWidgets/nxwidgets/src/cscrollingtextbox.cxx +++ b/graphics/nxwidgets/src/cscrollingtextbox.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cscrollingtextbox.cxx + * apps/graphics/nxwidgets/src/cscrollingtextbox.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/csliderhorizontal.cxx b/graphics/nxwidgets/src/csliderhorizontal.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/csliderhorizontal.cxx rename to graphics/nxwidgets/src/csliderhorizontal.cxx index 06dd4baf0..3bb696230 100644 --- a/graphics/NxWidgets/nxwidgets/src/csliderhorizontal.cxx +++ b/graphics/nxwidgets/src/csliderhorizontal.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/csliderhorizontal.cxx + * apps/graphics/nxwidgets/src/csliderhorizontal.cxx * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/csliderhorizontalgrip.cxx b/graphics/nxwidgets/src/csliderhorizontalgrip.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/csliderhorizontalgrip.cxx rename to graphics/nxwidgets/src/csliderhorizontalgrip.cxx index 9483890e2..360ef1169 100644 --- a/graphics/NxWidgets/nxwidgets/src/csliderhorizontalgrip.cxx +++ b/graphics/nxwidgets/src/csliderhorizontalgrip.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/csliderhorizontalgrip.cxx + * apps/graphics/nxwidgets/src/csliderhorizontalgrip.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cslidervertical.cxx b/graphics/nxwidgets/src/cslidervertical.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cslidervertical.cxx rename to graphics/nxwidgets/src/cslidervertical.cxx index a9afc0105..19872754f 100644 --- a/graphics/NxWidgets/nxwidgets/src/cslidervertical.cxx +++ b/graphics/nxwidgets/src/cslidervertical.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cslidervertical.cxx + * apps/graphics/nxwidgets/src/cslidervertical.cxx * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/csliderverticalgrip.cxx b/graphics/nxwidgets/src/csliderverticalgrip.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/csliderverticalgrip.cxx rename to graphics/nxwidgets/src/csliderverticalgrip.cxx index db5d40473..9cbd9f76e 100644 --- a/graphics/NxWidgets/nxwidgets/src/csliderverticalgrip.cxx +++ b/graphics/nxwidgets/src/csliderverticalgrip.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cslidervertical.cxx + * apps/graphics/nxwidgets/src/cslidervertical.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cstickybutton.cxx b/graphics/nxwidgets/src/cstickybutton.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cstickybutton.cxx rename to graphics/nxwidgets/src/cstickybutton.cxx index f77af1f0c..def9624d6 100644 --- a/graphics/NxWidgets/nxwidgets/src/cstickybutton.cxx +++ b/graphics/nxwidgets/src/cstickybutton.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cstickybutton.cxx + * apps/graphics/nxwidgets/src/cstickybutton.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cstickybuttonarray.cxx b/graphics/nxwidgets/src/cstickybuttonarray.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cstickybuttonarray.cxx rename to graphics/nxwidgets/src/cstickybuttonarray.cxx index 089714f80..5e8114285 100644 --- a/graphics/NxWidgets/nxwidgets/src/cstickybuttonarray.cxx +++ b/graphics/nxwidgets/src/cstickybuttonarray.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/include/cstickybuttonarray.cxx + * apps/graphics/nxwidgets/include/cstickybuttonarray.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cstickyimage.cxx b/graphics/nxwidgets/src/cstickyimage.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/cstickyimage.cxx rename to graphics/nxwidgets/src/cstickyimage.cxx index a28b43ed0..b85831221 100644 --- a/graphics/NxWidgets/nxwidgets/src/cstickyimage.cxx +++ b/graphics/nxwidgets/src/cstickyimage.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cstickyimage.cxx + * apps/graphics/nxwidgets/src/cstickyimage.cxx * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cstringiterator.cxx b/graphics/nxwidgets/src/cstringiterator.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cstringiterator.cxx rename to graphics/nxwidgets/src/cstringiterator.cxx index 188bf6758..2659de0ec 100644 --- a/graphics/NxWidgets/nxwidgets/src/cstringiterator.cxx +++ b/graphics/nxwidgets/src/cstringiterator.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cgraphicsport.cxx + * apps/graphics/nxwidgets/src/cgraphicsport.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/ctabpanel.cxx b/graphics/nxwidgets/src/ctabpanel.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/ctabpanel.cxx rename to graphics/nxwidgets/src/ctabpanel.cxx index 714d6853a..5d20d3ca7 100644 --- a/graphics/NxWidgets/nxwidgets/src/ctabpanel.cxx +++ b/graphics/nxwidgets/src/ctabpanel.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/ctabpanel.hxx + * apps/graphics/nxwidgets/src/ctabpanel.hxx * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Petteri Aimonen diff --git a/graphics/NxWidgets/nxwidgets/src/ctext.cxx b/graphics/nxwidgets/src/ctext.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/ctext.cxx rename to graphics/nxwidgets/src/ctext.cxx index f63684b6d..1d45e911f 100644 --- a/graphics/NxWidgets/nxwidgets/src/ctext.cxx +++ b/graphics/nxwidgets/src/ctext.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/ctext.cxx + * apps/graphics/nxwidgets/src/ctext.cxx * * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/ctextbox.cxx b/graphics/nxwidgets/src/ctextbox.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/ctextbox.cxx rename to graphics/nxwidgets/src/ctextbox.cxx index 31a855cbd..b70351125 100644 --- a/graphics/NxWidgets/nxwidgets/src/ctextbox.cxx +++ b/graphics/nxwidgets/src/ctextbox.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/ctextbox.cxx + * apps/graphics/nxwidgets/src/ctextbox.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cwidgetcontrol.cxx b/graphics/nxwidgets/src/cwidgetcontrol.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cwidgetcontrol.cxx rename to graphics/nxwidgets/src/cwidgetcontrol.cxx index 786a23caf..a83994230 100644 --- a/graphics/NxWidgets/nxwidgets/src/cwidgetcontrol.cxx +++ b/graphics/nxwidgets/src/cwidgetcontrol.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cwidgetcontrol.cxx + * apps/graphics/nxwidgets/src/cwidgetcontrol.cxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cwidgeteventhandlerlist.cxx b/graphics/nxwidgets/src/cwidgeteventhandlerlist.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/cwidgeteventhandlerlist.cxx rename to graphics/nxwidgets/src/cwidgeteventhandlerlist.cxx index a22b2545e..9cb7a5c04 100644 --- a/graphics/NxWidgets/nxwidgets/src/cwidgeteventhandlerlist.cxx +++ b/graphics/nxwidgets/src/cwidgeteventhandlerlist.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cwidgeteventhandlerlist.cxx + * apps/graphics/nxwidgets/src/cwidgeteventhandlerlist.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/cwindoweventhandlerlist.cxx b/graphics/nxwidgets/src/cwindoweventhandlerlist.cxx similarity index 98% rename from graphics/NxWidgets/nxwidgets/src/cwindoweventhandlerlist.cxx rename to graphics/nxwidgets/src/cwindoweventhandlerlist.cxx index f83a357d0..a31a47864 100644 --- a/graphics/NxWidgets/nxwidgets/src/cwindoweventhandlerlist.cxx +++ b/graphics/nxwidgets/src/cwindoweventhandlerlist.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/cwindoweventhandlerlist.cxx + * apps/graphics/nxwidgets/src/cwindoweventhandlerlist.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwidgets/src/singletons.cxx b/graphics/nxwidgets/src/singletons.cxx similarity index 99% rename from graphics/NxWidgets/nxwidgets/src/singletons.cxx rename to graphics/nxwidgets/src/singletons.cxx index 983cc3ace..f28e068d8 100644 --- a/graphics/NxWidgets/nxwidgets/src/singletons.cxx +++ b/graphics/nxwidgets/src/singletons.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwidgets/src/singletons.cxx + * apps/graphics/nxwidgets/src/singletons.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwm/.gitignore b/graphics/nxwm/.gitignore similarity index 100% rename from graphics/NxWidgets/nxwm/.gitignore rename to graphics/nxwm/.gitignore diff --git a/graphics/NxWidgets/nxwm/COPYING b/graphics/nxwm/COPYING similarity index 100% rename from graphics/NxWidgets/nxwm/COPYING rename to graphics/nxwm/COPYING diff --git a/graphics/nxwm/ChangeLog.txt b/graphics/nxwm/ChangeLog.txt new file mode 100644 index 000000000..55cde0e1b --- /dev/null +++ b/graphics/nxwm/ChangeLog.txt @@ -0,0 +1,652 @@ +1.0 2012-03-22 Gregory Nutt + +* The initial release of the NxWidgets package + +1.1 2012-05-19 Gregory Nutt + +* Updated and verified the NxWidgets DOxygen documentation. Contributed + by Jose Pablo Carballo. +* IBitmap, CRlePalettBitmap: Extended class to support differnt LUTs + for selected and non-selected images. +* CImage: If selected, uses different LUTs based, different borders. + CImage is now basically a button type. +* CImage: Add logic to hightlight an CImage (using the selected LUT). +* nxwm: The tiny NX window manager (NxWM) is being developed in this directory. +* UnitTests/nxwm: A unit test for the NX window manager. +* CWidgetControl: Add a semaphore to force clients to wait if the + size or position of the window is not yet known (multi-user mode only). +* During integration of NxWM, corrected numerous problems with NxWidgets + running on toolbars and framed windows. That capability was commented + out in the 1.0 release but is verfied functional in 1.1. +* CRlePalettBitmap: Fix an error in the text that determines if we + need to "rewind" to the beginning of the image. +* CRlePalettBitmap: Fixe a positioning problem. It was actually losing + the last row of every image! +* CNxWidget: Removed support for "shelving" widgets. I will be removing + some lesser used feature over time in order to reduce the NxWidgets + footprint. +* CNxWidget: Removed support for reference constants and close types. + The goal is to ge the base widget class as small as possible. +* CNxTkWindow: Fix uninitialized pointer value. +* CNxToolbar: Need to "fake" the fix position callback to avoid + deadlock waits for the callback that won't happen. +* CNxTkWindow: Fix toolbar background color +* CWidgetControl: Don't declare the the geometry is good until a non-NULL + window size is received. +* CGraphicsPort and CWidgetControl: If the underlying graphics device + is write-only, then we have to render fonts a little differently. +* CNxWidgets, CWidgetControl, and CRectCache: Big change! Remove all support + for widgets in a "vertical" hierarchy. Now widgets exist in a flat, + two-dimensional space and should not overlap. This should greatly + reduce the memory requirements and, since, NuttX already supports + a hierarchical windowing system, does not result in loss of functionality. +* CNxWidgets and CWidgetControl. Remove specific built-in support for + modal loops. There are too many different control mechanisms that might + be needed. Replace with hooks to control widget events from totally + external logic. +* CWindowEventHandler, CWindowEventHandlerList, CWidgetControl: New + callback classes to receive notifications about window events. +* NxWM::CFullScreenWindow and NxWM::CTaskbar: Add support in NxWM for full + screen window applications. +* All application windows now use CWindowEventHandler and CWindowEventHandlerList + to get notifications about mouse and keyboard events. These class will + then automatically handle polling (with no need for a modal loop). +* NxWM::CTouchscreen and NxWM::CCalibration: Add touchscreen support (still a long + way to go). +* NxWM::g_playBitmp: Change the play icon again. These tiny touch icons + must be very simple. +* NxWM::CCalibration: Beef up touch input handling logic. Now changes the + color of the touch circle to yellow when it is touched. +* NxWM::CTouchscreen: Do not read touchscreen data when there is no consumer. +* NxWM::CWindowControl: Add new class to wrap CWidgetControl and provide + some special mouse and keyboard input event handling. +* NxWM::CTaskbar: Correct the calculation of the physical size of the + display. +* NxWM::CCalibration: run method must clear m_stop when returning, or you can + never restart the Calibration window. +* NxWM::CTaskbar: On a failure to start an application, the application icon + CImage was being deleted twice. +* NXWidgets::CImage: Now handles mouse click callbacks. CImage is now really + a button. Probably should separate basic imaging functionality as CImage + and create a new CImageButton. +* NxWM::CStartWindow: Now ignores any close application button presses + (You can't close the start window). +* NxWM::CCalibration: The calibration application now has its own thread. + This was necessary for a proper integration with the taskbar. +* NxWM::CCalibration and NxWM:CTouchscreen: Changed the mechanism use + to report calbration data. It is now reported directly from CCalibration + to CTouchscreen. If external logic needs calibration, it can now get it + from CTouchscreen instead of CCalibration. This change was necessary + to make the termination conditions of CCalibration clean (it used to + have to persist until some external logic got the Calibration data). +* IApplication, IApplicationWindow, and all classes that inherit from + these: Now support method to report if the application is a full-screen + or a normal application. This is necessary to prevent CTaskbar from + displaying a task bar on top of a full-screen window. +* NxWM::CTaskbar: Ooops... minimizing the wrong application! +* NxWM::CNxConsole: Add a on_exit() exit handler that will close the + NxConsole window when the NSH thread exits. A correct build now depends + on having CONFIG_SCHED_ONEXIT defined. +* NXWidgets::CNxWidget: Add a new onPreRelease() method. +* NXWidgets::CButton, CButtonArry, CImage now post action event at pre-release time. +* NxWM: ICON touches are now drive by action events instead of click events. +* NXWidgets::CNxTkWindow: Reported size of a framed window must exclude the + height of the tool bar (if present) +* TODO.txt: Add a file to keep track of issues. +* NxWM::CStartWindow and IApplicationFactory: This is a substantial + redesign. IApplication wraps an application. However, if we want to + be able to start multiple copies of an application, then we need to + be able to create multiple IApplication instances from the start window. + Enter IApplicationFactory. Icons in the start window now correspond + to application factories; icons in the task bar no correspond to + application instances. +* NxWM::CStartWindow and CWindowControl: The above change necessitated + another architectural change: When create applications, it is sometimes + necessary to wait for windows events. The above change moved the + application creation to the window event thread, hence, causing deadlocks + wheneven the logic tried to wait for a window event. The solution was + to create a new thread, called the start window thread, that runs + asynchronously and can wait for windoew events. +* doc/NxWM-ThreadingModel.ppt: Documented the now rather complex NxWM + threading model. + +1.2 2012-06-15 Gregory Nutt + +* NXWidgets::CCallback: callback arguement is now type CCallback and not + CWidgetControl; Added a method to redirect keyboard contacts to either + the widgets in the window (via CWidgetControl) or to an NxConsole (via + nxcon_kbdin()). +* NXWidgets::INxWindow, CBgWindow, CNxTkWindow, CNxToolbar, CNxWindow: + Now pass the CCallback intances as the callback argument instead of + the CWidgetControl instance. New method redirectNxConsole() will + support redirection of any window keyboard input to the NxConsole + (via CCallback). +* NxWM:CNxConsole: Configures the NxConsole window to redirection keyboard + input to the NxConsole; redirects standard input to the NxConsole + device driver. +* NxWM:CKeyboard: Add a new class that implements a keyboard listener + thread. This thread reads from /dev/console and injects the keyboard + input into NX. NX will determine which window is at the top of the + heirarchy and re-direct the keyboard input to only that top window. + This solves an important problem with, for example, running multiple + copies of the NxConsole: On the copy of the NxConsole at the top of + the heirarchy should get the keyboard input. +* UnitTests/nxwm/main.cxx: Now starts the keyboard thread if + CONFIG_NXWM_KEYBOARD is defined. +* NxWM::CTaskbar: After drawing the task bar, need to raise the + application window otherwise the taskbar will be on the top and + keyboard input will not be received by the top application. +* NxWM::CTaskbar: Bugfix... previous window should not be minimized + when a new window is started. It should stay in a maximized state + so that it will re-appear with the window above it is closed or + minimized. +* NxWM::CHexCalculator: Add a hexadecimal/decimal calculator + example. +* NXWidgets::CNxTkWindow: Back out height adjustment in the getSize() + method. The code was correct as it was before. +* NXWidgets::CButtonArray and NXWidgets::CGraphicsPort: There is + a kludge in there to handle the case where we cannot read the + background data because the LCD does not support read operations. + 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. Fixed in CButtonArrary, but the problem + probably exists in other places as well. +* NxWM: Increase default spacing of icons on the Start Window. +* NxWM::CHexCalculator: Fix some non-standard calculator behavior + after = is pressed. Use upper case hex. Increase font size. +* nxwm/Makefile: Fix error that creapt in during some other + recent check-ins. + +1.3 2012-09-29 Gregory Nutt + +* UnitTests/*/main.cxx: Change entry point name to be consistent + with with entry point naming conventions introduced in NuttX + 6.22. +* Kconfig: Added a mconfig configuration file. Eventually, NxWidgets + needs to get hooked into the NuttX mconf configuration. Still not + exactly sure how to do that. +* libnxwidgets/Makefile and NxWidgets/nxwm/Makefile: Need updates + for consistency with recent changes to NuttX build system (>= 6.22) +* Kconfig: Add option to turn on the memory monitor feature of the + NxWidgets/NxWM unit tests. + +1.4 2012-12-20 Gregory Nutt + +* libnxwidgets/Makefile, NxWidgets/nxwm/Makefile, and + NxWidgets/UnitTests/nxwm/Makefile: Makefile improvements from + submitted by Petteri Aimonen. Other Makefiles in the UnitTests + directory probably also need these changes. +* libnxwidgets/src/ccallback.cxx: Fix misplaced #endif. Provided + by Petteri Aimonen. +* libnxwidgets/src/cnxserver.cxx: Reduce delay to allow NX server + to start. One second was un-necessarily long. Reduced to 50 MS. + Reduction suggested by Petteri Aimonen. +* tools/bitmap_converter.py: This script converts from any image type + supported by Python imaging library to the RLE-encoded format used by + NxWidgets. +* NxWidgets/nxwm/src/capplicationwindow.cxx: If the "desktop" is empty, + users have no need to minimize any windows. If the buttons are small, + it's easy to hit minimize button accidentally when trying to close an + application. Contributed by Petteri Aimonen. +* NxWidgets/nxwm/src/ctaskbar.cxx: Add an option to eliminate the + background image. Contributed by Petteri Aimonen. +* NxWidgets/nxwm/src/chexcalculator.cxx and NxWidgets/nxwm/src/cstartwindow.cxx: + The config settings CONFIG_NXWM_STARTWINDOW_ICON and CONFIG_NXWM_HEXCALCULATOR_ICON + allow changing the icons used for these applications. However, to declare symbols + for these icons user would need to modify NxWidgets header files. + This commit adds a simple forward declaration to the relevant files, based on the + configured icon. If the icon does not exist, linker will give an error about it. + Contributed by Petteri Aimonen. +* NxWidgets::CTaskBar: Highlight the current window in the task bar. + Contributed by Petteri Aimonen. +* NxWidgets/libnxwidgets/src/glyph_cycle.cxx: Width of glyph_cycle was wrong; + Destructor needs to by public. From Petteri Aimonen. +* NxWidgets::CNumericEdit. This is basically a label with plus and minus buttons. + Contributed by Petteri, Aimonen. +* NxWM::CStartWindow: Fix mq_receive error handling with signal is recieved. + From Petteri Aimonen. +* NxWidgets::CNxTimer: Replace the original (apparently non-functional) signal- + based solution with a work queue-based solution. This raises some isses about + using the internal work queues from user space. I have decided to implemented + user-space work queues (someday) in order to accomplish that functionaliy. + Submitted by Petteri Aimonen. +* NxWidgets:CText and NxWidgets:CNumericEdite: Fix some memory freeing bugs + (from Petteri Aimonen). +* NxWidgets::CScrollingPanel: Usability improvements. It is borderless for now, + because there was no easy way to redraw only the required part of the border. + Contributed by Petteri Aimonen. +* NxWidgets::CNxWidgets and NxWM::CStartWindow: Small changes to make sub- + classing easier (from Petteri Aimonen). + +1.5 2013-02-01 Gregory Nutt + +* NxWidgets::CGraphicsPort::move(): Fix typo bug in bounding rectangle + calculation (from Petteri Aimonen). +* NxWM::CScrollingPanel::scrollChildren(): Avoid unnecessary redraws in + CScrollingPanel (contributed by Petteri Aimonen). +* NxWM::CCycleButton: Remove the separator from CCycleButton. It draws in + wrong place, and doesnt look very good in the correct place either. + (from Petteri Aimonen). +* NxWidgets::CGraphicsPort: Many times we only want a constant background. + In that case the old code fills the background, reads it back, renders + the text and then writes it back. When used with LCD's (instead of + framebuffers) this causes unnecessary delay and screen flicker. + This commit adds a variant of drawText that takes background color, + so that the background and text can both be rendered at one go. + The old functions still function as before (Petteri Aimonen). +* NxWidgets::CLabel: The label was drawn as a single rectangular region, + then a text was added to the on top of this. The result is that the + text would flicker when the CLabel was updated. With this change, the + two step update is replaced with a five step update: The background + is updated as four rectangulear regions (leaving the previous text in + place), then the new text is updated. This eliminates the flicker + (Petteri Aimonen). +* Kconfig: Many NxWidgets/NxWM settings do not have meaningful, generic + default values. Colors, for example, depend on pixel depth. Some + geometry settings depending on other geometry settings. Font IDs are + not know-able by the configuration system. etc. In these cases, it + is best if the settings are just not undefined so that the system can + calculate a reasonable default. however, if no default is provided + in the .config file, mconf will complain and generate errors. So work + around this, I added several "enabling" settings to override the + default setting. This is awkward and I preferred the configuration as + it was before, but this avoids the mconf errors and warnings. +* UnitTests: Changed occurrences of lib_rawprintf() and lib_lowprintf() + to match recent changes to NuttX (will be in NuttX-6.25) +* CGraphicsPort::_drawText: Renamed from CGraphicsPort::drawText in order + to eliminate some naming collisions when overloaded in some configurations + (i.e., when both bool and nx_pixel_t are uint8_t). From Petteri Aimonen. +* CNxWidgets::drawContents: Change base drawContents from a do-nothing + function to a function that fills the widget with the background color. + This is useful when using CNxWidgets as a "panel" , i.e. a container + for other widgets. Subclasses will override drawContents and decide + themselves how to draw the background. +* CNxWidgets::CTabPanel: A new widget contributed by Petteri Aimonen. + This widget provides a tab panel, which has a button bar at the top + and panels below it. Pressing a button will select the corresponding + panel. + +1.6 2013-03-15 Gregory Nutt + +* Type of argv[] has changed from const char ** to char * const * +* NXWidgets::CNxWidget: Add an inline function to get the current style. +* NxWM::CTaskBar: Make a some methods of CTaskbar virtual to allow + customizations. From Petteri Aimonen. +* NXWidgets::CCycleButton: Make CCycleButton change state in onPreRelease(). + This way the new value is already available when a listener gets the + action event. From Petteri Aimonen. +* NxWidgets/tools/bitmap_converter.py: Fix bitmap_converter.py so that + it works with indexed input images. +* NxWidgets::CLabel: Fix backward conditional compilation in the + "flicker free" logic. +* NxWidgets::CNxTimer: Previously repeated timers were re-enabled after + the timer action event. Consequently, if the action event handler tried + to stop the timer, the request would be ignored. Changes the order + so that the timer is re-enabled before the callback. There is still + no risk of re-entrancy, because everything executes on the USRWORK work + queue. From Petteri Aimonen. +* NxWidgets::CMultiLineTestBox: Fix text placement error. From Petteri + Aimonen. +* NxWidgets::CWidgetControl: Added another semaphore, boundssem, which + is set as soon as the screen bounds are known. This corrects two + problems: + 1) Due to the way nxgl_rectsize computes the size, it will never + be 0,0 like CWidgetControl expects. Therefore the size is considered + valid even though it has not been set yet. + 2) After the check is fixed to test for > 1, NxWM window creation will + hang. This is due to the fact that it uses the screen bounds for + determining window size. This was being blocked on geosem, which + is only posted after the size has been set. + From Petteri Aimonen. +* NxWidgets::CImage: Two enhancements: + 1) Allow changing the bitmap even after the control has been created. + 2) Allow giving 'null' to have the control draw no image at all. + From Petteri Aimonen. +* NxWM::CTaskBar: Allow windows with null icon. This makes sense for e.g. + full screen windows. From Petteri Aimonen. +* NxWM::CApplicationWindow: Add config options to override NxWM + stop/minimize icons. From Petteri Aimonen. +* NwWM::CStartWindow, NxWM::CWindowMessenger: Get rid of the start window + thread. Instead, handle all events through the USRWORK work queue. + For me, this was necessary because I would open some files in button + handlers and close them in NxTimer handlers. If these belonged to + different tasks, the close operation would fail. Further benefits: + + Gets rid of one task and message queue. + + Reduces the amount of code required + + Decouples CStartWindow from everything else - now it is just a window + with application icons, not an integral part of the event logic. + + All events come from the same thread, which reduces the possibility of + multithreading errors in user code. + + The user code can also send events to USRWORK, so that everything gets + serialized nicely without having to use so many mutexes. + Drawbacks: + - Currently the work state structure is malloc()ed, causing one allocation + and free per each input event. Could add a memory pool for these later, but + the speed difference doesn't seem noticeable. + - The work queue will add ~50 ms latency to input events. This is however + configurable, and the delay is anyway short enough that it is unnoticeable. + From Petteri Aimonen. + +1.7 2013-04-28 Gregory Nutt + +* NxWidgets bitmap_converter.py: Fix bug when image width > 255. From + Petteri Aimonen (2013-4-22). +* NxWM::CScrollbarPanel: Fix spelling error in class name: CScollbarPanel + should be CScrollbarPanel. From Petteri Aimonen (2013-4-22). +* NxWidgets:: CGlyphButton: Generate action event, like CButton does. + From Petteri Aimonen (2013-4-22). +* NxWidgets:: CGlyphButton: Prevent drawing outside of the bitmap size. + From Petteri Aimonen (2013-4-22). +* NxWM::CTaskBar: Add option CONFIG_NXWM_TASKBAR_NO_BORDER to suppress + drawing of the border on the taskbar. From Petteri Aimonen (2013-4-22). +* NxWidgets::CNxTimer: Add function to check if CNxTimer is running. + From Petteri Aimonen (2013-4-22). +* NxWidgets::CNxWidgets: Allow overriding of the checkCollision() method. + From Petteri Aimonen (2013-4-22). + +1.8 2013-06-14 Gregory Nutt + +* NxWM::CMediaPlayer: shell application for an MP3 Media Player with + Kconfig settings to enable it. I plan to write this app to help + develop and test the MP3 codec chip driver. It really doesn't do + anything yet except display a text box saying "Coming soon", and I + need to minimize the icon size a bit. From Ken Pettit (2013-5-11). +* NxWidgets/nxwm/src/glyph_mediaplayer.cxx: Smaller version of the + media player glyph. From Ken Pettit (2013-5-12). +* NxWidgets/nxwm/include/ccalibration.hxx and src/ccalibration.cxx: + Fix a race condition that would cause the calibration screen + to fail to come up when its icon was touched (From Ken Pettit, + 2013-5-12). +* Kconfig: Default priorities for NxWidget and NxWM threads + should be 100, not 50, to be consistent with other default priorities. +* NxWidgets::CGlyphSliderHorizontal and NxWidgets::CGlyphSliderHorizontalGrip: + New widgets added by Ken Pettit (2013-5-15). +* NxWidgets/UnitTests/CGlyphSliderHorizontal: Adds a unit test for the + NxWidgets::CGlyphSliderHorizontal class. From Ken Pettit (2013-5-17) . +* NxWidgets::CGlyphSliderHorizontal: Fix a drawing error. From Ken + Pettit (2013-5-17). +* UnitTests/*/Makefile and .gitignore: Update the way that NSH + the Unit Tests are registered as built-in NSH applications (2013-5-30). +* NxWidgets::CImage: Allow a NULL pointer for a bitmap. Add protection + to prevent dereferencing the NULL pointer. From Petteri Aimonen + (2013-6-4). +* NxWidgets::CNumericEdit: Delay before auto-incrementing now varies: + A longer delay is required to start auto-incrementing and speed increases + while pressed. From Petteri Aimonen (2013-6-4). +* NxWM::CTaskbar: Add a method to redraw the taskbar and the current + application. This should only be necessary if the display loses + state due to e.g. powerdown or other manual intervention. From + Petteri Aimonen (2013-6-4). + +1.9 2013-10-28 Gregory Nutt + +* NxWM::CCalibration.cxx/hxx: If CONFIG_NXWM_CALIBRATION_MESSAGES is + defined then CCalibration will provide some instructions in the center + of the display (2013-10-14). +* NxWM::CCalibration.cxx/hxx: Add options to collect and average + multiple samples at each location. Also logic to discard the most + extreme samples before averaging (2013-10-14). +* NxWidgets::CScaledBitmap: This new class is a wrapper for an class + the exports IBitMap. It will perform scaling via bi-linear interpolation + so that images can be scaled to any size desired (2013-10-15). +* NxWM::CTaskbar:: Can now be configured to scale taskbar icons using + NxWidgets::CScaledBitmap (2013-10-15) +* NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx: Add a big, 320x320 + NuttX logo image. The older, smaller NuttX logo was renamed from + nxlogo to nxlogo160x160 in all places (2015-10-15). +* NxWM::CCalibration and NxWM::CTouchscreen: Add a complex touchscreen + scaling algorithm to handling the case where the measured X values also + vary with y position (and vice versa) (2013-10-17). + +1.10 2013-12-07 Gregory Nutt + +* Kconfig and UnitTests/nxwm: Add logic to enable saving and recovering + touchscreen calibration data. This depends upon having platform-dependent + support for storage of configuration data. Portions suggested by + Ken Pettit (2013-10-30). +* NxWM:Calibration: Saving of calibration data must be performed in + CCalibration, not in UnitTests/nxwm. Why? Because the touchscreen + calibration could also be initiated from other ways other than through + the one-time, start-up initialization logic (2013-10-30). + +1.11 2014-01-30 Gregory Nutt + +* NxWidgets/Kconfig and NxWidgets::CNxServer: Server initialization can + now be disabled in the configuration (in fact, it is disabled by default). + This is because in the kernel build mode, the NX server must be initialized + in kernel mode by the RTOS before applications using the server run in + user mode. +* NxWm: Added CONFIG_NXWM_NXTERM that can be used to disable the NxConsole + window (2013-12-30). +* NxWm::CTouchscreen: Added CONFIG_NXWM_TOUCHSCREEN_DEVINIT that can be used + to suppress calls to initialize the touchscreen device from the listener + thread. This is necessary if the kernel mode build is used: In that case, + the touchscreen must be initialized in kernel space before NxWM is started + (2013-12-30). + +1.12 2014-08-15 Gregory Nutt + +* libnxwidgets/include/nxconfig.hxx and libnxwidgets/src/cscaledbitmap.cxx: + Fix typo RBG -> RGB. This makes NxWidgets incompatible with versions of + NuttX 7.2 and below. +* nxwm/src/glyph_*.cxx: Rename all ICON glyph files to include the size of the + ICON as part of the file name. This is in preparation for supporting a + set of larger ICONs (2014-7-12). +* nxwm/src/glyph_play48x48.cxx: Add a larger NxWM play icon (2014-7-12). +* nxwm/src/glyph_caclulator47x49.cxx: Add a larger NxWM calculator icon + (2014-7-13). +* nxwm/src/glyph_cmd49x43.cxx: Add a larger NxWM NxConsole icon (2014-7-13). +* nxwm/src/glyph_calibration48x42.cxx: Add a larger NxWM Calibration icon + (2014-7-13). +* nxwm/src/glyph_minimize42x42.cxx: Add a larger NxWM minimize icon + (2014-7-13). +* nxwm/src/glyph_stop42x42.cxx: Add a larger NxWM close icon (2014-8-13). +* nxwm/src/glyph_mediaplayer44x50.cxx: Add a larger NxWM media player icon + (2014-7-14). +* Kconfig, nxwm/include/nxwmconfig.hxx, nxwm/src/capplicationwindow.cxx: + Toolbar font ID can now be separately configured (2014-7-14). +* nxwm/src/cmediaplayer.cxx: Will now dynamically position player controls + based on the display and image sizes (2014-7-14). +* nxwm/src/glyph_mediagrip30x30.cxx and glyph_mplayer_controls43x41.cxx: Add + larger images for the media player (2014-7-14). +* Kconfig, nxwm/src/cmediaplayer.cxx: Add options to manage spacing of media + player buttons and borders vs. borderless buttons (2014-7-14). +* NxWidgets::CImage: Fix setImageLeft and setImageTop methods (2014-7-14). +* NxWidget::CImage: Now supports helper methods to align images in the + widget region (2014-7-14). +* NxWM::CMediaPlayer now uses the new CImage methods to align media controls + in buttons (2014-7-14). +* NxWidgets::CStickyImage: A version of CImage that sticks in the selected + state when clicked (2014-7-15). +* NxMW::CMediaPlayer: Now supports a pause button (2014-7-15). +* NxMW::CMediaPlayer: Fix some memory leaks (2014-7-16). +* NxMW::CMediaPlayer: Change spacing, make text region big enough to support + a multi-line, scrollable region (2014-7-16). +* NxMW::CMediaPlayer: Correctly catch the volume level change event + (2014-7-16). +* NxMW::CMediaPlayer: Convert CLabel to a CListBox to support selection of + one of many media files to play. This should be a CScrollingTextBox to + support an indefinitely large number of media files (2014-7-16). +* NxWidgets::CGraphicsPort: Fix drawBitmapGreyScale method. Actually drew + nothing because of several errors in positioning and buffer usage + (2014-7-17) +* NxWidgets::CImage: Should not attempt to draw the "empty" regions at the + top and the bottom of the image box in greyscale (2014-7-17). +* NxWM::CMediaPlayer: Fix some state-related bugs introduced yesterday. + Improved state-related button displayes. Now correctly catches and + handles file selection events (2014-7-17). +* NxWidgets::CImage: Cannot use NxWidgets::CGraphicsPort:drawBitmapGreyScale() + because it does not respect transparent or background colors in its current + form. The end result is that makes the image background grey as well as the + image (2014-7-17). +* NxWM::CMediaPlayer: State variable was left in a bad state and caused some + problems down the road (2014-7-17). +* NxWidgets::CGlyphSliderHorizontal: No longer uses a hard-coded slider + height; the slider height is now provided as a parameter, replacing the + widget height which is now calculated from the glip image height + (2014-7-17). +* NxWM::CMediaPlayer: Now calculates the volume slider height from the grip + image height (2014-7-17). +* NxWM::CApplicationWindow: Created the custom font for the toolbar title, + but never used it! (2014-7-17). +* NxWidgets::CNxString: Make destructor virtual. From Petteri Aimonen + (2014-7-22). +* NxWidgets::CTaskbar: Fix type of return value fromopenRawWindow() + method. From Petteri Aimonen (2014-7-22). +* NxWidgets::CTabPanel: Modify behavior in showPage() method. Eliminate a + duplicate redraw that caused flickering; re-order some logic so that + widgets are hidden before operated on. From Petteri Aimonen (2014-7-22). +* NxWidgets:CTabPanel: Make CTabPanel raise action event when tab is + changed. Also add a function for getting the currently selected tab + index. From Petteri Aimonen (2014-7-22). +* NxWidgets::CNxTimer: Make CNxTimer stop itself before destruction. + Otherwise a call to an invalid work queue entry may occur. From Petteri + Aimonen (2014-7-22). +* NxWidgets/Kconfig: Add configuration options to filter CMediaPlayer files + based on extension (2014-7-23) +* NxWM::CMediaPlayer: Add logic to read files from the media mountpoint, + filter them by extension, and display the file names in the listbox (2014-7-23). +* NxWM::CMediaPlayer: Beginning integration of NxPlayer into Nxwm::MediaPlayer. + Gets handle, sets device, and releases handle. Lots more to be done + (2014-7-23). +* NxWidgets::CNxString: Add a getAllocSize() method to make it easier to + convert CNxStrings to NUL-terminated C strings (2014-7-24). +* NxWM::IApplicationFactory: dd a do-nothing, virtual destructor to + eliminate a warning (2014-7-24). +* NxWM::CMediaPlayer: Lots of changes to integrate with Ken's NxPlayer + (2014-7-24). +* NxWM::CMediaPlayer: Revise state logic. We need an additional state for + the case where a file is selected, but playing has not yet start. Several + other state-related fixes (2014-7-25). +* NxWM::CMediaPlayer: Need to remember last text box selection or else each + new Value Change event from the volume slider is confused with a new file + selection (2014-7-27). +* NxWM::CMediaPlayer: Correct handling of increments to sub-sampling rate + (2014-7-27). +* NxWidgets::CNxWidget: Remove an unused bit field (2014-7-28). +* NxWM::CMediaPlayer: Add a CLabel that show the current fast forward/rewind + speed (2014-7-28). +* NxWM::CKeyboard: Add support for a USB keyboard as the NxConsole and text + widget input. Not fully functional as of this initial check-in. Basic + functionality is there, but there are conditions were the keyboard gets + lost (2014-7-30). + +1.13 2014-09-28 Gregory Nutt + +* Change all references to NxConsole to NxTerm. This introduces an + incompatibility with versions prior to NuttX-7.5 (2014-9-20). + +1.14 2014-11-26 Gregory Nutt + +* Fix all UnitTest/ files to account for the corrected syslog() prototype. + This change to the NuttX syslog introduces an incompatibility between + NuttX 7.6 and previous versions of the UnitTest code. + +1.15 2015-04-14 Gregory Nutt + +* In NuttX 7.9, the interface arch_tcinitialize() was replaced with the + boardctl() interface. Old versions of NxWM will then be incompatible + with Versions of NuttX at 7.9 and beyond (2015-03-31). +* NxWidgets::CNxServer: More renaming: up_lcdinitialize->board_lcd_initialize, + up_lcdgetdev->board_lcd_getdev, up_lcduninitialize->board_lcd_uninitialize + (2015-04-04). +* NxWidgets:: INxWindow, CNxWindow, CBgWindow, CNxTkWindow, CNxToolbar, + CGraphicsPort: Add a capped parameter to all drawLine() methods. Pass on + to NX nx_drawline() and NXTK nxtk_drawlinetoolbar() and nxtk_drawlinewindow() + functions (2015-04-05). + +1.16 2016-06-01 Gregory Nutt + +* NxWM::CTouchscreen: When boardctl() fails, need to print errno not the + returned value which will always be -1 (2015-04-16). +* NxWidgets::CNxServer: Correct use of the BOARDIOC_GRAPHICS_SETUP + boardctl() call (2015-04-16). +* CListBox unit test: Should use RAND_MAX, not MAX_RAND (2015-04-16). +* The NxWidgets/ directory has been removed from the NuttX GIT repository + and now stands alone in its own repository (2015-06-27). +* Framebuffer driver parameters have changed. This introduces an + incompatibility with versions of NuttX prior to 7.16 (2016-04-14). +* UnitTests: Add Make.defs files to all UnitTests directories. This is + required by the current apps/Makefile. Hmmm.. This means that no one + has built the NxWidgets packages in the last several realeases! + (2016-04-23). +* UnitTests: Add some default definitions to handle the (unusual) case + where 'make clean' is called with no .config or Make.defs file installed + (2016-05-10). + +1.17 2016-07-25 Gregory Nutt + +* UnitTests: Back conditional logic out of UnitTest Make.defs files. It + does not belong there and causes link failures like "Cannot find nxwm_main" + (2016-06-05). +* Change dbg() and vdbg() to err() and info() (2016-06-11). +* Change some *err() message to *info() messages if what was a *dbg() + message does not indicate and error condition (2016-06-14). +* Add _ to front of debug macros (2016-06-16). +* Unittests: All Makefiles must provided a (dummy) prefconfig target to be + compatible with changes to the apps/ configuration system that will be + be released in NuttX-7.17 (2016-06-29). +* Changes to pre-processor include statments needed to handle reorganization + of the apps/include directory (2016-07-01). +* Update include paths to adapt to changes made to apps/ include path logic + (2016-07-22). + +1.18 2016-12-26 Gregory Nutt + +* NxWM needs the path to the apps/include directory (2016-07-28). +* NxWidgets: Fix CListBox crash when clicked below the last item. From + Petteri Aimonen (2016-09-22). +* libnxwdigets: Fix memory leak in CNxWindow and make behaviour match + CNxTkWindow. From Petteri Aimonen (2016-09-22). +* libnxwidgets: Fix default text colors in NxWidgets::CListBox. From + Petteri Aimonen (2016-09-22). +* libnxwidgets: Avoid unnecessary redraw in NxWidgets::CListBox. The + ListData will raise an event that will cause a redraw anyway. Redrawing + in click() caused double redraws. From Petteri Aimonen (2016-09-22). +* libnxwidgets: Fix coordinate handling in NxWidgets::CMultiLineTextBox. + Related to 'Thu Feb 21 16:47:01 2013 Fix text placement in + CMultiLineTextbox.' There was a few similar bugs remaining in calculating + of rows to show and in clearing the background. From Petteri Aimonen + (2016-09-22). +* libnxwidgets: Allow NxWidgets::CListDataItems subclasses access to text + and value. From Petteri Aimonen (2016-09-22). +* Add setting task name via prctl() to NxWidgets::CNxServer and + NxWM:CTouchScreen. From Petteri Aimonen (2016-09-22). +* libnxwidgets: In NxWidgets::CText, allow setting negative line spacing. + This is useful to have text take up less space, as quite many fonts have + large line spacings built-in. From Petteri Aimonen (2016-09-22). +* libnxwidgets: Allow setting line spacing in NxWidgets::CMultiLineTextBox. + From Petteri Aimonen (2016-09-22). +* CNxServer: Remove NX server task. Now calls nx_start (indirectly through + boardctrl(BOARDIOC_NX_START) to start the NX Server kernel thread + (2016-12-01). +* CNxServer: Can't use printf in this context (2016-12-01) + +1.19 2018-03-02 Gregory Nutt + +* Correct NX Server message queue names. Should not be /dev/nx*. They must + be relative to /dev/mqueue so "nxabc" will appear at "/var/nxabc" + (2017-01-08). +* strcasecmp, strncasecmp, bzero, bcmp, and bcopy should be defined in + strings.h, not string.h. bzero, bcmp, and bcopy are legacy functions; the + contemporary counterparts should be used instead (2017-02-16). +* Unitests/nxwm: Change includes because up_cxxinitialize() is now + prototyped in apps/include/platfor/cxxinitialize.h (2017-05-13). +* Prototype of nsh_telnetstart() has changed (2017-07-05). +* NxWidgets: fix work_s initialization in cwindowmessenger.hxx. From Sakari + Kapanen (2017-09-24). +* Remove all support for single user mode (2017-10-14). +* Remove unused CONFIG_NXWIDGETS_EXTERNINIT configuration variable + (2017-10-15). +* CTaskBar: Fix type checking issue with GCC 6 From Sakari Kapanen + (2017-11-08). +* nxwm: Eliminate BOARDIOC_TSCTEST_SETUP (2018-01-17). +* In NxWM unit test, call boardctl(BOARDIOC_INIT) if available and + appropriate (2018-01-17). +* Fix a dependency in Kconfig: CONFIG_NXWIDGET_SERVERINIT is definitely + supported in the PROTECTED and KERNEL build modes (2018-01-18). + +After Nuttx-7.26, the NxWidgets repository was merged into the apps/ +repository. See the apps/ChangeLot.txt for changes since that time. + diff --git a/graphics/nxwm/Doxygen/Doxyfile b/graphics/nxwm/Doxygen/Doxyfile new file mode 100644 index 000000000..13cf8dd25 --- /dev/null +++ b/graphics/nxwm/Doxygen/Doxyfile @@ -0,0 +1,1551 @@ +# Doxyfile 1.6.3 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = NXWidgets + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = "1.19" + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = NO + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = YES + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 2 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it parses. +# With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this tag. +# The format is ext=language, where ext is a file extension, and language is one of +# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, +# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat +# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = YES + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = YES + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = YES + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = YES + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = NO + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = NO + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = NO + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= NO + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = NO + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by +# doxygen. The layout file controls the global structure of the generated output files +# in an output format independent way. The create the layout file that represents +# doxygen's defaults, run doxygen with the -l option. You can optionally specify a +# file name after the option, if omitted DoxygenLayout.xml will be used as the name +# of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = "../nxwidgets" "../nxwm" + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 + +FILE_PATTERNS = + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = NO + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = NO + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = YES + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER +# are set, an additional index file will be generated that can be used as input for +# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated +# HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. +# For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's +# filter section matches. +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = YES + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = NO + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = YES + +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = NO + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = NO + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = NO + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = NO + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = NO + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = YES + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = NO + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES diff --git a/graphics/nxwm/Doxygen/README.txt b/graphics/nxwm/Doxygen/README.txt new file mode 100644 index 000000000..26d76ce4b --- /dev/null +++ b/graphics/nxwm/Doxygen/README.txt @@ -0,0 +1,64 @@ +README +====== + +This directory contains the documentation automatically generated by Doxygen. + +Contents +======== + + o Installing the necessary packages in Ubuntu + o Generating documentation + o References + +Installing the necessary packages in Ubuntu +=========================================== + +1. Install the following packages. + + $ sudo aptitude install doxygen doxygen-doc doxygen-gui dot2tex graphviz + +2. (Optional) Install Doxygen from the latest sourcode. + + The Ubuntu package is outdated. The newer the version of Doxygen, the better + the documentation looks. + + Place yourself in some temporary folder where you can download the source, + and run [1]: + + $ svn co https://doxygen.svn.sourceforge.net/svnroot/doxygen/trunk doxygen-svn + $ cd doxygen-svn + $ ./configure + $ make + $ make install + +Generating documentation +======================== + +Two ways described here: + +1. Use the provided gendoc.sh script. + + trunk/NXWidgets/Doxygen/gendoc.sh + + The script only needs the argument to the absolute path where to place the + generated documentation. I.e.: + + $ cd /path/to/nuttx/trunk/NXWidgets/Doxygen/ + $ mkdir doc + $ ./gendoc.sh $PWD/doc + + +2. Using the Doxyfile directly: + + The file "Doxyfile" contains the configuration of the Doxygen settings + for the run, edit only if necessary. + + To generate the documentation type: + + $ cd /path/to/nuttx/trunk/NXWidgets/Doxygen/ + $ doxygen Doxyfile + +References +========== + +[1] http://www.stack.nl/~dimitri/doxygen/download.html diff --git a/graphics/nxwm/Doxygen/gendoc.sh b/graphics/nxwm/Doxygen/gendoc.sh new file mode 100644 index 000000000..17161d3d3 --- /dev/null +++ b/graphics/nxwm/Doxygen/gendoc.sh @@ -0,0 +1,94 @@ +#!/bin/bash +################################################################################# +# apps/graphics/nxwm/Doxygen/gendoc.sh +# +# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Author: Jose Pablo Carballo +# +# 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. +# +################################################################################# +# +# set -x +# Functions + +function ShowUsage() +{ + echo "" + echo "USAGE: $0 " + echo "" + echo "Where:" + echo " is the full, absolut path to place the doxygen output" + echo "" +} + +# Input parameters + +DOXYGENOUTPUT_DIR=$1 +if [ -z "${DOXYGENOUTPUT_DIR}" ]; then + echo "Missing required arguments" + ShowUsage + exit 1 +fi + +# Check that the directory exist + +if [ ! -d "${DOXYGENOUTPUT_DIR}" ]; then + echo "Directory ${DOXYGENOUTPUT_DIR} does not exist" + exit 1 +fi + +# Find the doxygen configuration file + +DOXYFILE="Doxyfile" +if [ ! -e "${DOXYFILE}" ]; then + echo "This script must be executed in the documentation/ directory" + exit 1 +fi + +doxygen "${DOXYFILE}" || \ + { + echo "Failed to run doxygen"; \ + exit 1; + + } + +cp -rf html "${DOXYGENOUTPUT_DIR}" || \ + { + echo "Failed to move html output"; \ + exit 1; + } + +rm -rf html || \ + { + echo "Failed to remove the html/ directory"; \ + exit 1; + } + +echo "open ${DOXYGENOUTPUT_DIR}/html/index.html to start browsing" + diff --git a/graphics/NxWidgets/nxwm/Kconfig b/graphics/nxwm/Kconfig similarity index 96% rename from graphics/NxWidgets/nxwm/Kconfig rename to graphics/nxwm/Kconfig index 2918e5d9b..24eced657 100644 --- a/graphics/NxWidgets/nxwm/Kconfig +++ b/graphics/nxwm/Kconfig @@ -6,7 +6,7 @@ menu "NxWM" config NXWM - bool "Enable NxWM" + tristate "NxWM" default n depends on NXWIDGETS ---help--- @@ -19,6 +19,7 @@ menu "NxWM General Settings" config NXWM_LARGE_ICONS bool "Use large icons" default n + select NXGLPYHS_LARGE_ICONS ---help--- The default icons are nominally 25x25 pixels for a small resolution/display, this is a good selection. For example, a @@ -47,12 +48,6 @@ config NXWM_DEFAULT_FONTID endif # NXWM_CUSTOM_FONTID -config NXWM_UNITTEST - bool "NxWM Unit Test" - default n - ---help--- - Enable Hooks for the NxWM Unit Test - comment "Color configuration" config NXWM_CUSTOM_FILLCOLORS @@ -296,15 +291,15 @@ if NXWM_CUSTOM_APPWINDOW_ICONS config NXWM_STOP_BITMAP string "Stop Icon" - default "NxWM::g_stopBitmap" + default "NXWidgets::g_stopBitmap" ---help--- - The glyph to use as the Stop icon. Default: NxWM::g_stopBitmap + The glyph to use as the Stop icon. Default: NXWidgets::g_stopBitmap config NXWM_MINIMIZE_BITMAP string "Minimize Icon" - default "NxWM::g_minimizeBitmap" + default "NXWidgets::g_minimizeBitmap" ---help--- - The glyph to use as the Minimize icon. Default: NxWM::g_minimizeBitmap + The glyph to use as the Minimize icon. Default: NXWidgets::g_minimizeBitmap endif # NXWM_CUSTOM_APPWINDOW_ICONS endmenu # NxWM Application Window Configuration @@ -328,15 +323,15 @@ config NXWM_CUSTOM_STARTWINDOW_ICON bool "Custom Start Window Icon" default n ---help--- - Select to override the default Start Window Icon: NxWM::g_playBitmap + Select to override the default Start Window Icon: NXWidgets::g_playBitmap if NXWM_CUSTOM_STARTWINDOW_ICON config NXWM_STARTWINDOW_ICON string "StartWindow Icon" - default "NxWM::g_playBitmap" + default "NXWidgets::g_playBitmap" ---help--- - The glyph to use as the start window icon. Default: NxWM::g_playBitmap + The glyph to use as the start window icon. Default: NXWidgets::g_playBitmap endif # NXWM_CUSTOM_STARTWINDOW_ICON @@ -452,15 +447,15 @@ config NXWM_CUSTOM_NXTERM_ICON bool "Custom NxTerm Icon" default n ---help--- - Select to override the default NxTerm Window Icon: NxWM::g_cmdBitmap + Select to override the default NxTerm Window Icon: NXWidgets::g_cmdBitmap if NXWM_CUSTOM_NXTERM_ICON config NXWM_NXTERM_ICON string "NxTerm Icon" - default "NxWM::g_cmdBitmap" + default "NXWidgets::g_cmdBitmap" ---help--- - The glyph to use as the NxTerm icon. Default: NxWM::g_cmdBitmap + The glyph to use as the NxTerm icon. Default: NXWidgets::g_cmdBitmap endif # NXWM_NXTERM_ICON endif # NXWM_NXTERM @@ -719,16 +714,16 @@ config NXWM_CUSTOM_CALIBRATION_ICON default n ---help--- Select to override the default Calibration Window Icon: - NxWM::g_calibrationBitmap + NXWidgets::g_calibrationBitmap if NXWM_CUSTOM_CALIBRATION_ICON config NXWM_CALIBRATION_ICON string "Callibration Icon" - default "NxWM::g_calibrationBitmap" + default "NXWidgets::g_calibrationBitmap" ---help--- The ICON to use for the touchscreen calibration application. Default: - NxWM::g_calibrationBitmap + NXWidgets::g_calibrationBitmap endif # NXWM_CUSTOM_CALIBRATION_ICON @@ -780,16 +775,16 @@ config NXWM_CUSTOM_HEXCALCULATOR_ICON default n ---help--- Select to override the default Hex Calculator Window Icon: - NxWM::g_calculatorBitmap + NXWidgets::g_calculatorBitmap if NXWM_CUSTOM_HEXCALCULATOR_ICON config NXWM_HEXCALCULATOR_ICON string "Calculator Icon" - default "NxWM::g_calculatorBitmap" + default "NXWidgets::g_calculatorBitmap" ---help--- The ICON to use for the hex calculator application. Default: - "NxWM::g_calculatorBitmap" + "NXWidgets::g_calculatorBitmap" endif # NXWM_CUSTOM_HEXCALCULATOR_ICON diff --git a/graphics/NxWidgets/nxwm/Make.defs b/graphics/nxwm/Make.defs similarity index 95% rename from graphics/NxWidgets/nxwm/Make.defs rename to graphics/nxwm/Make.defs index 531df95ba..6b5f88e9f 100644 --- a/graphics/NxWidgets/nxwm/Make.defs +++ b/graphics/nxwm/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/NxWidgets/nxwm/Make.defs +# apps/graphics/nxwm/Make.defs # Adds selected applications to apps/ build # # Copyright (C) 2018 Gregory Nutt. All rights reserved. @@ -35,6 +35,6 @@ ############################################################################ ifeq ($(CONFIG_NXWM),y) -CONFIGURED_APPS += graphics/NxWidgets/nxwm +CONFIGURED_APPS += graphics/nxwm endif diff --git a/graphics/NxWidgets/nxwm/Makefile b/graphics/nxwm/Makefile similarity index 78% rename from graphics/NxWidgets/nxwm/Makefile rename to graphics/nxwm/Makefile index 5f3870385..2cd8ccf2a 100644 --- a/graphics/NxWidgets/nxwm/Makefile +++ b/graphics/nxwm/Makefile @@ -1,5 +1,5 @@ ################################################################################# -# apps/graphics/NxWidgets/nxwm/Makefile +# apps/graphics/nxwm/Makefile # # Copyright (C) 2012, 2014, 2016, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -35,11 +35,12 @@ -include $(TOPDIR)/Make.defs -ASRCS = -CSRCS = +ASRCS = +CSRCS = # Window Manager +MAINSRC = nxwm_main.cxx CXXSRCS = capplicationwindow.cxx cfullscreenwindow.cxx ctaskbar.cxx cwindowmessenger.cxx # Device support @@ -64,26 +65,11 @@ ifeq ($(CONFIG_NXWM_NXTERM),y) CXXSRCS += cnxterm.cxx endif -# Images - -ifeq ($(CONFIG_NXWM_LARGE_ICONS),y) -CXXSRCS += glyph_calculator47x49.cxx glyph_calibration48x42.cxx glyph_cmd49x43.cxx -CXXSRCS += glyph_minimize42x42.cxx glyph_play48x48.cxx glyph_stop42x42.cxx -else -CXXSRCS += glyph_calculator24x25.cxx glyph_calibration24x21.cxx glyph_cmd25x22.cxx -CXXSRCS += glyph_minimize21x21.cxx glyph_play24x24.cxx glyph_stop21x21.cxx -endif - ifeq ($(CONFIG_NXWM_MEDIAPLAYER),y) CXXSRCS += cmediaplayer.cxx -ifeq ($(CONFIG_NXWM_LARGE_ICONS),y) -CXXSRCS += glyph_mediaplayer44x50.cxx glyph_mplayer_controls43x41.cxx -CXXSRCS += glyph_mediagrip60x30.cxx -else -CXXSRCS += glyph_mediaplayer24x24.cxx glyph_mplayer_controls32x32.cxx -endif endif VPATH = src include $(APPDIR)/Application.mk + diff --git a/graphics/nxwm/README.txt b/graphics/nxwm/README.txt new file mode 100644 index 000000000..497b01222 --- /dev/null +++ b/graphics/nxwm/README.txt @@ -0,0 +1,30 @@ +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. diff --git a/graphics/nxwm/ReleaseNotes.txt b/graphics/nxwm/ReleaseNotes.txt new file mode 100644 index 000000000..46c04137d --- /dev/null +++ b/graphics/nxwm/ReleaseNotes.txt @@ -0,0 +1,642 @@ +NxWidgets-1.0 +============= + +The initial version of NxWidgets was released on March 22, 2012. This +package has been used in several projects prior to its release to open +source and is considered stable its initial release (although not all +features have been fully verified). + +NxWidgets-1.1 +============= + +The 2nd release of the NxWidgets package was made on May 19, 2012. The +headline new feature in this release is: + +* NxWM, the tiny window manager based on NX and NxWidgets. 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. User + input via a touchscreen or mouse and keyboard is supported. + + 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 NxConsole. 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). + + This initial realease of NxWM should be considered an alpha release. + All know issues are listed in the top-level TODO list. + +Other important new features include: + +* NxWidgets::IBitmap and NxWidgets::CRlePalettBitmap: Extended to + support different color look-up-tables (LUTs). This allows images + to be highlighted when touched, for example. +* NxWidgets::CImage: Extended to support button-like behavior. CImage + widgets now work well as touchable icons. +* NxWidgets::CWidgetControl: Add a semaphore to force clients to wait if the + size or position of the window is not yet known (multi-user mode only). + Enabled and verified creation of framed windows. +* NxWidgets::CWindowEventHandler and NxWidgets::CWindowEventHandler: Add + support for getting callbacks for window events. +* DOxygen documentation support. Contributed by Jose Pablo Carballo. + +An effort is underway to simplify NxWidgets and reduce its memory footprint: + +* NxWidgets::CNxWidget: Removed support for "shelving" widgets, reference + constants, and close types. Remove all support for widgets in a "vertical" + hierarchy. Now widgets exist in a flat, two-dimensional space and should + not overlap. Removed built-in modal loops. + +Bug fixes include changes to the following (see the ChangeLog for details): + +* NxWidgets::CRlePalettBitmap, NxWidgets::CRlePalettBitmap, + NxWidgets::CGraphicsPort, NxWidgets::CWidgetControl + +NxWidgets-1.2 +============= + +The 3rd release of the NxWidgets package was made on June 15, 2012. This +release depends on NuttX-6.19 or above and should not be used with older +NuttX releases. + +New features and enhancements include: + +* NxWM::CNxConsole: The NxWM NxConsole windows now correctly receive keyboard + input. In version 1.1, NxConsoles received input from /dev/console. That, + of course, leads to chaos when there a multiple windows trying to get input + from the same device. There is now a keyboard listener task that will + accept input from /dev/console and inject that input into the NX keyboard + interface. NX will give the keyboard input only to the top window that + has focus, eliminating the chaos. + +* NxWM::CHexcalculator: The NxWM demonstration/unit test now includes a hex + calculator applications. This demonstrates the use of arrays of buttons + within a window. + +Bugfixes: + +* NxWM::CTaskbar: Was inappropriately minimizing some windows. Fixes + some window raising/lowering bugs. + +* NXWidgets::CButtonArray: Fix some coloring problems when rending button + text in cases where we cannot read from the display device. + +As well as other, less critical bugs (see the ChangeLog for details) + +NxWidgets-1.3 +============= + +The 4th release of the NxWidgets package was made on September 29, 2012. This +release depends on NuttX-6.22 or above and should not be used with older +NuttX releases. + +There are no functional changes in this release of NxWidgets. This release +is required in order to retain compatibility with the most recent versions +of NuttX. These comptibility changes include: + +* Naming of function entry points +* Build system changes +* Changes needed for the NuttX configuration tool + +NxWidgets-1.4 +============= + +The 5th release of the NxWidgets package was made on December 20, 2012. This +release depends on NuttX-6.24 or above and should not be used with older +NuttX releases. This release corresponds to SVN revision r5447. + +Note: Nearly all changes between 1.3 and 1.4 were the result of the efforts +of Petteri Aimonen. + +Additional new features and extended functionality in Version 1.4: + +* NxWdigets::CNxServer: Reduce start-up delay +* NxWM::CApplicationWindow: Option to eliminate minimize button. +* NxWM::CTaskbar: Option to eliminte the background image; highlight current + icon in the task bar. +* NxWidgets::CNumericEdit: New widget. Basically a CLabel with +/- buttons. +* NxWidgets::CNxTimer: Replace the original signal-based solution with a + work queue-based solution. This raises some isses about using the + internal work queues from user space. +* Build System: Misc improvements. +* Tools: bitmap_converter.py will convert images to NxWidgets RLE-encoded format. + +Bugfixes (see the change log for details). Some of these are very important +(marked *critical*): + +* NxWidgets::CCallback: Misplaced #endif +* NxWM::CCalculator and NxWM::CStartWindow: Add forward declaration for icon images. +* glych_cycle: Correct width, destructor needs to be public. +* NxWidgets:CText and NxWidgets:CNumericEdite: Fix some memory freeing bugs +* NxWidgets::CScrollingPanel: It is borderless for now because there was no + easy way to redraw only the required part of the border. + +NxWidgets-1.5 +============= + +The 6th release of the NxWidgets package was made on February 1, 2013. This +release depends on NuttX-6.25 or above and should not be used with older +NuttX releases. This release corresponds to SVN revision r5595. + +Note: Nearly all of the changes between 1.4 and 1.5 were the result of the +efforts of Petteri Aimonen. + +Additional new features and extended functionality in Version 1.5: + +* CNxWidgets::CTabPanel: A new widget contributed by Petteri Aimonen. + This widget provides a tab panel, which has a button bar at the top + and panels below it. Pressing a button will select the corresponding + panel. +* NxWidgets::CGraphicsPort: Many times we only want a constant background. + In that case the old code filled the background, read it back, rendered + the text and then wrote it back. When used with an LCD this causes + some screen flicker. Added a variant of drawText that takes background + color, so that the background and text can both be rendered at one go. +* NxWM::CScrollingPanel::scrollChildren(): Avoid unnecessary redraws in + CScrollingPanel +* Kconfig: Added several "enabling" settings that must be selected to + override the default setting. +* UnitTests: Changes for compatibility with NuttX-6.25 + +Bugfixes: + +* NxWidgets::CGraphicsPort::move(): Fix typo bug in bounding rectangle + calculation. +* NxWM::CCycleButton: Remove the separator from CCycleButton. It draws in + wrong place, and doesn't look very good in the correct place either. +* NxWidgets::CLabel: The label was drawn as a single rectangular region, + then a text was added to the on top of this. The result is that the + text would flicker when the CLabel was updated. With this change, the + two step update is replaced with a five step update: The background + is updated as four rectangulear regions (leaving the previous text in + place), then the new text is updated. This eliminates the flicker. +* CGraphicsPort::_drawText: Renamed from CGraphicsPort::drawText in order + to eliminate some naming collisions when overloaded in some configurations + (i.e., when both bool and nx_pixel_t are uint8_t). + +NxWidgets-1.6 +============= + +The 7th release of the NxWidgets package was made on March 15, 2013. This +release depends on NuttX-6.26 or above and should not be used with older +NuttX releases. This release corresponds to SVN revision r5745. + +Note: All of the changes between 1.5 and 1.6 were the result of the +efforts of Petteri Aimonen. + +Additional new features and extended functionality in Version 1.6: + +* NXWidgets::CNxWidget: Add an inline function to get the current style. +* NXWidgets::CCycleButton: Make CCycleButton change state in onPreRelease(). + This way the new value is already available when a listener gets the + action event. +* NxWidgets::CImage: Two enhancements: + 1) Allow changing the bitmap even after the control has been created. + 2) Allow giving 'null' to have the control draw no image at all. + +* NxWM::CTaskBar: Make a some methods of CTaskbar virtual to allow + customizations. +* NxWM::CTaskBar: Allow windows with null icon. This makes sense for e.g. + full screen windows. +* NxWM::CApplicationWindow: Add config options to override NxWM + stop/minimize icons. +* NwWM::CStartWindow, NxWM::CWindowMessenger: Get rid of the start window + thread. Instead, handle all events through the USRWORK work queue. + For me, this was necessary because I would open some files in button + handlers and close them in NxTimer handlers. If these belonged to + different tasks, the close operation would fail. Further benefits: + + Gets rid of one task and message queue. + + Reduces the amount of code required + + Decouples CStartWindow from everything else - now it is just a window + with application icons, not an integral part of the event logic. + + All events come from the same thread, which reduces the possibility of + multithreading errors in user code. + + The user code can also send events to USRWORK, so that everything gets + serialized nicely without having to use so many mutexes. + Drawbacks: + - Currently the work state structure is malloc()ed, causing one allocation + and free per each input event. Could add a memory pool for these later, but + the speed difference doesn't seem noticeable. + - The work queue will add ~50 ms latency to input events. This is however + configurable, and the delay is anyway short enough that it is unnoticeable. + +Bugfixes: + +* NxWidgets::CWidgetControl: Added another semaphore, boundssem, which + is set as soon as the screen bounds are known. This corrects two + problems: + 1) Due to the way nxgl_rectsize computes the size, it will never + be 0,0 like CWidgetControl expects. Therefore the size is considered + valid even though it has not been set yet. + 2) After the check is fixed to test for > 1, NxWM window creation will + hang. This is due to the fact that it uses the screen bounds for + determining window size. This was being blocked on geosem, which + is only posted after the size has been set. +* NxWidgets::CNxTimer: Previously repeated timers were re-enabled after + the timer action event. Consequently, if the action event handler tried + to stop the timer, the request would be ignored. Changes the order + so that the timer is re-enabled before the callback. There is still + no risk of re-entrancy, because everything executes on the USRWORK work + queue. +* NxWidgets::CLabel: Fix backward conditional compilation in the "flicker + free" logic. +* NxWidgets::CMultiLineTestBox: Fix text placement error. From Petteri + Aimonen. + +* NxWidgets/tools/bitmap_converter.py: Fix bitmap_converter.py so that + it works with indexed input images. + +NxWidgets-1.7 +============= + +The 8th release of the NxWidgets package was made on April 28, 2013. This +release depends on NuttX-6.26 or above and should not be used with older +NuttX releases. + +Note: All of the changes between 1.6 and 1.7 were the result of the +efforts of Petteri Aimonen. + +Additional new features and extended functionality in Version 1.7: + +* NxWidgets::CGlyphButton: Generate action event, like CButton does. +* NxWM::CTaskBar: Add option CONFIG_NXWM_TASKBAR_NO_BORDER to suppress + drawing of the border on the taskbar. +* NxWidgets::CNxTimer: Add function to check if CNxTimer is running. +* NxWidgets::CNxWidgets: Allow overriding of the checkCollision() method. + +Bugfixes: + +* NxWidgets bitmap_converter.py: Fix bug when image width > 255 +* NxWM::CScrollbarPanel: Fix spelling error in class name: CScollbarPanel + should be CScrollbarPanel +* NxWidgets::CGlyphButton: Prevent drawing outside of the bitmap size. + +NxWidgets-1.8 +============= + +The 9th release of the NxWidgets package was made on June 14, 2013. This +release depends on NuttX-6.26 or above and should not be used with older +NuttX releases. + +Note: Most of the changes between 1.7 and 1.8 were the result of the +efforts of Ken Pettit and Petteri Aimonen. + +Additional new features and extended functionality in Version 1.8: + +* NxWM::CMediaPlayer: Shell application for an MP3 Media Player (from Ken + Pettit). +* NxWidgets::CGlyphSliderHorizontal and NxWidgets::CGlyphSliderHorizontalGrip: + New widgets added by Ken Pettit. Includes a Unit Test. +* NxWidgets::CImage: Allow a NULL pointer for a bitmap (from Petteri + Aimonen). +* NxWidgets::CNumericEdit: Delay before auto-incrementing now varies: A + longer delay is required to start auto-incrementing and speed increases + while pressed (from Petteri Aimonen). +* NxWM::CTaskbar: Add a method to redraw the taskbar and the current + application. This should only be necessary if the display loses state due + to e.g. powerdown or other manual intervention (from Petteri Aimonen). + +Bugfixes: + +* NxWM::CCalibration: Fix a race condition that would cause the calibration + screen to fail to come up when its icon was touched (from Ken Pettit). +* Default priorities for NxWidget and NxWM threads should be 100, not 50, to + be consistent with other default priorities. +* NxWidgets::CGlyphSliderHorizontal: Fix a drawing error (from Ken Pettit). +* Update the way that NSH the Unit Tests are registered as built-in NSH + applications. + +NxWidgets-1.9 +============= + +The 10th release of the NxWidgets package was made on October 28, 2013. This +release depends on NuttX-6.26 or above and should not be used with older +NuttX releases. + +Additional new features and extended functionality in Version 1.9: + +* NxWM::CCalibration.cxx/hxx: If CONFIG_NXWM_CALIBRATION_MESSAGES is + defined then CCalibration will provide some instructions in the center + of the display. +* NxWM::CCalibration.cxx/hxx: Add options to collect and average + multiple samples at each location. Also logic to discard the most + extreme samples before averaging. +* NxWidgets::CScaledBitmap: This new class is a wrapper for an class + the exports IBitMap. It will perform scaling via bi-linear interpolation + so that images can be scaled to any size desired. +* NxWM::CTaskbar:: Can now be configured to scale taskbar icons using + NxWidgets::CScaledBitmap. +* NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx: Add a big, 320x320 + NuttX logo image. The older, smaller NuttX logo was renamed from + nxlogo to nxlogo160x160 in all places. +* NxWM::CCalibration and NxWM::CTouchscreen: Add a complex touchscreen + scaling algorithm to handling the case where the measured X values also + vary with y position (and vice versa). + +Bugfixes: + +(There are no bugfixes recorded for this release). + +NxWidgets-1.10 +============== + +The 11th release of the NxWidgets package was made on December 7, 2013. This +release depends on NuttX-6.26 or above and should not be used with older +NuttX releases. + +Additional new features and extended functionality in Version 1.10: + +* NxWM:Calibration and UnitTests/nxwm: Add logic to enable saving and + recovering touchscreen calibration data. This depends upon having + platform-dependent support for storage of configuration data. Portions + suggested by Ken Pettit. + +NxWidgets-1.11 +============== + +The 12th release of the NxWidgets package was made on January 20, 2014. This +release depends on NuttX-6.33 or above and should not be used with older +NuttX releases. + +Additional new features and extended functionality in Version 1.11: + +* Primarily changes associated with the NuttX kernel build where the + graphics application lies in user space and the graphics server lies in + protected kernel space. This change is mostly a matter of repartitioning + functionality and should not cause in any functional differences. + +NxWidgets-1.12 +============== + +The 13th release of the NxWidgets package was made on August 14, 2014. This +release depends on NuttX-7.3 or above and should not be used with older +NuttX releases. + +Additional new features and extended functionality in Version 1.12: + +* NxWM: Rename all ICON glyph files to include the size of the ICON as part + of the file name. This allows us to support different sizes for the same + ICON +* NxWM: Add larger versions (approx 50x50) versions of all ICONs. +* NxWM::CToolBar: Toolbar font ID can now be separately configured. +* NxWM::CMediaPlayer: Will now dynamically position player controls + based on the display and image sizes. +* NxWM::CMediaPlayer: Add options to manage spacing of media player + buttons and borders vs. borderless buttons. +* NxWidget::CImage: Now includes methods to align images in the widget + region. +* NxWM::CMediaPlayer now uses the new CImage methods to align media controls + in buttons. +* NxWidgets::CStickyImage: A version of CImage that sticks in the selected + state when clicked. +* NxMW::CMediaPlayer: Now supports a pause button. +* NxMW::CMediaPlayer: Convert CLabel to a CListBox to support selection of + one of many media files to play. This should be a CScrollingTextBox to + support an indefinitely large number of media files. +* NxWidgets::CGlyphSliderHorizontal: No longer uses a hard-coded slider + height; the slider height is now provided as a parameter, replacing the + widget height which is now calculated from the glip image height. +* NxWM::CMediaPlayer: Now calculates the volume slider height from the grip + image height. +* NxWidgets:CTabPanel: Make CTabPanel raise action event when tab is + changed. Also add a function for getting the currently selected tab + index. From Petteri Aimonen. +* NxWidgets/Kconfig: Add configuration options to filter CMediaPlayer files + based on extension. +* NxWM::CMediaPlayer: Add logic to read files from the media mountpoint, + filter them by extension, and display the file names in the listbox. +* NxWM::CMediaPlayer: Now integrated with the NxPlayer library. +* NxWidgets::CNxString: Add a getAllocSize() method to make it easier to + convert CNxStrings to NUL-terminated C strings. +* NxWM::CMediaPlayer: Add a CLabel that show the current fast forward/rewind + speed. +* NxWM::CKeyboard: Add support for a USB keyboard as the NxConsole and text + widget input. + +Bugfixes: + +* NxWidgets: Fix typo RBG -> RGB. This makes NxWidgets incompatible with + versions of NuttX 7.2 and below. +* NxWidgets::CImage: Fix setImageLeft and setImageTop methods +* NxMW::CMediaPlayer: Correctly catch the volume level change event. +* NxWidgets::CGraphicsPort: Fix drawBitmapGreyScale method. Actually drew + nothing because of several errors in positioning and buffer usage. +* NxWidgets::CImage: Should not attempt to draw the "empty" regions at the + top and the bottom of the image box in greyscale. +* NxWidgets::CNxString: Make destructor virtual. From Petteri Aimonen. +* NxWidgets::CTaskbar: Fix type of return value from openRawWindow() + method. From Petteri Aimonen. +* NxWidgets::CTabPanel: Modify behavior in showPage() method. Eliminate a + duplicate redraw that caused flickering; re-order some logic so that + widgets are hidden before operated on. From Petteri Aimonen. +* NxWidgets::CNxTimer: Make CNxTimer stop itself before destruction. + Otherwise a call to an invalid work queue entry may occur. From Petteri + Aimonen. +* NxWM::IApplicationFactory: Add a do-nothing, virtual destructor to + eliminate a warning. +* XWidgets::CNxWidget: Remove an unused bit field. + +NxWidgets-1.13 +============== + +The 14th release of the NxWidgets package was made on September 28, 2014. This +release depends on NuttX-7.5 or above and should not be used with older +NuttX releases. + +Additional new features and extended functionality in Version 1.13: + +* There are no new features in this release. This release simply updates + some naming that is necessary for NxWidgets to build successfully with + NuttX-7.5 and above. + +Bugfixes: + +* There are no new bug fixes in this release. + +NxWidgets-1.14 +============== + +The 15th release of the NxWidgets package was made on November 26, 2014. This +release depends on NuttX-7.6 or above and should not be used with older +NuttX releases. + +Additional new features and extended functionality in Version 1.14: + +* There are no new features in this release. This release simply correct + all UnitTest/ files to account for the corrected syslog() prototype in + NuttX 7.6. That change introduced an incompatibility between NuttX 7.6 + and previous versions of the UnitTest code. + +Bugfixes: + +* There are no new bug fixes in this release. + + +NxWidgets-1.15 +============== + +The 16th release of the NxWidgets package was made on April 14, 2015. This +release depends on NuttX-7.24 or above and should not be used with older +NuttX releases. + +Additional new features and extended functionality in Version 1.15: + +* The primary purpose of this release is update the NxWidgets and NxWM + implementations to reflect changes in naming and interfaces in the + NuttX 7.24 release +* NxWidgets:: INxWindow, CNxWindow, CBgWindow, CNxTkWindow, CNxToolbar, + CGraphicsPort updated to include a "caps" parameter in all drawLine() + methods. This permits drawing a circular cap at the end of lines and + better supports joining of line segments. + +Bugfixes: + +* There are no new bug fixes in this release. + +NxWidgets-1.16 +============== + +The 17th release of the NxWidgets package was made on June 1, 2016. This +release depends on NuttX-7.16 or above and should not be used with older +NuttX releases. + +The TAG for this release is nuttx-7.16 + +Additional new features and extended functionality in Version 1.15: + +* The NxWidgets/ directory has been removed from the NuttX GIT repository + and now stands alone in its own repository (2015-06-27). + +Bugfixes\: + +* NxWM::CTouchscreen: When boardctl() fails, need to print errno not the + returned value which will always be -1. +* NxWidgets::CNxServer: Correct use of the BOARDIOC_GRAPHICS_SETUP + boardctl() call. +* CListBox unit test: Should use RAND_MAX, not MAX_RAND. +* Framebuffer driver parameters have changed. This introduces an + incompatibility with versions of NuttX prior to 7.16. +* UnitTests: Add Make.defs files to all UnitTests directories. This is + required by the current apps/Makefile. Hmmm.. This means that no one + has built the NxWidgets packages in the last several realeases! +* UnitTests: Add some default definitions to handle the (unusual) case + where 'make clean' is called with no .config or Make.defs file installed + +NxWidgets-1.17 +============== + +The 18th release of the NxWidgets package was made on July 25, 2016. This +release depends on NuttX-7.17 or above and should not be used with older +NuttX releases. + +The TAG for this release is nuttx-7.17 + +Additional new features and extended functionality in Version 1.17: + +* There are no new features in this release. There are only updates + necessary to use NxWidgets with other changes to NuttX-7.17. These + changes include: + + - Changes to debug macro names. dbg() and vdbg() are replaces with + info(), warn(), and err(). + - Changes to Unittests/ Makefiles to deal with changes in the apps/ + build system. + - Changes to pre-processor include statments needed to handle + reorganization of the apps/include directory. + - Update include paths to adapt to changes made to apps/ include path + logic + +Bugfixes\: + +* None in this release + +NxWidgets-1.18 +============== + +The 19th release of the NxWidgets package was made on December 26, 2016. This +release depends on NuttX-7.19 or above and should not be used with older +NuttX releases. + +The TAG for this release is nuttx-7.19 + +Additional new features and extended functionality in Version 1.18: + +* libnxwidgets: Allow NxWidgets::CListDataItems subclasses access to text + and value. From Petteri Aimonen. +* Add setting task name via prctl() to NxWidgets::CNxServer and + NxWM:CTouchScreen. From Petteri Aimonen. +* libnxwidgets: In NxWidgets::CText, allow setting negative line spacing. + This is useful to have text take up less space, as quite many fonts have + large line spacings built-in. From Petteri Aimonen. +* libnxwidgets: Allow setting line spacing in NxWidgets::CMultiLineTextBox. + From Petteri Aimonen. +* CNxServer: Remove NX server task. Now calls nx_start (indirectly through + boardctrl(BOARDIOC_NX_START) to start the NX Server kernel thread. + +Bugfixes: + +* NxWM needs the path to the apps/include directory. +* NxWidgets: Fix CListBox crash when clicked below the last item. From + Petteri Aimonen. +* libnxwdigets: Fix memory leak in CNxWindow and make behaviour match + CNxTkWindow. From Petteri Aimonen. +* libnxwidgets: Fix default text colors in NxWidgets::CListBox. From + Petteri Aimonen. +* libnxwidgets: Avoid unnecessary redraw in NxWidgets::CListBox. The + ListData will raise an event that will cause a redraw anyway. Redrawing + in click() caused double redraws. From Petteri Aimonen. +* libnxwidgets: Fix coordinate handling in NxWidgets::CMultiLineTextBox. + Related to 'Thu Feb 21 16:47:01 2013 Fix text placement in + CMultiLineTextbox.' There was a few similar bugs remaining in calculating + of rows to show and in clearing the background. From Petteri Aimonen. +* CNxServer: Can't use printf in this context. + +NxWidgets-1.19 +============== + +The 20th release of the NxWidgets package was made on March 2, 2018. This +release depends on NuttX-7.24 or above and should not be used with older +NuttX releases. + +The TAG for this release is nuttx-7.24 + +Additional new features and extended functionality in Version 1.19: + + (There are no new graphics features. This release is for NuttX + compatibility only and includes a few additional bugfixes) + +Bugfixes and Updates for Compatibility with NuttX-7.24: + +* Correct NX Server message queue names. Should not be /dev/nx*. They must + be relative to /dev/mqueue so "nxabc" will appear at "/var/nxabc". +* strcasecmp, strncasecmp, bzero, bcmp, and bcopy should be defined in + strings.h, not string.h. bzero, bcmp, and bcopy are legacy functions; the + contemporary counterparts should be used instead. +* Unitests/nxwm: Change includes because up_cxxinitialize() is now + prototyped in apps/include/platfor/cxxinitialize.h. +* Prototype of nsh_telnetstart() has changed. +* NxWidgets: Fix work_s initialization in cwindowmessenger.hxx. From Sakari + Kapanen. +* Remove all support for single user mode. +* Remove unused CONFIG_NXWIDGETS_EXTERNINIT configuration variable. +* CTaskBar: Fix type checking issue with GCC 6 From Sakari Kapanen. +* nxwm: Eliminate BOARDIOC_TSCTEST_SETUP (2018-01-17). +* In NxWM unit test, call boardctl(BOARDIOC_INIT) if available and + appropriate (2018-01-17). +* Fix a dependency in Kconfig: CONFIG_NXWIDGET_SERVERINIT is definitely + supported in the PROTECTED and KERNEL build modes (2018-01-18). + diff --git a/graphics/NxWidgets/TODO.txt b/graphics/nxwm/TODO.txt similarity index 65% rename from graphics/NxWidgets/TODO.txt rename to graphics/nxwm/TODO.txt index bafd7b708..afd8a52fe 100644 --- a/graphics/NxWidgets/TODO.txt +++ b/graphics/nxwm/TODO.txt @@ -1,33 +1,7 @@ -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. - NxWM ---- (4) General NxWMIssues - (0) NxTerm Issues (0) CHexCalculator Issues (3) CMediaPlayer Issues (1) Platform specific Issues @@ -83,9 +57,6 @@ o General NxWM Issues to be productized, this change should be done in order to reduce stack memory consumption. -o NxTerm Issues - ---------------- - o CHexCalculator Issues --------------------- @@ -111,21 +82,3 @@ o CMediaPlayer Issues Status: Open 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 - diff --git a/graphics/NxWidgets/nxwm/doc/NxWM-ThreadingModel.ppt b/graphics/nxwm/doc/NxWM-ThreadingModel.ppt similarity index 100% rename from graphics/NxWidgets/nxwm/doc/NxWM-ThreadingModel.ppt rename to graphics/nxwm/doc/NxWM-ThreadingModel.ppt diff --git a/graphics/NxWidgets/nxwm/src/capplicationwindow.cxx b/graphics/nxwm/src/capplicationwindow.cxx similarity index 98% rename from graphics/NxWidgets/nxwm/src/capplicationwindow.cxx rename to graphics/nxwm/src/capplicationwindow.cxx index d274210f7..b78e8a7a1 100644 --- a/graphics/NxWidgets/nxwm/src/capplicationwindow.cxx +++ b/graphics/nxwm/src/capplicationwindow.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/NxWidgets/nxwm/src/capplicationwindow.cxx + * apps/graphics/nxwm/src/capplicationwindow.cxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,8 +45,8 @@ #include "graphics/nxwidgets/cwidgetcontrol.hxx" #include "graphics/nxwidgets/cgraphicsport.hxx" +#include "graphics/nxglyphs.hxx" #include "graphics/nxwm/nxwmconfig.hxx" -#include "graphics/nxwm/nxwmglyphs.hxx" #include "graphics/nxwm/cwindowmessenger.hxx" #include "graphics/nxwm/capplicationwindow.hxx" @@ -57,13 +57,13 @@ #ifdef CONFIG_NXWM_STOP_BITMAP extern const struct NXWidgets::SRlePaletteBitmap CONFIG_NXWM_STOP_BITMAP; #else -# define CONFIG_NXWM_STOP_BITMAP g_stopBitmap +# define CONFIG_NXWM_STOP_BITMAP NXWidgets::g_stopBitmap #endif #ifdef CONFIG_NXWM_MINIMIZE_BITMAP extern const struct NXWidgets::SRlePaletteBitmap CONFIG_NXWM_MINIMIZE_BITMAP; #else -# define CONFIG_NXWM_MINIMIZE_BITMAP g_minimizeBitmap +# define CONFIG_NXWM_MINIMIZE_BITMAP NXWidgets::g_minimizeBitmap #endif /******************************************************************************************** diff --git a/graphics/NxWidgets/nxwm/src/ccalibration.cxx b/graphics/nxwm/src/ccalibration.cxx similarity index 99% rename from graphics/NxWidgets/nxwm/src/ccalibration.cxx rename to graphics/nxwm/src/ccalibration.cxx index 696ba5645..247e02361 100644 --- a/graphics/NxWidgets/nxwm/src/ccalibration.cxx +++ b/graphics/nxwm/src/ccalibration.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/NxWidgets/nxwm/src/ccalibration.cxx + * apps/graphics/nxwm/src/ccalibration.cxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -50,7 +50,7 @@ #endif #include "graphics/nxwm/nxwmconfig.hxx" -#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxglyphs.hxx" #include "graphics/nxwm/ctouchscreen.hxx" #include "graphics/nxwm/ccalibration.hxx" diff --git a/graphics/NxWidgets/nxwm/src/cfullscreenwindow.cxx b/graphics/nxwm/src/cfullscreenwindow.cxx similarity index 98% rename from graphics/NxWidgets/nxwm/src/cfullscreenwindow.cxx rename to graphics/nxwm/src/cfullscreenwindow.cxx index 205a6163b..e8c95ef50 100644 --- a/graphics/NxWidgets/nxwm/src/cfullscreenwindow.cxx +++ b/graphics/nxwm/src/cfullscreenwindow.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/NxWidgets/nxwm/src/cfullscreenwindow.cxx + * apps/graphics/nxwm/src/cfullscreenwindow.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -46,7 +46,7 @@ #include "graphics/nxwidgets/cgraphicsport.hxx" #include "graphics/nxwm/nxwmconfig.hxx" -#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxglyphs.hxx" #include "graphics/nxwm/cfullscreenwindow.hxx" /******************************************************************************************** diff --git a/graphics/NxWidgets/nxwm/src/chexcalculator.cxx b/graphics/nxwm/src/chexcalculator.cxx similarity index 99% rename from graphics/NxWidgets/nxwm/src/chexcalculator.cxx rename to graphics/nxwm/src/chexcalculator.cxx index b7c3319ae..1e5b052eb 100644 --- a/graphics/NxWidgets/nxwm/src/chexcalculator.cxx +++ b/graphics/nxwm/src/chexcalculator.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/NxWidgets/nxwm/src/chexcalculator.cxx + * apps/graphics/nxwm/src/chexcalculator.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +45,7 @@ #include "graphics/nxwidgets/cwidgetcontrol.hxx" #include "graphics/nxwm/nxwmconfig.hxx" -#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxglyphs.hxx" #include "graphics/nxwm/chexcalculator.hxx" /******************************************************************************************** diff --git a/graphics/NxWidgets/nxwm/src/ckeyboard.cxx b/graphics/nxwm/src/ckeyboard.cxx similarity index 99% rename from graphics/NxWidgets/nxwm/src/ckeyboard.cxx rename to graphics/nxwm/src/ckeyboard.cxx index 5ea4f3e59..8248a97eb 100644 --- a/graphics/NxWidgets/nxwm/src/ckeyboard.cxx +++ b/graphics/nxwm/src/ckeyboard.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/NxWidgets/nxwm/src/ckeyboard.cxx + * apps/graphics/nxwm/src/ckeyboard.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwm/src/cmediaplayer.cxx b/graphics/nxwm/src/cmediaplayer.cxx similarity index 99% rename from graphics/NxWidgets/nxwm/src/cmediaplayer.cxx rename to graphics/nxwm/src/cmediaplayer.cxx index 9fe06aa0e..e633a6eb4 100644 --- a/graphics/NxWidgets/nxwm/src/cmediaplayer.cxx +++ b/graphics/nxwm/src/cmediaplayer.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/NxWidgets/nxwm/src/cmediaplayer.cxx + * apps/graphics/nxwm/src/cmediaplayer.cxx * * Copyright (C) 2013 Ken Pettit. All rights reserved. * Copyright (C) 2014 Gregory Nutt. All rights reserved. @@ -50,13 +50,13 @@ #include #include -#include "graphics/nxwidgets/system/nxplayer.h" +#include "system/nxplayer.h" #include #include "graphics/nxwidgets/cwidgetcontrol.hxx" #include "graphics/nxwm/nxwmconfig.hxx" -#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxglyphs.hxx" #include "graphics/nxwm/cmediaplayer.hxx" /******************************************************************************************** diff --git a/graphics/NxWidgets/nxwm/src/cnxterm.cxx b/graphics/nxwm/src/cnxterm.cxx similarity index 99% rename from graphics/NxWidgets/nxwm/src/cnxterm.cxx rename to graphics/nxwm/src/cnxterm.cxx index 54c4ef974..e82120d04 100644 --- a/graphics/NxWidgets/nxwm/src/cnxterm.cxx +++ b/graphics/nxwm/src/cnxterm.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/NxWidgets/nxwm/src/cnxterm.cxx + * apps/graphics/nxwm/src/cnxterm.cxx * * Copyright (C) 2012. 2014, 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -56,7 +56,7 @@ #include "graphics/nxwidgets/cwidgetcontrol.hxx" #include "graphics/nxwm/nxwmconfig.hxx" -#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxglyphs.hxx" #include "graphics/nxwm/cnxterm.hxx" /******************************************************************************************** diff --git a/graphics/NxWidgets/nxwm/src/cstartwindow.cxx b/graphics/nxwm/src/cstartwindow.cxx similarity index 99% rename from graphics/NxWidgets/nxwm/src/cstartwindow.cxx rename to graphics/nxwm/src/cstartwindow.cxx index 95e551116..25e931fba 100644 --- a/graphics/NxWidgets/nxwm/src/cstartwindow.cxx +++ b/graphics/nxwm/src/cstartwindow.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/NxWidgets/nxwm/src/cstartwindow.cxx + * apps/graphics/nxwm/src/cstartwindow.cxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -47,7 +47,7 @@ #include "graphics/nxwidgets/cwidgetcontrol.hxx" #include "graphics/nxwm/nxwmconfig.hxx" -#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxglyphs.hxx" #include "graphics/nxwm/ctaskbar.hxx" #include "graphics/nxwm/cstartwindow.hxx" diff --git a/graphics/NxWidgets/nxwm/src/ctaskbar.cxx b/graphics/nxwm/src/ctaskbar.cxx similarity index 99% rename from graphics/NxWidgets/nxwm/src/ctaskbar.cxx rename to graphics/nxwm/src/ctaskbar.cxx index 6286edcb1..a23be2599 100644 --- a/graphics/NxWidgets/nxwm/src/ctaskbar.cxx +++ b/graphics/nxwm/src/ctaskbar.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/NxWidgets/nxwm/src/ctaskbar.cxx + * apps/graphics/nxwm/src/ctaskbar.cxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/nxwm/src/ctouchscreen.cxx b/graphics/nxwm/src/ctouchscreen.cxx similarity index 99% rename from graphics/NxWidgets/nxwm/src/ctouchscreen.cxx rename to graphics/nxwm/src/ctouchscreen.cxx index 8f779a534..6471d6832 100644 --- a/graphics/NxWidgets/nxwm/src/ctouchscreen.cxx +++ b/graphics/nxwm/src/ctouchscreen.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/NxWidgets/nxwm/src/ctouchscreen.cxx + * apps/graphics/nxwm/src/ctouchscreen.cxx * * Copyright (C) 2012, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -57,7 +57,7 @@ #include "graphics/nxwidgets/cgraphicsport.hxx" #include "graphics/nxwm/nxwmconfig.hxx" -#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxglyphs.hxx" #include "graphics/nxwm/ctouchscreen.hxx" /******************************************************************************************** diff --git a/graphics/NxWidgets/nxwm/src/cwindowmessenger.cxx b/graphics/nxwm/src/cwindowmessenger.cxx similarity index 99% rename from graphics/NxWidgets/nxwm/src/cwindowmessenger.cxx rename to graphics/nxwm/src/cwindowmessenger.cxx index 19c96a40f..12abbd7e1 100644 --- a/graphics/NxWidgets/nxwm/src/cwindowmessenger.cxx +++ b/graphics/nxwm/src/cwindowmessenger.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/NxWidgets/nxwm/src/cwindowmessenger.cxx + * apps/graphics/nxwm/src/cwindowmessenger.cxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/NxWidgets/UnitTests/nxwm/nxwm_main.cxx b/graphics/nxwm/src/nxwm_main.cxx similarity index 99% rename from graphics/NxWidgets/UnitTests/nxwm/nxwm_main.cxx rename to graphics/nxwm/src/nxwm_main.cxx index c736f22a3..006d758b9 100644 --- a/graphics/NxWidgets/UnitTests/nxwm/nxwm_main.cxx +++ b/graphics/nxwm/src/nxwm_main.cxx @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// -// apps/graphics/NxWidgets/UnitTests/nxwm/nxwm_main.cxx +// apps/graphics/nxwm/src/nxwm_main.cxx // -// Copyright (C) 2012 Gregory Nutt. All rights reserved. +// Copyright (C) 2012, 2019 Gregory Nutt. All rights reserved. // Author: Gregory Nutt // // Redistribution and use in source and binary forms, with or without diff --git a/graphics/NxWidgets/.gitignore b/graphics/save/.gitignore similarity index 100% rename from graphics/NxWidgets/.gitignore rename to graphics/save/.gitignore diff --git a/include/graphics/nxwidgets/glyphs.hxx b/include/graphics/nxglyphs.hxx similarity index 83% rename from include/graphics/nxwidgets/glyphs.hxx rename to include/graphics/nxglyphs.hxx index 56b1ff060..b71336e11 100644 --- a/include/graphics/nxwidgets/glyphs.hxx +++ b/include/graphics/nxglyphs.hxx @@ -1,7 +1,7 @@ /**************************************************************************** - * apps/include/graphics/nxwidgets/glyphs.hxx + * apps/include/graphics/nxwidgets/nxglyphs.hxx * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -67,8 +67,8 @@ * ****************************************************************************/ -#ifndef __APPS_INCLUDE_GRAPHICS_NXWIDGETS_GLYPHS_HXX -#define __APPS_INCLUDE_GRAPHICS_NXWIDGETS_GLYPHS_HXX +#ifndef __APPS_INCLUDE_GRAPHICS_NXGLYPHS_HXX +#define __APPS_INCLUDE_GRAPHICS_NXGLYPHS_HXX /**************************************************************************** * Included Files @@ -81,6 +81,8 @@ #include +#include "graphics/nxwidgets/nxconfig.hxx" + /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ @@ -95,6 +97,7 @@ namespace NXWidgets { struct SBitmap; + // Bitmaps used by NxWidgets // Global RLE Paletted Bitmaps extern const struct SRlePaletteBitmap g_nuttxBitmap160x160; @@ -125,8 +128,27 @@ namespace NXWidgets extern const struct SBitmap g_shift; extern const struct SBitmap g_capslock; extern const struct SBitmap g_control; + + // Bitmaps used by NxWM + // Global RLE Paletted Bitmaps + + extern const struct SRlePaletteBitmap g_calculatorBitmap; + extern const struct SRlePaletteBitmap g_calibrationBitmap; + extern const struct SRlePaletteBitmap g_cmdBitmap; + + // Used by NxWM meda player + + extern const struct SRlePaletteBitmap g_mediaplayerBitmap; + extern const struct SRlePaletteBitmap g_mplayerFwdBitmap; + extern const struct SRlePaletteBitmap g_mplayerPlayBitmap; + extern const struct SRlePaletteBitmap g_mplayerPauseBitmap; + extern const struct SRlePaletteBitmap g_mplayerRewBitmap; + extern const struct SRlePaletteBitmap g_mplayerVolBitmap; + extern const struct SRlePaletteBitmap g_minimizeBitmap; + extern const struct SRlePaletteBitmap g_playBitmap; + extern const struct SRlePaletteBitmap g_stopBitmap; } #endif // __cplusplus -#endif // __APPS_INCLUDE_GRAPHICS_NXWIDGETS_GLYPHS_HXX +#endif // __APPS_INCLUDE_GRAPHICS_NXGLYPHS_HXX diff --git a/include/graphics/nxwm/ctaskbar.hxx b/include/graphics/nxwm/ctaskbar.hxx index b29a59476..e6a09837b 100644 --- a/include/graphics/nxwm/ctaskbar.hxx +++ b/include/graphics/nxwm/ctaskbar.hxx @@ -49,9 +49,9 @@ #include "graphics/nxwidgets/cwidgeteventhandler.hxx" #include "graphics/nxwidgets/cwidgeteventargs.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" -#include "graphics/nxwm/nxwmglyphs.hxx" +#include "graphics/nxglyphs.hxx" +#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxwm/capplicationwindow.hxx" #include "graphics/nxwm/cfullscreenwindow.hxx" #include "graphics/nxwm/iapplication.hxx" diff --git a/include/graphics/nxwm/nxwmconfig.hxx b/include/graphics/nxwm/nxwmconfig.hxx index b010ceafd..825b9a421 100644 --- a/include/graphics/nxwm/nxwmconfig.hxx +++ b/include/graphics/nxwm/nxwmconfig.hxx @@ -322,7 +322,7 @@ */ #ifndef CONFIG_NXWM_STARTWINDOW_ICON -# define CONFIG_NXWM_STARTWINDOW_ICON NxWM::g_playBitmap +# define CONFIG_NXWM_STARTWINDOW_ICON NXWidgets::g_playBitmap #endif /** @@ -409,7 +409,7 @@ */ # ifndef CONFIG_NXWM_NXTERM_ICON -# define CONFIG_NXWM_NXTERM_ICON NxWM::g_cmdBitmap +# define CONFIG_NXWM_NXTERM_ICON NXWidgets::g_cmdBitmap # endif #endif @@ -506,7 +506,7 @@ * CONFIG_NXWM_CALIBRATION_FONTID - Use this default NxWidgets font ID * instead of the system font ID (NXFONT_DEFAULT). * CONFIG_NXWM_CALIBRATION_ICON - The ICON to use for the touchscreen - * calibration application. Default: NxWM::g_calibrationBitmap + * calibration application. Default: NXWidgets::g_calibrationBitmap * CONFIG_NXWM_CALIBRATION_SIGNO - The realtime signal used to wake up the * touchscreen calibration thread. Default: 5 * CONFIG_NXWM_CALIBRATION_LISTENERPRIO - Priority of the calibration listener @@ -543,7 +543,7 @@ #endif #ifndef CONFIG_NXWM_CALIBRATION_ICON -# define CONFIG_NXWM_CALIBRATION_ICON NxWM::g_calibrationBitmap +# define CONFIG_NXWM_CALIBRATION_ICON NXWidgets::g_calibrationBitmap #endif #ifndef CONFIG_NXWM_CALIBRATION_SIGNO @@ -599,7 +599,7 @@ * CONFIG_NXWM_HEXCALCULATOR_BACKGROUNDCOLOR - The background color of the * calculator display. Default: Same as CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR * CONFIG_NXWM_HEXCALCULATOR_ICON - The ICON to use for the hex calculator - * application. Default: NxWM::g_calculatorBitmap + * application. Default: NXWidgets::g_calculatorBitmap * CONFIG_NXWM_HEXCALCULATOR_FONTID - The font used with the calculator. * Default: CONFIG_NXWM_DEFAULT_FONTID */ @@ -609,7 +609,7 @@ #endif #ifndef CONFIG_NXWM_HEXCALCULATOR_ICON -# define CONFIG_NXWM_HEXCALCULATOR_ICON NxWM::g_calculatorBitmap +# define CONFIG_NXWM_HEXCALCULATOR_ICON NXWidgets::g_calculatorBitmap #endif #ifndef CONFIG_NXWM_HEXCALCULATOR_FONTID @@ -622,7 +622,7 @@ * CONFIG_NXWM_HEXCALCULATOR_BACKGROUNDCOLOR - The background color of the * calculator display. Default: Same as CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR * CONFIG_NXWM_HEXCALCULATOR_ICON - The ICON to use for the hex calculator - * application. Default: NxWM::g_calculatorBitmap + * application. Default: NXWidgets::g_calculatorBitmap * CONFIG_NXWM_HEXCALCULATOR_FONTID - The font used with the calculator. * Default: CONFIG_NXWM_DEFAULT_FONTID */ @@ -660,27 +660,27 @@ #endif #ifndef CONFIG_NXWM_MEDIAPLAYER_ICON -# define CONFIG_NXWM_MEDIAPLAYER_ICON NxWM::g_mediaplayerBitmap +# define CONFIG_NXWM_MEDIAPLAYER_ICON NXWidgets::g_mediaplayerBitmap #endif #ifndef CONFIG_NXWM_MPLAYER_FWD_ICON -# define CONFIG_NXWM_MPLAYER_FWD_ICON NxWM::g_mplayerFwdBitmap +# define CONFIG_NXWM_MPLAYER_FWD_ICON NXWidgets::g_mplayerFwdBitmap #endif #ifndef CONFIG_NXWM_MPLAYER_PLAY_ICON -# define CONFIG_NXWM_MPLAYER_PLAY_ICON NxWM::g_mplayerPlayBitmap +# define CONFIG_NXWM_MPLAYER_PLAY_ICON NXWidgets::g_mplayerPlayBitmap #endif #ifndef CONFIG_NXWM_MPLAYER_PAUSE_ICON -# define CONFIG_NXWM_MPLAYER_PAUSE_ICON NxWM::g_mplayerPauseBitmap +# define CONFIG_NXWM_MPLAYER_PAUSE_ICON NXWidgets::g_mplayerPauseBitmap #endif #ifndef CONFIG_NXWM_MPLAYER_REW_ICON -# define CONFIG_NXWM_MPLAYER_REW_ICON NxWM::g_mplayerRewBitmap +# define CONFIG_NXWM_MPLAYER_REW_ICON NXWidgets::g_mplayerRewBitmap #endif #ifndef CONFIG_NXWM_MPLAYER_VOL_ICON -# define CONFIG_NXWM_MPLAYER_VOL_ICON NxWM::g_mplayerVolBitmap +# define CONFIG_NXWM_MPLAYER_VOL_ICON NXWidgets::g_mplayerVolBitmap #endif #ifndef CONFIG_NXWM_MEDIAPLAYER_FONTID diff --git a/include/graphics/nxwm/nxwmglyphs.hxx b/include/graphics/nxwm/nxwmglyphs.hxx deleted file mode 100644 index 984ef559a..000000000 --- a/include/graphics/nxwm/nxwmglyphs.hxx +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** - * apps/include/graphics/nxwm/nxwmconfig.hxx - * - * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * 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. - * - ****************************************************************************/ - -#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_NXWMGLYPHS_HXX -#define __APPS_INCLUDE_GRAPHICS_NXWM_NXWMGLYPHS_HXX - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -#include "graphics/nxwidgets/nxconfig.hxx" -#include "graphics/nxwidgets/glyphs.hxx" - -/**************************************************************************** - * Pre-Processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Bitmap Glyphs - ****************************************************************************/ - -#if defined(__cplusplus) - -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_playBitmap; - extern const struct NXWidgets::SRlePaletteBitmap g_stopBitmap; -} - -#endif // __cplusplus -#endif // __APPS_INCLUDE_GRAPHICS_NXWM_NXWMGLYPHS_HXX diff --git a/system/embedlog/Makefile b/system/embedlog/Makefile index 89b112c2a..3ef4537b7 100644 --- a/system/embedlog/Makefile +++ b/system/embedlog/Makefile @@ -207,3 +207,4 @@ distclean:: $(Q) $(call DELDIR, $(EMBEDLOG_TARBALL)) include $(APPDIR)/Application.mk + diff --git a/system/nxplayer/Makefile b/system/nxplayer/Makefile index a22afd29a..ca0b06f11 100644 --- a/system/nxplayer/Makefile +++ b/system/nxplayer/Makefile @@ -39,25 +39,42 @@ # NxPlayer Library -CSRCS = nxplayer.c +CSRCS = nxplayer.c # NxPlayer Application +# Make be built as a library: +# CONFIG_SYSTEM_NXPLAYER=y +# CONFIG_NXPLAYER_COMMAND_LINE=n +# As an NSH built-in task: +# CONFIG_SYSTEM_NXPLAYER=y +# CONFIG_NXPLAYER_COMMAND_LINE=y +# As an loadable module +# CONFIG_SYSTEM_NXPLAYER=m +# CONFIG_NXPLAYER_COMMAND_LINE=y -APPNAME = nxplayer -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = CONFIG_NXPLAYER_MAINTHREAD_STACKSIZE +# Assume building as a library (with no main entry point) + +MAINSRC = +MODULE = +APPNAME = +PRIORITY = +STACKSIZE = ifeq ($(CONFIG_SYSTEM_NXPLAYER),m) -MAINSRC = nxplayer_main.c -else -ifeq ($(CONFIG_NXPLAYER_COMMAND_LINE),y) -MAINSRC = nxplayer_main.c -endif -endif +# Build as a loadable module -CONFIG_XYZ_PROGNAME ?= nxplayer$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) +MAINSRC = nxplayer_main.c +PROGNAME = nxplayer +MODULE = m -MODULE = CONFIG_SYSTEM_NXPLAYER +else ifeq ($(CONFIG_NXPLAYER_COMMAND_LINE),y) +# Build as an NSH built-in application + +MAINSRC = nxplayer_main.c +APPNAME = nxplayer +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = CONFIG_NXPLAYER_MAINTHREAD_STACKSIZE +MODULE = y +endif include $(APPDIR)/Application.mk diff --git a/graphics/NxWidgets/tools/README.txt b/tools/README.txt similarity index 100% rename from graphics/NxWidgets/tools/README.txt rename to tools/README.txt diff --git a/graphics/NxWidgets/tools/bitmap_converter.py b/tools/bitmap_converter.py similarity index 100% rename from graphics/NxWidgets/tools/bitmap_converter.py rename to tools/bitmap_converter.py