Changeset 24665 in osm

Timestamp:

2010-12-09T15:01:36+01:00 (14 years ago)

Author:

malcolmh

Message:

buttons & tips

Location:

applications/editors/josm/plugins/smed/plugs/oseam/src

Files:

• images/AmberButton.png (modified) ( previous)
• images/AmberButton.svg (modified) (4 diffs)
• images/BarrelButton.png (modified) ( previous)
• images/BarrelButton.svg (modified) (3 diffs)
• images/BeaconButton.png (modified) ( previous)
• images/BeaconButton.svg (modified) (3 diffs)
• images/BlackButton.png (modified) ( previous)
• images/BlackButton.svg (modified) (4 diffs)
• images/BlueButton.png (modified) ( previous)
• images/BlueButton.svg (modified) (4 diffs)
• images/CanButton.png (modified) ( previous)
• images/CanButton.svg (modified) (3 diffs)
• images/CardEButton.png (modified) ( previous)
• images/CardEButton.svg (modified) (5 diffs)
• images/CardNButton.png (modified) ( previous)
• images/CardNButton.svg (modified) (3 diffs)
• images/CardSButton.png (modified) ( previous)
• images/CardSButton.svg (modified) (4 diffs)
• images/CardWButton.png (modified) ( previous)
• images/CardWButton.svg (modified) (4 diffs)
• images/ChanButton.png (modified) ( previous)
• images/ChanButton.svg (modified) (4 diffs)
• images/ConeButton.png (modified) ( previous)
• images/ConeButton.svg (modified) (3 diffs)
• images/FloatButton.png (modified) ( previous)
• images/FloatButton.svg (modified) (3 diffs)
• images/FogButton.png (modified) ( previous)
• images/FogButton.svg (modified) (5 diffs)
• images/GreenButton.png (modified) ( previous)
• images/GreenButton.svg (modified) (4 diffs)
• images/HazButton.png (modified) ( previous)
• images/HazButton.svg (modified) (4 diffs)
• images/IsolButton.png (modified) ( previous)
• images/IsolButton.svg (modified) (4 diffs)
• images/LightFloatButton.png (modified) ( previous)
• images/LightFloatButton.svg (modified) (3 diffs)
• images/LightMajorButton.png (modified) ( previous)
• images/LightMajorButton.svg (modified) (3 diffs)
• images/LightMinorButton.png (modified) ( previous)
• images/LightVesselButton.png (modified) ( previous)
• images/LightVesselButton.svg (modified) (3 diffs)
• images/LighthouseButton.png (modified) ( previous)
• images/LighthouseButton.svg (modified) (3 diffs)
• images/LightsButton.png (modified) ( previous)
• images/LightsButton.svg (modified) (5 diffs)
• images/LitButton.png (modified) ( previous)
• images/LitButton.svg (modified) (5 diffs)
• images/OrangeButton.png (modified) ( previous)
• images/OrangeButton.svg (modified) (3 diffs)
• images/PerchPButton.png (modified) ( previous)
• images/PerchPButton.svg (modified) (3 diffs)
• images/PerchSButton.png (modified) ( previous)
• images/PerchSButton.svg (modified) (4 diffs)
• images/PillarButton.png (modified) ( previous)
• images/PillarButton.svg (modified) (3 diffs)
• images/PortButton.png (modified) ( previous)
• images/PortButton.svg (modified) (3 diffs)
• images/PrefPortButton.png (modified) ( previous)
• images/PrefPortButton.svg (modified) (3 diffs)
• images/PrefStbdButton.png (modified) ( previous)
• images/PrefStbdButton.svg (modified) (3 diffs)
• images/RadarButton.png (modified) ( previous)
• images/RadarButton.svg (modified) (5 diffs)
• images/RedButton.png (modified) ( previous)
• images/RedButton.svg (modified) (4 diffs)
• images/RegionAButton.png (modified) ( previous)
• images/RegionAButton.svg (modified) (5 diffs)
• images/RegionBButton.png (modified) ( previous)
• images/RegionBButton.svg (modified) (6 diffs)
• images/SafeWaterButton.png (modified) ( previous)
• images/SafeWaterButton.svg (modified) (4 diffs)
• images/SparButton.png (modified) ( previous)
• images/SparButton.svg (modified) (3 diffs)
• images/SpecButton.png (modified) ( previous)
• images/SpecButton.svg (modified) (3 diffs)
• images/SphereButton.png (modified) ( previous)
• images/SphereButton.svg (modified) (3 diffs)
• images/StakeButton.png (modified) ( previous)
• images/StakeButton.svg (modified) (3 diffs)
• images/StbdButton.png (modified) ( previous)
• images/StbdButton.svg (modified) (3 diffs)
• images/SuperButton.png (modified) ( previous)
• images/SuperButton.svg (modified) (3 diffs)
• images/TopButton.png (modified) ( previous)
• images/TopButton.svg (modified) (5 diffs)
• images/TowerButton.png (modified) ( previous)
• images/TowerButton.svg (modified) (3 diffs)
• images/VioletButton.png (modified) ( previous)
• images/VioletButton.svg (modified) (4 diffs)
• images/WhiteButton.png (modified) ( previous)
• images/WhiteButton.svg (modified) (4 diffs)
• images/YellowButton.png (modified) ( previous)
• images/YellowButton.svg (modified) (4 diffs)
• oseam/dialogs/OSeaMAction.java (modified) (4 diffs)
• oseam/msg/messages.properties (modified) (1 diff)
• oseam/msg/messages_de.properties (modified) (2 diffs)
• oseam/msg/messages_en.properties (modified) (1 diff)
• oseam/panels/PanelHaz.java (modified) (5 diffs)
• oseam/panels/PanelLights.java (modified) (5 diffs)
• oseam/panels/PanelPort.java (modified) (9 diffs)
• oseam/panels/PanelPrefPort.java (modified) (8 diffs)
• oseam/panels/PanelPrefStbd.java (modified) (8 diffs)
• oseam/panels/PanelSafeWater.java (modified) (5 diffs)
• oseam/panels/PanelSpec.java (modified) (19 diffs)
• oseam/panels/PanelStbd.java (modified) (9 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/src/images/AmberButton.svg

@@ -11 +11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
+   width="30"
+   height="30"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="OrangeButton.svg"
+   sodipodi:docname="AmberButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OrangeButton.png"
    inkscape:export-xdpi="90"
@@ -2896 +2896 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-5.039281"
+     inkscape:cx="12.112134"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -2924 +2924 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2932 +2932 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1020.3622)"
+     transform="translate(0,-1022.3622)"
      style="display:inline">
-    <rect
-       y="1020.488"
-       x="0.12588699"
-       height="31.748224"
-       width="31.748226"
-       id="rect3618"
-       style="fill:#ffbf00;fill-opacity:1;stroke:#000000;stroke-width:0.25177398000000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/RedButton.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffbf00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path8131"
+       sodipodi:cx="14.628272"
+       sodipodi:cy="14.576233"
+       sodipodi:rx="14.539884"
+       sodipodi:ry="14.539884"
+       d="m 29.168156,14.576233 a 14.539884,14.539884 0 1 1 -29.07976756,0 14.539884,14.539884 0 1 1 29.07976756,0 z"
+       transform="matrix(0.99734814,0,0,0.99734814,0.41052003,1022.8246)" />
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="4.8613586"
+       y="1041.2253"
+       id="text8133"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan8135"
+         x="4.8613586"
+         y="1041.2253">Am</tspan></text>
   </g>
 </svg>

applications/editors/josm/plugins/smed/plugs/oseam/src/images/BarrelButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658387,0.41488489,224.30043)" />
     <linearGradient
        inkscape:collect="always"
@@ -2649 +2649 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="20.705008"
+     inkscape:cx="4.353163"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -2688 +2688 @@
      style="display:inline">
     <rect
-       y="1020.484"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846865" />
     <g
        transform="matrix(0.2,0,0,0.2,-14.853461,1011.2262)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/BeaconButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658387,0.41488489,224.30043)" />
     <linearGradient
        inkscape:collect="always"
@@ -4035 +4035 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="20.705008"
+     inkscape:cx="4.353163"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -4074 +4074 @@
      style="display:inline">
     <rect
-       y="1020.484"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846865" />
     <g
        transform="matrix(0.2,0,0,0.2,-14.950987,1018.4848)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/BlackButton.svg

@@ -11 +11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
+   width="30"
+   height="30"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="RadarButton.svg"
+   sodipodi:docname="BlackButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/FogButton.png"
    inkscape:export-xdpi="90"
@@ -2896 +2896 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-5.039281"
-     inkscape:cy="14.585448"
+     inkscape:cx="-21.391126"
+     inkscape:cy="15.827314"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -2924 +2924 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2932 +2932 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1020.3622)"
+     transform="translate(0,-1022.3622)"
      style="display:inline">
-    <rect
-       y="1020.488"
-       x="0.12588699"
-       height="31.748224"
-       width="31.748226"
-       id="rect3618"
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.25177398000000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path9522"
+       sodipodi:cx="14.584078"
+       sodipodi:cy="14.664621"
+       sodipodi:rx="14.672466"
+       sodipodi:ry="14.628272"
+       d="m 29.256544,14.664621 a 14.672466,14.628272 0 1 1 -29.34493244,0 14.672466,14.628272 0 1 1 29.34493244,0 z"
+       transform="matrix(0.98858377,0,0,0.99157043,0.58241737,1022.8211)" />
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="10.69499"
+       y="1041.9324"
+       id="text9524"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan9526"
+         x="10.69499"
+         y="1041.9324">B</tspan></text>
   </g>
 </svg>

applications/editors/josm/plugins/smed/plugs/oseam/src/images/BlueButton.svg

