Merge branch 'athena-refactor' of ssh://git.axiodl.com:6431/AxioDL/amuse into athena-refactor

Editor/SoundMacroEditor.cpp

@@ -158,7 +158,14 @@ CommandWidget::CommandWidget(amuse::SoundMacro::ICmd* cmd, amuse::SoundMacro::Cm
     if (op != amuse::SoundMacro::CmdOp::End)
     {
         m_deleteButton.setFixedSize(21, 21);
-        m_deleteButton.setIcon(QIcon(QStringLiteral(":/icons/IconSoundMacroDelete.svg")));
+        m_deleteButton.setStyleSheet("QPushButton {\n"
+                                     "    background-image: url(\":/icons/IconSoundMacroDelete.svg\");\n"
+                                     "    background-repeat: no-repeat;\n"
+                                     "}\n"
+                                     "QPushButton:hover {\n"
+                                     "    background-image: url(\":/icons/IconSoundMacroDeleteHovered.svg\");\n"
+                                     "    background-repeat: no-repeat;\n"
+                                     "}");
         m_deleteButton.setFlat(true);
         m_deleteButton.setToolTip(tr("Delete this SoundMacro"));
         connect(&m_deleteButton, SIGNAL(clicked(bool)), this, SLOT(deleteClicked()));

Editor/resources/IconSoundMacroDeleteHovered.svg

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="20"
+   viewBox="0 0 5.2916665 5.2916668"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="IconSoundMacroDeleteHovered.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#7f7f7f"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="64.48"
+     inkscape:cx="3.5548908"
+     inkscape:cy="13.722588"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="3840"
+     inkscape:window-height="2033"
+     inkscape:window-x="0"
+     inkscape:window-y="66"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid817"
+       empspacing="0"
+       spacingx="0.52916666"
+       spacingy="0.52916666"
+       visible="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-291.70832)">
+    <path
+       style="fill:none;stroke:#9c0000;stroke-width:0.52916664;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.0583333,292.76665 3.175,3.175"
+       id="path10"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path819"
+       d="m 4.2333333,292.76665 -3.175,3.175"
+       style="fill:none;stroke:#9c0000;stroke-width:0.52916664;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>

Editor/resources/lang_de.ts

@@ -4,7 +4,7 @@
 <context>
     <name>CommandWidget</name>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="+163"/>
+        <location filename="../SoundMacroEditor.cpp" line="+170"/>
         <source>Delete this SoundMacro</source>
         <translation type="unfinished"></translation>
     </message>
@@ -542,7 +542,7 @@
 <context>
     <name>TargetButton</name>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="-948"/>
+        <location filename="../SoundMacroEditor.cpp" line="-955"/>
         <source>Set step with target click</source>
         <translation type="unfinished"></translation>
     </message>

Editor/resources/resources.qrc

@@ -20,6 +20,7 @@
         <file>IconCurve.svg</file>
         <file>IconNewCurve.svg</file>
         <file>IconSoundMacroDelete.svg</file>
+        <file>IconSoundMacroDeleteHovered.svg</file>
         <file>IconSoundMacroTarget.svg</file>
         <file>IconSoundMacroTargetDisabled.svg</file>
         <file>IconKill.svg</file>