Permalink
Browse files

UI Theme support with Traditional and two new themes.

  • Loading branch information...
JesperWe authored and David Register committed Jun 11, 2012
1 parent 0d10546 commit 5b8c8b48be5c47ae7609dd2d11a9abc73d2f0617
Showing with 31,387 additions and 35,947 deletions.
  1. +32 −15 CMakeLists.txt
  2. +1 −369 include/chart1.h
  3. +59 −0 include/compasswin.h
  4. +2 −2 include/concanv.h
  5. +6 −0 include/ocpn_types.h
  6. +4 −2 include/options.h
  7. +1 −1 include/routeman.h
  8. +8 −7 include/statwin.h
  9. +200 −0 include/styles.h
  10. +368 −0 include/toolbar.h
  11. +1 −1 plugins/dashboard_pi/src/dashboard_pi.cpp
  12. +1 −1 plugins/grib_pi/src/grib_pi.cpp
  13. +4 −5 src/about.cpp
  14. +7 −3 src/ais.cpp
  15. +0 −8 src/bitmaps/README.TXT
  16. +0 −29 src/bitmaps/activepoint.xpm
  17. +0 −23 src/bitmaps/airplane.xpm
  18. BIN src/bitmaps/ais.png
  19. BIN src/bitmaps/ais_alarm.png
  20. BIN src/bitmaps/ais_alarm_active.png
  21. BIN src/bitmaps/ais_alive.png
  22. BIN src/bitmaps/ais_alive_active.png
  23. BIN src/bitmaps/ais_disabled.png
  24. BIN src/bitmaps/ais_supressed.png
  25. BIN src/bitmaps/ais_supressed_active.png
  26. +0 −21 src/bitmaps/anchor.xpm
  27. +0 −22 src/bitmaps/anchorage.xpm
  28. +0 −21 src/bitmaps/boarding.xpm
  29. +0 −23 src/bitmaps/boundary.xpm
  30. +0 −21 src/bitmaps/bouy1.xpm
  31. +0 −21 src/bitmaps/bouy2.xpm
  32. +0 −23 src/bitmaps/campfire.xpm
  33. +0 −21 src/bitmaps/camping.xpm
  34. +0 −21 src/bitmaps/circle.xpm
  35. BIN src/bitmaps/colscheme.png
  36. BIN src/bitmaps/compass.png
  37. +0 −22 src/bitmaps/coral.xpm
  38. +0 −43 src/bitmaps/create_all.sh
  39. BIN src/bitmaps/cross.png
  40. +0 −39 src/bitmaps/cross.xpm
  41. BIN src/bitmaps/current.png
  42. +0 −161 src/bitmaps/default_pi.xpm
  43. +0 −21 src/bitmaps/diamond.xpm
  44. BIN src/bitmaps/donate.png
  45. BIN src/bitmaps/down.png
  46. +0 −277 src/bitmaps/down.xpm
  47. +0 −20 src/bitmaps/empty.xpm
  48. BIN src/bitmaps/exitt.png
  49. +0 −22 src/bitmaps/fish.xpm
  50. +0 −22 src/bitmaps/fishhaven.xpm
  51. +0 −25 src/bitmaps/fishing.xpm
  52. +0 −22 src/bitmaps/float.xpm
  53. BIN src/bitmaps/follow.png
  54. +0 −22 src/bitmaps/food.xpm
  55. +0 −25 src/bitmaps/fuel.xpm
  56. BIN src/bitmaps/gps1.png
  57. BIN src/bitmaps/gps2.png
  58. BIN src/bitmaps/gps3.png
  59. BIN src/bitmaps/gpsGrn.png
  60. BIN src/bitmaps/gpsGry.png
  61. BIN src/bitmaps/gpsRed.png
  62. BIN src/bitmaps/gpsYel.png
  63. BIN src/bitmaps/gpx_export.png
  64. BIN src/bitmaps/gpx_import.png
  65. +0 −48 src/bitmaps/grabber.xpm
  66. +0 −22 src/bitmaps/greenlite.xpm
  67. BIN src/bitmaps/help.png
  68. +0 −283 src/bitmaps/icons.cpp
  69. +0 −67 src/bitmaps/icons.h
  70. BIN src/bitmaps/inviz.png
  71. +0 −21 src/bitmaps/kelp.xpm
  72. BIN src/bitmaps/left.png
  73. +0 −269 src/bitmaps/left.xpm
  74. +0 −22 src/bitmaps/light.xpm
  75. +0 −22 src/bitmaps/light1.xpm
  76. +0 −23 src/bitmaps/litevessel.xpm
  77. BIN src/bitmaps/mercprj.png
  78. BIN src/bitmaps/mob.png
  79. +0 −294 src/bitmaps/mob.xpm
  80. BIN src/bitmaps/mob_btn.png
  81. +0 −23 src/bitmaps/mooring.xpm
  82. +0 −23 src/bitmaps/oilbouy.xpm
  83. +0 −35 src/bitmaps/optimize_png.sh
  84. BIN src/bitmaps/pencil.png
  85. +0 −136 src/bitmaps/pencil.xpm
  86. +0 −23 src/bitmaps/platform.xpm
  87. +0 −134 src/bitmaps/png2wx.pl
  88. +0 −20 src/bitmaps/polyconic.xpm
  89. BIN src/bitmaps/print.png
  90. BIN src/bitmaps/redX.png
  91. +0 −23 src/bitmaps/redgreenlite.xpm
  92. +0 −22 src/bitmaps/redlite.xpm
  93. BIN src/bitmaps/right.png
  94. +0 −271 src/bitmaps/right.xpm
  95. +0 −21 src/bitmaps/rock1.xpm
  96. +0 −21 src/bitmaps/rock2.xpm
  97. BIN src/bitmaps/route.png
  98. BIN src/bitmaps/route_manager.png
  99. +0 −21 src/bitmaps/sand.xpm
  100. BIN src/bitmaps/scin.png
  101. BIN src/bitmaps/scout.png
  102. +0 −22 src/bitmaps/scuba.xpm
  103. BIN src/bitmaps/settings.png
  104. BIN src/bitmaps/ship_red.png
  105. +0 −23 src/bitmaps/shoal.xpm
  106. BIN src/bitmaps/skewprj.png
  107. +0 −21 src/bitmaps/snag.xpm
  108. BIN src/bitmaps/sort_asc.png
  109. BIN src/bitmaps/sort_desc.png
  110. +0 −21 src/bitmaps/square.xpm
  111. +1,285 −0 src/bitmaps/styles.xml
  112. BIN src/bitmaps/text.png
  113. BIN src/bitmaps/tide.png
  114. BIN src/bitmaps/tidesml.png
  115. BIN src/bitmaps/tmercprj.png
  116. BIN src/bitmaps/toolicons_journeyman.png
  117. BIN src/bitmaps/toolicons_journeyman_flat.png
  118. BIN src/bitmaps/toolicons_traditional.png
  119. BIN src/bitmaps/trackoff.png
  120. BIN src/bitmaps/trackon.png
  121. +0 −21 src/bitmaps/triangle.xpm
  122. BIN src/bitmaps/up.png
  123. +0 −281 src/bitmaps/up.xpm
  124. BIN src/bitmaps/viz.png
  125. +0 −21 src/bitmaps/wreck1.xpm
  126. +0 −22 src/bitmaps/wreck2.xpm
  127. +0 −21 src/bitmaps/xmblue.xpm
  128. +0 −21 src/bitmaps/xmgreen.xpm
  129. +0 −21 src/bitmaps/xmred.xpm
  130. BIN src/bitmaps/zoomin.png
  131. BIN src/bitmaps/zoomout.png
  132. +5,981 −9,978 src/chart1.cpp
  133. +683 −669 src/chartsymbols.cpp
  134. +10,842 −12,380 src/chcanv.cpp
  135. +228 −0 src/compasswin.cpp
  136. +40 −29 src/concanv.cpp
  137. +9 −0 src/navutil.cpp
  138. +2,214 −2,243 src/options.cpp
  139. +6 −2 src/pluginmanager.cpp
  140. +421 −422 src/razdsparser.cpp
  141. +61 −156 src/routeman.cpp
  142. +5,570 −5,619 src/s52plib.cpp
  143. +764 −729 src/statwin.cpp
  144. +805 −0 src/styles.cpp
  145. +1,784 −0 src/toolbar.cpp