@@ -11 +11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
+   width="30"
+   height="30"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="GreenButton.svg"
+   sodipodi:docname="BlueButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/GreenButton.png"
    inkscape:export-xdpi="90"
@@ -2896 +2896 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-5.039281"
-     inkscape:cy="14.585448"
+     inkscape:cx="-9.8990353"
+     inkscape:cy="16.53442"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -2924 +2924 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2932 +2932 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1020.3622)"
+     transform="translate(0,-1022.3622)"
      style="display:inline">
-    <rect
-       y="1020.488"
-       x="0.12588699"
-       height="31.748224"
-       width="31.748226"
-       id="rect3618"
-       style="fill:#0000ff;fill-opacity:1;stroke:#000000;stroke-width:0.25177398000000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/RedButton.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#0000ff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path10913"
+       sodipodi:cx="14.584078"
+       sodipodi:cy="14.664621"
+       sodipodi:rx="14.672466"
+       sodipodi:ry="14.71666"
+       d="m 29.256544,14.664621 a 14.672466,14.71666 0 1 1 -29.34493244,0 14.672466,14.71666 0 1 1 29.34493244,0 z"
+       transform="matrix(0.98868191,0,0,0.98571295,0.5809862,1022.9071)" />
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="6.0987964"
+       y="1041.4021"
+       id="text10915"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan10917"
+         x="6.0987964"
+         y="1041.4021">Bu</tspan></text>
   </g>
 </svg>

applications/editors/josm/plugins/smed/plugs/oseam/src/images/CanButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658387,0.41488489,224.30043)" />
     <linearGradient
        inkscape:collect="always"
@@ -2166 +2166 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="20.705008"
+     inkscape:cx="4.353163"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -2205 +2205 @@
      style="display:inline">
     <rect
-       y="1020.484"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846865" />
     <g
        transform="matrix(0.2,0,0,0.2,-14.870755,1011.8858)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardEButton.svg

@@ -11 +11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="60"
+   width="50"
    height="32"
    id="svg2"
@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.59953219,0,0,0.80259616,0.02186308,207.76946)" />
+       gradientTransform="matrix(0.49345889,0,0,0.78853394,0.32579679,222.28719)" />
     <linearGradient
        inkscape:collect="always"
@@ -227 +227 @@
      inkscape:pageshadow="2"
      inkscape:zoom="23.758788"
-     inkscape:cx="29.158592"
+     inkscape:cx="21.372"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -266 +266 @@
      style="display:inline">
     <rect
-       y="1020.5345"
-       x="0.1723098"
-       height="31.65538"
-       width="59.65538"
+       y="1020.8117"
+       x="0.44962546"
+       height="31.10075"
+       width="49.10075"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3446196;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.89925092;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.1153665"
+       ry="4.9123955" />
     <path
        style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 37.576781,1036.9239 -14.983929,-0.042 7.449875,10.5224 7.534054,-10.4803 z"
+       d="M 32.483929,1036.9239 17.5,1036.8819 l 7.449875,10.5224 7.534054,-10.4803 z"
        id="path2871"
        sodipodi:nodetypes="cccc" />
@@ -280 +282 @@
        sodipodi:nodetypes="cccc"
        id="path3645"
-       d="m 22.592852,1035.9137 14.983929,0 -7.491965,-10.5224 -7.491964,10.5224 z"
+       d="m 17.5,1035.9137 14.983929,0 -7.491965,-10.5224 L 17.5,1035.9137 z"
        style="fill:#000000;fill-opacity:1;stroke:none" />
   </g>

applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardNButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
+       gradientTransform="matrix(0.49262,0,0,0.78641747,0.36774549,224.47224)" />
     <linearGradient
        inkscape:collect="always"
@@ -227 +227 @@
      inkscape:pageshadow="2"
      inkscape:zoom="16.8"
-     inkscape:cx="18.528662"
+     inkscape:cx="7.5167572"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -266 +266 @@
      style="display:inline">
     <rect
-       y="1020.5195"
-       x="0.15732755"
-       height="31.685345"
-       width="49.685345"
+       y="1020.8536"
+       x="0.49136364"
+       height="31.017273"
+       width="49.017273"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.98272729;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.9327693"
+       ry="4.8945775" />
     <path
        style="fill:#000000;fill-opacity:1;stroke:none"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardSButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
+       gradientTransform="matrix(0.49251421,0,0,0.80352693,0.37303504,206.46592)" />
     <linearGradient
        inkscape:collect="always"
@@ -218 +218 @@
        inkscape:vp_x="0 : 160 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3606"
+       id="linearGradient11776"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.49262,0,0,0.78641747,0.36774549,224.47224)"
+       x1="50.002548"
+       y1="1012.4216"
+       x2="50.002548"
+       y2="1052.3596" />
   </defs>
   <sodipodi:namedview
@@ -227 +237 @@
      inkscape:pageshadow="2"
      inkscape:zoom="16.8"
-     inkscape:cx="18.409614"
+     inkscape:cx="7.3977092"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -266 +276 @@
      style="display:inline">
     <rect
-       y="1020.5195"
-       x="0.15732755"
-       height="31.685345"
-       width="49.685345"
+       y="1020.8536"
+       x="0.49136364"
+       height="31.017273"
+       width="49.017273"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient11776);fill-opacity:1;stroke:#000000;stroke-width:0.98272729;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.9327693"
+       ry="4.8945775" />
     <path
        style="fill:#000000;fill-opacity:1;stroke:none"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardWButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
+       gradientTransform="matrix(0.49262,0,0,0.78641747,0.36774549,224.47224)" />
     <linearGradient
        inkscape:collect="always"
@@ -227 +227 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.879394"
-     inkscape:cx="26.847728"
+     inkscape:cx="11.274543"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -255 +255 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -266 +266 @@
      style="display:inline">
     <rect
-       y="1020.5195"
-       x="0.15732755"
-       height="31.685345"
-       width="49.685345"
+       y="1020.8536"
+       x="0.49136364"
+       height="31.017273"
+       width="49.017273"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.98272729;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.9327693"
+       ry="4.8945775" />
     <path
        style="fill:#000000;fill-opacity:1;stroke:none"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/ChanButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.59912248,0,0,1.004396,0.04234889,-4.5667837)" />
+       gradientTransform="matrix(0.5930728,0,0,0.98913378,0.3448493,11.189869)" />
     <linearGradient
        inkscape:collect="always"
@@ -94 +94 @@
      inkscape:pageshadow="2"
      inkscape:zoom="16.8"
-     inkscape:cx="24.376189"
+     inkscape:cx="25.269046"
      inkscape:cy="24.109257"
      inkscape:document-units="px"
@@ -133 +133 @@
      style="display:inline">
     <rect
-       y="1012.5549"
-       x="0.1926928"
-       height="39.614613"
-       width="59.614613"
+       y="1012.856"
+       x="0.49367511"
+       height="39.01265"
+       width="59.01265"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3853856;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.98735023;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.9495125"
+       ry="4.9240227" />
     <rect
        style="fill:#d40000;fill-opacity:1;stroke:#000000;stroke-width:0.78358072;stroke-opacity:1"
@@ -165 +167 @@
        sodipodi:rx="10.684524"
        sodipodi:ry="9.6428576"
-       d="m 36.190476,11.369047 a 10.684524,9.6428576 0 1 1 -21.369047,0 10.684524,9.6428576 0 1 1 21.369047,0 z"
+       d="m 36.190476,11.369047 c 0,5.325603 -4.783624,9.642858 -10.684523,9.642858 -5.9009,0 -10.684524,-4.317255 -10.684524,-9.642858 0,-5.325603 4.783624,-9.6428574 10.684524,-9.6428574 5.900899,0 10.684523,4.3172544 10.684523,9.6428574 z"
        transform="matrix(0.7128465,0,0,0.78804359,11.900236,1015.3897)"
        inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/ConeButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658387,0.41488489,224.30043)" />
     <linearGradient
        inkscape:collect="always"
@@ -2327 +2327 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="20.705008"
+     inkscape:cx="4.353163"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -2366 +2366 @@
      style="display:inline">
     <rect
-       y="1020.484"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846865" />
     <g
        id="g3653"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/FloatButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658387,0.41488489,224.30043)" />
     <linearGradient
        inkscape:collect="always"
@@ -2978 +2978 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="10.010017"
+     inkscape:cx="-6.341828"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -3017 +3017 @@
      style="display:inline">
     <rect
-       y="1020.484"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846865" />
     <g
        transform="matrix(0.2,0,0,0.2,-14.985176,1015.5874)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/FogButton.svg

@@ -16 +16 @@
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="LightButton.svg"
+   sodipodi:docname="FogButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/LightButton.png"
    inkscape:export-xdpi="90"
@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.31906733,0,0,0.80495018,0.04582017,205.33918)" />
+       gradientTransform="matrix(0.31177734,0,0,0.78655888,0.41033864,224.32632)" />
     <linearGradient
        inkscape:collect="always"
@@ -1844 +1844 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="11.312564"
+     inkscape:cx="-5.039281"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -1872 +1872 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -1883 +1883 @@
      style="display:inline">
     <rect
-       y="1020.488"
-       x="0.12588699"
-       height="31.748224"
-       width="31.748226"
+       y="1020.8508"
+       x="0.48857608"
+       height="31.022848"
+       width="31.022848"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.25177398;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.97715217;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.8857608"
+       ry="4.8857613" />
     <g
        style="display:inline"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/GreenButton.svg

@@ -11 +11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
+   width="30"
+   height="30"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="YellowButton.svg"
+   sodipodi:docname="GreenButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/YellowButton.png"
    inkscape:export-xdpi="90"
