summaryrefslogtreecommitdiff
path: root/app/bin/bitmaps
diff options
context:
space:
mode:
Diffstat (limited to 'app/bin/bitmaps')
-rw-r--r--app/bin/bitmaps/CMakeLists.txt242
-rw-r--r--app/bin/bitmaps/ballgreen.pngbin0 -> 451 bytes
-rw-r--r--app/bin/bitmaps/ballgreen.xpm35
-rw-r--r--app/bin/bitmaps/ballred.pngbin0 -> 799 bytes
-rw-r--r--app/bin/bitmaps/ballred.xpm38
-rw-r--r--app/bin/bitmaps/bluedot.pngbin0 -> 364 bytes
-rw-r--r--app/bin/bitmaps/bluedot.xpm26
-rw-r--r--app/bin/bitmaps/bo_edge.pngbin0 -> 319 bytes
-rw-r--r--app/bin/bitmaps/bo_edge.xpm20
-rw-r--r--app/bin/bitmaps/bo_flat.pngbin0 -> 310 bytes
-rw-r--r--app/bin/bitmaps/bo_flat.xpm20
-rw-r--r--app/bin/bitmaps/bo_ll.pngbin0 -> 335 bytes
-rw-r--r--app/bin/bitmaps/bo_ll.xpm20
-rw-r--r--app/bin/bitmaps/bo_lld.pngbin0 -> 340 bytes
-rw-r--r--app/bin/bitmaps/bo_lld.xpm20
-rw-r--r--app/bin/bitmaps/bo_lli.pngbin0 -> 334 bytes
-rw-r--r--app/bin/bitmaps/bo_lli.xpm20
-rw-r--r--app/bin/bitmaps/bo_llu.pngbin0 -> 341 bytes
-rw-r--r--app/bin/bitmaps/bo_llu.xpm20
-rw-r--r--app/bin/bitmaps/bo_lr.pngbin0 -> 337 bytes
-rw-r--r--app/bin/bitmaps/bo_lr.xpm20
-rw-r--r--app/bin/bitmaps/bo_lrd.pngbin0 -> 328 bytes
-rw-r--r--app/bin/bitmaps/bo_lrd.xpm20
-rw-r--r--app/bin/bitmaps/bo_lri.pngbin0 -> 345 bytes
-rw-r--r--app/bin/bitmaps/bo_lri.xpm20
-rw-r--r--app/bin/bitmaps/bo_lru.pngbin0 -> 332 bytes
-rw-r--r--app/bin/bitmaps/bo_lru.xpm20
-rw-r--r--app/bin/bitmaps/bo_t.pngbin0 -> 344 bytes
-rw-r--r--app/bin/bitmaps/bo_t.xpm20
-rw-r--r--app/bin/bitmaps/bo_ti.pngbin0 -> 347 bytes
-rw-r--r--app/bin/bitmaps/bo_ti.xpm20
-rw-r--r--app/bin/bitmaps/bo_tl.pngbin0 -> 355 bytes
-rw-r--r--app/bin/bitmaps/bo_tl.xpm20
-rw-r--r--app/bin/bitmaps/bo_tr.pngbin0 -> 351 bytes
-rw-r--r--app/bin/bitmaps/bo_tr.xpm20
-rw-r--r--app/bin/bitmaps/carpart.pngbin0 -> 319 bytes
-rw-r--r--app/bin/bitmaps/carpart.xpm22
-rw-r--r--app/bin/bitmaps/carproto.pngbin0 -> 347 bytes
-rw-r--r--app/bin/bitmaps/carproto.xpm23
-rw-r--r--app/bin/bitmaps/funnel.pngbin0 -> 527 bytes
-rw-r--r--app/bin/bitmaps/funnel.xpm62
-rw-r--r--app/bin/bitmaps/funnelclear.pngbin0 -> 780 bytes
-rw-r--r--app/bin/bitmaps/funnelclear.xpm124
-rw-r--r--app/bin/bitmaps/greendot.pngbin0 -> 343 bytes
-rw-r--r--app/bin/bitmaps/greendot.xpm23
-rw-r--r--app/bin/bitmaps/greenstar.pngbin0 -> 528 bytes
-rw-r--r--app/bin/bitmaps/greenstar.xpm69
-rw-r--r--app/bin/bitmaps/greydot.pngbin0 -> 359 bytes
-rw-r--r--app/bin/bitmaps/greydot.xpm25
-rw-r--r--app/bin/bitmaps/greystar.pngbin0 -> 528 bytes
-rw-r--r--app/bin/bitmaps/greystar.xpm69
-rw-r--r--app/bin/bitmaps/loosen.pngbin0 -> 265 bytes
-rw-r--r--app/bin/bitmaps/loosen.xpm183
-rwxr-xr-xapp/bin/bitmaps/mkimage3.cmake9
-rw-r--r--app/bin/bitmaps/note.pngbin0 -> 265 bytes
-rw-r--r--app/bin/bitmaps/note.xpm114
-rw-r--r--app/bin/bitmaps/partlist.pngbin0 -> 341 bytes
-rw-r--r--app/bin/bitmaps/partlist.xpm21
-rw-r--r--app/bin/bitmaps/pause.pngbin0 -> 265 bytes
-rw-r--r--app/bin/bitmaps/pause.xpm147
-rw-r--r--app/bin/bitmaps/png/down16.pngbin170 -> 193 bytes
-rw-r--r--app/bin/bitmaps/png/down24.pngbin180 -> 282 bytes
-rw-r--r--app/bin/bitmaps/reddot.pngbin0 -> 364 bytes
-rw-r--r--app/bin/bitmaps/reddot.xpm26
-rw-r--r--app/bin/bitmaps/redstar.pngbin0 -> 522 bytes
-rw-r--r--app/bin/bitmaps/redstar.xpm67
-rw-r--r--app/bin/bitmaps/struct.pngbin0 -> 343 bytes
-rw-r--r--app/bin/bitmaps/struct.xpm22
-rw-r--r--app/bin/bitmaps/svg/down.svg66
-rw-r--r--app/bin/bitmaps/xtc.pngbin0 -> 761 bytes
-rw-r--r--app/bin/bitmaps/xtc.xpm83
-rw-r--r--app/bin/bitmaps/yellowdot.pngbin0 -> 372 bytes
-rw-r--r--app/bin/bitmaps/yellowdot.xpm27
-rw-r--r--app/bin/bitmaps/yellowstar.pngbin0 -> 522 bytes
-rw-r--r--app/bin/bitmaps/yellowstar.xpm67
-rw-r--r--app/bin/bitmaps/zero.pngbin0 -> 290 bytes
-rw-r--r--app/bin/bitmaps/zero.xpm21
77 files changed, 187 insertions, 1704 deletions
diff --git a/app/bin/bitmaps/CMakeLists.txt b/app/bin/bitmaps/CMakeLists.txt
index 0a68722..e3601aa 100644
--- a/app/bin/bitmaps/CMakeLists.txt
+++ b/app/bin/bitmaps/CMakeLists.txt
@@ -1,100 +1,188 @@
-# Generate XPM bitmaps from SVG files
+# Generate bitmaps from SVG files and other places
+#
+# FLATPAK builds use pregenerated bitmap files. See below;
+#
+# We generate different types of bitmap files depending of the platform
+# Both use the common suffix .image1 (this saves lots of ugly preprocesor code)
+# Unix - ascii-ized version of the .png files (using gdk_pixbuf_csource)
+# Window - .xpm files (using pngtoxpm)
+#
+# Toolbar button icons come in 3 sizes. Separate .image1 files are generated for each size
+# A small #include file (.image3) is generated for each icon, Which #include's the 3 .image1 files
+# and an array definition to select the bitmap for the size
+# Toolbar icons are defined as .svg file which are converated by Inkscape into .png files.
+# Some of the generated bitmap are ugly and handcrafted .png files are used instead
+# This live in ${CMAKE_CURRENT_SOURCE}/png
+#
+# Another group of icons are used as dialog decorations.
+# These .png files live in ${CMAKE_CURRENT_SOURCE_DIR}
PROJECT(genbitmaps)
-# Find the conversion tool
+set (IMG3S
+ background benchwork bezier-line bezier-track block bottom box
+ bridge building car-inventory change-grid circle-center
+ circle-filled-center circle-filled-tangent circle-line-center
+ circle-line-tangent circle-line circle-tangent circle clone
+ connect control convert-from convert-to copy cornu curved-chord
+ curved-end curved-line-chord curved-line-end curved-line-middle
+ curved-line-tangent curved-middle curved-tangent cut delete
+ describe description dimension doc-export-bmap doc-export-dxf
+ doc-export-svg doc-export doc-import-mod doc-import doc-new doc-open
+ doc-print doc-recent doc-revert doc-save-as doc-save doc-setup down
+ ease-broad ease-cornu ease-gt-broad ease-gt-sharp ease-lt-broad
+ ease-lt-sharp ease-none ease-normal ease-sharp
+ elevation exit extend filled-box filled-polygon go helix
+ info join-line join layers magnet manage map move
+ new-car ok pan-zoom parallel-line parallel parameter paste
+ polygon polyline profile protractor redo reflect roadbed
+ rotate ruler select sensor signal snap-curs snap-grid
+ split-draw split sticky-doc sticky-link sticky-note stop
+ straight-line straight switch-motor table-edge text ties top
+ train trim tunnel turnout-design turnout turntable undo
+ zoom-choose zoom-extent zoom-in zoom-out
+ )
+set( PIXS 16 24 32 )
+
+set (IMG1S
+ ballgreen ballred bluedot bo_edge bo_flat bo_lld bo_lli bo_llu bo_ll bo_lrd bo_lri
+ bo_lru bo_lr bo_ti bo_tl bo_tr bo_t carpart carproto funnelclear funnel greendot
+ greenstar greydot greystar loosen note partlist pause reddot redstar struct xtc
+ yellowdot yellowstar zero
+)
+
+# If ../../../bitmaps exists it is because we are building for FlatPak which can't
+# build bitmaps because we don't have inkscape
+# Instead we copy the bitmaps from bia regular build and include them at the top
+# level of the source tree in the tarball we create for the FlatPak build
+# See distribution/flatpak/make-source-archive
+# So if bitmaps/ exists then we are doing a FlatPak build
+if ( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../../bitmaps/" )
+ # FLATPAK
+ MESSAGE( STATUS "FlatPak build" )
+ foreach( img1 ${IMG1S} )
+ list(APPEND IMG_RESULTS ${img1}.image1)
+ endforeach()
+ foreach( img3 ${IMG3S} )
+ foreach( pix 16 24 32 )
+ list(APPEND IMG_RESULTS ${img3}${pix}.image1)
+ endforeach()
+ list(APPEND IMG_RESULTS ${img3}.image3)
+ endforeach()
+
+ foreach ( img ${IMG_RESULTS} )
+ add_custom_command(
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../../../bitmaps/${img}
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${img}
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../../../bitmaps/${img} ${CMAKE_CURRENT_BINARY_DIR}/${img}
+ )
+ endforeach()
+ MESSAGE( STATUS ${IMG_RESULTS} )
+
+ add_custom_target (
+ genbitmaps
+ DEPENDS ${IMG_RESULTS}
+ )
+ return()
+endif()
+# Find the conversion tool
find_package(Inkscape)
if( NOT Inkscape_FOUND )
message( STATUS "Inkscape not found." )
+ return()
else()
message(STATUS "Inkscape is: ${Inkscape_EXECUTABLE}")
message(STATUS "Export option is: ${Inkscape_EXPORT}")
+endif()
- set (XPMS
- background benchwork bezier-line bezier-track block bottom box
- bridge building car-inventory change-grid circle-center
- circle-filled-center circle-filled-tangent circle-line-center
- circle-line-tangent circle-line circle-tangent circle clone
- connect control convert-from convert-to copy cornu curved-chord
- curved-end curved-line-chord curved-line-end curved-line-middle
- curved-line-tangent curved-middle curved-tangent cut delete
- describe description dimension doc-export-bmap doc-export-dxf
- doc-export-svg doc-export doc-import-mod doc-import doc-new doc-open
- doc-print doc-recent doc-revert doc-save-as doc-save doc-setup down
- ease-broad ease-cornu ease-gt-broad ease-gt-sharp ease-lt-broad
- ease-lt-sharp ease-none ease-normal ease-sharp
- elevation exit extend filled-box filled-polygon go helix
- info join-line join layers magnet manage map move
- new-car ok pan-zoom parallel-line parallel parameter paste
- polygon polyline profile protractor redo reflect roadbed
- rotate ruler select sensor signal snap-curs snap-grid
- split-draw split sticky-doc sticky-link sticky-note stop
- straight-line straight switch-motor table-edge text ties top
- train trim tunnel turnout-design turnout turntable undo
- zoom-choose zoom-extent zoom-in zoom-out
- )
- set( PIXS 16 24 32 )
-
- foreach(xpm ${XPMS})
- foreach(pix ${PIXS})
- if ( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/png/${xpm}${pix}.png" )
- # MESSAGE( STATUS "Custom ${CMAKE_CURRENT_SOURCE_DIR}/png/${xpm}${pix}.png" )
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/png/${xpm}${pix}.png
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/png/${xpm}${pix}.png
- COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/png/
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/png/${xpm}${pix}.png ${CMAKE_CURRENT_BINARY_DIR}/png/${xpm}${pix}.png
- )
- else()
- # MESSAGE( STATUS "SVG ${CMAKE_CURRENT_SOURCE_DIR}/svg/${xpm}.svg" )
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/png/${xpm}${pix}.png
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/svg/${xpm}.svg
- COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/png/
- COMMAND ${Inkscape_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/svg/${xpm}.svg -h ${pix} ${Inkscape_EXPORT}${CMAKE_CURRENT_BINARY_DIR}/png/${xpm}${pix}.png
- )
- endif()
- # build a list of all the depends
- list(APPEND PNG_RESULTS ${CMAKE_CURRENT_BINARY_DIR}/png/${xpm}${pix}.png)
- endforeach()
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${xpm}.xpm3
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/png/${xpm}16.png
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/png/${xpm}24.png
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/png/${xpm}32.png
- COMMAND pngtoxpm ${CMAKE_CURRENT_BINARY_DIR}/${xpm}.xpm3
-# COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/${xpm}.xpm3 ${CMAKE_CURRENT_SOURCE_DIR}/${xpm}.xpm3
- )
- # build a list of all the depends
- list(APPEND XPM_RESULTS ${xpm}.xpm3)
- endforeach()
- add_custom_target (
- genbitmaps
- DEPENDS ${XPM_RESULTS}
- DEPENDS ${PNG_RESULTS}
+foreach(img3 ${IMG3S})
+ STRING(MAKE_C_IDENTIFIER ${img3} NAME )
+ foreach(pix ${PIXS})
+ if ( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/png/${img3}${pix}.png" )
+ # MESSAGE( STATUS "Custom ${CMAKE_CURRENT_SOURCE_DIR}/png/${img3}${pix}.png" )
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/png/${img3}${pix}.png
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/png/${img3}${pix}.png
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/png/
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/png/${img3}${pix}.png ${CMAKE_CURRENT_BINARY_DIR}/png/${img3}${pix}.png
+ )
+ else()
+ # MESSAGE( STATUS "SVG ${CMAKE_CURRENT_SOURCE_DIR}/svg/${img3}.svg" )
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/png/${img3}${pix}.png
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/svg/${img3}.svg
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/png/
+ COMMAND ${Inkscape_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/svg/${img3}.svg -h ${pix} ${Inkscape_EXPORT}${CMAKE_CURRENT_BINARY_DIR}/png/${img3}${pix}.png
+ )
+ endif()
+ if(UNIX)
+ add_custom_command(
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/png/${img3}${pix}.png
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${img3}${pix}.image1
+ COMMAND gdk-pixbuf-csource --stream --name ${NAME}${pix}_image1 ${CMAKE_CURRENT_BINARY_DIR}/png/${img3}${pix}.png > ${CMAKE_CURRENT_BINARY_DIR}/${img3}${pix}.image1
+ )
+ else()
+ add_custom_command(
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/png/${img3}${pix}.png
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${img3}${pix}.image1
+ COMMAND pngtoxpm ${img3}${pix}_image1 ${CMAKE_CURRENT_BINARY_DIR}/png/${img3}${pix}.png ${CMAKE_CURRENT_BINARY_DIR}/${img3}${pix}.image1
+ )
+ endif()
+ endforeach()
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${img3}.image3
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${img3}16.image1
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${img3}24.image1
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${img3}32.image1
+ COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/mkimage3.cmake ${img3}
)
-
- if(WIN32)
- # Temporarily the FreeImage dll is copied to the build directory
+ list(APPEND IMG_RESULTS ${img3}.image3)
+endforeach()
+
+foreach(img1 ${IMG1S})
+ STRING(MAKE_C_IDENTIFIER ${img1} NAME )
+ if(UNIX)
add_custom_command(
- TARGET genbitmaps PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy ${FREEIMAGE_SHAREDLIB} ${CMAKE_CURRENT_BINARY_DIR}
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${img1}.image1
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${img1}.png
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/
+ COMMAND gdk-pixbuf-csource --stream --name ${NAME}_image1 ${CMAKE_CURRENT_SOURCE_DIR}/${img1}.png > ${CMAKE_CURRENT_BINARY_DIR}/${img1}.image1
)
- cmake_path(GET FREEIMAGE_SHAREDLIB FILENAME filename)
+ else()
add_custom_command(
- TARGET genbitmaps POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E rm ${CMAKE_CURRENT_BINARY_DIR}/${filename}
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${img1}.image1
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${img1}.png
+ COMMAND pngtoxpm ${img1}_image1 ${CMAKE_CURRENT_SOURCE_DIR}/${img1}.png ${CMAKE_CURRENT_BINARY_DIR}/${img1}.image1
)
-#
-
endif()
+ list(APPEND IMG_RESULTS ${img1}.image1)
+ list(APPEND IMG_RESULTS ${img1}.png)
+endforeach()
+
+add_custom_target (
+ genbitmaps
+ DEPENDS ${IMG_RESULTS}
+)
+
+
+if(WIN32)
+ # Temporarily the FreeImage dll is copied to the build directory
+ add_custom_command(
+ TARGET genbitmaps PRE_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy ${FREEIMAGE_SHAREDLIB} ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ cmake_path(GET FREEIMAGE_SHAREDLIB FILENAME filename)
+ add_custom_command(
+ TARGET genbitmaps POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E rm ${CMAKE_CURRENT_BINARY_DIR}/${filename}
+ )
+
endif()
#MESSAGE (STATUS "SVG Converter: ${SVG_CONVERTER}")
#MESSAGE (STATUS "Source Dir: ${CMAKE_CURRENT_SOURCE_DIR}")
-#MESSAGE (STATUS "XPMs: ${XPMS}")
-#MESSAGE (STATUS "XPM_RESULTS: ${XPM_RESULTS}")
-#MESSAGE (STATUS "PNG_RESULTS: ${PNG_RESULTS}")
+#MESSAGE (STATUS "XPMs: ${IMG3S}")
+#MESSAGE (STATUS "IMG_RESULTS: ${IMG_RESULTS}")
diff --git a/app/bin/bitmaps/ballgreen.png b/app/bin/bitmaps/ballgreen.png
new file mode 100644
index 0000000..788b7bc
--- /dev/null
+++ b/app/bin/bitmaps/ballgreen.png
Binary files differ
diff --git a/app/bin/bitmaps/ballgreen.xpm b/app/bin/bitmaps/ballgreen.xpm
deleted file mode 100644
index 14fb1e2..0000000
--- a/app/bin/bitmaps/ballgreen.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * ballgreen[] = {
-"16 16 16 1",
-" c None",
-". c #292929",
-"+ c #292B29",
-"@ c #29322B",
-"# c #365233",
-"$ c #2D432E",
-"% c #57A572",
-"& c #B0D6C1",
-"* c #3F9159",
-"= c #7EC097",
-"- c #296932",
-"; c #2D8840",
-"> c #2C9231",
-", c #44C530",
-"' c #45BA32",
-") c #7BF737",
-" .+@#$@+. ",
-" +$%&&&&%$+ ",
-" +#&&&&&&&&*+ ",
-" +#=&===&&&==#+ ",
-".@%%%%%%%%%%%*@.",
-"+-;%%;*%**%%%*$+",
-"@-**;*;;;;;;*;-@",
-"@--;-;;;;;;;;;-@",
-"@---->>>;->>---$",
-"@->->>>>>;>>;--@",
-"+->>>>,>>,>>>>-+",
-".$>>>,,,,,,>>>@.",
-" +->',,)),,,>-+ ",
-" +#,)))))),>+ ",
-" +#,)))),$+ ",
-" .+$##$+. "};
diff --git a/app/bin/bitmaps/ballred.png b/app/bin/bitmaps/ballred.png
new file mode 100644
index 0000000..e49c445
--- /dev/null
+++ b/app/bin/bitmaps/ballred.png
Binary files differ
diff --git a/app/bin/bitmaps/ballred.xpm b/app/bin/bitmaps/ballred.xpm
deleted file mode 100644
index 8d56dd4..0000000
--- a/app/bin/bitmaps/ballred.xpm
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char *ballred[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 16 1",
-" c #20F301EC00EA",
-". c #060400000000",
-"X c #297B14040000",
-"o c #ED34010C0000",
-"O c #FFFF07880000",
-"+ c #E2BA07180718",
-"@ c #A1E800000000",
-"# c #F4791D5E016C",
-"$ c #D2A11FA11FA1",
-"% c #6D77055602AD",
-"& c #FB014C2607BE",
-"* c #FB747AB40D88",
-"= c #CDB757875787",
-"- c #E5DEA339A339",
-"; c #000000000000",
-": c None",
-/* pixels */
-"::::;. .;::::",
-":::. =----= .:::",
-"::.%--------$.::",
-":.%=====-====%.:",
-"; $$$=$$$$=$$% ;",
-".%+$$$$$$$$$$$%.",
-" @++++++++++++@ ",
-" @++@+++++@+++@ ",
-" @ooooOoooooooo ",
-" oooooOOOOoooo@ ",
-".@ooOOOOOOOOoo@.",
-"; oOO######OOo ;",
-":.@O##&&&###O@.:",
-"::.%#&&*&*&#%.::",
-":::.X#***&#X.:::",
-"::::;. XX .;::::"
-};
diff --git a/app/bin/bitmaps/bluedot.png b/app/bin/bitmaps/bluedot.png
new file mode 100644
index 0000000..6f6353d
--- /dev/null
+++ b/app/bin/bitmaps/bluedot.png
Binary files differ
diff --git a/app/bin/bitmaps/bluedot.xpm b/app/bin/bitmaps/bluedot.xpm
deleted file mode 100644
index 5c1df4c..0000000
--- a/app/bin/bitmaps/bluedot.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * bluedot[] = {
-"16 16 7 1",
-" c None",
-". c #000000",
-"+ c #3465A4",
-"@ c #3565A4",
-"# c #4465A1",
-"$ c #5A649B",
-"% c #4C79BA",
-" ",
-" ",
-" .... ",
-" ..#@@#.. ",
-" .$%%%+++$. ",
-" .%%%%%+++. ",
-" .#%%%%%+++#. ",
-" .@%%%%%+++@. ",
-" .@+%%%++++@. ",
-" .#++++++++#. ",
-" .++++++++. ",
-" .$++++++$. ",
-" ..#@@#.. ",
-" .... ",
-" ",
-" "};
diff --git a/app/bin/bitmaps/bo_edge.png b/app/bin/bitmaps/bo_edge.png
new file mode 100644
index 0000000..97926c1
--- /dev/null
+++ b/app/bin/bitmaps/bo_edge.png
Binary files differ
diff --git a/app/bin/bitmaps/bo_edge.xpm b/app/bin/bitmaps/bo_edge.xpm
deleted file mode 100644
index da936f9..0000000
--- a/app/bin/bitmaps/bo_edge.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * bo_edge_xpm[] = {
-"16 14 3 1",
-" c None",
-". c #000000000000",
-"X c #FFFF9A691861",
-" ...... ",
-" .XXXX. ",
-" .XXXX. ",
-" .XXXX. ",
-" .XXXX. ",
-" .XXXX. ",
-" .XXXX. ",
-" .XXXX. ",
-" .XXXX. ",
-" .XXXX. ",
-" .XXXX. ",
-" .XXXX. ",
-" .XXXX. ",
-" ...... "};
diff --git a/app/bin/bitmaps/bo_flat.png b/app/bin/bitmaps/bo_flat.png
new file mode 100644
index 0000000..8783938
--- /dev/null
+++ b/app/bin/bitmaps/bo_flat.png
Binary files differ
diff --git a/app/bin/bitmaps/bo_flat.xpm b/app/bin/bitmaps/bo_flat.xpm
deleted file mode 100644
index 1402d10..0000000
--- a/app/bin/bitmaps/bo_flat.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * bo_flat_xpm[] = {
-"16 14 3 1",
-" c None",
-". c #000000000000",
-"X c #FFFF9A691861",
-" ",
-" ",
-" ",
-" ",
-" .............. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .............. ",
-" ",
-" ",
-" ",
-" "};
diff --git a/app/bin/bitmaps/bo_ll.png b/app/bin/bitmaps/bo_ll.png
new file mode 100644
index 0000000..1b84179
--- /dev/null
+++ b/app/bin/bitmaps/bo_ll.png
Binary files differ
diff --git a/app/bin/bitmaps/bo_ll.xpm b/app/bin/bitmaps/bo_ll.xpm
deleted file mode 100644
index a3bfcdb..0000000
--- a/app/bin/bitmaps/bo_ll.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * bo_ll_xpm[] = {
-"16 14 3 1",
-" c None",
-". c #000000000000",
-"X c #FFFF9A691861",
-" ........ ",
-" .XXXXXX. ",
-" .XXXXXX. ",
-" .XXXXXX. ",
-" .XXX.... ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" ..... "};
diff --git a/app/bin/bitmaps/bo_lld.png b/app/bin/bitmaps/bo_lld.png
new file mode 100644
index 0000000..06b66ed
--- /dev/null
+++ b/app/bin/bitmaps/bo_lld.png
Binary files differ
diff --git a/app/bin/bitmaps/bo_lld.xpm b/app/bin/bitmaps/bo_lld.xpm
deleted file mode 100644
index f1068cf..0000000
--- a/app/bin/bitmaps/bo_lld.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * bo_lld_xpm[] = {
-"16 14 3 1",
-" c None",
-". c #000000000000",
-"X c #FFFF9A691861",
-" ",
-" ",
-" ",
-" .............. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" ..........XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" ..... ",
-" ",
-" "};
diff --git a/app/bin/bitmaps/bo_lli.png b/app/bin/bitmaps/bo_lli.png
new file mode 100644
index 0000000..669dcc1
--- /dev/null
+++ b/app/bin/bitmaps/bo_lli.png
Binary files differ
diff --git a/app/bin/bitmaps/bo_lli.xpm b/app/bin/bitmaps/bo_lli.xpm
deleted file mode 100644
index e5d5bc7..0000000
--- a/app/bin/bitmaps/bo_lli.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * bo_lli_xpm[] = {
-"16 14 3 1",
-" c None",
-". c #000000000000",
-"X c #FFFF9A691861",
-" ..... ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .....XXX. ",
-" .XXXXXXX. ",
-" .XXXXXXX. ",
-" .XXXXXXX. ",
-" ......... "};
diff --git a/app/bin/bitmaps/bo_llu.png b/app/bin/bitmaps/bo_llu.png
new file mode 100644
index 0000000..e994f38
--- /dev/null
+++ b/app/bin/bitmaps/bo_llu.png
Binary files differ
diff --git a/app/bin/bitmaps/bo_llu.xpm b/app/bin/bitmaps/bo_llu.xpm
deleted file mode 100644
index 79ad1f1..0000000
--- a/app/bin/bitmaps/bo_llu.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * bo_llu_xpm[] = {
-"16 14 3 1",
-" c None",
-". c #000000000000",
-"X c #FFFF9A691861",
-" ",
-" ",
-" ..... ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX.......... ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .............. ",
-" ",
-" ",
-" "};
diff --git a/app/bin/bitmaps/bo_lr.png b/app/bin/bitmaps/bo_lr.png
new file mode 100644
index 0000000..38f7a2c
--- /dev/null
+++ b/app/bin/bitmaps/bo_lr.png
Binary files differ
diff --git a/app/bin/bitmaps/bo_lr.xpm b/app/bin/bitmaps/bo_lr.xpm
deleted file mode 100644
index 869a0ba..0000000
--- a/app/bin/bitmaps/bo_lr.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * bo_lr_xpm[] = {
-"16 14 3 1",
-" c None",
-". c #000000000000",
-"X c #FFFF9A691861",
-" ........ ",
-" .XXXXXX. ",
-" .XXXXXX. ",
-" .XXXXXX. ",
-" ....XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" ..... "};
diff --git a/app/bin/bitmaps/bo_lrd.png b/app/bin/bitmaps/bo_lrd.png
new file mode 100644
index 0000000..598cfa1
--- /dev/null
+++ b/app/bin/bitmaps/bo_lrd.png
Binary files differ
diff --git a/app/bin/bitmaps/bo_lrd.xpm b/app/bin/bitmaps/bo_lrd.xpm
deleted file mode 100644
index 29f6550..0000000
--- a/app/bin/bitmaps/bo_lrd.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * bo_lrd_xpm[] = {
-"16 14 3 1",
-" c None",
-". c #000000000000",
-"X c #FFFF9A691861",
-" ",
-" ",
-" ",
-" .............. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXX.......... ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" ..... ",
-" ",
-" "};
diff --git a/app/bin/bitmaps/bo_lri.png b/app/bin/bitmaps/bo_lri.png
new file mode 100644
index 0000000..0ecc88b
--- /dev/null
+++ b/app/bin/bitmaps/bo_lri.png
Binary files differ
diff --git a/app/bin/bitmaps/bo_lri.xpm b/app/bin/bitmaps/bo_lri.xpm
deleted file mode 100644
index e58e682..0000000
--- a/app/bin/bitmaps/bo_lri.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * bo_lri_xpm[] = {
-"16 14 3 1",
-" c None",
-". c #000000000000",
-"X c #FFFF9A691861",
-" ..... ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX..... ",
-" .XXXXXXX. ",
-" .XXXXXXX. ",
-" .XXXXXXX. ",
-" ......... "};
diff --git a/app/bin/bitmaps/bo_lru.png b/app/bin/bitmaps/bo_lru.png
new file mode 100644
index 0000000..874c873
--- /dev/null
+++ b/app/bin/bitmaps/bo_lru.png
Binary files differ
diff --git a/app/bin/bitmaps/bo_lru.xpm b/app/bin/bitmaps/bo_lru.xpm
deleted file mode 100644
index 2c093b5..0000000
--- a/app/bin/bitmaps/bo_lru.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * bo_lru_xpm[] = {
-"16 14 3 1",
-" c None",
-". c #000000000000",
-"X c #FFFF9A691861",
-" ",
-" ",
-" ..... ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" ..........XXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .............. ",
-" ",
-" ",
-" "};
diff --git a/app/bin/bitmaps/bo_t.png b/app/bin/bitmaps/bo_t.png
new file mode 100644
index 0000000..94e9c34
--- /dev/null
+++ b/app/bin/bitmaps/bo_t.png
Binary files differ
diff --git a/app/bin/bitmaps/bo_t.xpm b/app/bin/bitmaps/bo_t.xpm
deleted file mode 100644
index 6842404..0000000
--- a/app/bin/bitmaps/bo_t.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * bo_t_xpm[] = {
-"16 14 3 1",
-" c None",
-". c #000000000000",
-"X c #FFFF9A691861",
-" ............. ",
-" .XXXXXXXXXXX. ",
-" .XXXXXXXXXXX. ",
-" .XXXXXXXXXXX. ",
-" .....XXX..... ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" ..... "};
diff --git a/app/bin/bitmaps/bo_ti.png b/app/bin/bitmaps/bo_ti.png
new file mode 100644
index 0000000..71e0475
--- /dev/null
+++ b/app/bin/bitmaps/bo_ti.png
Binary files differ
diff --git a/app/bin/bitmaps/bo_ti.xpm b/app/bin/bitmaps/bo_ti.xpm
deleted file mode 100644
index 3c86b96..0000000
--- a/app/bin/bitmaps/bo_ti.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * bo_ti_xpm[] = {
-"16 14 3 1",
-" c None",
-". c #000000000000",
-"X c #FFFF9A691861",
-" ..... ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .....XXX..... ",
-" .XXXXXXXXXXX. ",
-" .XXXXXXXXXXX. ",
-" .XXXXXXXXXXX. ",
-" ............. "};
diff --git a/app/bin/bitmaps/bo_tl.png b/app/bin/bitmaps/bo_tl.png
new file mode 100644
index 0000000..8b9627c
--- /dev/null
+++ b/app/bin/bitmaps/bo_tl.png
Binary files differ
diff --git a/app/bin/bitmaps/bo_tl.xpm b/app/bin/bitmaps/bo_tl.xpm
deleted file mode 100644
index 5d63874..0000000
--- a/app/bin/bitmaps/bo_tl.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * bo_tl_xpm[] = {
-"16 14 3 1",
-" c None",
-". c #000000000000",
-"X c #FFFF9A691861",
-" ..... ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" ..........XXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" ..........XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" ..... ",
-" "};
diff --git a/app/bin/bitmaps/bo_tr.png b/app/bin/bitmaps/bo_tr.png
new file mode 100644
index 0000000..4f0d347
--- /dev/null
+++ b/app/bin/bitmaps/bo_tr.png
Binary files differ
diff --git a/app/bin/bitmaps/bo_tr.xpm b/app/bin/bitmaps/bo_tr.xpm
deleted file mode 100644
index 4acbcef..0000000
--- a/app/bin/bitmaps/bo_tr.xpm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char * bo_tr_xpm[] = {
-"16 14 3 1",
-" c None",
-". c #000000000000",
-"X c #FFFF9A691861",
-" ..... ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX.......... ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXX.......... ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" .XXX. ",
-" ..... "};
diff --git a/app/bin/bitmaps/carpart.png b/app/bin/bitmaps/carpart.png
new file mode 100644
index 0000000..705f523
--- /dev/null
+++ b/app/bin/bitmaps/carpart.png
Binary files differ
diff --git a/app/bin/bitmaps/carpart.xpm b/app/bin/bitmaps/carpart.xpm
deleted file mode 100644
index 215a7c1..0000000
--- a/app/bin/bitmaps/carpart.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char*carpart_xpm[]={
-"16 16 3 1",
-". c None",
-"# c #ffff00000000",
-"a c #000000000000",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-".##############.",
-".##############.",
-".##############.",
-".##############.",
-"a##############a",
-"..a.a......a.a..",
-".a.a.a....a.a.a.",
-"..a.a......a.a..",
-"................",
-"................"};
diff --git a/app/bin/bitmaps/carproto.png b/app/bin/bitmaps/carproto.png
new file mode 100644
index 0000000..d9d9288
--- /dev/null
+++ b/app/bin/bitmaps/carproto.png
Binary files differ
diff --git a/app/bin/bitmaps/carproto.xpm b/app/bin/bitmaps/carproto.xpm
deleted file mode 100644
index eb07037..0000000
--- a/app/bin/bitmaps/carproto.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char*carproto_xpm[]={
-"16 16 4 1",
-". c None",
-"c c #ffff00000000",
-"a c #00000000ffff",
-"# c #000000000000",
-"....a.......a...",
-"...aa..aa..aa...",
-"..aaa..aa.aaa...",
-"...aa......aa...",
-"...aa..aa..aa...",
-"...aa..aa..aa...",
-"..aaaa....aaaa..",
-".cccccccccccccc.",
-".cccccccccccccc.",
-".cccccccccccccc.",
-".cccccccccccccc.",
-"#cccccccccccccc#",
-"..#.#......#.#..",
-".#.#.#....#.#.#.",
-"..#.#......#.#..",
-"................"};
diff --git a/app/bin/bitmaps/funnel.png b/app/bin/bitmaps/funnel.png
new file mode 100644
index 0000000..2bae581
--- /dev/null
+++ b/app/bin/bitmaps/funnel.png
Binary files differ
diff --git a/app/bin/bitmaps/funnel.xpm b/app/bin/bitmaps/funnel.xpm
deleted file mode 100644
index ef7cd23..0000000
--- a/app/bin/bitmaps/funnel.xpm
+++ /dev/null
@@ -1,62 +0,0 @@
-/* XPM */
-static char *funnel_xpm[] = {
-"16 16 43 1",
-" c None",
-". c #216262",
-"+ c #123737",
-"@ c #030A0A",
-"# c #000000",
-"$ c #010303",
-"% c #050E0E",
-"& c #091C1C",
-"* c #0F2E2E",
-"= c #164242",
-"- c #1C5353",
-"; c #76D1D1",
-"> c #82D5D5",
-", c #79D2D2",
-"' c #62CBCB",
-") c #65CCCC",
-"! c #75D1D1",
-"~ c #80D5D5",
-"{ c #5FCACA",
-"] c #52C5C5",
-"^ c #42C0C0",
-"/ c #39ACAC",
-"( c #3BB1B1",
-"_ c #57C7C7",
-": c #7BD3D3",
-"< c #89D8D8",
-"[ c #7ED4D4",
-"} c #60CACA",
-"| c #43C0C0",
-"1 c #4BC3C3",
-"2 c #86D7D7",
-"3 c #71D0D0",
-"4 c #46C1C1",
-"5 c #50C5C5",
-"6 c #49C2C2",
-"7 c #4CC3C3",
-"8 c #5EC9C9",
-"9 c #000101",
-"0 c #040B0B",
-"a c #020606",
-"b c #72D0D0",
-"c c #010404",
-"d c #313333",
-" ",
-" .+@###$%&*=-. ",
-" .;;;>,')!~;;. ",
-" .+;{]^/(^_:-. ",
-" +<;[}|1:;2- ",
-" +@;;345;;=- ",
-" @#;;6_;*= ",
-" ##;78&* ",
-" ##'%& ",
-" #'% ",
-" #'% ",
-" #'% ",
-" 9'0 ",
-" $'a ",
-" #bc ",
-" ##d "};
diff --git a/app/bin/bitmaps/funnelclear.png b/app/bin/bitmaps/funnelclear.png
new file mode 100644
index 0000000..171809b
--- /dev/null
+++ b/app/bin/bitmaps/funnelclear.png
Binary files differ
diff --git a/app/bin/bitmaps/funnelclear.xpm b/app/bin/bitmaps/funnelclear.xpm
deleted file mode 100644
index 45d948f..0000000
--- a/app/bin/bitmaps/funnelclear.xpm
+++ /dev/null
@@ -1,124 +0,0 @@
-/* XPM */
-static char * funnelclear_xpm[] = {
-"16 16 105 2",
-" c None",
-". c #216262",
-"+ c #123737",
-"@ c #030A0A",
-"# c #000000",
-"$ c #010303",
-"% c #050E0E",
-"& c #091C1C",
-"* c #0F2E2E",
-"= c #164242",
-"- c #1C5353",
-"; c #76D1D1",
-"> c #82D5D5",
-", c #79D2D2",
-"' c #62CBCB",
-") c #65CCCC",
-"! c #75D1D1",
-"~ c #80D5D5",
-"{ c #7AAEAE",
-"] c #9D5E5E",
-"^ c #6DA5A5",
-"/ c #39ACAC",
-"( c #3BB1B1",
-"_ c #42C0C0",
-": c #57C7C7",
-"< c #8AB6B6",
-"[ c #A21717",
-"} c #7D4747",
-"| c #92BABA",
-"1 c #9F6464",
-"2 c #FF7777",
-"3 c #9C6060",
-"4 c #6CA5A5",
-"5 c #4BC3C3",
-"6 c #7BD3D3",
-"7 c #86B4B4",
-"8 c #A16767",
-"9 c #F87070",
-"0 c #A70000",
-"a c #9C0101",
-"b c #FE7676",
-"c c #D44C4C",
-"d c #FA7272",
-"e c #965C5C",
-"f c #70AAAA",
-"g c #85B4B4",
-"h c #9B6464",
-"i c #EA6262",
-"j c #E45C5C",
-"k c #A30000",
-"l c #8C0303",
-"m c #990000",
-"n c #EF6767",
-"o c #BE3636",
-"p c #E65E5E",
-"q c #955F5F",
-"r c #996464",
-"s c #D74F4F",
-"t c #CD4545",
-"u c #A00000",
-"v c #A10000",
-"w c #880000",
-"x c #940000",
-"y c #DB5353",
-"z c #B72E2E",
-"A c #C63D3D",
-"B c #BA3131",
-"C c #9F1515",
-"D c #A81E1E",
-"E c #9B0000",
-"F c #9C0000",
-"G c #830000",
-"H c #8F0000",
-"I c #B42525",
-"J c #A21111",
-"K c #A51414",
-"L c #970000",
-"M c #980000",
-"N c #910000",
-"O c #8B0000",
-"P c #AF1515",
-"Q c #AC1111",
-"R c #920000",
-"S c #8C0000",
-"T c #8D0000",
-"U c #B81111",
-"V c #870000",
-"W c #C41111",
-"X c #800202",
-"Y c #820000",
-"Z c #D01111",
-"` c #7C6161",
-" . c #5A0606",
-".. c #570000",
-"+. c #720000",
-"@. c #D81111",
-"#. c #6C0000",
-"$. c #5FAFAF",
-"%. c #020606",
-"&. c #340000",
-"*. c #5F0000",
-"=. c #270000",
-"-. c #6AC2C2",
-";. c #360000",
-">. c #313333",
-" ",
-" . + @ # # # $ % & * = - . ",
-" . ; ; ; > , ' ) ! ~ ; ; . ",
-" . + ; { ] ^ / ( _ : < [ } ",
-" + | 1 2 3 4 5 6 7 8 9 0 0 ",
-" + a b c d e f g h i c j k ",
-" l m n o p q r s o t u v ",
-" w x y z A B C D E F ",
-" G H I J J K L M ",
-" N O P Q Q Q R N ",
-" S T U U U U U U T S ",
-" V V W W W X V W W W V V ",
-" Y Z Z Z ` .G Y Z Z Z Y ",
-" ..+.@.#.$.%. ..+.@.+... ",
-" # &.*.=.-.$ # # ;.*.&.# ",
-" # # >. "};
diff --git a/app/bin/bitmaps/greendot.png b/app/bin/bitmaps/greendot.png
new file mode 100644
index 0000000..e48b1c2
--- /dev/null
+++ b/app/bin/bitmaps/greendot.png
Binary files differ
diff --git a/app/bin/bitmaps/greendot.xpm b/app/bin/bitmaps/greendot.xpm
deleted file mode 100644
index 8c44035..0000000
--- a/app/bin/bitmaps/greendot.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * greendot[] = {
-"16 16 4 1",
-" c None",
-". c #000000",
-"+ c #4E9A06",
-"@ c #59A51A",
-" ",
-" ",
-" .... ",
-" ..++++.. ",
-" .+@@@++++. ",
-" .@@@@@+++. ",
-" .+@@@@@++++. ",
-" .+@@@@@++++. ",
-" .++@@@+++++. ",
-" .++++++++++. ",
-" .++++++++. ",
-" .++++++++. ",
-" ..++++.. ",
-" .... ",
-" ",
-" "};
diff --git a/app/bin/bitmaps/greenstar.png b/app/bin/bitmaps/greenstar.png
new file mode 100644
index 0000000..b4e4c51
--- /dev/null
+++ b/app/bin/bitmaps/greenstar.png
Binary files differ
diff --git a/app/bin/bitmaps/greenstar.xpm b/app/bin/bitmaps/greenstar.xpm
deleted file mode 100644
index b83a4b9..0000000
--- a/app/bin/bitmaps/greenstar.xpm
+++ /dev/null
@@ -1,69 +0,0 @@
-/* XPM */
-static char * greenstar[] = {
-"16 16 50 1",
-" c None",
-". c #264706",
-"+ c #274906",
-"@ c #346408",
-"# c #386C09",
-"$ c #478A0D",
-"% c #46880C",
-"& c #224007",
-"* c #131D0A",
-"= c #234207",
-"- c #274B06",
-"; c #2D5306",
-"> c #305A07",
-", c #3A700A",
-"' c #4D960E",
-") c #4A900D",
-"! c #356508",
-"~ c #264806",
-"{ c #203B07",
-"] c #1C3508",
-"^ c #203C07",
-"/ c #42800C",
-"( c #478B0D",
-"_ c #529E0F",
-": c #4C940E",
-"< c #46890D",
-"[ c #417E0B",
-"} c #3C730A",
-"| c #1B3208",
-"1 c #346208",
-"2 c #4B920E",
-"3 c #498F0D",
-"4 c #45850C",
-"5 c #407C0B",
-"6 c #315B07",
-"7 c #336108",
-"8 c #44840C",
-"9 c #2E5507",
-"0 c #3F7A0B",
-"a c #3F790B",
-"b c #3C740A",
-"c c #2B5106",
-"d c #1F3808",
-"e c #386B09",
-"f c #234107",
-"g c #2A4F06",
-"h c #182C09",
-"i c #2E5707",
-"j c #1A3008",
-"k c #172B09",
-" ",
-" ",
-" ",
-" .+ ",
-" @# ",
-" $%& ",
-" *=-;>,')!~={] ",
-" ^#/('_:<[}@| ",
-" 1%)23456 ",
-" 74%8[9 ",
-" ,05abc ",
-" deef;e1 ",
-" &gh di| ",
-" j k ",
-" ",
-" "};
diff --git a/app/bin/bitmaps/greydot.png b/app/bin/bitmaps/greydot.png
new file mode 100644
index 0000000..6e45a24
--- /dev/null
+++ b/app/bin/bitmaps/greydot.png
Binary files differ
diff --git a/app/bin/bitmaps/greydot.xpm b/app/bin/bitmaps/greydot.xpm
deleted file mode 100644
index 771a096..0000000
--- a/app/bin/bitmaps/greydot.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * greydot[] = {
-"16 16 6 1",
-" c None",
-". c #000000",
-"+ c #30312F",
-"@ c #959792",
-"# c #888A85",
-"$ c #A2A49F",
-" ",
-" ",
-" .... ",
-" .+@@@@+. ",
-" .#$$$@@@#. ",
-" +$$$$$@@@+ ",
-" .@$$$$$@@@@. ",
-" .@$$$$$@@@@. ",
-" .@@$$$@@@@@. ",
-" .@@@@@@@@@@. ",
-" +@@@@@@@@+ ",
-" .#@@@@@@#. ",
-" .+@@@@+. ",
-" .... ",
-" ",
-" "};
diff --git a/app/bin/bitmaps/greystar.png b/app/bin/bitmaps/greystar.png
new file mode 100644
index 0000000..5d6f465
--- /dev/null
+++ b/app/bin/bitmaps/greystar.png
Binary files differ
diff --git a/app/bin/bitmaps/greystar.xpm b/app/bin/bitmaps/greystar.xpm
deleted file mode 100644
index e7c5300..0000000
--- a/app/bin/bitmaps/greystar.xpm
+++ /dev/null
@@ -1,69 +0,0 @@
-/* XPM */
-static char * greystar[] = {
-"16 16 50 1",
-" c None",
-". c #5A5B57",
-"+ c #5B5D59",
-"@ c #6D6F6A",
-"# c #73756F",
-"$ c #878984",
-"% c #868882",
-"& c #555652",
-"* c #3D3F3C",
-"= c #565854",
-"- c #5C5E59",
-"; c #62645F",
-"> c #676964",
-", c #757772",
-"' c #8F918C",
-") c #8B8D88",
-"! c #6E706A",
-"~ c #5A5C58",
-"{ c #51534F",
-"] c #4D4F4B",
-"^ c #525450",
-"/ c #81837D",
-"( c #888A84",
-"_ c #959792",
-": c #8E908A",
-"< c #868983",
-"[ c #7F817B",
-"} c #787A74",
-"| c #4C4D49",
-"1 c #6C6E69",
-"2 c #8D8F8A",
-"3 c #8B8D87",
-"4 c #848680",
-"5 c #7D807A",
-"6 c #686A65",
-"7 c #6B6D68",
-"8 c #83857F",
-"9 c #646561",
-"0 c #7D7F79",
-"a c #7C7E78",
-"b c #787B75",
-"c c #60625D",
-"d c #50514D",
-"e c #72746E",
-"f c #565753",
-"g c #5F615D",
-"h c #474945",
-"i c #646661",
-"j c #4A4B48",
-"k c #474844",
-" ",
-" ",
-" ",
-" .+ ",
-" @# ",
-" $%& ",
-" *=-;>,')!~={] ",
-" ^#/('_:<[}@| ",
-" 1%)23456 ",
-" 74%8[9 ",
-" ,05abc ",
-" deef;e1 ",
-" &gh di| ",
-" j k ",
-" ",
-" "};
diff --git a/app/bin/bitmaps/loosen.png b/app/bin/bitmaps/loosen.png
new file mode 100644
index 0000000..cefff17
--- /dev/null
+++ b/app/bin/bitmaps/loosen.png
Binary files differ
diff --git a/app/bin/bitmaps/loosen.xpm b/app/bin/bitmaps/loosen.xpm
deleted file mode 100644
index 9a92872..0000000
--- a/app/bin/bitmaps/loosen.xpm
+++ /dev/null
@@ -1,183 +0,0 @@
-static char *loosen_x16[] = {
- "16 16 24 1",
- " c None",
- "0 c #4878c8",
- "1 c #c80000",
- "2 c #c86868",
- "3 c #6890c8",
- "4 c #78a8e8",
- "5 c #c82020",
- "6 c #5880c8",
- "7 c #7890b0",
- "8 c #c83838",
- "9 c #c81010",
- "A c #8090b8",
- "B c #88b0e8",
- "C c #c87070",
- "D c #5888d0",
- "E c #c82828",
- "F c #7090b8",
- "G c #5078c0",
- "H c #6088d0",
- "I c #c87878",
- "J c #c83030",
- "K c #c84040",
- "L c #6890d0",
- "M c #7890b8",
- " ",
- " ",
- " ",
- " D D 3 3 D D ",
- " 0A0A6M M6A0A0 ",
- " 4 4 B B 4 4 ",
- " 0707GF FG7070 ",
- " H H L L H H ",
- " EC2E ",
- " 89 9J ",
- " 1I 1C ",
- " K9 98 ",
- " 5C2E ",
- " ",
- " ",
- " "};
-static char *loosen_x24[] = {
- "24 24 38 1",
- " c None",
- "0 c #084098",
- "1 c #c80000",
- "2 c #3870c8",
- "3 c #c84848",
- "4 c #4888e8",
- "5 c #2058c0",
- "6 c #c81818",
- "7 c #78a8e8",
- "8 c #6080b8",
- "9 c #4870b0",
- "A c #c86868",
- "B c #6090e8",
- "C c #4068b0",
- "D c #90a8d0",
- "E c #5878a8",
- "F c #c82828",
- "G c #c80808",
- "H c #3068b8",
- "I c #5890f8",
- "J c #7088b0",
- "K c #6898f0",
- "L c #5880b8",
- "M c #c85858",
- "N c #c87070",
- "O c #88a8e8",
- "P c #104098",
- "Q c #3068c8",
- "R c #2860b8",
- "S c #6898e0",
- "T c #c81010",
- "U c #4070c0",
- "V c #5070a8",
- "W c #104898",
- "X c #c83030",
- "Y c #c82020",
- "Z c #c85050",
- "a c #c87878",
- " ",
- " ",
- " ",
- " ",
- " ",
- " LUJJQJJ28 82JJQJJUL ",
- " CHEV5EER9 9REE5VEHC ",
- " 7 I K K I 7 ",
- " 7 I K K I 7 ",
- " DS 4 B B 4 SD ",
- " P0PW0PP0P P0PP0WP0P ",
- " O K 7 7 K O ",
- " ZG 1M ",
- " N1G 11A ",
- " 11 11a ",
- " G1M A11 ",
- " 316 Y1X ",
- " F1X X1Y ",
- " T1 1T ",
- " A M ",
- " ",
- " ",
- " ",
- " "};
-static char *loosen_x32[] = {
- "32 32 41 1",
- " c None",
- "0 c #0840a0",
- "1 c #c80000",
- "2 c #7088b0",
- "3 c #c82828",
- "4 c #3068c0",
- "5 c #5090f8",
- "6 c #2058bc",
- "7 c #80a8e8",
- "8 c #c85050",
- "9 c #6078b0",
- "A c #c81010",
- "B c #3058a0",
- "C c #689df0",
- "D c #486ca8",
- "E c #205098",
- "F c #c83838",
- "G c #95b0e0",
- "H c #4068a0",
- "I c #c86060",
- "J c #1648a0",
- "K c #4870b8",
- "L c #3d68b0",
- "M c #2860b8",
- "N c #2050a4",
- "O c #1048a8",
- "P c #c84343",
- "Q c #c80808",
- "R c #c81919",
- "S c #5070a9",
- "T c #70a0f0",
- "U c #c86c6c",
- "V c #6480b0",
- "W c #4070b8",
- "X c #5890f8",
- "Y c #2860c4",
- "Z c #3860a0",
- "a c #c83030",
- "b c #2850a0",
- "c c #1850a8",
- "d c #88a8e8",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " 7G T C C T G7 ",
- " VMLSSL6SSS6LV VL6SSS6LSSLMV ",
- " DcNBBNOBBBObD DbOBBBONBBNcD ",
- " Cd GX 5 5 XG dC ",
- " Cd GX 5 5 XG dC ",
- " Cd GX 5 5 XG dC ",
- " Cd GX 5 5 XG dC ",
- " ZJJEEJ0EEE0JH HJ0EEE0JEEJJZ ",
- " 24W99KY999YS2 2SY999YK99W42 ",
- " 7G T C C T G7 ",
- " QF R1 ",
- " 111 11Q ",
- " A11U I11Q ",
- " 311P 811R ",
- " P113 P11R ",
- " 8113 F113 ",
- " a11P P11R ",
- " A11U I11A ",
- " 111 11Q ",
- " 1a R1 ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " "};
-
-static char **loosen_xpm[3] = { loosen_x16, loosen_x24, loosen_x32 };
diff --git a/app/bin/bitmaps/mkimage3.cmake b/app/bin/bitmaps/mkimage3.cmake
new file mode 100755
index 0000000..780a36a
--- /dev/null
+++ b/app/bin/bitmaps/mkimage3.cmake
@@ -0,0 +1,9 @@
+
+set ( IMG ${CMAKE_ARGV3} )
+
+file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/${IMG}.image3 "#include \"${IMG}16.image1\"\n" )
+file( APPEND ${CMAKE_CURRENT_BINARY_DIR}/${IMG}.image3 "#include \"${IMG}24.image1\"\n" )
+file( APPEND ${CMAKE_CURRENT_BINARY_DIR}/${IMG}.image3 "#include \"${IMG}32.image1\"\n" )
+STRING(MAKE_C_IDENTIFIER ${IMG} NAME )
+file( APPEND ${CMAKE_CURRENT_BINARY_DIR}/${IMG}.image3 "static wIconBitMap_t ${NAME}_image3[3] = { ${NAME}16_image1, ${NAME}24_image1, ${NAME}32_image1 };\n" )
+ #MESSAGE( "OUTFILE=${CMAKE_CURRENT_BINARY_DIR}/${IMG}.image3" )
diff --git a/app/bin/bitmaps/note.png b/app/bin/bitmaps/note.png
new file mode 100644
index 0000000..cefff17
--- /dev/null
+++ b/app/bin/bitmaps/note.png
Binary files differ
diff --git a/app/bin/bitmaps/note.xpm b/app/bin/bitmaps/note.xpm
deleted file mode 100644
index 51bf8c7..0000000
--- a/app/bin/bitmaps/note.xpm
+++ /dev/null
@@ -1,114 +0,0 @@
-static char *note_x16[] = {
- "16 16 10 1",
- " c None",
- "0 c #000000",
- "1 c #0066CC",
- "2 c #999999",
- "3 c #CC9900",
- "4 c #CC9933",
- "5 c #CC9999",
- "6 c #FFCC00",
- "7 c #FFCC33",
- "8 c #FFCC66",
- " ",
- " ",
- " ",
- " 444444444444 ",
- " 46666666666344 ",
- " 46888888886664 ",
- " 47222222227664 ",
- " 46522222566664 ",
- " 46788888866664 ",
- " 47111111117664 ",
- " 46666666666664 ",
- " 46666666666664 ",
- " 47777777777774 ",
- " ",
- " ",
- " "};
-
-static char *note_x24[] = {
- "24 24 10 1",
- " c None",
- "0 c #000000",
- "1 c #999999",
- "2 c #CC9900",
- "3 c #CC9933",
- "4 c #CC9999",
- "5 c #CCCC66",
- "6 c #FFCC00",
- "7 c #FFCC33",
- "8 c #FFCC66",
- " ",
- " ",
- " ",
- " ",
- " ",
- " 37777777777333333 ",
- " 3666666666666666233 ",
- " 36666666666666662223 ",
- " 36788888888888766663 ",
- " 36411111111111566663 ",
- " 36666666666666666663 ",
- " 36611111111156666663 ",
- " 36688888888876666663 ",
- " 36844444444444866663 ",
- " 36544444444444566663 ",
- " 36666666666666666663 ",
- " 36666666666666666663 ",
- " 36666666666666666663 ",
- " 37777777777777777773 ",
- " ",
- " ",
- " ",
- " ",
- " "};
-
-static char *note_x32[] = {
- "32 32 11 1",
- " c None",
- "0 c #000000",
- "1 c #0066CC",
- "2 c #3399CC",
- "3 c #999999",
- "4 c #CC9900",
- "5 c #CC9933",
- "6 c #CCCC00",
- "7 c #FFCC00",
- "8 c #FFCC33",
- "9 c #FFCC66",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " 55555555 ",
- " 57777778888888888888855 ",
- " 877777777777777777777445 ",
- " 8777777777777777777774445 ",
- " 87777777777777777777774465 ",
- " 87799999999999999997777775 ",
- " 87833333333333333337777775 ",
- " 87777777777777777777777775 ",
- " 87777777777777777777777775 ",
- " 87782111111111128777777775 ",
- " 87777777777777777777777775 ",
- " 87777777777777777777777775 ",
- " 87833333333333333337777775 ",
- " 87799999999999999997777775 ",
- " 87777777777777777777777775 ",
- " 87777777777777777777777775 ",
- " 87777777777777777777777775 ",
- " 87777777777777777777777775 ",
- " 58888887777777777777777775 ",
- " 55555555555555555555 ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " "};
-
-static char *note_xpm[3] = { note_x16, note_x24, note_x32 };
-
diff --git a/app/bin/bitmaps/partlist.png b/app/bin/bitmaps/partlist.png
new file mode 100644
index 0000000..32b2ac4
--- /dev/null
+++ b/app/bin/bitmaps/partlist.png
Binary files differ
diff --git a/app/bin/bitmaps/partlist.xpm b/app/bin/bitmaps/partlist.xpm
deleted file mode 100644
index 78c4674..0000000
--- a/app/bin/bitmaps/partlist.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * partlist_xpm[] = {
-"16 16 2 1",
-" c None",
-". c #000000000000",
-" . . . ",
-"..... . . ",
-" . . . ",
-"..... . ",
-" . . . ",
-" ",
-". .. .. .. ",
-". . . . .",
-". . .. .. .. ",
-". . . . . .",
-". .. .. . .",
-" ... . . ",
-" . . . . ",
-" . .. ... . ",
-" . . . ",
-" . . ..."};
diff --git a/app/bin/bitmaps/pause.png b/app/bin/bitmaps/pause.png
new file mode 100644
index 0000000..cefff17
--- /dev/null
+++ b/app/bin/bitmaps/pause.png
Binary files differ
diff --git a/app/bin/bitmaps/pause.xpm b/app/bin/bitmaps/pause.xpm
deleted file mode 100644
index da61446..0000000
--- a/app/bin/bitmaps/pause.xpm
+++ /dev/null
@@ -1,147 +0,0 @@
-static char* pause_x16[] = {
- "16 16 20 1",
- " c None",
- "0 c #000000",
- "1 c #003300",
- "2 c #003333",
- "3 c #006633",
- "4 c #009966",
- "5 c #333333",
- "6 c #336633",
- "7 c #336666",
- "8 c #339966",
- "9 c #33CC99",
- "A c #666666",
- "B c #66CC99",
- "C c #99CC99",
- "D c #99CCCC",
- "E c #CCCCCC",
- "F c #CCFFCC",
- "G c #CCFFFF",
- "H c #FFFFFF",
- "I c #808080",
- " 0 ",
- " 00000 ",
- " 01133300 ",
- " 001688887210 ",
- " 01688888888821 ",
- " 07CCCCDDDDDDC5 ",
- " 0AEEEEEEEEEEE5 ",
- " 0IHHHHHHHHHHG5 ",
- " 0IHHHHHHHHHHG5 ",
- " 0AFFFFFFFFFFD5 ",
- " 07DDDDDDDDDDC2 ",
- " 05BBBBBBBBBBB2 ",
- " 128BBBBBB9720 ",
- " 0128999810 ",
- " 0134210 ",
- " 020 "};
-
-static char* pause_x24[] = {
- "24 24 22 1",
- " c None",
- "0 c #000000",
- "1 c #003300",
- "2 c #003333",
- "3 c #006633",
- "4 c #009966",
- "5 c #333333",
- "6 c #336633",
- "7 c #336666",
- "8 c #339966",
- "9 c #33CC66",
- "A c #33CC99",
- "B c #666666",
- "C c #669999",
- "D c #66CC99",
- "E c #99CCCC",
- "F c #99FFCC",
- "G c #CCCCCC",
- "H c #CCFFCC",
- "I c #CCFFFF",
- "J c #FFFFFF",
- "K c #808080",
- " ",
- " 000 ",
- " 0012000 ",
- " 0003333300 ",
- " 0036777773210 ",
- " 01278888888887100 ",
- " 01278888888888888710 ",
- " 05CCCCCCCCCCCCCCCCC0 ",
- " 07EEEEEEEEEEEEEEEEE0 ",
- " 0BGGGGGGGGGGGGGGGGG0 ",
- " 0BIIIIIIIIIIIIIIIII0 ",
- " 0KJJJJJJJJJJJJJJJJJ0 ",
- " 0KJJJJJJJJJJJJJJJJJ0 ",
- " 0BHHHHHHHHHHHHHHHHH0 ",
- " 0BFFFFFFFFFFFFFFFFF0 ",
- " 07EEEEEEEEEEEEEEEEE0 ",
- " 07DDDDDDDDDDDDDDDDD0 ",
- " 02DDDDDDDDDDDDDDDDC1 ",
- " 027DDDDDDDDDDDDA620 ",
- " 028AAAAAAAAA720 ",
- " 0128AAAA9811 ",
- " 013894110 ",
- " 01210 ",
- " 0 "};
-
-static char* pause_x32[] = {
- "32 32 22 1",
- " c None",
- "0 c #000000",
- "1 c #003300",
- "2 c #003333",
- "3 c #006633",
- "4 c #009966",
- "5 c #333333",
- "6 c #336633",
- "7 c #336666",
- "8 c #339966",
- "9 c #339999",
- "A c #33CC66",
- "B c #33CC99",
- "C c #669966",
- "D c #66CC99",
- "E c #99CC99",
- "F c #99CCCC",
- "G c #99FFCC",
- "H c #CCCCCC",
- "I c #CCFFCC",
- "J c #CCFFFF",
- "K c #FFFFFF",
- " ",
- " ",
- " 00000 ",
- " 0023300 ",
- " 00233333200 ",
- " 011333333333210 ",
- " 0013777777777776100 ",
- " 006888888888888888600 ",
- " 0168888888888888888888210 ",
- " 018CCCCCCCCCCCCCCCCCCCCC810 ",
- " 05EEEEEEEEEEEEEEEEEEEEEEE50 ",
- " 05FFFFFFFFFFFFFFFFFFFFFFF50 ",
- " 05HHHHHHHHHHHHHHHHHHHHHHH50 ",
- " 05IIIIIIIIIIIIIIIIIIIIIII50 ",
- " 05KKKKKKKKKKKKKKKKKKKKKKK50 ",
- " 05KKKKKKKKKKKKKKKKKKKKKKK50 ",
- " 06KKKKKKKKKKKKKKKKKKKKKKK60 ",
- " 05JJJJJJJJJJJJJJJJJJJJJJJ50 ",
- " 05IIIIIIIIIIIIIIIIIIIIIII50 ",
- " 05GGGGGGGGGGGGGGGGGGGGGGG50 ",
- " 05FFFFFFFFFFFFFFFFFFFFFFF50 ",
- " 05FFFFFFFFFFFFFFFFFFFFFFF50 ",
- " 05DDDDDDDDDDDDDDDDDDDDDDD50 ",
- " 028DDDDDDDDDDDDDDDDDDDDD820 ",
- " 0228DDDDDDDDDDDDDDDDD9220 ",
- " 026BBBBBBBBBBBBBBB620 ",
- " 028BBBBBBBBBBB820 ",
- " 128AAAAAAA821 ",
- " 0128AAA4210 ",
- " 0134310 ",
- " 010 ",
- " "};
-
-static char *pause_xpm[3] = { pause_x16, pause_x24, pause_x32 };
-
diff --git a/app/bin/bitmaps/png/down16.png b/app/bin/bitmaps/png/down16.png
index e272de2..53220c6 100644
--- a/app/bin/bitmaps/png/down16.png
+++ b/app/bin/bitmaps/png/down16.png
Binary files differ
diff --git a/app/bin/bitmaps/png/down24.png b/app/bin/bitmaps/png/down24.png
index 0b72634..d51c8ef 100644
--- a/app/bin/bitmaps/png/down24.png
+++ b/app/bin/bitmaps/png/down24.png
Binary files differ
diff --git a/app/bin/bitmaps/reddot.png b/app/bin/bitmaps/reddot.png
new file mode 100644
index 0000000..6c8aaf3
--- /dev/null
+++ b/app/bin/bitmaps/reddot.png
Binary files differ
diff --git a/app/bin/bitmaps/reddot.xpm b/app/bin/bitmaps/reddot.xpm
deleted file mode 100644
index 14529bf..0000000
--- a/app/bin/bitmaps/reddot.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * reddot[] = {
-"16 16 7 1",
-" c None",
-". c #000000",
-"+ c #CC0000",
-"@ c #CA1F1E",
-"# c #E62E16",
-"$ c #C04E4B",
-"% c #B25F5B",
-" ",
-" ",
-" .... ",
-" ..$@@$.. ",
-" .%###+++%. ",
-" .#####+++. ",
-" .$#####+++$. ",
-" .@#####+++@. ",
-" .@+###++++@. ",
-" .$++++++++$. ",
-" .++++++++. ",
-" .%++++++%. ",
-" ..$@@$.. ",
-" .... ",
-" ",
-" "};
diff --git a/app/bin/bitmaps/redstar.png b/app/bin/bitmaps/redstar.png
new file mode 100644
index 0000000..5cb3a9c
--- /dev/null
+++ b/app/bin/bitmaps/redstar.png
Binary files differ
diff --git a/app/bin/bitmaps/redstar.xpm b/app/bin/bitmaps/redstar.xpm
deleted file mode 100644
index b9f51f9..0000000
--- a/app/bin/bitmaps/redstar.xpm
+++ /dev/null
@@ -1,67 +0,0 @@
-/* XPM */
-static char * redstar[] = {
-"16 16 48 1",
-" c None",
-". c #950800",
-"+ c #980800",
-"@ c #B50A00",
-"# c #BF0A00",
-"$ c #E00C00",
-"% c #DE0C00",
-"& c #8D0800",
-"* c #670600",
-"= c #900800",
-"- c #990800",
-"; c #A30900",
-"> c #AC0900",
-", c #C30B00",
-"' c #ED0D00",
-") c #E70C00",
-"! c #B70A00",
-"~ c #960800",
-"{ c #870700",
-"] c #810700",
-"^ c #890700",
-"/ c #D60C00",
-"( c #E20C00",
-"_ c #F70D00",
-": c #EC0D00",
-"< c #D30B00",
-"[ c #C70B00",
-"} c #7E0700",
-"| c #B40A00",
-"1 c #EA0D00",
-"2 c #DB0C00",
-"3 c #D10B00",
-"4 c #AD0900",
-"5 c #B20A00",
-"6 c #D90C00",
-"7 c #A50900",
-"8 c #D00B00",
-"9 c #CE0B00",
-"0 c #C90B00",
-"a c #A00900",
-"b c #850700",
-"c c #BE0A00",
-"d c #8E0800",
-"e c #9E0900",
-"f c #770600",
-"g c #A70900",
-"h c #7B0700",
-"i c #760600",
-" ",
-" ",
-" ",
-" .+ ",
-" @# ",
-" $%& ",
-" *=-;>,')!~={] ",
-" ^#/('_:$<[@} ",
-" |%)1)234 ",
-" 52%6<7 ",
-" ,8390a ",
-" bccd;c| ",
-" &ef bg} ",
-" h i ",
-" ",
-" "};
diff --git a/app/bin/bitmaps/struct.png b/app/bin/bitmaps/struct.png
new file mode 100644
index 0000000..678c92d
--- /dev/null
+++ b/app/bin/bitmaps/struct.png
Binary files differ
diff --git a/app/bin/bitmaps/struct.xpm b/app/bin/bitmaps/struct.xpm
deleted file mode 100644
index a37979c..0000000
--- a/app/bin/bitmaps/struct.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * struct_xpm[] = {
-"16 16 3 1",
-"o c None",
-" c #000000000000",
-". c #FFFFFFFFFFFF",
-" ",
-" ............ ",
-" . .......... . ",
-" .. ........ .. ",
-" ... ...... ... ",
-" .... .... ",
-" ... ...... ... ",
-" .. ........ .. ",
-" . .......... . ",
-" ............ ",
-" ",
-"o ............ o",
-"oo .......... oo",
-"ooo ........ ooo",
-"oooo oo ",
-"oooooooooooooo "};
diff --git a/app/bin/bitmaps/svg/down.svg b/app/bin/bitmaps/svg/down.svg
index 41f83fb..c936d22 100644
--- a/app/bin/bitmaps/svg/down.svg
+++ b/app/bin/bitmaps/svg/down.svg
@@ -1,56 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="210mm"
+ height="297mm"
+ viewBox="0 0 210 297"
version="1.1"
- id="Layer_1"
- x="0px"
- y="0px"
- viewBox="0 0 24 48"
- style="enable-background:new 0 0 24 48;"
- xml:space="preserve"
- sodipodi:docname="down.svg"
- inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
- id="metadata13"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs11" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1647"
- inkscape:window-height="933"
- id="namedview9"
- showgrid="false"
- inkscape:zoom="11.681573"
- inkscape:cx="10.715926"
- inkscape:cy="22.589078"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="Layer_1"
- inkscape:document-rotation="0" />
-<style
- type="text/css"
- id="style2">
- .st0{stroke:#000000;stroke-miterlimit:10;}
-</style>
-
-
-<path
- id="path838"
- style="fill:#000000;fill-opacity:1;stroke-width:0.542529;stroke-linecap:square"
- inkscape:transform-center-x="0.02977867"
- inkscape:transform-center-y="-0.65983518"
- d="m 21.394513,16.625061 -18.8746311,0.01685 0.1253841,3.396706 9.422005,11.319468 9.386564,-11.355799 z"
- sodipodi:nodetypes="cccccc" /></svg>
+ id="svg5"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg">
+ <defs
+ id="defs2" />
+ <g
+ id="layer1" />
+</svg>
diff --git a/app/bin/bitmaps/xtc.png b/app/bin/bitmaps/xtc.png
new file mode 100644
index 0000000..166e50f
--- /dev/null
+++ b/app/bin/bitmaps/xtc.png
Binary files differ
diff --git a/app/bin/bitmaps/xtc.xpm b/app/bin/bitmaps/xtc.xpm
deleted file mode 100644
index 3c13e32..0000000
--- a/app/bin/bitmaps/xtc.xpm
+++ /dev/null
@@ -1,83 +0,0 @@
-/* XPM */
-static char * xtc_xpm[] = {
-"64 64 16 1",
-" c None",
-". c #888A85",
-"+ c #555753",
-"@ c #D3D7CF",
-"# c #BABDB6",
-"$ c #EEEEEC",
-"% c #4E9A06",
-"& c #73D216",
-"* c #8AE234",
-"= c #E9B96E",
-"- c #FCAF3E",
-"; c #C4A000",
-"> c #C17D11",
-", c #8F5902",
-"' c #F57900",
-") c #2E3436",
-" .......................................+++++++++++ ",
-" .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@.+ ",
-" .#$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
-" .#$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
-" .#$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
-" .#$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
-" .#$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
-" .#$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
-" .#$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
-" .#$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
-" .#$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+ ",
-" .#$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@@+ ",
-" ..$$$@$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@%%+ ",
-" ..$$@#@$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$#%&@+ ",
-" ..$$$@$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@%%*@@+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$%&*@**+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@%*@=***+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$#%*=***&%+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$%%*@***&%%+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@%&*****%%%%+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@%&=@***%%%%@+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$=%*=***&%%%%#$+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$@%&*@***&%%%%@$$+ ",
-" ..$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$@%&*=***%%%%%@$$$+ ",
-" +.$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$#%**=**&%%%%#$$$$$+ ",
-" +.$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$=%*=@**&%%%%@$$$$$$+ ",
-" +.$$$$$$@$$$$$$$$$$$$$$$$$$$$$$=-*@***%%%%%@$$$$$$$+ ",
-" +.$$$$$$@$$$===$$$$$$$$$$$$$$$=--=**&%%%%#$$$$$$$$$+ ",
-" +.$$$$$$@$$@@@@===$$$$$$$$$$$@----;*%%%%@$$$$$$$$$$+ ",
-" +.$$$@$$@$$@#.#=@=@=@$$$$$$$@------;%%%@$$$$$$$$$$$+ ",
-" +.$$@#@$@$$$$=..#=@==@@@$$$$--------;%$$$$$$$$$$$$$+ ",
-" +.$$$@$$@$$$@@=@#.=@=$===@==------=@$$$$$$$$$$$$$$$+ ",
-" +.$$$$$$@$$$#@=@=@...@==@==------=@$$$$$$$$$$$$$$$$+ ",
-" +.$$$$$$@$$@#.=##===@...#=-----====$==$@@$$@$$$$$$$+ ",
-" +.$$$$$$@$$@==>,.>===-===>--=>======-==-'=='@==$$$$+ ",
-" +.$$$$$$@$$$#===.,,,==>.,>>==..====>======='==@$$$$+ ",
-" +.$$$$$$@$$$#==#==,.+.,++,=.=====>.,......=>==#$$$$+ ",
-" +.$$$$$$@$$$@@@@===$-@=...=#=#,,#,#===.=...,..#@$$$+ ",
-" +.$$$$$$@$$$@@=@=@=$======#.==#>#>@=====@===@=$$$$$+ ",
-" +.$$$$$$@$$$####=#=#=#====#=#>#,.....,....#####$$$$+ ",
-" +.$$$$$$@$$$####.#=#=#==#=###=#=#=#,.......####$$$$+ ",
-" +.$$$$$$@$$$@==@===$=@====@===$-==='=$===@==@==$$$$+ ",
-" +.$$$$$$@$$$$@=$@@@$@@@@@=$@@@$=@@$==$=-=$==$==@$$$+ ",
-" +.$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@$$$@$$@$$$$+ ",
-" +.$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+ ",
-" +.$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+ ",
-" ++$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+ ",
-" ++$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+ ",
-" ++$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+ ",
-" )+$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+) ",
-" )+$$$$$$@$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$+) ",
-" )+.###############################################.+ ",
-" )+++++++++++++++++++++++++++++++++++++++++++++++++ ",
-" ",
-" ",
-" "};
diff --git a/app/bin/bitmaps/yellowdot.png b/app/bin/bitmaps/yellowdot.png
new file mode 100644
index 0000000..1595ab2
--- /dev/null
+++ b/app/bin/bitmaps/yellowdot.png
Binary files differ
diff --git a/app/bin/bitmaps/yellowdot.xpm b/app/bin/bitmaps/yellowdot.xpm
deleted file mode 100644
index da0dddf..0000000
--- a/app/bin/bitmaps/yellowdot.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * yellowdot[] = {
-"16 16 8 1",
-" c None",
-". c #000000",
-"+ c #B69A19",
-"@ c #E0C504",
-"# c #EBD200",
-"$ c #CFB410",
-"% c #EFD947",
-"& c #EDD400",
-" ",
-" ",
-" .... ",
-" .+@##@+. ",
-" .$%%%&&&$. ",
-" +%%%%%&&&+ ",
-" .@%%%%%&&&@. ",
-" .#%%%%%&&&#. ",
-" .#&%%%&&&&#. ",
-" .@&&&&&&&&@. ",
-" +&&&&&&&&+ ",
-" .$&&&&&&$. ",
-" .+@##@+. ",
-" .... ",
-" ",
-" "};
diff --git a/app/bin/bitmaps/yellowstar.png b/app/bin/bitmaps/yellowstar.png
new file mode 100644
index 0000000..11ffe78
--- /dev/null
+++ b/app/bin/bitmaps/yellowstar.png
Binary files differ
diff --git a/app/bin/bitmaps/yellowstar.xpm b/app/bin/bitmaps/yellowstar.xpm
deleted file mode 100644
index 637ad9c..0000000
--- a/app/bin/bitmaps/yellowstar.xpm
+++ /dev/null
@@ -1,67 +0,0 @@
-/* XPM */
-static char * yellowstar[] = {
-"16 16 48 1",
-" c None",
-". c #AB9600",
-"+ c #AE9900",
-"@ c #D0B600",
-"# c #DBC000",
-"$ c #FFDF02",
-"% c #FFDF00",
-"& c #A28D00",
-"* c #766700",
-"= c #A59000",
-"- c #B09A00",
-"; c #BBA400",
-"> c #C5AC00",
-", c #DFC300",
-"' c #FFE111",
-") c #FFE00A",
-"! c #D2B800",
-"~ c #AC9700",
-"{ c #9B8800",
-"] c #948100",
-"^ c #9D8A00",
-"/ c #F6D700",
-"( c #FFE004",
-"_ c #FFE31D",
-": c #FFE10F",
-"< c #F2D400",
-"[ c #E5C800",
-"} c #917F00",
-"| c #CEB500",
-"1 c #FFE10E",
-"2 c #FCDC00",
-"3 c #F0D200",
-"4 c #C7AE00",
-"5 c #CCB300",
-"6 c #FADB00",
-"7 c #BEA600",
-"8 c #EED100",
-"9 c #ECCF00",
-"0 c #E6CA00",
-"a c #B8A100",
-"b c #988500",
-"c c #DABE00",
-"d c #A38F00",
-"e c #B69F00",
-"f c #897800",
-"g c #BFA700",
-"h c #8D7B00",
-"i c #877600",
-" ",
-" ",
-" ",
-" .+ ",
-" @# ",
-" $%& ",
-" *=-;>,')!~={] ",
-" ^#/('_:$<[@} ",
-" |%)1)234 ",
-" 52%6<7 ",
-" ,8390a ",
-" bccd;c| ",
-" &ef bg} ",
-" h i ",
-" ",
-" "};
diff --git a/app/bin/bitmaps/zero.png b/app/bin/bitmaps/zero.png
new file mode 100644
index 0000000..55a90cb
--- /dev/null
+++ b/app/bin/bitmaps/zero.png
Binary files differ
diff --git a/app/bin/bitmaps/zero.xpm b/app/bin/bitmaps/zero.xpm
deleted file mode 100644
index d3466d5..0000000
--- a/app/bin/bitmaps/zero.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * zero_xpm[] = {
-"6 16 2 1",
-" c None",
-". c #000000000000",
-" ",
-" .... ",
-"......",
-".. ..",
-".. ..",
-".. ..",
-".. ..",
-".. ..",
-".. ..",
-".. ..",
-".. ..",
-".. ..",
-".. ..",
-"......",
-" .... ",
-" "};