diff --git a/gpxsee.qrc b/gpxsee.qrc index 21e6e8e2..652940ec 100644 --- a/gpxsee.qrc +++ b/gpxsee.qrc @@ -157,6 +157,7 @@ icons/map/marine/buoy-red-white-red-white.png icons/map/marine/buoy-red-black.png icons/map/marine/buoy-red-green.png + icons/map/marine/buoy-red-yellow.png icons/map/marine/buoy-red-green-red.png icons/map/marine/buoy-red-green-red-green.png icons/map/marine/buoy-yellow.png @@ -167,6 +168,7 @@ icons/map/marine/buoy-yellow-red-yellow.png icons/map/marine/buoy-black-white.png icons/map/marine/buoy-black-red.png + icons/map/marine/buoy-black-white-black.png icons/map/marine/buoy-black-red-black.png icons/map/marine/buoy-black-green.png icons/map/marine/buoy-black-yellow.png @@ -190,6 +192,7 @@ icons/map/marine/beacon-red-white-red-white.png icons/map/marine/beacon-red-black.png icons/map/marine/beacon-red-green.png + icons/map/marine/beacon-red-yellow.png icons/map/marine/beacon-red-green-red.png icons/map/marine/beacon-red-green-red-green.png icons/map/marine/beacon-yellow.png @@ -199,6 +202,7 @@ icons/map/marine/beacon-yellow-black-yellow.png icons/map/marine/beacon-yellow-red-yellow.png icons/map/marine/beacon-black-white.png + icons/map/marine/beacon-black-white-black.png icons/map/marine/beacon-black-red.png icons/map/marine/beacon-black-red-black.png icons/map/marine/beacon-black-green.png diff --git a/icons/map/marine/beacon-black-white-black.png b/icons/map/marine/beacon-black-white-black.png new file mode 100644 index 00000000..ea4bbfea Binary files /dev/null and b/icons/map/marine/beacon-black-white-black.png differ diff --git a/icons/map/marine/beacon-red-yellow.png b/icons/map/marine/beacon-red-yellow.png new file mode 100644 index 00000000..82ec81b5 Binary files /dev/null and b/icons/map/marine/beacon-red-yellow.png differ diff --git a/icons/map/marine/buoy-black-white-black.png b/icons/map/marine/buoy-black-white-black.png new file mode 100644 index 00000000..98c3c018 Binary files /dev/null and b/icons/map/marine/buoy-black-white-black.png differ diff --git a/icons/map/marine/buoy-red-yellow.png b/icons/map/marine/buoy-red-yellow.png new file mode 100644 index 00000000..a1c2fdc4 Binary files /dev/null and b/icons/map/marine/buoy-red-yellow.png differ diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp index b8f87482..ea39fd16 100644 --- a/src/map/ENC/style.cpp +++ b/src/map/ENC/style.cpp @@ -43,6 +43,7 @@ using namespace Util; PNT(type, COLOR2(3, 1), ":/marine/" name "-red-white.png", dx, dy); \ PNT(type, COLOR2(3, 2), ":/marine/" name "-red-black.png", dx, dy); \ PNT(type, COLOR2(3, 4), ":/marine/" name "-red-green.png", dx, dy); \ + PNT(type, COLOR2(3, 6), ":/marine/" name "-red-yellow.png", dx, dy); \ PNT(type, COLOR2(4, 1), ":/marine/" name "-green-white.png", dx, dy); \ PNT(type, COLOR2(4, 2), ":/marine/" name "-green-black.png", dx, dy); \ PNT(type, COLOR2(4, 3), ":/marine/" name "-green-red.png", dx, dy); \ @@ -55,6 +56,7 @@ using namespace Util; PNT(type, COLOR3(1, 6, 1), ":/marine/" name "-white-yellow-white.png", dx, dy); \ PNT(type, COLOR3(1, 9, 1), ":/marine/" name "-white-yellow-white.png", dx, dy); \ PNT(type, COLOR3(1, 11, 1), ":/marine/" name "-white-yellow-white.png", dx, dy); \ + PNT(type, COLOR3(2, 1, 2), ":/marine/" name "-black-white-black.png", dx, dy); \ PNT(type, COLOR3(2, 3, 2), ":/marine/" name "-black-red-black.png", dx, dy); \ PNT(type, COLOR3(2, 6, 2), ":/marine/" name "-black-yellow-black.png", dx, dy); \ PNT(type, COLOR3(3, 4, 3), ":/marine/" name "-red-green-red.png", dx, dy); \