@@ -2896 +2896 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-5.039281"
-     inkscape:cy="14.585448"
+     inkscape:cx="-21.391126"
+     inkscape:cy="14.943429"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -2924 +2924 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2932 +2932 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1020.3622)"
+     transform="translate(0,-1022.3622)"
      style="display:inline">
-    <rect
-       y="1020.488"
-       x="0.12588699"
-       height="31.748224"
-       width="31.748226"
-       id="rect3618"
-       style="fill:#00ff00;fill-opacity:1;stroke:#000000;stroke-width:0.25177398000000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/RedButton.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#00ff00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path12304"
+       sodipodi:cx="14.672466"
+       sodipodi:cy="14.75301"
+       sodipodi:rx="14.584078"
+       sodipodi:ry="14.628272"
+       d="m 29.256544,14.75301 a 14.584078,14.628272 0 1 1 -29.16815556,0 14.584078,14.628272 0 1 1 29.16815556,0 z"
+       transform="matrix(0.99447589,0,0,0.99147142,0.40858608,1022.735)" />
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="10.16466"
+       y="1041.5789"
+       id="text12306"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan12308"
+         x="10.16466"
+         y="1041.5789">G</tspan></text>
   </g>
 </svg>

applications/editors/josm/plugins/smed/plugs/oseam/src/images/HazButton.svg

@@ -55 +55 @@
        y2="1052.3623"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.59911932,0,0,1.0028484,0.04403199,-2.9405696)" />
+       gradientTransform="matrix(0.59309343,0,0,0.98766919,0.34532731,12.729805)" />
   </defs>
   <sodipodi:namedview
@@ -65 +65 @@
      inkscape:pageshadow="2"
      inkscape:zoom="16.8"
-     inkscape:cx="21.187585"
+     inkscape:cx="29.223299"
      inkscape:cy="17.390374"
      inkscape:document-units="px"
@@ -104 +104 @@
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient5451);fill-opacity:1;stroke:#000000;stroke-width:0.38782403;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:url(#linearGradient5451);fill-opacity:1;stroke:#000000;stroke-width:0.9873997;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect4923"
-       width="59.612175"
-       height="39.612175"
-       x="0.19391201"
-       y="1012.5562" />
+       width="59.0126"
+       height="39.0126"
+       x="0.49369985"
+       y="1012.8559"
+       rx="4.9497104"
+       ry="4.9243193" />
     <path
        style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.89626366px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -138 +140 @@
        sodipodi:rx="4.6130953"
        sodipodi:ry="4.5833335"
-       d="m 30.238095,18.154762 a 4.6130953,4.5833335 0 1 1 -9.22619,0 4.6130953,4.5833335 0 1 1 9.22619,0 z"
+       d="m 30.238095,18.154762 c 0,2.531305 -2.065353,4.583334 -4.613095,4.583334 -2.547742,0 -4.613095,-2.052029 -4.613095,-4.583334 0,-2.531305 2.065353,-4.583333 4.613095,-4.583333 2.547742,0 4.613095,2.052028 4.613095,4.583333 z"
        transform="matrix(0.97349799,0,0,0.97981954,5.0094661,1004.6483)" />
     <path
        transform="matrix(0.97349799,0,0,0.97981954,4.9797042,1014.559)"
-       d="m 30.238095,18.154762 a 4.6130953,4.5833335 0 1 1 -9.22619,0 4.6130953,4.5833335 0 1 1 9.22619,0 z"
+       d="m 30.238095,18.154762 c 0,2.531305 -2.065353,4.583334 -4.613095,4.583334 -2.547742,0 -4.613095,-2.052029 -4.613095,-4.583334 0,-2.531305 2.065353,-4.583333 4.613095,-4.583333 2.547742,0 4.613095,2.052028 4.613095,4.583333 z"
        sodipodi:ry="4.5833335"
        sodipodi:rx="4.6130953"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/IsolButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.49933406,0,0,0.8033559,0.03202456,206.98513)" />
+       gradientTransform="matrix(0.49261999,0,0,0.78641747,0.36774548,224.47224)" />
     <linearGradient
        inkscape:collect="always"
@@ -227 +227 @@
      inkscape:pageshadow="2"
      inkscape:zoom="8.4000001"
-     inkscape:cx="20.720478"
+     inkscape:cx="-1.3033313"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -266 +266 @@
      style="display:inline">
     <rect
-       y="1020.5195"
-       x="0.15732755"
-       height="31.685345"
-       width="49.685345"
+       y="1020.8536"
+       x="0.49136364"
+       height="31.017273"
+       width="49.017273"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.98272729;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.9327693"
+       ry="4.8945775" />
     <path
        sodipodi:type="arc"
@@ -280 +282 @@
        sodipodi:rx="5.0892859"
        sodipodi:ry="5"
-       d="M 17.738095,12 A 5.0892859,5 0 1 1 7.5595236,12 5.0892859,5 0 1 1 17.738095,12 z"
+       d="m 17.738095,12 c 0,2.761424 -2.278551,5 -5.089286,5 -2.8107345,0 -5.0892854,-2.238576 -5.0892854,-5 0,-2.7614237 2.2785509,-5 5.0892854,-5 2.810735,0 5.089286,2.2385763 5.089286,5 z"
        transform="matrix(1.1789473,0,0,1.2,10.08772,1015.9622)" />
     <path
        transform="matrix(1.1789473,0,0,1.2,10.08772,1027.9622)"
-       d="M 17.738095,12 A 5.0892859,5 0 1 1 7.5595236,12 5.0892859,5 0 1 1 17.738095,12 z"
+       d="m 17.738095,12 c 0,2.761424 -2.278551,5 -5.089286,5 -2.8107345,0 -5.0892854,-2.238576 -5.0892854,-5 0,-2.7614237 2.2785509,-5 5.0892854,-5 2.810735,0 5.089286,2.2385763 5.089286,5 z"
        sodipodi:ry="5"
        sodipodi:rx="5.0892859"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightFloatButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515287,0.04684594,205.12988)" />
+       gradientTransform="matrix(0.29168742,0,0,0.78658389,0.41488488,224.30038)" />
     <linearGradient
        inkscape:collect="always"
@@ -2502 +2502 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.879394"
-     inkscape:cx="24.192008"
+     inkscape:cx="8.618823"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -2541 +2541 @@
      style="display:inline">
     <rect
-       y="1020.484"
-       x="0.12188905"
-       height="31.75622"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808098"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377811;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.97616196;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846869" />
     <g
        transform="matrix(0.2,0,0,0.2,-14.943084,1015.5914)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightMajorButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515291,0.04684594,205.12989)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658389,0.4148849,224.30038)" />
     <linearGradient
        inkscape:collect="always"
@@ -1305 +1305 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.879394"
-     inkscape:cx="24.192008"
+     inkscape:cx="8.618823"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -1344 +1344 @@
      style="display:inline">
     <rect
-       y="1020.4841"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377811;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846865" />
     <g
        transform="matrix(0.2,0,0,0.2,-14.966032,1005.0587)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightVesselButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515291,0.04684594,205.12989)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658389,0.4148849,224.30038)" />
     <linearGradient
        inkscape:collect="always"
@@ -2173 +2173 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.879394"
-     inkscape:cx="24.192008"
+     inkscape:cx="8.618823"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -2212 +2212 @@
      style="display:inline">
     <rect
-       y="1020.4841"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377811;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846865" />
     <g
        transform="matrix(0.2,0,0,0.2,-15.020417,1015.5111)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/LighthouseButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515291,0.04684594,205.12989)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658389,0.4148849,224.30038)" />
     <linearGradient
        inkscape:collect="always"
@@ -766 +766 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.879394"
-     inkscape:cx="24.192008"
+     inkscape:cx="8.618823"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -805 +805 @@
      style="display:inline">
     <rect
-       y="1020.4841"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377811;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846865" />
     <g
        transform="matrix(0.2,0,0,0.2,-15.055419,1005.1792)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightsButton.svg

@@ -1133 +1133 @@
        y2="1052.3622"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.59911867,0,0,1.0028502,0.04406036,-2.9424675)" />
+       gradientTransform="matrix(0.59309517,0,0,0.98767692,0.34523459,12.721869)" />
   </defs>
   <sodipodi:namedview
@@ -1143 +1143 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.879394"
-     inkscape:cx="32.420093"
+     inkscape:cx="16.846908"
      inkscape:cy="14.533528"
      inkscape:document-units="px"
@@ -1182 +1182 @@
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient4900);fill-opacity:1;stroke:#000000;stroke-width:0.38807189;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:url(#linearGradient4900);fill-opacity:1;stroke:#000000;stroke-width:0.9874047;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect4370"
-       width="59.611927"
-       height="39.611931"
-       x="0.19403595"
-       y="1012.5562"
+       width="59.012596"
+       height="39.012596"
+       x="0.49370235"
+       y="1012.8558"
        inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/LightsButton.png"
        inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       inkscape:export-ydpi="90"
+       rx="4.9497304"
+       ry="4.9243493" />
     <g
        transform="matrix(0.24,0,0,0.24,-5.9369293,995.96112)"
@@ -1245 +1247 @@
        sodipodi:rx="20.863094"
        sodipodi:ry="18.571428"
-       d="M 5.1814965,31.127108 A 20.863094,18.571428 0 0 1 13.379492,18.691468"
+       d="m 5.1814965,31.127108 c 0.7396451,-4.958864 3.69536,-9.442424 8.1979955,-12.43564"
        transform="matrix(1.0723689,0,0,1.2014911,2.3755149,994.01712)"
        sodipodi:start="3.273593"
@@ -1255 +1257 @@
        sodipodi:start="5.3457358"
        transform="matrix(1.0723689,0,0,1.2014911,2.3755149,994.07664)"
