ObjToken refactor and Sample nodes

Editor/resources/IconSample.svg

@@ -0,0 +1,74 @@
+<?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="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="IconSample.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#393939"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="34.25"
+     inkscape:cx="8.0516224"
+     inkscape:cy="8.452632"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="3840"
+     inkscape:window-height="2079"
+     inkscape:window-x="0"
+     inkscape:window-y="40"
+     inkscape:window-maximized="1"
+     showborder="true"
+     objecttolerance="4"
+     gridtolerance="4"
+     guidetolerance="5">
+    <inkscape:grid
+       visible="true"
+       empspacing="1"
+       id="grid4173"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-292.76665)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       id="path1184"
+       title="sin(x*4*pi)*sin(x*pi)"
+       d="m 0.36489826,294.88332 c 0.12976062,-1.7e-4 0.25952124,-0.20582 0.38928188,-0.34418 0.12976062,-0.13838 0.25952116,-0.13639 0.38928186,0.11952 0.1297606,0.25593 0.2595211,0.73341 0.3892818,0.99106 0.1297606,0.25765 0.2595213,0.22574 0.3892819,-0.11953 0.1297606,-0.34528 0.2595212,-0.94796 0.3892819,-1.29374 0.1297606,-0.34576 0.2595213,-0.37673 0.3892818,-0.11953 0.1297606,0.2572 0.2595213,0.73474 0.3892819,0.99106 0.1297607,0.25631 0.2595213,0.25771 0.3892819,0.11953 0.1297606,-0.13818 0.2595212,-0.34402 0.3892819,-0.34419"
+       style="fill:none;fill-opacity:1;stroke:#04e2ff;stroke-width:0.43794215;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

Editor/resources/lang_de.ts

@@ -13,6 +13,7 @@
     <name>MainWindow</name>
     <message>
         <location filename="../MainWindow.ui" line="+14"/>
+        <location filename="../MainWindow.cpp" line="+181"/>
         <source>Amuse</source>
         <translation>Amuse</translation>
     </message>
@@ -22,7 +23,7 @@
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>P&amp;roject</source>
         <translation>Projekt</translation>
     </message>
@@ -60,12 +61,12 @@
         <translation type="vanished">&amp; Wiederholen</translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="-66"/>
         <source>Recent &amp;Projects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+74"/>
         <source>&amp;Cut</source>
         <translation>&amp;Schnitt</translation>
     </message>
@@ -85,9 +86,13 @@
         <translation>&amp;Löschen</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Import</source>
-        <translation>&amp;Einführen</translation>
+        <translation type="vanished">&amp;Einführen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Import Groups</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -170,12 +175,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="+70"/>
+        <location line="+8"/>
+        <source>Reload Sample &amp;Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainWindow.cpp" line="-109"/>
         <source>Quit</source>
         <translation>Verlassen</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+160"/>
         <source>The directory at &apos;%1&apos; must exist for the Amuse editor.</source>
         <translation>Das Verzeichnis unter &apos;% 1&apos; muss für den Amuse-Editor vorhanden sein.</translation>
     </message>
@@ -200,7 +210,7 @@
         <translation>Es konnte nicht in das Verzeichnis geschrieben werden</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+46"/>
         <source>No Audio Devices Found</source>
         <translation>Keine Audiogeräte gefunden</translation>
     </message>
@@ -210,7 +220,7 @@
         <translation>Keine MIDI-Geräte gefunden</translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+201"/>
         <source>New Project</source>
         <translation>Neues Projekt</translation>
     </message>
@@ -225,29 +235,39 @@
         <translation>Das Verzeichnis &apos;% 1&apos; existiert nicht.</translation>
     </message>
     <message>
-        <location line="-432"/>
+        <location line="-468"/>
         <source>Clear Recent Projects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <location line="+292"/>
+        <location line="+124"/>
+        <source>Amuse [%1/%2/%3]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Amuse [%1]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+302"/>
         <source>The directory at &apos;%1&apos; must not be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
-        <location line="+292"/>
+        <location line="-301"/>
+        <location line="+302"/>
         <source>Directory empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-181"/>
+        <location line="-189"/>
         <source>SUSTAIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+195"/>
         <source>Bad Directory</source>
         <translation>Schlechtes Verzeichnis</translation>
     </message>
@@ -258,18 +278,29 @@
     </message>
     <message>
         <location line="+0"/>
-        <location line="+127"/>
+        <location line="+76"/>
+        <location line="+83"/>
         <location line="+45"/>
         <source>Scanning Project</source>
         <translation>Projekt scannen</translation>
     </message>
     <message>
-        <location line="-160"/>
+        <location line="-192"/>
         <source>Opening %1</source>
         <translation>Eröffnung% 1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+64"/>
+        <source>Reloading Samples</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Scanning %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Import Project</source>
         <translation>Projekt importieren</translation>
     </message>
@@ -360,7 +391,7 @@
 <context>
     <name>ProjectModel</name>
     <message>
-        <location filename="../ProjectModel.cpp" line="+210"/>
+        <location filename="../ProjectModel.cpp" line="+226"/>
         <source>Sound Macros</source>
         <translation>Sound-Makros</translation>
     </message>
@@ -384,6 +415,11 @@
         <source>Layers</source>
         <translation>Lagen</translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Samples</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -401,7 +437,7 @@
 <context>
     <name>QUndoStack</name>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="+157"/>
+        <location filename="../SoundMacroEditor.cpp" line="+162"/>
         <source>Change %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -506,7 +542,7 @@
 <context>
     <name>TargetButton</name>
     <message>
-        <location filename="../SoundMacroEditor.cpp" line="-939"/>
+        <location filename="../SoundMacroEditor.cpp" line="-944"/>
         <source>Set step with target click</source>
         <translation type="unfinished"></translation>
     </message>

Editor/resources/resources.qrc

@@ -23,6 +23,7 @@
         <file>IconSoundMacroTarget.svg</file>
         <file>IconSoundMacroTargetDisabled.svg</file>
         <file>IconKill.svg</file>
+        <file>IconSample.svg</file>
     </qresource>
     <qresource prefix="/bg">
         <file>FaceGrey.svg</file>