View
@@ -290,8 +290,8 @@ ENDIF (NOT WIN32)
#FILE(GLOB_RECURSE SRCS *.cpp *.c)
SET(HDRS
- include/ocpn_types.h
- include/ocpndc.h
+ include/ocpn_types.h
+ include/ocpndc.h
include/chart1.h
include/bbox.h
include/ocpn_pixel.h
@@ -313,20 +313,23 @@ SET(HDRS
include/wvschart.h
include/about.h
include/ais.h
- include/pluginmanager.h
- include/ocpn_plugin.h
+ include/pluginmanager.h
+ include/ocpn_plugin.h
include/gpxdocument.h
- include/wx/json_defs.h
- include/wx/jsonwriter.h
- include/chartsymbols.h
- include/razdsparser.h
+ include/wx/json_defs.h
+ include/wx/jsonwriter.h
+ include/chartsymbols.h
+ include/razdsparser.h
+ include/styles.h
+ include/toolbar.h
+ include/compasswin.h
)
SET(SRCS
src/chart1.cpp
src/bbox.cpp
src/ocpn_pixel.cpp
- src/ocpndc.cpp
+ src/ocpndc.cpp
src/chartdb.cpp
src/chartdbs.cpp
src/chartimg.cpp
@@ -345,13 +348,15 @@ SET(SRCS
src/wvschart.cpp
src/about.cpp
src/ais.cpp
- src/pluginmanager.cpp
+ src/pluginmanager.cpp
src/gpxdocument.cpp
- src/wxJSON/jsonwriter.cpp
- src/wxJSON/jsonval.cpp
- src/chartsymbols.cpp
- src/razdsparser.cpp
-
+ src/wxJSON/jsonwriter.cpp
+ src/wxJSON/jsonval.cpp
+ src/chartsymbols.cpp
+ src/razdsparser.cpp
+ src/styles.cpp
+ src/toolbar.cpp
+ src/compasswin.cpp
)
IF(wx_Version MATCHES "2.9")
@@ -575,6 +580,13 @@ SET(wvsData
data/wvsdata/wvs43.dat
)
+SET(uiData
+ src/bitmaps/styles.xml
+ src/bitmaps/toolicons_journeyman.png
+ src/bitmaps/toolicons_journeyman_flat.png
+ src/bitmaps/toolicons_traditional.png
+ )
+
IF (USE_S57)
SET(s57data
data/s57data/attdecode.csv
@@ -645,6 +657,8 @@ IF(APPLE)
SET_SOURCE_FILES_PROPERTIES(
${wvsData} PROPERTIES MACOSX_PACKAGE_LOCATION SharedSupport/wvsdata )
+SET_SOURCE_FILES_PROPERTIES(
+ ${uiData} PROPERTIES MACOSX_PACKAGE_LOCATION SharedSupport/uidata )
SET_SOURCE_FILES_PROPERTIES(
${s57data} PROPERTIES MACOSX_PACKAGE_LOCATION SharedSupport/s57data )
SET_SOURCE_FILES_PROPERTIES(
@@ -673,6 +687,7 @@ ADD_EXECUTABLE(${PACKAGE_NAME} MACOSX_BUNDLE
${HDRS}
${SRCS}
${wvsData}
+ ${uidata}
${s57data}
${tcData}
data/license.txt
@@ -772,6 +787,8 @@ ENDIF(WIN32)
INSTALL(FILES ${wvsData} DESTINATION ${PREFIX_PKGDATA}/wvsdata PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+INSTALL(FILES ${uiData} DESTINATION ${PREFIX_PKGDATA}/uidata PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+
IF (USE_S57)
INSTALL(FILES ${s57data} DESTINATION ${PREFIX_PKGDATA}/s57data PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
ENDIF (USE_S57)
Oops, something went wrong.

0 comments on commit 5b8c8b4

Please sign in to comment.