-       d="m 38.210829,18.601908 a 20.863094,18.571428 0 0 1 8.329355,12.495165"
+       d="m 38.210829,18.601908 c 4.567507,2.985326 7.574378,7.496041 8.329355,12.495165"
        sodipodi:ry="18.571428"
        sodipodi:rx="20.863094"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/LitButton.svg

@@ -16 +16 @@
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="CardEButton.svg"
+   sodipodi:docname="LitButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/CardWButton_de.png"
    inkscape:export-xdpi="90"
@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.31906733,0,0,0.80495018,0.04582017,205.33918)" />
+       gradientTransform="matrix(0.31177734,0,0,0.78655888,0.41033864,224.32632)" />
     <linearGradient
        inkscape:collect="always"
@@ -1305 +1305 @@
      inkscape:pageshadow="2"
      inkscape:zoom="22.627417"
-     inkscape:cx="4.241496"
+     inkscape:cx="8.4399425"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -1333 +1333 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -1344 +1344 @@
      style="display:inline">
     <rect
-       y="1020.488"
-       x="0.12588699"
-       height="31.748224"
-       width="31.748226"
+       y="1020.8508"
+       x="0.48857608"
+       height="31.022848"
+       width="31.022848"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.25177398;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.97715217;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.8857608"
+       ry="4.8857613" />
     <g
        transform="matrix(0.2,0,0,0.2,-21.427059,1000.8281)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/OrangeButton.svg

@@ -11 +11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
+   width="30"
+   height="30"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="RedButton.svg"
-   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/WhiteButton.png"
+   sodipodi:docname="OrangeButton.svg"
+   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OrangeButton.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
@@ -2896 +2896 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-5.039281"
-     inkscape:cy="14.585448"
+     inkscape:cx="-12.091135"
+     inkscape:cy="18.655741"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -2932 +2932 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1020.3622)"
+     transform="translate(0,-1022.3622)"
      style="display:inline">
-    <rect
-       y="1020.488"
-       x="0.12588699"
-       height="31.748224"
-       width="31.748226"
-       id="rect3618"
-       style="fill:#ff7f00;fill-opacity:1;stroke:#000000;stroke-width:0.25177398000000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/RedButton.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ff7f00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path13695"
+       sodipodi:cx="14.628272"
+       sodipodi:cy="14.75301"
+       sodipodi:rx="14.71666"
+       sodipodi:ry="14.71666"
+       d="m 29.344932,14.75301 a 14.71666,14.71666 0 1 1 -29.43331949,0 14.71666,14.71666 0 1 1 29.43331949,0 z"
+       transform="matrix(0.98576169,0,0,0.98576169,0.58000984,1022.8192)" />
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="6.717515"
+       y="1041.5789"
+       id="text13697"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan13699"
+         x="6.717515"
+         y="1041.5789">Or</tspan></text>
   </g>
 </svg>

applications/editors/josm/plugins/smed/plugs/oseam/src/images/PerchPButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658387,0.41488489,224.30043)" />
     <linearGradient
        inkscape:collect="always"
@@ -4196 +4196 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="29.72062"
+     inkscape:cx="13.368775"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -4235 +4235 @@
      style="display:inline">
     <rect
-       y="1020.484"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846865" />
     <g
        transform="matrix(0.2,0,0,0.2,-14.975456,1015.4008)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/PerchSButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658387,0.41488489,224.30043)" />
     <linearGradient
        inkscape:collect="always"
@@ -4357 +4357 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="29.72062"
+     inkscape:cx="13.368775"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -4368 +4368 @@
      inkscape:window-x="1440"
      inkscape:window-y="0"
-     inkscape:window-maximized="0">
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
     <inkscape:grid
        type="xygrid"
@@ -4396 +4398 @@
      style="display:inline">
     <rect
-       y="1020.484"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846865" />
     <g
        transform="matrix(0.2,0,0,0.2,-14.971931,1015.4439)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/PillarButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658387,0.41488489,224.30043)" />
     <linearGradient
        inkscape:collect="always"
@@ -1116 +1116 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="20.705008"
+     inkscape:cx="4.353163"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -1155 +1155 @@
      style="display:inline">
     <rect
-       y="1020.484"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846865" />
     <g
        transform="matrix(0.2,0,0,0.2,-14.91533,1021.415)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/PortButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
+       gradientTransform="matrix(0.49262,0,0,0.78641747,0.36774549,224.47224)" />
     <linearGradient
        inkscape:collect="always"
@@ -227 +227 @@
      inkscape:pageshadow="2"
      inkscape:zoom="16.8"
-     inkscape:cx="34.316666"
+     inkscape:cx="23.304761"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -266 +266 @@
      style="display:inline">
     <rect
-       y="1020.5195"
-       x="0.15732755"
-       height="31.685345"
-       width="49.685345"
+       y="1020.8536"
+       x="0.49136364"
+       height="31.017273"
+       width="49.017273"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.98272729;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.9327693"
+       ry="4.8945775" />
     <g
        id="g4583"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/PrefPortButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
+       gradientTransform="matrix(0.49262,0,0,0.78641747,0.36774549,224.47224)" />
     <linearGradient
        inkscape:collect="always"
@@ -360 +360 @@
      inkscape:pageshadow="2"
      inkscape:zoom="16.8"
-     inkscape:cx="30.498515"
+     inkscape:cx="19.48661"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -399 +399 @@
      style="display:inline">
     <rect
-       y="1020.5195"
-       x="0.15732755"
-       height="31.685345"
-       width="49.685345"
+       y="1020.8536"
+       x="0.49136364"
+       height="31.017273"
+       width="49.017273"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.98272729;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.9327693"
+       ry="4.8945775" />
     <g
        transform="matrix(0.4,0,0,0.4,-35.302351,987.50542)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/PrefStbdButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
+       gradientTransform="matrix(0.49262,0,0,0.78641747,0.36774549,224.47224)" />
     <linearGradient
        inkscape:collect="always"
@@ -521 +521 @@
      inkscape:pageshadow="2"
      inkscape:zoom="16.8"
-     inkscape:cx="23.296134"
+     inkscape:cx="12.284229"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -560 +560 @@
      style="display:inline">
     <rect
-       y="1020.5195"
-       x="0.15732755"
-       height="31.685345"
-       width="49.685345"
+       y="1020.8536"
+       x="0.49136364"
+       height="31.017273"
+       width="49.017273"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.98272729;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.9327693"
+       ry="4.8945775" />
     <g
        transform="matrix(0.4,0,0,0.4,-35.06138,986.93649)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/RadarButton.svg

@@ -16 +16 @@
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="FogButton.svg"
+   sodipodi:docname="RadarButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/FogButton.png"
    inkscape:export-xdpi="90"
@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.31906733,0,0,0.80495018,0.04582017,205.33918)" />
+       gradientTransform="matrix(0.31177734,0,0,0.78655888,0.41033864,224.32632)" />
     <linearGradient
        inkscape:collect="always"
@@ -2922 +2922 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="11.312564"
+     inkscape:cx="-5.039281"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -2950 +2950 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2961 +2961 @@
      style="display:inline">
     <rect
-       y="1020.488"
-       x="0.12588699"
-       height="31.748224"
-       width="31.748226"
+       y="1020.8508"
+       x="0.48857608"
+       height="31.022848"
+       width="31.022848"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.25177398;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.97715217;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.8857608"
+       ry="4.8857613" />
     <g
        style="display:inline"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/RedButton.svg

@@ -11 +11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
+   width="30"
+   height="30"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="WhiteButton.svg"
+   sodipodi:docname="RedButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/WhiteButton.png"
    inkscape:export-xdpi="90"
@@ -2896 +2896 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-5.039281"
+     inkscape:cx="-21.391126"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -2924 +2924 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2932 +2932 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1020.3622)"
+     transform="translate(0,-1022.3622)"
      style="display:inline">
-    <rect
-       y="1020.488"
-       x="0.12588699"
-       height="31.748224"
-       width="31.748226"
-       id="rect3618"
-       style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:0.25177398000000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path6740"
+       sodipodi:cx="14.495689"
+       sodipodi:cy="14.487844"
+       sodipodi:rx="14.495689"
+       sodipodi:ry="14.539884"
+       d="m 28.991379,14.487844 a 14.495689,14.539884 0 1 1 -28.991379,0 14.495689,14.539884 0 1 1 28.991379,0 z"
+       transform="matrix(1.0003382,0,0,0.99729764,0.49940838,1022.9136)" />
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="10.606602"
+       y="1041.5789"
+       id="text6742"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6744"
+         x="10.606602"
+         y="1041.5789">R</tspan></text>
   </g>
 </svg>

applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionAButton.svg

@@ -23 +23 @@
   <defs
      id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4910">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop4912" />
+      <stop
+         style="stop-color:#80a4c4;stop-opacity:1"
+         offset="1"
+         id="stop4914" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3638"
@@ -4348 +4360 @@
        inkscape:vp_x="0 : 160 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4910"
+       id="radialGradient4916"
+       cx="14.959728"
+       cy="9.6885777"
+       fx="14.959728"
+       fy="9.6885777"
+       r="15.476156"
+       gradientTransform="matrix(1,0,0,1.0042834,0,-0.06432913)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -4357 +4380 @@
      inkscape:pageshadow="2"
      inkscape:zoom="22.627417"
-     inkscape:cx="25.699645"
-     inkscape:cy="12.778874"
+     inkscape:cx="21.059257"
+     inkscape:cy="12.663493"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -4395 +4418 @@
      transform="translate(0,-1022.3622)"
      style="display:inline">
-    <rect
-       y="1022.48"
-       x="0.11801904"
-       height="29.763964"
-       width="29.763962"
-       id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.23603809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient4916);stroke:#000000;stroke-opacity:1;stroke-width:1.03285581000000004;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1"
+       id="path4136"
+       sodipodi:cx="14.959728"
+       sodipodi:cy="15.018175"
+       sodipodi:rx="14.959728"
+       sodipodi:ry="15.026019"
+       d="m 29.919456,15.018175 a 14.959728,15.026019 0 1 1 -29.919456,0 14.959728,15.026019 0 1 1 29.919456,0 z"
+       transform="matrix(0.97033215,0,0,0.9660513,0.48409468,1022.8539)" />
     <rect
        style="fill:#d40000;fill-opacity:1;stroke:#000000;stroke-width:0.97859073;stroke-opacity:1"
@@ -4407 +4433 @@
        width="8.021409"
        height="10.021409"
-       x="6.2668648"
-       y="1032.3708" />
+       x="6.0900879"
+       y="1033.9176" />
     <path
        style="fill:#00d400;fill-opacity:1;stroke:#000000;stroke-width:0.87779164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 15.740492,1042.4428 5.123931,-10.1665 4.898626,10.1665 -10.022557,0 z"
+       d="m 15.917269,1043.9896 5.123931,-10.1665 4.898626,10.1665 -10.022557,0 z"
        id="path3458"
        sodipodi:nodetypes="cccc" />
+    <text
+       xml:space="preserve"
+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="11.092738"
+       y="1032.3422"
+       id="text4918"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4920"
+         x="11.092738"
+         y="1032.3422">A</tspan></text>
   </g>
 </svg>

applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionBButton.svg

@@ -16 +16 @@
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="RegionBButton.svg"
+   sodipodi:docname="RegionAButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/RegionAButton.png"
    inkscape:export-xdpi="90"
@@ -23 +23 @@
   <defs
      id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4910">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop4912" />
+      <stop
+         style="stop-color:#80a4c4;stop-opacity:1"
+         offset="1"
+         id="stop4914" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3638"
@@ -4348 +4360 @@
        inkscape:vp_x="0 : 160 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4910"
+       id="radialGradient4916"
+       cx="14.959728"
+       cy="9.6885777"
+       fx="14.959728"
+       fy="9.6885777"
+       r="15.476156"
+       gradientTransform="matrix(1,0,0,1.0042834,0,-0.06432913)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -4357 +4380 @@
      inkscape:pageshadow="2"
      inkscape:zoom="22.627417"
-     inkscape:cx="31.04714"
-     inkscape:cy="12.778874"
+     inkscape:cx="21.059257"
+     inkscape:cy="12.663493"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -4385 +4408 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
@@ -4395 +4418 @@
      transform="translate(0,-1022.3622)"
      style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient4916);stroke:#000000;stroke-opacity:1;stroke-width:1.03285581000000004;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1"
+       id="path4136"
+       sodipodi:cx="14.959728"
+       sodipodi:cy="15.018175"
+       sodipodi:rx="14.959728"
+       sodipodi:ry="15.026019"
+       d="m 29.919456,15.018175 a 14.959728,15.026019 0 1 1 -29.919456,0 14.959728,15.026019 0 1 1 29.919456,0 z"
+       transform="matrix(0.97033215,0,0,0.9660513,0.48409468,1022.8539)" />
     <rect
-       y="1022.48"
-       x="0.11801904"
-       height="29.763964"
-       width="29.763962"
-       id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.23603809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-    <rect
-       style="fill:#00d400;fill-opacity:1;stroke:#000000;stroke-width:0.97859073;stroke-opacity:1"
+       style="fill:#00d400;fill-opacity:1;stroke:#000000;stroke-width:0.97859072999999996;stroke-opacity:1"
        id="rect3456"
        width="8.021409"
        height="10.021409"
-       x="6.3552532"
-       y="1032.415" />
+       x="6.0900879"
+       y="1033.9176" />
     <path
-       style="fill:#d40000;fill-opacity:1;stroke:#000000;stroke-width:0.87779164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 15.82888,1042.487 5.123931,-10.1665 4.898626,10.1665 -10.022557,0 z"
+       style="fill:#d40000;fill-opacity:1;stroke:#000000;stroke-width:0.87779163999999998px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 15.917269,1043.9896 5.123931,-10.1665 4.898626,10.1665 -10.022557,0 z"
        id="path3458"
        sodipodi:nodetypes="cccc" />
+    <text
+       xml:space="preserve"
+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="11.092738"
+       y="1032.3422"
+       id="text4918"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4920"
+         x="11.092738"
+         y="1032.3422">B</tspan></text>
   </g>
 </svg>

applications/editors/josm/plugins/smed/plugs/oseam/src/images/SafeWaterButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
+       gradientTransform="matrix(0.49251421,0,0,0.80352693,0.37303504,206.46592)" />
     <linearGradient
        inkscape:collect="always"
@@ -1429 +1429 @@
        inkscape:vp_x="0 : 160 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3606"
+       id="linearGradient10516"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.49262,0,0,0.78641747,0.36774549,224.47224)"
+       x1="50.002548"
+       y1="1012.4216"
+       x2="50.002548"
+       y2="1052.3596" />
   </defs>
   <sodipodi:namedview
@@ -1438 +1448 @@
      inkscape:pageshadow="2"
      inkscape:zoom="16.8"
-     inkscape:cx="42.82857"
+     inkscape:cx="31.816665"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -1477 +1487 @@
      style="display:inline">
     <rect
-       y="1020.5195"
-       x="0.15732755"
-       height="31.685345"
-       width="49.685345"
+       y="1020.8536"
+       x="0.49136364"
+       height="31.017273"
+       width="49.017273"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient10516);fill-opacity:1;stroke:#000000;stroke-width:0.98272729;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.9327693"
+       ry="4.8945775" />
     <g
        id="g3742"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/SparButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658387,0.41488489,224.30043)" />
     <linearGradient
        inkscape:collect="always"
@@ -2005 +2005 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="20.705008"
+     inkscape:cx="4.353163"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -2044 +2044 @@
      style="display:inline">
     <rect
-       y="1020.484"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846865" />
     <g
        transform="matrix(0.2,0,0,0.2,-14.892118,1009.5739)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/SpecButton.svg

@@ -52 +52 @@
        y2="1052.3621"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.59911405,0,0,1.0028655,0.04429586,-2.9582287)" />
+       gradientTransform="matrix(0.59311065,0,0,0.98774228,0.34446445,12.654511)" />
   </defs>
   <sodipodi:namedview
@@ -62 +62 @@
      inkscape:pageshadow="2"
      inkscape:zoom="16.8"
-     inkscape:cx="36.273753"
+     inkscape:cx="25.261848"
      inkscape:cy="21.571101"
      inkscape:document-units="px"
@@ -101 +101 @@
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient4185);fill-opacity:1;stroke:#000000;stroke-width:0.39013091;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:url(#linearGradient4185);fill-opacity:1;stroke:#000000;stroke-width:0.98744649;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="rect3667"
-       width="59.609871"
-       height="39.609871"
-       x="0.19506545"
-       y="1012.5572"
+       width="59.012554"
+       height="39.012554"
+       x="0.49372324"
+       y="1012.8559"
        inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/SpecButton_de.png"
        inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       inkscape:export-ydpi="90"
+       rx="4.9498978"
+       ry="4.9246001" />
     <path
        style="fill:#ffd400;fill-opacity:1;stroke:#000000;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/SphereButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658387,0.41488489,224.30043)" />
     <linearGradient
        inkscape:collect="always"
@@ -2488 +2488 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="20.705008"
+     inkscape:cx="4.353163"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -2527 +2527 @@
      style="display:inline">
     <rect
-       y="1020.484"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846865" />
     <g
        style="display:inline"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/StakeButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658387,0.41488489,224.30043)" />
     <linearGradient
        inkscape:collect="always"
@@ -4357 +4357 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="29.72062"
+     inkscape:cx="13.368775"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -4396 +4396 @@
      style="display:inline">
     <rect
-       y="1020.484"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846865" />
     <g
        transform="matrix(0.2,0,0,0.2,-14.971932,1015.7091)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/StbdButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
+       gradientTransform="matrix(0.49262,0,0,0.78641747,0.36774549,224.47224)" />
     <linearGradient
        inkscape:collect="always"
@@ -388 +388 @@
      inkscape:pageshadow="2"
      inkscape:zoom="16.8"
-     inkscape:cx="27.411904"
+     inkscape:cx="16.399999"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -427 +427 @@
      style="display:inline">
     <rect
-       y="1020.5195"
-       x="0.15732755"
-       height="31.685345"
-       width="49.685345"
+       y="1020.8536"
+       x="0.49136364"
+       height="31.017273"
+       width="49.017273"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.98272729;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.9327693"
+       ry="4.8945775" />
     <g
        id="g3653"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/SuperButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658387,0.41488489,224.30043)" />
     <linearGradient
        inkscape:collect="always"
@@ -3307 +3307 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="20.705008"
+     inkscape:cx="4.353163"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -3346 +3346 @@
      style="display:inline">
     <rect
-       y="1020.484"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="1.9507744"
+       ry="1.9538747" />
     <g
        transform="matrix(0.2,0,0,0.2,-14.978328,1015.5911)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/TopButton.svg

@@ -16 +16 @@
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="RadarButton.svg"
+   sodipodi:docname="TopButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/RadarButton.png"
    inkscape:export-xdpi="90"
@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.31906733,0,0,0.80495018,0.04582017,205.33918)" />
+       gradientTransform="matrix(0.31177734,0,0,0.78655888,0.41033864,224.32632)" />
     <linearGradient
        inkscape:collect="always"
@@ -4637 +4637 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="11.312564"
+     inkscape:cx="-5.039281"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -4665 +4665 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -4676 +4676 @@
      style="display:inline">
     <rect
-       y="1020.488"
-       x="0.12588699"
-       height="31.748224"
-       width="31.748226"
+       y="1020.8508"
+       x="0.48857608"
+       height="31.022848"
+       width="31.022848"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.25177398;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.97715217;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.8857608"
+       ry="4.8857613" />
     <g
        transform="matrix(0.2,0,0,0.2,-5.9895464,1015.9165)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/TowerButton.svg

@@ -75 +75 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
+       gradientTransform="matrix(0.29168745,0,0,0.78658387,0.41488489,224.30043)" />
     <linearGradient
        inkscape:collect="always"
@@ -4763 +4763 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="20.705008"
+     inkscape:cx="4.353163"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -4802 +4802 @@
      style="display:inline">
     <rect
-       y="1020.484"
-       x="0.12188905"
-       height="31.756222"
-       width="29.756222"
+       y="1020.8504"
+       x="0.48808095"
+       height="31.023838"
+       width="29.023838"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.9761619;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       rx="4.876936"
+       ry="4.8846865" />
     <g
        transform="matrix(0.2,0,0,0.2,-14.879776,1018.571)"

applications/editors/josm/plugins/smed/plugs/oseam/src/images/VioletButton.svg

@@ -11 +11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
+   width="30"
+   height="30"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="BlueButton.svg"
+   sodipodi:docname="VioletButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/BlueButton.png"
    inkscape:export-xdpi="90"
@@ -2896 +2896 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-5.039281"
-     inkscape:cy="14.585448"
+     inkscape:cx="-21.391126"
+     inkscape:cy="21.484168"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -2924 +2924 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2932 +2932 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1020.3622)"
+     transform="translate(0,-1022.3622)"
      style="display:inline">
-    <rect
-       y="1020.488"
-       x="0.12588699"
-       height="31.748224"
-       width="31.748226"
-       id="rect3618"
-       style="fill:#8f00ff;fill-opacity:1;stroke:#000000;stroke-width:0.25177398000000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/RedButton.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#8f00ff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path16762"
+       sodipodi:cx="14.672466"
+       sodipodi:cy="14.75301"
+       sodipodi:rx="14.760855"
+       sodipodi:ry="14.71666"
+       d="m 29.433321,14.75301 a 14.760855,14.71666 0 1 1 -29.52170944,0 14.760855,14.71666 0 1 1 29.52170944,0 z"
+       transform="matrix(0.98285863,0,0,0.98581022,0.57904001,1022.8185)" />
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="8.8388357"
+       y="1041.844"
+       id="text16764"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan16766"
+         x="8.8388357"
+         y="1041.844">Vi</tspan></text>
   </g>
 </svg>

applications/editors/josm/plugins/smed/plugs/oseam/src/images/WhiteButton.svg

@@ -11 +11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
+   width="30"
+   height="30"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="BlackButton.svg"
+   sodipodi:docname="WhiteButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/BlackButton.png"
    inkscape:export-xdpi="90"
@@ -2896 +2896 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-5.039281"
+     inkscape:cx="-11.336247"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -2924 +2924 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2932 +2932 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1020.3622)"
+     transform="translate(0,-1022.3622)"
      style="display:inline">
-    <rect
-       y="1020.488"
-       x="0.12588699"
-       height="31.748224"
-       width="31.748226"
-       id="rect3618"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.25177398000000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path5349"
+       sodipodi:cx="15.02602"
+       sodipodi:cy="15.194951"
+       sodipodi:rx="14.849243"
+       sodipodi:ry="15.158603"
+       d="m 29.875263,15.194951 a 14.849243,15.158603 0 1 1 -29.69848611,0 14.849243,15.158603 0 1 1 29.69848611,0 z"
+       transform="matrix(0.9775735,0,0,0.957623,0.31096102,1022.8112)" />
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="8.485281"
+       y="1041.7556"
+       id="text5351"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5353"
+         x="8.485281"
+         y="1041.7556">W</tspan></text>
   </g>
 </svg>

applications/editors/josm/plugins/smed/plugs/oseam/src/images/YellowButton.svg

@@ -11 +11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
+   width="30"
+   height="30"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="AmberButton.svg"
+   sodipodi:docname="YellowButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OrangeButton.png"
    inkscape:export-xdpi="90"
@@ -2896 +2896 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-5.039281"
+     inkscape:cx="21.035283"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -2924 +2924 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2932 +2932 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1020.3622)"
+     transform="translate(0,-1022.362)"
      style="display:inline">
-    <rect
-       y="1020.488"
-       x="0.12588699"
-       height="31.748224"
-       width="31.748226"
-       id="rect3618"
-       style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.25177398000000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/RedButton.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path18573"
+       sodipodi:cx="14.760855"
+       sodipodi:cy="14.75301"
+       sodipodi:rx="14.672466"
+       sodipodi:ry="14.71666"
+       d="m 29.433321,14.75301 a 14.672466,14.71666 0 1 1 -29.34493256,0 14.672466,14.71666 0 1 1 29.34493256,0 z"
+       transform="matrix(0.98868191,0,0,0.98571295,0.4062101,1022.8197)" />
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="10.783379"
+       y="1041.7554"
+       id="text18575"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan18577"
+         x="10.783379"
+         y="1041.7554">Y</tspan></text>
   </g>
 </svg>

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java

@@ -262 +262 @@
                         topButton = new JRadioButton(new ImageIcon(getClass().getResource(
                                         "/images/TopButton.png")));
-                        topButton.setBounds(new Rectangle(0, 165, 40, 40));
-                        topButton.setToolTipText(tr("Topmarks"));
+                        topButton.setBounds(new Rectangle(0, 165, 36, 32));
+                        topButton.setToolTipText(Messages.getString("TopmarksTip"));
                 }
                 return topButton;
@@ -272 +272 @@
                         fogButton = new JRadioButton(new ImageIcon(getClass().getResource(
                                         "/images/FogButton.png")));
-                        fogButton.setBounds(new Rectangle(0, 200, 40, 40));
-                        fogButton.setToolTipText(tr("Fog signals"));
+                        fogButton.setBounds(new Rectangle(0, 200, 36, 32));
+                        fogButton.setToolTipText(Messages.getString("FogSignalsTip"));
                 }
                 return fogButton;
@@ -282 +282 @@
                         radarButton = new JRadioButton(new ImageIcon(getClass()
                                         .getResource("/images/RadarButton.png")));
-                        radarButton.setBounds(new Rectangle(0, 235, 40, 40));
-                        radarButton.setToolTipText(tr("Radar"));
+                        radarButton.setBounds(new Rectangle(0, 235, 36, 32));
+                        radarButton.setToolTipText(Messages.getString("RadarTip"));
                 }
                 return radarButton;
@@ -292 +292 @@
                         litButton = new JRadioButton(new ImageIcon(getClass().getResource(
                                         "/images/LitButton.png")));
-                        litButton.setBounds(new Rectangle(0, 270, 40, 40));
-                        litButton.setToolTipText(tr("Lights"));
+                        litButton.setBounds(new Rectangle(0, 270, 36, 32));
+                        litButton.setToolTipText(Messages.getString("LitTip"));
                 }
                 return litButton;

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties

@@ -15 +15 @@
 WestTip=West cardinal marks
 IsolTip=Isolated danger marks
+LighthouseTip=Lighthouse
+MajorLightTip=Major light
+MinorLightTip=Minor light
+LightVesselTip=Light vessel
+LightFloatTip=Light float
+TopmarksTip=Topmarks
+FogSignalsTip=Fog signals
+RadarTip=Radar
+LitTip=Lights
+PillarTip=Pillar buoy
+SparTip=Spar buoy
+CanTip=Can buoy
+ConeTip=Cone buoy
+SphereTip=Sphere buoy
+BarrelTip=Barrel buoy
+FloatTip=Light float
+SuperTip=Super-buoy
+BeaconTip=Beacon
+TowerTip=Beacon tower
+StakeTip=Stake beacon
+PerchTip=Perch beacon
+RegionATip=IALA Region A
+RegionBTip=IALA Region B

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties

@@ -5 +5 @@
 SpecTip=Special Purpose marks
 LightsTip=Lights marks
-PortTip=Port hand marks
-StbdTip=Starboard hand marks
-PrefPortTip=Preferred Port hand marks
-PrefStbdTip=Preferred Starboard hand marks
-SafeWaterTip=Safe Water marks
+PortTip=Backbord
+StbdTip=Steuerbord
+PrefPortTip=Abzweigung Backboard
+PrefStbdTip=Abzweigung Steuerbord
+SafeWaterTip=Safe water marks
 NorthTip=North cardinal marks
 SouthTip=South cardinal marks
@@ -15 +15 @@
 WestTip=West cardinal marks
 IsolTip=Isolated danger marks
+LighthouseTip=Leuchtturm
+MajorLightTip=primäres Feuer
+MinorLightTip=sekundäres Feuer
+LightVesselTip=Feuerschiff
+LightFloatTip=Leuchtfloß
+TopmarksTip=Topmarks
+FogSignalsTip=Fog signals
+RadarTip=Radar
+LitTip=Lights
+PillarTip=Bakentonne
+SparTip=Spierentonne
+CanTip=Stumpftonne
+ConeTip=Spitztonne
+SphereTip=Kugeltonne
+BarrelTip=Fasstonne
+FloatTip=Leuchtfloß
+SuperTip=Super-buoy
+BeaconTip=Spiere
+TowerTip=Beacon tower
+StakeTip=Stake beacon
+PerchTip=Pricke
+RegionATip=IALA Region A
+RegionBTip=IALA Region B

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties

@@ -15 +15 @@
 WestTip=West cardinal marks
 IsolTip=Isolated danger marks
+LighthouseTip=Lighthouse
+MajorLightTip=Major light
+MinorLightTip=Minor light
+LightVesselTip=Light vessel
+LightFloatTip=Light float
+TopmarksTip=Topmarks
+FogSignalsTip=Fog signals
+RadarTip=Radar
+LitTip=Lights
+PillarTip=Pillar buoy
+SparTip=Spar buoy
+CanTip=Can buoy
+ConeTip=Cone buoy
+SphereTip=Sphere buoy
+BarrelTip=Barrel buoy
+FloatTip=Light float
+SuperTip=Super-buoy
+BeaconTip=Beacon
+TowerTip=Beacon tower
+StakeTip=Stake beacon
+PerchTip=Perch beacon
+RegionATip=IALA Region A
+RegionBTip=IALA Region B

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java

@@ -153 +153 @@
                                         .getResource("/images/PillarButton.png")));
                         pillarButton.setBounds(new Rectangle(55, 0, 90, 32));
+                        pillarButton.setToolTipText(Messages.getString("PillarTip"));
                 }
                 return pillarButton;
@@ -162 +163 @@
                                         "/images/SparButton.png")));
                         sparButton.setBounds(new Rectangle(55, 32, 90, 32));
+                        sparButton.setToolTipText(Messages.getString("SparTip"));
                 }
                 return sparButton;
@@ -171 +173 @@
                                         .getResource("/images/FloatButton.png")));
                         floatButton.setBounds(new Rectangle(55, 64, 90, 32));
+                        floatButton.setToolTipText(Messages.getString("FloatTip"));
                 }
                 return floatButton;
@@ -180 +183 @@
                                         .getResource("/images/BeaconButton.png")));
                         beaconButton.setBounds(new Rectangle(55, 96, 90, 32));
+                        beaconButton.setToolTipText(Messages.getString("BeaconTip"));
                 }
                 return beaconButton;
@@ -189 +193 @@
                                         .getResource("/images/TowerButton.png")));
                         towerButton.setBounds(new Rectangle(55, 128, 90, 32));
+                        towerButton.setToolTipText(Messages.getString("TowerTip"));
                 }
                 return towerButton;

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java

@@ -70 +70 @@
                                         .getResource("/images/LighthouseButton.png")));
                         houseButton.setBounds(new Rectangle(0, 0, 35, 32));
+                        houseButton.setToolTipText(Messages.getString("LighthouseTip"));
                 }
                 return houseButton;
@@ -79 +80 @@
                                         .getResource("/images/LightMajorButton.png")));
                         majorButton.setBounds(new Rectangle(0, 32, 35, 32));
+                        majorButton.setToolTipText(Messages.getString("MajorLightTip"));
                 }
                 return majorButton;
@@ -88 +90 @@
                                         .getResource("/images/LightMinorButton.png")));
                         minorButton.setBounds(new Rectangle(0, 64, 35, 32));
+                        minorButton.setToolTipText(Messages.getString("MinorLightTip"));
                 }
                 return minorButton;
@@ -97 +100 @@
                                         .getResource("/images/LightVesselButton.png")));
                         vesselButton.setBounds(new Rectangle(0, 96, 35, 32));
+                        vesselButton.setToolTipText(Messages.getString("LightVesselTip"));
                 }
                 return vesselButton;
@@ -106 +110 @@
                                         .getResource("/images/LightFloatButton.png")));
                         floatButton.setBounds(new Rectangle(0, 128, 35, 32));
+                        floatButton.setToolTipText(Messages.getString("LightFloatTip"));
                 }
                 return floatButton;

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java

@@ -106 +106 @@
                                         .getResource("/images/RegionAButton.png")));
                         regionAButton.setBounds(new Rectangle(0, 0, 35, 30));
+                        regionAButton.setToolTipText(Messages.getString("RegionATip"));
                 }
                 return regionAButton;
@@ -115 +116 @@
                                         .getResource("/images/RegionBButton.png")));
                         regionBButton.setBounds(new Rectangle(0, 30, 35, 30));
+                        regionBButton.setToolTipText(Messages.getString("RegionBTip"));
                 }
                 return regionBButton;
@@ -124 +126 @@
                                         .getResource("/images/PillarButton.png")));
                         pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
+                        pillarButton.setToolTipText(Messages.getString("PillarTip"));
                 }
                 return pillarButton;
@@ -133 +136 @@
                                         "/images/SparButton.png")));
                         sparButton.setBounds(new Rectangle(0, 96, 35, 32));
+                        sparButton.setToolTipText(Messages.getString("SparTip"));
                 }
                 return sparButton;
@@ -142 +146 @@
                                         "/images/CanButton.png")));
                         canButton.setBounds(new Rectangle(0, 128, 35, 32));
+                        canButton.setToolTipText(Messages.getString("CanTip"));
                 }
                 return canButton;
@@ -151 +156 @@
                                         .getResource("/images/FloatButton.png")));
                         floatButton.setBounds(new Rectangle(35, 0, 35, 32));
+                        floatButton.setToolTipText(Messages.getString("FloatTip"));
                 }
                 return floatButton;
@@ -160 +166 @@
                                         .getResource("/images/BeaconButton.png")));
                         beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
+                        beaconButton.setToolTipText(Messages.getString("BeaconTip"));
                 }
                 return beaconButton;
@@ -169 +176 @@
                                         .getResource("/images/TowerButton.png")));
                         towerButton.setBounds(new Rectangle(35, 64, 35, 32));
+                        towerButton.setToolTipText(Messages.getString("TowerTip"));
                 }
                 return towerButton;
@@ -178 +186 @@
                                         .getResource("/images/PerchPButton.png")));
                         perchButton.setBounds(new Rectangle(35, 96, 35, 32));
+                        perchButton.setToolTipText(Messages.getString("PerchTip"));
                 }
                 return perchButton;

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefPort.java

@@ -101 +101 @@
                                         .getResource("/images/RegionAButton.png")));
                         regionAButton.setBounds(new Rectangle(0, 0, 35, 30));
+                        regionAButton.setToolTipText(Messages.getString("RegionATip"));
                 }
                 return regionAButton;
@@ -110 +111 @@
                                         .getResource("/images/RegionBButton.png")));
                         regionBButton.setBounds(new Rectangle(0, 30, 35, 30));
+                        regionBButton.setToolTipText(Messages.getString("RegionBTip"));
                 }
                 return regionBButton;
@@ -119 +121 @@
                                         .getResource("/images/PillarButton.png")));
                         pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
+                        pillarButton.setToolTipText(Messages.getString("PillarTip"));
                 }
                 return pillarButton;
@@ -128 +131 @@
                                         "/images/SparButton.png")));
                         sparButton.setBounds(new Rectangle(0, 96, 35, 32));
+                        sparButton.setToolTipText(Messages.getString("SparTip"));
                 }
                 return sparButton;
@@ -137 +141 @@
                                         "/images/CanButton.png")));
                         canButton.setBounds(new Rectangle(0, 128, 35, 32));
+                        canButton.setToolTipText(Messages.getString("CanTip"));
                 }
                 return canButton;
@@ -146 +151 @@
                                         .getResource("/images/FloatButton.png")));
                         floatButton.setBounds(new Rectangle(35, 0, 35, 32));
+                        floatButton.setToolTipText(Messages.getString("FloatTip"));
                 }
                 return floatButton;
@@ -155 +161 @@
                                         .getResource("/images/BeaconButton.png")));
                         beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
+                        beaconButton.setToolTipText(Messages.getString("BeaconTip"));
                 }
                 return beaconButton;
@@ -164 +171 @@
                                         .getResource("/images/TowerButton.png")));
                         towerButton.setBounds(new Rectangle(35, 64, 35, 32));
+                        towerButton.setToolTipText(Messages.getString("TowerTip"));
                 }
                 return towerButton;

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefStbd.java

@@ -101 +101 @@
                                         .getResource("/images/RegionAButton.png")));
                         regionAButton.setBounds(new Rectangle(0, 0, 35, 30));
+                        regionAButton.setToolTipText(Messages.getString("RegionATip"));
                 }
                 return regionAButton;
@@ -110 +111 @@
                                         .getResource("/images/RegionBButton.png")));
                         regionBButton.setBounds(new Rectangle(0, 30, 35, 30));
+                        regionBButton.setToolTipText(Messages.getString("RegionBTip"));
                 }
                 return regionBButton;
@@ -119 +121 @@
                                         .getResource("/images/PillarButton.png")));
                         pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
+                        pillarButton.setToolTipText(Messages.getString("PillarTip"));
                 }
                 return pillarButton;
@@ -128 +131 @@
                                         "/images/SparButton.png")));
                         sparButton.setBounds(new Rectangle(0, 96, 35, 32));
+                        sparButton.setToolTipText(Messages.getString("SparTip"));
                 }
                 return sparButton;
@@ -137 +141 @@
                                         "/images/ConeButton.png")));
                         coneButton.setBounds(new Rectangle(0, 128, 35, 32));
+                        coneButton.setToolTipText(Messages.getString("ConeTip"));
                 }
                 return coneButton;
@@ -146 +151 @@
                                         .getResource("/images/FloatButton.png")));
                         floatButton.setBounds(new Rectangle(35, 0, 35, 32));
+                        floatButton.setToolTipText(Messages.getString("FloatTip"));
                 }
                 return floatButton;
@@ -155 +161 @@
                                         .getResource("/images/BeaconButton.png")));
                         beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
+                        beaconButton.setToolTipText(Messages.getString("BeaconTip"));
                 }
                 return beaconButton;
@@ -164 +171 @@
                                         .getResource("/images/TowerButton.png")));
                         towerButton.setBounds(new Rectangle(35, 64, 35, 32));
+                        towerButton.setToolTipText(Messages.getString("TowerTip"));
                 }
                 return towerButton;

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSafeWater.java

@@ -71 +71 @@
                                         .getResource("/images/PillarButton.png")));
                         pillarButton.setBounds(new Rectangle(0, 0, 35, 32));
+                        pillarButton.setToolTipText(Messages.getString("PillarTip"));
                 }
                 return pillarButton;
@@ -80 +81 @@
                                         "/images/SparButton.png")));
                         sparButton.setBounds(new Rectangle(0, 32, 35, 32));
+                        sparButton.setToolTipText(Messages.getString("SparTip"));
                 }
                 return sparButton;
@@ -89 +91 @@
                                         .getResource("/images/SphereButton.png")));
                         sphereButton.setBounds(new Rectangle(0, 64, 35, 32));
+                        sphereButton.setToolTipText(Messages.getString("SphereTip"));
                 }
                 return sphereButton;
@@ -98 +101 @@
                                         .getResource("/images/BarrelButton.png")));
                         barrelButton.setBounds(new Rectangle(0, 96, 35, 32));
+                        barrelButton.setToolTipText(Messages.getString("BarrelTip"));
                 }
                 return barrelButton;
@@ -107 +111 @@
                                         .getResource("/images/FloatButton.png")));
                         floatButton.setBounds(new Rectangle(0, 128, 35, 32));
+                        floatButton.setToolTipText(Messages.getString("FloatTip"));
                 }
                 return floatButton;

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java

@@ -155 +155 @@
                                         .getResource("/images/PillarButton.png")));
                         pillarButton.setBounds(new Rectangle(105, 0, 35, 32));
+                        pillarButton.setToolTipText(Messages.getString("PillarTip"));
                 }
                 return pillarButton;
@@ -164 +165 @@
                                         "/images/SparButton.png")));
                         sparButton.setBounds(new Rectangle(105, 32, 35, 32));
+                        sparButton.setToolTipText(Messages.getString("SparTip"));
                 }
                 return sparButton;
@@ -173 +175 @@
                                         "/images/CanButton.png")));
                         canButton.setBounds(new Rectangle(105, 64, 35, 32));
+                        canButton.setToolTipText(Messages.getString("CanTip"));
                 }
                 return canButton;
@@ -182 +185 @@
                                         "/images/ConeButton.png")));
                         coneButton.setBounds(new Rectangle(105, 96, 35, 32));
+                        coneButton.setToolTipText(Messages.getString("ConeTip"));
                 }
                 return coneButton;
@@ -191 +195 @@
                                         .getResource("/images/SphereButton.png")));
                         sphereButton.setBounds(new Rectangle(105, 128, 35, 32));
+                        sphereButton.setToolTipText(Messages.getString("SphereTip"));
                 }
                 return sphereButton;
@@ -200 +205 @@
                                         .getResource("/images/BarrelButton.png")));
                         barrelButton.setBounds(new Rectangle(140, 0, 35, 32));
+                        barrelButton.setToolTipText(Messages.getString("BarrelTip"));
                 }
                 return barrelButton;
@@ -209 +215 @@
                                         .getResource("/images/SuperButton.png")));
                         superButton.setBounds(new Rectangle(140, 32, 35, 32));
+                        superButton.setToolTipText(Messages.getString("SuperTip"));
                 }
                 return superButton;
@@ -218 +225 @@
                                         .getResource("/images/FloatButton.png")));
                         floatButton.setBounds(new Rectangle(140, 64, 35, 32));
+                        floatButton.setToolTipText(Messages.getString("FloatTip"));
                 }
                 return floatButton;
@@ -227 +235 @@
                                         .getResource("/images/BeaconButton.png")));
                         beaconButton.setBounds(new Rectangle(140, 96, 35, 32));
+                        beaconButton.setToolTipText(Messages.getString("BeaconTip"));
                 }
                 return beaconButton;
@@ -236 +245 @@
                                         .getResource("/images/TowerButton.png")));
                         towerButton.setBounds(new Rectangle(140, 128, 35, 32));
+                        towerButton.setToolTipText(Messages.getString("TowerTip"));
                 }
                 return towerButton;
@@ -244 +254 @@
                         whiteButton = new JRadioButton(new ImageIcon(getClass()
                                         .getResource("/images/WhiteButton.png")));
-                        whiteButton.setBounds(new Rectangle(4, 32, 33, 32));
+                        whiteButton.setBounds(new Rectangle(0, 32, 34, 32));
                         whiteButton.setToolTipText(tr("White"));
                 }
@@ -254 +264 @@
                         redButton = new JRadioButton(new ImageIcon(getClass().getResource(
                                         "/images/RedButton.png")));
-                        redButton.setBounds(new Rectangle(37, 32, 33, 32));
+                        redButton.setBounds(new Rectangle(34, 32, 34, 32));
                         redButton.setToolTipText(tr("Red"));
                 }
@@ -264 +274 @@
                         orangeButton = new JRadioButton(new ImageIcon(getClass()
                                         .getResource("/images/OrangeButton.png")));
-                        orangeButton.setBounds(new Rectangle(70, 32, 33, 32));
+                        orangeButton.setBounds(new Rectangle(68, 32, 34, 32));
                         orangeButton.setToolTipText(tr("Orange"));
                 }
@@ -274 +284 @@
                         amberButton = new JRadioButton(new ImageIcon(getClass()
                                         .getResource("/images/AmberButton.png")));
-                        amberButton.setBounds(new Rectangle(4, 64, 33, 32));
+                        amberButton.setBounds(new Rectangle(0, 64, 34, 32));
                         amberButton.setToolTipText(tr("Amber"));
                 }
@@ -284 +294 @@
                         yellowButton = new JRadioButton(new ImageIcon(getClass()
                                         .getResource("/images/YellowButton.png")));
-                        yellowButton.setBounds(new Rectangle(37, 64, 33, 32));
+                        yellowButton.setBounds(new Rectangle(34, 64, 34, 32));
                         yellowButton.setToolTipText(tr("Yellow"));
                 }
@@ -294 +304 @@
                         greenButton = new JRadioButton(new ImageIcon(getClass()
                                         .getResource("/images/GreenButton.png")));
-                        greenButton.setBounds(new Rectangle(70, 64, 33, 32));
+                        greenButton.setBounds(new Rectangle(68, 64, 34, 32));
                         greenButton.setToolTipText(tr("Green"));
                 }
@@ -304 +314 @@
                         blueButton = new JRadioButton(new ImageIcon(getClass().getResource(
                                         "/images/BlueButton.png")));
-                        blueButton.setBounds(new Rectangle(4, 96, 33, 32));
+                        blueButton.setBounds(new Rectangle(0, 96, 34, 32));
                         blueButton.setToolTipText(tr("Blue"));
                 }
@@ -314 +324 @@
                         violetButton = new JRadioButton(new ImageIcon(getClass()
                                         .getResource("/images/VioletButton.png")));
-                        violetButton.setBounds(new Rectangle(37, 96, 33, 32));
+                        violetButton.setBounds(new Rectangle(34, 96, 34, 32));
                         violetButton.setToolTipText(tr("Violet"));
                 }
@@ -324 +334 @@
                         blackButton = new JRadioButton(new ImageIcon(getClass()
                                         .getResource("/images/BlackButton.png")));
-                        blackButton.setBounds(new Rectangle(70, 96, 33, 32));
+                        blackButton.setBounds(new Rectangle(68, 96, 34, 32));
                         blackButton.setToolTipText(tr("Black"));
                 }

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java

@@ -106 +106 @@
                                         .getResource("/images/RegionAButton.png")));
                         regionAButton.setBounds(new Rectangle(0, 0, 35, 30));
+                        regionAButton.setToolTipText(Messages.getString("RegionATip"));
                 }
                 return regionAButton;
@@ -115 +116 @@
                                         .getResource("/images/RegionBButton.png")));
                         regionBButton.setBounds(new Rectangle(0, 30, 35, 30));
+                        regionBButton.setToolTipText(Messages.getString("RegionBTip"));
                 }
                 return regionBButton;
@@ -124 +126 @@
                                         .getResource("/images/PillarButton.png")));
                         pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
+                        pillarButton.setToolTipText(Messages.getString("PillarTip"));
                 }
                 return pillarButton;
@@ -133 +136 @@
                                         "/images/SparButton.png")));
                         sparButton.setBounds(new Rectangle(0, 96, 35, 32));
+                        sparButton.setToolTipText(Messages.getString("SparTip"));
                 }
                 return sparButton;
@@ -142 +146 @@
                                         "/images/ConeButton.png")));
                         coneButton.setBounds(new Rectangle(0, 128, 35, 32));
+                        coneButton.setToolTipText(Messages.getString("ConeTip"));
                 }
                 return coneButton;
@@ -151 +156 @@
                                         .getResource("/images/FloatButton.png")));
                         floatButton.setBounds(new Rectangle(35, 0, 35, 32));
+                        floatButton.setToolTipText(Messages.getString("FloatTip"));
                 }
                 return floatButton;
@@ -160 +166 @@
                                         .getResource("/images/BeaconButton.png")));
                         beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
+                        beaconButton.setToolTipText(Messages.getString("BeaconTip"));
                 }
                 return beaconButton;
@@ -169 +176 @@
                                         .getResource("/images/TowerButton.png")));
                         towerButton.setBounds(new Rectangle(35, 64, 35, 32));
+                        towerButton.setToolTipText(Messages.getString("TowerTip"));
                 }
                 return towerButton;
@@ -178 +186 @@
                                         .getResource("/images/PerchSButton.png")));
                         perchButton.setBounds(new Rectangle(35, 96, 35, 32));
+                        perchButton.setToolTipText(Messages.getString("PerchTip"));
                 }
                 return perchButton;