diff i18n/sonic-visualiser_en_US.ts @ 398:249fe3768d91

* Update translation strings
author Chris Cannam
date Mon, 07 Feb 2011 20:19:33 +0000
parents e91910707283
children 5b048b2e2e2a
line wrap: on
line diff
--- a/i18n/sonic-visualiser_en_US.ts	Mon Feb 07 11:56:04 2011 +0000
+++ b/i18n/sonic-visualiser_en_US.ts	Mon Feb 07 20:19:33 2011 +0000
@@ -4,17 +4,17 @@
 <context>
     <name>ActivityLog</name>
     <message>
-        <location filename="../../widgets/ActivityLog.cpp" line="30"/>
+        <location filename="../../svgui/widgets/ActivityLog.cpp" line="30"/>
         <source>Activity Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ActivityLog.cpp" line="35"/>
+        <location filename="../../svgui/widgets/ActivityLog.cpp" line="35"/>
         <source>&lt;p&gt;Activity Log lists your interactions and other events within %1.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ActivityLog.cpp" line="63"/>
+        <location filename="../../svgui/widgets/ActivityLog.cpp" line="63"/>
         <source>%1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22,7 +22,7 @@
 <context>
     <name>AddLayerCommand</name>
     <message>
-        <location filename="../../framework/Document.cpp" line="951"/>
+        <location filename="../../svapp/framework/Document.cpp" line="953"/>
         <source>Add %1 Layer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30,7 +30,7 @@
 <context>
     <name>AggregateWaveModel</name>
     <message>
-        <location filename="../../data/model/AggregateWaveModel.h" line="45"/>
+        <location filename="../../svcore/data/model/AggregateWaveModel.h" line="45"/>
         <source>Aggregate Wave</source>
         <translation type="unfinished"></translation>
     </message>
@@ -38,7 +38,7 @@
 <context>
     <name>AlignmentModel</name>
     <message>
-        <location filename="../../data/model/AlignmentModel.h" line="47"/>
+        <location filename="../../svcore/data/model/AlignmentModel.h" line="47"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -46,17 +46,17 @@
 <context>
     <name>AudioCallbackPlaySource</name>
     <message>
-        <location filename="../../audioio/AudioCallbackPlaySource.cpp" line="444"/>
+        <location filename="../../svapp/audioio/AudioCallbackPlaySource.cpp" line="459"/>
         <source>Play from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../audioio/AudioCallbackPlaySource.cpp" line="459"/>
+        <location filename="../../svapp/audioio/AudioCallbackPlaySource.cpp" line="482"/>
         <source>Stop at %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../audioio/AudioCallbackPlaySource.cpp" line="1025"/>
+        <location filename="../../svapp/audioio/AudioCallbackPlaySource.cpp" line="1061"/>
         <source>Change time-stretch factor to %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -64,39 +64,39 @@
 <context>
     <name>AudioDial</name>
     <message>
-        <location filename="../../widgets/AudioDial.cpp" line="416"/>
+        <location filename="../../svgui/widgets/AudioDial.cpp" line="416"/>
         <source>%1: %2%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/AudioDial.cpp" line="418"/>
+        <location filename="../../svgui/widgets/AudioDial.cpp" line="418"/>
         <source>%2%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/AudioDial.cpp" line="481"/>
+        <location filename="../../svgui/widgets/AudioDial.cpp" line="481"/>
         <source>New value for %1, from %2 to %3 %4:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/AudioDial.cpp" line="484"/>
+        <location filename="../../svgui/widgets/AudioDial.cpp" line="484"/>
         <source>New value for %1, from %2 to %3:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/AudioDial.cpp" line="489"/>
+        <location filename="../../svgui/widgets/AudioDial.cpp" line="489"/>
         <source>Enter a new value from %1 to %2 %3:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/AudioDial.cpp" line="492"/>
-        <location filename="../../widgets/AudioDial.cpp" line="516"/>
+        <location filename="../../svgui/widgets/AudioDial.cpp" line="492"/>
+        <location filename="../../svgui/widgets/AudioDial.cpp" line="516"/>
         <source>Enter a new value from %1 to %2:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/AudioDial.cpp" line="499"/>
-        <location filename="../../widgets/AudioDial.cpp" line="515"/>
+        <location filename="../../svgui/widgets/AudioDial.cpp" line="499"/>
+        <location filename="../../svgui/widgets/AudioDial.cpp" line="515"/>
         <source>Enter new value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -104,27 +104,27 @@
 <context>
     <name>AudioTargetFactory</name>
     <message>
-        <location filename="../../audioio/AudioTargetFactory.cpp" line="72"/>
+        <location filename="../../svapp/audioio/AudioTargetFactory.cpp" line="72"/>
         <source>(auto)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../audioio/AudioTargetFactory.cpp" line="76"/>
+        <location filename="../../svapp/audioio/AudioTargetFactory.cpp" line="76"/>
         <source>JACK Audio Connection Kit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../audioio/AudioTargetFactory.cpp" line="80"/>
+        <location filename="../../svapp/audioio/AudioTargetFactory.cpp" line="80"/>
         <source>PulseAudio Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../audioio/AudioTargetFactory.cpp" line="84"/>
+        <location filename="../../svapp/audioio/AudioTargetFactory.cpp" line="84"/>
         <source>Core Audio Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../audioio/AudioTargetFactory.cpp" line="88"/>
+        <location filename="../../svapp/audioio/AudioTargetFactory.cpp" line="88"/>
         <source>Default Soundcard Device</source>
         <translation type="unfinished"></translation>
     </message>
@@ -132,72 +132,72 @@
 <context>
     <name>BZipFileDevice</name>
     <message>
-        <location filename="../../data/fileio/BZipFileDevice.cpp" line="49"/>
+        <location filename="../../svcore/data/fileio/BZipFileDevice.cpp" line="49"/>
         <source>File is already open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/BZipFileDevice.cpp" line="54"/>
+        <location filename="../../svcore/data/fileio/BZipFileDevice.cpp" line="54"/>
         <source>Append mode not supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/BZipFileDevice.cpp" line="60"/>
+        <location filename="../../svcore/data/fileio/BZipFileDevice.cpp" line="60"/>
         <source>File access mode not specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/BZipFileDevice.cpp" line="66"/>
+        <location filename="../../svcore/data/fileio/BZipFileDevice.cpp" line="66"/>
         <source>Read and write modes both specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/BZipFileDevice.cpp" line="75"/>
+        <location filename="../../svcore/data/fileio/BZipFileDevice.cpp" line="75"/>
         <source>Failed to open file for writing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/BZipFileDevice.cpp" line="86"/>
+        <location filename="../../svcore/data/fileio/BZipFileDevice.cpp" line="86"/>
         <source>Failed to open bzip2 stream for writing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/BZipFileDevice.cpp" line="102"/>
+        <location filename="../../svcore/data/fileio/BZipFileDevice.cpp" line="102"/>
         <source>Failed to open file for reading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/BZipFileDevice.cpp" line="113"/>
+        <location filename="../../svcore/data/fileio/BZipFileDevice.cpp" line="113"/>
         <source>Failed to open bzip2 stream for reading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/BZipFileDevice.cpp" line="127"/>
+        <location filename="../../svcore/data/fileio/BZipFileDevice.cpp" line="127"/>
         <source>Internal error (open for neither read nor write)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/BZipFileDevice.cpp" line="136"/>
+        <location filename="../../svcore/data/fileio/BZipFileDevice.cpp" line="136"/>
         <source>File not open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/BZipFileDevice.cpp" line="148"/>
+        <location filename="../../svcore/data/fileio/BZipFileDevice.cpp" line="148"/>
         <source>bzip2 stream write close error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/BZipFileDevice.cpp" line="160"/>
+        <location filename="../../svcore/data/fileio/BZipFileDevice.cpp" line="160"/>
         <source>bzip2 stream read close error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/BZipFileDevice.cpp" line="169"/>
+        <location filename="../../svcore/data/fileio/BZipFileDevice.cpp" line="169"/>
         <source>Internal error (close for neither read nor write)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/BZipFileDevice.cpp" line="186"/>
+        <location filename="../../svcore/data/fileio/BZipFileDevice.cpp" line="186"/>
         <source>bzip2 stream read error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -205,7 +205,7 @@
 <context>
     <name>BundleCommand</name>
     <message numerus="yes">
-        <location filename="../../base/Command.cpp" line="98"/>
+        <location filename="../../svcore/base/Command.cpp" line="98"/>
         <source>%1 (%n change(s))</source>
         <translation type="unfinished">
             <numerusform>%1 (%n change)</numerusform>
@@ -216,7 +216,7 @@
 <context>
     <name>CSVFileWriter</name>
     <message>
-        <location filename="../../data/fileio/CSVFileWriter.cpp" line="56"/>
+        <location filename="../../svcore/data/fileio/CSVFileWriter.cpp" line="56"/>
         <source>Failed to open file %1 for writing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -224,160 +224,164 @@
 <context>
     <name>CSVFormatDialog</name>
     <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="39"/>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="37"/>
         <source>Select Data Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="53"/>
-        <source>&lt;b&gt;Select Data Format&lt;/b&gt;&lt;p&gt;Please select the correct data format for this file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="56"/>
-        <source>Each row specifies:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="59"/>
-        <source>A point in time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="60"/>
-        <source>A value at a time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="61"/>
-        <source>A set of values</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="67"/>
-        <source>The first column contains:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="70"/>
-        <source>Time, in seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="71"/>
-        <source>Time, in audio sample frames</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="72"/>
-        <source>Data (rows are consecutive in time)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="79"/>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="43"/>
+        <source>Please select the correct data format for this file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="73"/>
+        <source>&lt;ignore&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="74"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="75"/>
+        <source>End time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="76"/>
+        <source>Duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="77"/>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="78"/>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="99"/>
+        <source>Timing is specified:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="102"/>
+        <source>Explicitly, in seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="103"/>
+        <source>Explicitly, in audio sample frames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="104"/>
+        <source>Implicitly: rows are equally spaced in time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="112"/>
         <source>Audio sample rate (Hz):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="101"/>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="135"/>
         <source>Frame increment between rows:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="119"/>
-        <source>
-Example data from file:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Colour3DPlotLayer</name>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="170"/>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="216"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="170"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="216"/>
         <source>Colour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="171"/>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="211"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="171"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="211"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="172"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="172"/>
         <source>Normalize Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="173"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="173"/>
         <source>Normalize Visible Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="174"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="174"/>
         <source>Invert Vertical Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="175"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="175"/>
         <source>Gain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="176"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="176"/>
         <source>Always Opaque</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="177"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="177"/>
         <source>Smooth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="178"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="178"/>
         <source>Bin Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="213"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="213"/>
         <source>Bins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="309"/>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="318"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="309"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="318"/>
         <source>Linear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="310"/>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="319"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="310"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="319"/>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="311"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="311"/>
         <source>+/-1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="312"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="312"/>
         <source>Absolute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="322"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="322"/>
         <source>&lt;unknown&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="329"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="329"/>
         <source>dB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="698"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="698"/>
         <source>Time:	%1 - %2
 Bin:	%3
 Value:	%4</source>
@@ -387,68 +391,68 @@
 <context>
     <name>ColourMapper</name>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="48"/>
-        <location filename="../../layer/ColourMapper.cpp" line="66"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="48"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="66"/>
         <source>&lt;unknown&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="52"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="52"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="53"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="53"/>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="54"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="54"/>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="55"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="55"/>
         <source>Red on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="56"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="56"/>
         <source>Yellow on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="57"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="57"/>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="58"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="58"/>
         <source>Sunset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="59"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="59"/>
         <source>Fruit Salad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="60"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="60"/>
         <source>Banded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="61"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="61"/>
         <source>Highlight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="62"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="62"/>
         <source>Printer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="63"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="63"/>
         <source>High Gain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -456,68 +460,68 @@
 <context>
     <name>CommandHistory</name>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="56"/>
-        <location filename="../../widgets/CommandHistory.cpp" line="61"/>
-        <location filename="../../widgets/CommandHistory.cpp" line="64"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="56"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="61"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="64"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="57"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="57"/>
         <source>Ctrl+Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="58"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="58"/>
         <source>Undo the last editing operation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="69"/>
-        <location filename="../../widgets/CommandHistory.cpp" line="74"/>
-        <location filename="../../widgets/CommandHistory.cpp" line="77"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="69"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="74"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="77"/>
         <source>Re&amp;do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="70"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="70"/>
         <source>Ctrl+Shift+Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="71"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="71"/>
         <source>Redo the last operation that was undone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="344"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="344"/>
         <source>Undo %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="370"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="370"/>
         <source>Redo %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="503"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="503"/>
         <source>Nothing to undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="503"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="503"/>
         <source>Nothing to redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="519"/>
-        <location filename="../../widgets/CommandHistory.cpp" line="541"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="519"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="541"/>
         <source>&amp;Undo %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="519"/>
-        <location filename="../../widgets/CommandHistory.cpp" line="542"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="519"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="542"/>
         <source>Re&amp;do %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -525,7 +529,7 @@
 <context>
     <name>Dense3DModelPeakCache</name>
     <message>
-        <location filename="../../data/model/Dense3DModelPeakCache.h" line="86"/>
+        <location filename="../../svcore/data/model/Dense3DModelPeakCache.h" line="86"/>
         <source>Dense 3-D Peak Cache</source>
         <translation type="unfinished"></translation>
     </message>
@@ -533,17 +537,17 @@
 <context>
     <name>DenseThreeDimensionalModel</name>
     <message>
-        <location filename="../../data/model/DenseThreeDimensionalModel.h" line="110"/>
+        <location filename="../../svcore/data/model/DenseThreeDimensionalModel.h" line="110"/>
         <source>Dense 3-D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/DenseThreeDimensionalModel.h" line="127"/>
+        <location filename="../../svcore/data/model/DenseThreeDimensionalModel.h" line="127"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/DenseThreeDimensionalModel.h" line="128"/>
+        <location filename="../../svcore/data/model/DenseThreeDimensionalModel.h" line="128"/>
         <source>Frame</source>
         <translation type="unfinished"></translation>
     </message>
@@ -551,7 +555,7 @@
 <context>
     <name>DenseTimeValueModel</name>
     <message>
-        <location filename="../../data/model/DenseTimeValueModel.h" line="89"/>
+        <location filename="../../svcore/data/model/DenseTimeValueModel.h" line="89"/>
         <source>Dense Time-Value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -559,12 +563,12 @@
 <context>
     <name>Document</name>
     <message>
-        <location filename="../../framework/Document.cpp" line="269"/>
+        <location filename="../../svapp/framework/Document.cpp" line="270"/>
         <source>Set main model to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/Document.cpp" line="271"/>
+        <location filename="../../svapp/framework/Document.cpp" line="272"/>
         <source>Clear main model</source>
         <translation type="unfinished"></translation>
     </message>
@@ -572,7 +576,7 @@
 <context>
     <name>EditableDenseThreeDimensionalModel</name>
     <message>
-        <location filename="../../data/model/EditableDenseThreeDimensionalModel.h" line="139"/>
+        <location filename="../../svcore/data/model/EditableDenseThreeDimensionalModel.h" line="139"/>
         <source>Editable Dense 3-D</source>
         <translation type="unfinished"></translation>
     </message>
@@ -580,12 +584,12 @@
 <context>
     <name>FFTModel</name>
     <message>
-        <location filename="../../data/model/FFTModel.h" line="187"/>
+        <location filename="../../svcore/data/model/FFTModel.h" line="187"/>
         <source>FFT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/FFTModel.cpp" line="203"/>
+        <location filename="../../svcore/data/model/FFTModel.cpp" line="203"/>
         <source>%1 Hz</source>
         <translation type="unfinished"></translation>
     </message>
@@ -593,22 +597,22 @@
 <context>
     <name>Fader</name>
     <message>
-        <location filename="../../widgets/Fader.cpp" line="141"/>
+        <location filename="../../svgui/widgets/Fader.cpp" line="141"/>
         <source>Enter new fader level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/Fader.cpp" line="142"/>
+        <location filename="../../svgui/widgets/Fader.cpp" line="142"/>
         <source>New fader level, from %1 to %2 dBFS:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/Fader.cpp" line="217"/>
+        <location filename="../../svgui/widgets/Fader.cpp" line="217"/>
         <source>Level: Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/Fader.cpp" line="219"/>
+        <location filename="../../svgui/widgets/Fader.cpp" line="219"/>
         <source>Level: %1%2.%3%4 dB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -616,48 +620,48 @@
 <context>
     <name>FeatureExtractionModelTransformer</name>
     <message>
-        <location filename="../../transform/FeatureExtractionModelTransformer.cpp" line="54"/>
+        <location filename="../../svcore/transform/FeatureExtractionModelTransformer.cpp" line="54"/>
         <source>No factory available for feature extraction plugin id &quot;%1&quot; (unknown plugin type, or internal error?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/FeatureExtractionModelTransformer.cpp" line="60"/>
+        <location filename="../../svcore/transform/FeatureExtractionModelTransformer.cpp" line="60"/>
         <source>Input model for feature extraction plugin &quot;%1&quot; is of wrong type (internal error?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/FeatureExtractionModelTransformer.cpp" line="66"/>
+        <location filename="../../svcore/transform/FeatureExtractionModelTransformer.cpp" line="66"/>
         <source>Failed to instantiate plugin &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/FeatureExtractionModelTransformer.cpp" line="81"/>
+        <location filename="../../svcore/transform/FeatureExtractionModelTransformer.cpp" line="81"/>
         <source>Cannot provide enough channels to feature extraction plugin &quot;%1&quot; (plugin min is %2, max %3; input model has %4)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/FeatureExtractionModelTransformer.cpp" line="112"/>
-        <location filename="../../transform/FeatureExtractionModelTransformer.cpp" line="127"/>
+        <location filename="../../svcore/transform/FeatureExtractionModelTransformer.cpp" line="112"/>
+        <location filename="../../svcore/transform/FeatureExtractionModelTransformer.cpp" line="127"/>
         <source>Failed to initialise feature extraction plugin &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/FeatureExtractionModelTransformer.cpp" line="117"/>
+        <location filename="../../svcore/transform/FeatureExtractionModelTransformer.cpp" line="117"/>
         <source>Feature extraction plugin &quot;%1&quot; rejected the given step and block sizes (%2 and %3); using plugin defaults (%4 and %5) instead</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/FeatureExtractionModelTransformer.cpp" line="135"/>
+        <location filename="../../svcore/transform/FeatureExtractionModelTransformer.cpp" line="135"/>
         <source>Transform was configured for version %1 of plugin &quot;%2&quot;, but the plugin being used is version %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/FeatureExtractionModelTransformer.cpp" line="150"/>
+        <location filename="../../svcore/transform/FeatureExtractionModelTransformer.cpp" line="150"/>
         <source>Plugin &quot;%1&quot; has no outputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/FeatureExtractionModelTransformer.cpp" line="165"/>
+        <location filename="../../svcore/transform/FeatureExtractionModelTransformer.cpp" line="165"/>
         <source>Plugin &quot;%1&quot; has no output named &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -665,49 +669,49 @@
 <context>
     <name>FileSource</name>
     <message>
-        <location filename="../../data/fileio/FileSource.cpp" line="93"/>
-        <location filename="../../data/fileio/FileSource.cpp" line="171"/>
-        <location filename="../../data/fileio/FileSource.cpp" line="203"/>
+        <location filename="../../svcore/data/fileio/FileSource.cpp" line="97"/>
+        <location filename="../../svcore/data/fileio/FileSource.cpp" line="175"/>
+        <location filename="../../svcore/data/fileio/FileSource.cpp" line="207"/>
         <source>Unsupported scheme in URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/FileSource.cpp" line="360"/>
+        <location filename="../../svcore/data/fileio/FileSource.cpp" line="364"/>
         <source>Downloading %1...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/FileSource.cpp" line="687"/>
+        <location filename="../../svcore/data/fileio/FileSource.cpp" line="691"/>
         <source>Failed to connect to FTP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/FileSource.cpp" line="689"/>
+        <location filename="../../svcore/data/fileio/FileSource.cpp" line="693"/>
         <source>Login failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/FileSource.cpp" line="691"/>
+        <location filename="../../svcore/data/fileio/FileSource.cpp" line="695"/>
         <source>Failed to change to correct directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/FileSource.cpp" line="693"/>
+        <location filename="../../svcore/data/fileio/FileSource.cpp" line="697"/>
         <source>FTP download aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/FileSource.cpp" line="713"/>
+        <location filename="../../svcore/data/fileio/FileSource.cpp" line="717"/>
         <source>Download cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/FileSource.cpp" line="744"/>
+        <location filename="../../svcore/data/fileio/FileSource.cpp" line="748"/>
         <source>Failed to create local file %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/FileSource.cpp" line="747"/>
+        <location filename="../../svcore/data/fileio/FileSource.cpp" line="751"/>
         <source>File contains no data!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -715,7 +719,7 @@
 <context>
     <name>I</name>
     <message>
-        <location filename="../../data/model/IntervalModel.h" line="103"/>
+        <location filename="../../svcore/data/model/IntervalModel.h" line="103"/>
         <source>Edit Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -723,52 +727,52 @@
 <context>
     <name>ImageDialog</name>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="49"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="49"/>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="56"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="56"/>
         <source>Label:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="63"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="63"/>
         <source>File or URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="73"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="73"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="79"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="79"/>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="187"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="187"/>
         <source>Unsupported scheme in URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="188"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="188"/>
         <source>The URL scheme &quot;%1&quot; is not supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="192"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="192"/>
         <source>Opening image URL...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="196"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="196"/>
         <source>File download failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="197"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="197"/>
         <source>Failed to download URL &quot;%1&quot;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -776,58 +780,58 @@
 <context>
     <name>ImageLayer</name>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="182"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="182"/>
         <source>In progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="606"/>
-        <location filename="../../layer/ImageLayer.cpp" line="711"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="606"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="711"/>
         <source>Select image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="678"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="678"/>
         <source>Move Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="735"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="735"/>
         <source>Drag Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="760"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="760"/>
         <source>Resize Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="794"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="794"/>
         <source>Delete Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="837"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="837"/>
         <source>Re-align pasted items?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="838"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="838"/>
         <source>The items you are pasting came from a layer with different source material from this one.  Do you want to re-align them in time, to match the source material for this layer?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="852"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="852"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="884"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="884"/>
         <source>New Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="915"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="915"/>
         <source>Opening image URL...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -835,38 +839,38 @@
 <context>
     <name>ImageModel</name>
     <message>
-        <location filename="../../data/model/ImageModel.h" line="96"/>
-        <location filename="../../data/model/ImageModel.h" line="154"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="96"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="154"/>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/ImageModel.h" line="124"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="124"/>
         <source>Edit Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/ImageModel.h" line="152"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="152"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/ImageModel.h" line="153"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="153"/>
         <source>Frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/ImageModel.h" line="155"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="155"/>
         <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/ImageModel.h" line="156"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="156"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/ImageModel.h" line="187"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="187"/>
         <source>Edit Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -874,38 +878,38 @@
 <context>
     <name>InteractiveFileFinder</name>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="52"/>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="192"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="52"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="192"/>
         <source>Select file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="53"/>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="193"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="53"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="193"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="59"/>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="199"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="59"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="199"/>
         <source>Select a session file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="60"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="60"/>
         <source>Sonic Visualiser session files (*.sv)
 RDF files (%1)
 All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="66"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="66"/>
         <source>Audio files (%1)
 All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="72"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="72"/>
         <source>All supported files (%1 %2)
 Sonic Visualiser Layer XML files (*.svl)
 Comma-separated data files (*.csv)
@@ -917,7 +921,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="79"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="79"/>
         <source>All supported files (%1 %2)
 Sonic Visualiser Layer XML files (*.svl)
 Comma-separated data files (*.csv)
@@ -928,7 +932,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="86"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="86"/>
         <source>All supported files (*.sv %1 %2)
 Sonic Visualiser session files (*.sv)
 Audio files (%2)
@@ -937,13 +941,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="101"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="101"/>
         <source>Image files (%1)
 All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="107"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="107"/>
         <source>All supported files (*.sv %1 %2 %3)
 Sonic Visualiser session files (*.sv)
 Audio files (%1)
@@ -953,79 +957,79 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="148"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="148"/>
         <source>File does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="149"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="149"/>
         <source>&lt;b&gt;File not found&lt;/b&gt;&lt;p&gt;File &quot;%1&quot; does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="154"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="154"/>
         <source>File is not readable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="155"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="155"/>
         <source>&lt;b&gt;File is not readable&lt;/b&gt;&lt;p&gt;File &quot;%1&quot; can not be read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="160"/>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="312"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="160"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="312"/>
         <source>Directory selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="161"/>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="313"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="161"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="313"/>
         <source>&lt;b&gt;Directory selected&lt;/b&gt;&lt;p&gt;File &quot;%1&quot; is a directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="166"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="166"/>
         <source>Non-file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="167"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="167"/>
         <source>&lt;b&gt;Not a file&lt;/b&gt;&lt;p&gt;Path &quot;%1&quot; is not a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="172"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="172"/>
         <source>File is empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="173"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="173"/>
         <source>&lt;b&gt;File is empty&lt;/b&gt;&lt;p&gt;File &quot;%1&quot; is empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="200"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="200"/>
         <source>Sonic Visualiser session files (*.sv)
 All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="206"/>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="212"/>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="218"/>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="228"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="206"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="212"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="218"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="228"/>
         <source>Select a file to export to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="207"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="207"/>
         <source>WAV audio files (*.wav)
 All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="213"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="213"/>
         <source>Sonic Visualiser Layer XML files (*.svl)
 Comma-separated data files (*.csv)
 RDF/Turtle files (%1)
@@ -1035,7 +1039,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="219"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="219"/>
         <source>Sonic Visualiser Layer XML files (*.svl)
 Comma-separated data files (*.csv)
 RDF/Turtle files (%1)
@@ -1044,71 +1048,71 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="229"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="229"/>
         <source>Portable Network Graphics files (*.png)
 All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="318"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="318"/>
         <source>File exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="319"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="319"/>
         <source>&lt;b&gt;File exists&lt;/b&gt;&lt;p&gt;The file &quot;%1&quot; already exists.
 Do you want to overwrite it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="451"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="451"/>
         <source>&lt;b&gt;File not found&lt;/b&gt;&lt;p&gt;Audio file &quot;%1&quot; could not be opened.
 Do you want to locate it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="453"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="453"/>
         <source>&lt;b&gt;File not found&lt;/b&gt;&lt;p&gt;File &quot;%1&quot; could not be opened.
 Do you want to locate it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="463"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="463"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="465"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="465"/>
         <source>Locate file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="466"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="466"/>
         <source>Use URL...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="467"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="467"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="486"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="486"/>
         <source>Use URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="487"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="487"/>
         <source>Please enter the URL to use for this file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="495"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="495"/>
         <source>Failed to open location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="496"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="496"/>
         <source>&lt;b&gt;Failed to open location&lt;/b&gt;&lt;p&gt;URL &quot;%1&quot; could not be opened</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1116,65 +1120,65 @@
 <context>
     <name>ItemEditDialog</name>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="58"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="58"/>
         <source>Timing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="69"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="69"/>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="73"/>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="104"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="73"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="104"/>
         <source> frames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="82"/>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="113"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="82"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="113"/>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="89"/>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="120"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="89"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="120"/>
         <source> usec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="100"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="100"/>
         <source>Duration:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="132"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="132"/>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="145"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="145"/>
         <source>Value:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="161"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="161"/>
         <source>Text:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="180"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="180"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="181"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="181"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="182"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="182"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1182,23 +1186,23 @@
 <context>
     <name>KeyReference</name>
     <message>
-        <location filename="../../widgets/KeyReference.cpp" line="61"/>
-        <location filename="../../widgets/KeyReference.cpp" line="92"/>
+        <location filename="../../svgui/widgets/KeyReference.cpp" line="61"/>
+        <location filename="../../svgui/widgets/KeyReference.cpp" line="92"/>
         <source>&amp;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/KeyReference.cpp" line="145"/>
+        <location filename="../../svgui/widgets/KeyReference.cpp" line="145"/>
         <source>&lt;i&gt;or&lt;/i&gt;&amp;nbsp;&lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/KeyReference.cpp" line="147"/>
+        <location filename="../../svgui/widgets/KeyReference.cpp" line="147"/>
         <source>&lt;/b&gt;&amp;nbsp;(%1)&lt;b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/KeyReference.cpp" line="162"/>
+        <location filename="../../svgui/widgets/KeyReference.cpp" line="162"/>
         <source>Sonic Visualiser: Key and Mouse Reference</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1206,17 +1210,17 @@
 <context>
     <name>LabelCounterInputDialog</name>
     <message>
-        <location filename="../../widgets/LabelCounterInputDialog.cpp" line="29"/>
+        <location filename="../../svgui/widgets/LabelCounterInputDialog.cpp" line="29"/>
         <source>Set Counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/LabelCounterInputDialog.cpp" line="33"/>
+        <location filename="../../svgui/widgets/LabelCounterInputDialog.cpp" line="33"/>
         <source>Fine counter (beats):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/LabelCounterInputDialog.cpp" line="36"/>
+        <location filename="../../svgui/widgets/LabelCounterInputDialog.cpp" line="36"/>
         <source>Coarse counter (bars):</source>
         <translation type="unfinished">Coarse counter (measures):</translation>
     </message>
@@ -1224,77 +1228,77 @@
 <context>
     <name>Labeller</name>
     <message>
-        <location filename="../../data/model/Labeller.h" line="89"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="89"/>
         <source>No numbering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="91"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="91"/>
         <source>Simple counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="93"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="93"/>
         <source>Cyclical counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="95"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="95"/>
         <source>Cyclical two-level counter (bar/beat)</source>
         <translation type="unfinished">Cyclical two-level counter (measure/beat)</translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="97"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="97"/>
         <source>Audio sample frame number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="99"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="99"/>
         <source>Time in seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="101"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="101"/>
         <source>Duration to the following item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="103"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="103"/>
         <source>Tempo (bpm) based on duration to following item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="105"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="105"/>
         <source>Duration since the previous item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="107"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="107"/>
         <source>Tempo (bpm) based on duration since previous item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="109"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="109"/>
         <source>Same as the nearest previous item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="111"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="111"/>
         <source>Value extracted from the item&apos;s label (where possible)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="153"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="153"/>
         <source>%1.%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="157"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="157"/>
         <source>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="176"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="176"/>
         <source>Label Points</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1302,85 +1306,79 @@
 <context>
     <name>Layer</name>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="70"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="70"/>
         <source>Waveform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="71"/>
-        <location filename="../../layer/LayerFactory.cpp" line="87"/>
-        <location filename="../../layer/LayerFactory.cpp" line="91"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="71"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="87"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="91"/>
         <source>Spectrogram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="72"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="72"/>
         <source>Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="73"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="73"/>
         <source>Time Instants</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="74"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="74"/>
         <source>Time Values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="75"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="75"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="76"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="76"/>
         <source>Regions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="77"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="77"/>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="78"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="78"/>
         <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="79"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="79"/>
         <source>Colour 3D Plot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="80"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="80"/>
         <source>Spectrum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="81"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="81"/>
         <source>Time Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="96"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="96"/>
         <source>Layer</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Layer::AddMeasurementRectCommand</name>
-    <message>
-        <location filename="../../layer/Layer.cpp" line="340"/>
+    <message>
+        <location filename="../../svgui/layer/Layer.cpp" line="340"/>
         <source>Make Measurement</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Layer::DeleteMeasurementRectCommand</name>
-    <message>
-        <location filename="../../layer/Layer.cpp" line="358"/>
+    <message>
+        <location filename="../../svgui/layer/Layer.cpp" line="358"/>
         <source>Delete Measurement</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1388,17 +1386,17 @@
 <context>
     <name>LayerTreeDialog</name>
     <message>
-        <location filename="../../widgets/LayerTreeDialog.cpp" line="34"/>
+        <location filename="../../svgui/widgets/LayerTreeDialog.cpp" line="34"/>
         <source>Layer Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTreeDialog.cpp" line="40"/>
+        <location filename="../../svgui/widgets/LayerTreeDialog.cpp" line="40"/>
         <source>Audio Data Sources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTreeDialog.cpp" line="61"/>
+        <location filename="../../svgui/widgets/LayerTreeDialog.cpp" line="61"/>
         <source>Panes and Layers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1406,22 +1404,22 @@
 <context>
     <name>LayerTreeModel</name>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="514"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="514"/>
         <source>Layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="515"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="515"/>
         <source>Shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="516"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="516"/>
         <source>Played</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="517"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="517"/>
         <source>Model</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1429,27 +1427,27 @@
 <context>
     <name>MIDIFileImportDialog</name>
     <message>
-        <location filename="../../widgets/MIDIFileImportDialog.cpp" line="32"/>
+        <location filename="../../svgui/widgets/MIDIFileImportDialog.cpp" line="32"/>
         <source>Merge all tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/MIDIFileImportDialog.cpp" line="33"/>
+        <location filename="../../svgui/widgets/MIDIFileImportDialog.cpp" line="33"/>
         <source>Merge all non-percussion tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/MIDIFileImportDialog.cpp" line="50"/>
+        <location filename="../../svgui/widgets/MIDIFileImportDialog.cpp" line="50"/>
         <source>Select track or tracks to import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/MIDIFileImportDialog.cpp" line="51"/>
+        <location filename="../../svgui/widgets/MIDIFileImportDialog.cpp" line="51"/>
         <source>&lt;b&gt;Select track to import&lt;/b&gt;&lt;p&gt;You can only import this file as a single annotation layer, but the file contains more than one track, or notes on more than one channel.&lt;p&gt;Please select the track or merged tracks you wish to import:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/MIDIFileImportDialog.cpp" line="70"/>
+        <location filename="../../svgui/widgets/MIDIFileImportDialog.cpp" line="70"/>
         <source>Error in MIDI file import</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1457,89 +1455,89 @@
 <context>
     <name>MIDIFileReader</name>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="112"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="112"/>
         <source>Wrong length for long data in MIDI stream (%1, should be %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="127"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="127"/>
         <source>Wrong length for int data in MIDI stream (%1, should be %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="144"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="144"/>
         <source>getMIDIByte called but no MIDI file open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="148"/>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="177"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="148"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="177"/>
         <source>End of MIDI file encountered while reading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="152"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="152"/>
         <source>Attempt to get more bytes than expected on Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="161"/>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="197"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="161"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="197"/>
         <source>Attempt to read past MIDI file end</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="173"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="173"/>
         <source>getMIDIBytes called but no MIDI file open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="181"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="181"/>
         <source>Attempt to get more bytes than available on Track (%1, only have %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="214"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="214"/>
         <source>getNumberFromMIDIBytes called but no MIDI file open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="248"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="248"/>
         <source>skipToNextTrack called but no MIDI file open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="479"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="479"/>
         <source>Invalid event code %1 found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="494"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="494"/>
         <source>Running status used for first event in track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="812"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="812"/>
         <source>MIDI file &quot;%1&quot; has no notes in any track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="835"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="835"/>
         <source> - uses GM percussion channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="839"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="839"/>
         <source>Track %1 (%2)%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="843"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="843"/>
         <source>Track %1 (untitled)%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/MIDIFileReader.cpp" line="1028"/>
+        <location filename="../../svcore/data/fileio/MIDIFileReader.cpp" line="1028"/>
         <source>%1 - vel %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1547,7 +1545,7 @@
 <context>
     <name>MIDIInput</name>
     <message>
-        <location filename="../../data/midi/MIDIInput.cpp" line="30"/>
+        <location filename="../../svcore/data/midi/MIDIInput.cpp" line="30"/>
         <source>Input</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1555,7 +1553,7 @@
 <context>
     <name>MP3FileReader</name>
     <message>
-        <location filename="../../data/fileio/MP3FileReader.cpp" line="115"/>
+        <location filename="../../svcore/data/fileio/MP3FileReader.cpp" line="115"/>
         <source>Decoding %1...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1563,2271 +1561,2317 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../main/MainWindow.cpp" line="162"/>
-        <location filename="../main/MainWindow.cpp" line="2592"/>
+        <location filename="../main/MainWindow.cpp" line="164"/>
+        <location filename="../main/MainWindow.cpp" line="2631"/>
         <source>Sonic Visualiser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="170"/>
+        <location filename="../main/MainWindow.cpp" line="172"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="171"/>
+        <location filename="../main/MainWindow.cpp" line="173"/>
         <source>Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="172"/>
+        <location filename="../main/MainWindow.cpp" line="174"/>
         <source>Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="173"/>
-        <location filename="../main/MainWindow.cpp" line="219"/>
-        <location filename="../main/MainWindow.cpp" line="2983"/>
+        <location filename="../main/MainWindow.cpp" line="175"/>
+        <location filename="../main/MainWindow.cpp" line="221"/>
+        <location filename="../main/MainWindow.cpp" line="3022"/>
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="174"/>
+        <location filename="../main/MainWindow.cpp" line="176"/>
         <source>Purple</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="175"/>
+        <location filename="../main/MainWindow.cpp" line="177"/>
         <source>Orange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="176"/>
+        <location filename="../main/MainWindow.cpp" line="178"/>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="177"/>
+        <location filename="../main/MainWindow.cpp" line="179"/>
         <source>Bright Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="178"/>
+        <location filename="../main/MainWindow.cpp" line="180"/>
         <source>Bright Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="179"/>
-        <location filename="../main/MainWindow.cpp" line="216"/>
-        <location filename="../main/MainWindow.cpp" line="2980"/>
+        <location filename="../main/MainWindow.cpp" line="181"/>
+        <location filename="../main/MainWindow.cpp" line="218"/>
+        <location filename="../main/MainWindow.cpp" line="3019"/>
         <source>Bright Green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="180"/>
+        <location filename="../main/MainWindow.cpp" line="182"/>
         <source>Bright Purple</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="181"/>
+        <location filename="../main/MainWindow.cpp" line="183"/>
         <source>Bright Orange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="234"/>
+        <location filename="../main/MainWindow.cpp" line="236"/>
         <source>Playback Speedup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="334"/>
-        <location filename="../main/MainWindow.cpp" line="902"/>
+        <location filename="../main/MainWindow.cpp" line="349"/>
+        <location filename="../main/MainWindow.cpp" line="927"/>
+        <location filename="../main/MainWindow.cpp" line="934"/>
         <source>&amp;Layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="342"/>
-        <location filename="../main/MainWindow.cpp" line="1286"/>
+        <location filename="../main/MainWindow.cpp" line="338"/>
+        <location filename="../main/MainWindow.cpp" line="1325"/>
         <source>&amp;Transform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="366"/>
+        <location filename="../main/MainWindow.cpp" line="373"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="368"/>
+        <location filename="../main/MainWindow.cpp" line="375"/>
         <source>File Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="370"/>
+        <location filename="../main/MainWindow.cpp" line="377"/>
         <source>File and Session Management</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="376"/>
+        <location filename="../main/MainWindow.cpp" line="383"/>
         <source>&amp;New Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="377"/>
+        <location filename="../main/MainWindow.cpp" line="384"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="378"/>
+        <location filename="../main/MainWindow.cpp" line="385"/>
         <source>Abandon the current Sonic Visualiser session and start a new one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="385"/>
+        <location filename="../main/MainWindow.cpp" line="392"/>
         <source>&amp;Open Session...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="386"/>
+        <location filename="../main/MainWindow.cpp" line="393"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="387"/>
+        <location filename="../main/MainWindow.cpp" line="394"/>
         <source>Open a previously saved Sonic Visualiser session file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="395"/>
+        <location filename="../main/MainWindow.cpp" line="402"/>
         <source>&amp;Open...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="396"/>
+        <location filename="../main/MainWindow.cpp" line="403"/>
         <source>Open a session file, audio file, or layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="402"/>
+        <location filename="../main/MainWindow.cpp" line="409"/>
         <source>&amp;Save Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="403"/>
+        <location filename="../main/MainWindow.cpp" line="410"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="404"/>
+        <location filename="../main/MainWindow.cpp" line="411"/>
         <source>Save the current session into a Sonic Visualiser session file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="413"/>
+        <location filename="../main/MainWindow.cpp" line="420"/>
         <source>Save Session &amp;As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="414"/>
+        <location filename="../main/MainWindow.cpp" line="421"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="415"/>
+        <location filename="../main/MainWindow.cpp" line="422"/>
         <source>Save the current session into a new Sonic Visualiser session file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="423"/>
+        <location filename="../main/MainWindow.cpp" line="430"/>
         <source>&amp;Import Audio File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="424"/>
+        <location filename="../main/MainWindow.cpp" line="431"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="425"/>
+        <location filename="../main/MainWindow.cpp" line="432"/>
         <source>Import an existing audio file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="430"/>
+        <location filename="../main/MainWindow.cpp" line="437"/>
         <source>Import Secondary Audio File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="431"/>
+        <location filename="../main/MainWindow.cpp" line="438"/>
         <source>Ctrl+Shift+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="432"/>
+        <location filename="../main/MainWindow.cpp" line="439"/>
         <source>Import an extra audio file as a separate layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="438"/>
+        <location filename="../main/MainWindow.cpp" line="445"/>
         <source>&amp;Export Audio File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="439"/>
+        <location filename="../main/MainWindow.cpp" line="446"/>
         <source>Export selection as an audio file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="446"/>
+        <location filename="../main/MainWindow.cpp" line="453"/>
         <source>Import Annotation &amp;Layer...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="447"/>
+        <location filename="../main/MainWindow.cpp" line="454"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="448"/>
+        <location filename="../main/MainWindow.cpp" line="455"/>
         <source>Import layer data from an existing file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="454"/>
+        <location filename="../main/MainWindow.cpp" line="461"/>
         <source>Export Annotation Layer...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="455"/>
+        <location filename="../main/MainWindow.cpp" line="462"/>
         <source>Export layer data to a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="462"/>
+        <location filename="../main/MainWindow.cpp" line="469"/>
         <source>Export Image File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="463"/>
+        <location filename="../main/MainWindow.cpp" line="470"/>
         <source>Export a single pane to an image file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="470"/>
+        <location filename="../main/MainWindow.cpp" line="477"/>
         <source>Open Lo&amp;cation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="471"/>
+        <location filename="../main/MainWindow.cpp" line="478"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="472"/>
+        <location filename="../main/MainWindow.cpp" line="479"/>
         <source>Open or import a file from a remote URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="479"/>
+        <location filename="../main/MainWindow.cpp" line="486"/>
         <source>&amp;Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="486"/>
+        <location filename="../main/MainWindow.cpp" line="493"/>
         <source>&amp;Preferences...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="487"/>
+        <location filename="../main/MainWindow.cpp" line="494"/>
         <source>Adjust the application preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="493"/>
+        <location filename="../main/MainWindow.cpp" line="500"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="494"/>
+        <location filename="../main/MainWindow.cpp" line="501"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="495"/>
+        <location filename="../main/MainWindow.cpp" line="502"/>
         <source>Exit Sonic Visualiser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="506"/>
+        <location filename="../main/MainWindow.cpp" line="513"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="510"/>
+        <location filename="../main/MainWindow.cpp" line="517"/>
         <source>Editing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="517"/>
+        <location filename="../main/MainWindow.cpp" line="524"/>
         <source>Cu&amp;t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="518"/>
+        <location filename="../main/MainWindow.cpp" line="525"/>
         <source>Ctrl+X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="519"/>
+        <location filename="../main/MainWindow.cpp" line="526"/>
         <source>Cut the selection from the current layer to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="527"/>
+        <location filename="../main/MainWindow.cpp" line="534"/>
         <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="528"/>
+        <location filename="../main/MainWindow.cpp" line="535"/>
         <source>Ctrl+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="529"/>
+        <location filename="../main/MainWindow.cpp" line="536"/>
         <source>Copy the selection from the current layer to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="537"/>
+        <location filename="../main/MainWindow.cpp" line="544"/>
         <source>&amp;Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="538"/>
+        <location filename="../main/MainWindow.cpp" line="545"/>
         <source>Ctrl+V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="539"/>
+        <location filename="../main/MainWindow.cpp" line="546"/>
         <source>Paste from the clipboard to the current layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="546"/>
-        <location filename="../main/MainWindow.cpp" line="2000"/>
+        <location filename="../main/MainWindow.cpp" line="553"/>
+        <source>Paste at Playback Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="554"/>
+        <source>Ctrl+Shift+V</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="555"/>
+        <source>Paste from the clipboard to the current layer, placing the first item at the playback position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="562"/>
+        <location filename="../main/MainWindow.cpp" line="2039"/>
         <source>&amp;Delete Selected Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="547"/>
+        <location filename="../main/MainWindow.cpp" line="563"/>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="548"/>
-        <location filename="../main/MainWindow.cpp" line="2001"/>
+        <location filename="../main/MainWindow.cpp" line="564"/>
+        <location filename="../main/MainWindow.cpp" line="2040"/>
         <source>Delete items in current selection from the current layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="558"/>
+        <location filename="../main/MainWindow.cpp" line="574"/>
         <source>Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="560"/>
+        <location filename="../main/MainWindow.cpp" line="576"/>
         <source>Select &amp;All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="561"/>
+        <location filename="../main/MainWindow.cpp" line="577"/>
         <source>Ctrl+A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="562"/>
+        <location filename="../main/MainWindow.cpp" line="578"/>
         <source>Select the whole duration of the current session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="569"/>
+        <location filename="../main/MainWindow.cpp" line="585"/>
         <source>Select &amp;Visible Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="570"/>
+        <location filename="../main/MainWindow.cpp" line="586"/>
         <source>Ctrl+Shift+A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="571"/>
+        <location filename="../main/MainWindow.cpp" line="587"/>
         <source>Select the time range corresponding to the current window width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="577"/>
+        <location filename="../main/MainWindow.cpp" line="593"/>
         <source>Select to &amp;Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="578"/>
+        <location filename="../main/MainWindow.cpp" line="594"/>
         <source>Shift+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="579"/>
+        <location filename="../main/MainWindow.cpp" line="595"/>
         <source>Select from the start of the session to the current playback position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="585"/>
+        <location filename="../main/MainWindow.cpp" line="601"/>
         <source>Select to &amp;End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="586"/>
+        <location filename="../main/MainWindow.cpp" line="602"/>
         <source>Shift+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="587"/>
+        <location filename="../main/MainWindow.cpp" line="603"/>
         <source>Select from the current playback position to the end of the session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="593"/>
+        <location filename="../main/MainWindow.cpp" line="609"/>
         <source>C&amp;lear Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="594"/>
+        <location filename="../main/MainWindow.cpp" line="610"/>
         <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="595"/>
+        <location filename="../main/MainWindow.cpp" line="611"/>
         <source>Clear the selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="604"/>
+        <location filename="../main/MainWindow.cpp" line="620"/>
         <source>Tapping Time Instants</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="606"/>
+        <location filename="../main/MainWindow.cpp" line="622"/>
         <source>&amp;Insert Instant at Playback Position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="607"/>
+        <location filename="../main/MainWindow.cpp" line="623"/>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="608"/>
+        <location filename="../main/MainWindow.cpp" line="624"/>
         <source>Insert a new time instant at the current playback position, in a new layer if necessary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="615"/>
+        <location filename="../main/MainWindow.cpp" line="631"/>
         <source>;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="620"/>
+        <location filename="../main/MainWindow.cpp" line="636"/>
         <source>Insert Instants at Selection &amp;Boundaries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="621"/>
+        <location filename="../main/MainWindow.cpp" line="637"/>
         <source>Shift+Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="622"/>
+        <location filename="../main/MainWindow.cpp" line="638"/>
         <source>Insert new time instants at the start and end of the current selected regions, in a new layer if necessary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="628"/>
+        <location filename="../main/MainWindow.cpp" line="644"/>
         <source>Insert Item at Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="629"/>
+        <location filename="../main/MainWindow.cpp" line="645"/>
         <source>Ctrl+Shift+Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="630"/>
+        <location filename="../main/MainWindow.cpp" line="646"/>
         <source>Insert a new note or region item corresponding to the current selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="638"/>
+        <location filename="../main/MainWindow.cpp" line="654"/>
         <source>Number New Instants with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="658"/>
+        <location filename="../main/MainWindow.cpp" line="674"/>
         <source>Cycle size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="679"/>
+        <location filename="../main/MainWindow.cpp" line="695"/>
         <source>Set Numbering Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="680"/>
+        <location filename="../main/MainWindow.cpp" line="696"/>
         <source>Set the counters used for counter-based labelling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="684"/>
+        <location filename="../main/MainWindow.cpp" line="700"/>
         <source>Renumber Selected Instants</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="685"/>
+        <location filename="../main/MainWindow.cpp" line="701"/>
         <source>Renumber the selected instants using the current labelling scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="701"/>
+        <location filename="../main/MainWindow.cpp" line="717"/>
         <source>Panning and Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="703"/>
+        <location filename="../main/MainWindow.cpp" line="719"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="705"/>
+        <location filename="../main/MainWindow.cpp" line="721"/>
         <source>Scroll &amp;Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="706"/>
+        <location filename="../main/MainWindow.cpp" line="722"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="707"/>
+        <location filename="../main/MainWindow.cpp" line="723"/>
         <source>Scroll the current pane to the left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="713"/>
+        <location filename="../main/MainWindow.cpp" line="729"/>
         <source>Scroll &amp;Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="714"/>
+        <location filename="../main/MainWindow.cpp" line="730"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="715"/>
+        <location filename="../main/MainWindow.cpp" line="731"/>
         <source>Scroll the current pane to the right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="721"/>
+        <location filename="../main/MainWindow.cpp" line="737"/>
         <source>&amp;Jump Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="722"/>
+        <location filename="../main/MainWindow.cpp" line="738"/>
         <source>Ctrl+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="723"/>
+        <location filename="../main/MainWindow.cpp" line="739"/>
         <source>Scroll the current pane a big step to the left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="729"/>
+        <location filename="../main/MainWindow.cpp" line="745"/>
         <source>J&amp;ump Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="730"/>
+        <location filename="../main/MainWindow.cpp" line="746"/>
         <source>Ctrl+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="731"/>
+        <location filename="../main/MainWindow.cpp" line="747"/>
         <source>Scroll the current pane a big step to the right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="737"/>
+        <location filename="../main/MainWindow.cpp" line="753"/>
         <source>Peek Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="738"/>
+        <location filename="../main/MainWindow.cpp" line="754"/>
         <source>Alt+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="739"/>
+        <location filename="../main/MainWindow.cpp" line="755"/>
         <source>Scroll the current pane to the left without moving the playback cursor or other panes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="745"/>
+        <location filename="../main/MainWindow.cpp" line="761"/>
         <source>Peek Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="746"/>
+        <location filename="../main/MainWindow.cpp" line="762"/>
         <source>Alt+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="747"/>
+        <location filename="../main/MainWindow.cpp" line="763"/>
         <source>Scroll the current pane to the right without moving the playback cursor or other panes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="755"/>
+        <location filename="../main/MainWindow.cpp" line="771"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="758"/>
+        <location filename="../main/MainWindow.cpp" line="774"/>
         <source>Zoom &amp;In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="759"/>
+        <location filename="../main/MainWindow.cpp" line="775"/>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="760"/>
+        <location filename="../main/MainWindow.cpp" line="776"/>
         <source>Increase the zoom level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="767"/>
+        <location filename="../main/MainWindow.cpp" line="783"/>
         <source>Zoom &amp;Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="768"/>
+        <location filename="../main/MainWindow.cpp" line="784"/>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="769"/>
+        <location filename="../main/MainWindow.cpp" line="785"/>
         <source>Decrease the zoom level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="775"/>
+        <location filename="../main/MainWindow.cpp" line="791"/>
         <source>Restore &amp;Default Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="776"/>
+        <location filename="../main/MainWindow.cpp" line="792"/>
         <source>Restore the zoom level to the default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="782"/>
+        <location filename="../main/MainWindow.cpp" line="798"/>
         <source>Zoom to &amp;Fit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="783"/>
+        <location filename="../main/MainWindow.cpp" line="799"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="784"/>
+        <location filename="../main/MainWindow.cpp" line="800"/>
         <source>Zoom to show the whole file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="792"/>
+        <location filename="../main/MainWindow.cpp" line="808"/>
         <source>Display Features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="796"/>
+        <location filename="../main/MainWindow.cpp" line="812"/>
         <source>Show &amp;No Overlays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="797"/>
+        <location filename="../main/MainWindow.cpp" line="813"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="798"/>
+        <location filename="../main/MainWindow.cpp" line="814"/>
         <source>Hide centre indicator, frame times, layer names and scale</source>
         <translation type="unfinished">Hide center indicator, frame times, layer names and scale</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="806"/>
+        <location filename="../main/MainWindow.cpp" line="822"/>
         <source>Show &amp;Minimal Overlays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="807"/>
+        <location filename="../main/MainWindow.cpp" line="823"/>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="808"/>
+        <location filename="../main/MainWindow.cpp" line="824"/>
         <source>Show centre indicator only</source>
         <translation type="unfinished">Show center indicator only</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="816"/>
+        <location filename="../main/MainWindow.cpp" line="832"/>
         <source>Show &amp;Standard Overlays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="817"/>
+        <location filename="../main/MainWindow.cpp" line="833"/>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="818"/>
+        <location filename="../main/MainWindow.cpp" line="834"/>
         <source>Show centre indicator, frame times and scale</source>
         <translation type="unfinished">Show center indicator, frame times and scale</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="826"/>
+        <location filename="../main/MainWindow.cpp" line="842"/>
         <source>Show &amp;All Overlays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="827"/>
+        <location filename="../main/MainWindow.cpp" line="843"/>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="828"/>
+        <location filename="../main/MainWindow.cpp" line="844"/>
         <source>Show all texts and scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="838"/>
+        <location filename="../main/MainWindow.cpp" line="854"/>
+        <source>Show All Time Rulers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="855"/>
+        <source>#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="856"/>
+        <source>Show or hide all time rulers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="863"/>
         <source>Show &amp;Zoom Wheels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="839"/>
+        <location filename="../main/MainWindow.cpp" line="864"/>
         <source>Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="840"/>
+        <location filename="../main/MainWindow.cpp" line="865"/>
         <source>Show thumbwheels for zooming horizontally and vertically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="847"/>
+        <location filename="../main/MainWindow.cpp" line="872"/>
         <source>Show Property Bo&amp;xes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="848"/>
+        <location filename="../main/MainWindow.cpp" line="873"/>
         <source>X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="849"/>
+        <location filename="../main/MainWindow.cpp" line="874"/>
         <source>Show the layer property boxes at the side of the main window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="856"/>
+        <location filename="../main/MainWindow.cpp" line="881"/>
         <source>Show Status &amp;Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="857"/>
+        <location filename="../main/MainWindow.cpp" line="882"/>
         <source>Show context help information in the status bar at the bottom of the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="874"/>
+        <location filename="../main/MainWindow.cpp" line="899"/>
         <source>Show La&amp;yer Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="875"/>
+        <location filename="../main/MainWindow.cpp" line="900"/>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="876"/>
+        <location filename="../main/MainWindow.cpp" line="901"/>
         <source>Open a window displaying the hierarchy of panes and layers in this session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="881"/>
+        <location filename="../main/MainWindow.cpp" line="906"/>
         <source>Show Acti&amp;vity Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="882"/>
+        <location filename="../main/MainWindow.cpp" line="907"/>
         <source>Open a window listing interactions and other events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="894"/>
+        <location filename="../main/MainWindow.cpp" line="919"/>
         <source>&amp;Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="910"/>
+        <location filename="../main/MainWindow.cpp" line="943"/>
         <source>Managing Panes and Layers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="912"/>
+        <location filename="../main/MainWindow.cpp" line="945"/>
         <source>Add &amp;New Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="913"/>
+        <location filename="../main/MainWindow.cpp" line="946"/>
         <source>N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="914"/>
+        <location filename="../main/MainWindow.cpp" line="947"/>
         <source>Add a new pane containing only a time ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="940"/>
+        <location filename="../main/MainWindow.cpp" line="973"/>
         <source>Add New %1 Layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="941"/>
+        <location filename="../main/MainWindow.cpp" line="974"/>
         <source>Add a new empty layer of type %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="947"/>
+        <location filename="../main/MainWindow.cpp" line="980"/>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="997"/>
+        <location filename="../main/MainWindow.cpp" line="1030"/>
         <source>Add &amp;Waveform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="999"/>
+        <location filename="../main/MainWindow.cpp" line="1032"/>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1000"/>
+        <location filename="../main/MainWindow.cpp" line="1033"/>
         <source>Add a new pane showing a waveform view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1002"/>
+        <location filename="../main/MainWindow.cpp" line="1035"/>
+        <source>Shift+W</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="1036"/>
         <source>Add a new layer showing a waveform view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1009"/>
+        <location filename="../main/MainWindow.cpp" line="1043"/>
         <source>Add Spectro&amp;gram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1011"/>
+        <location filename="../main/MainWindow.cpp" line="1045"/>
         <source>G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1012"/>
+        <location filename="../main/MainWindow.cpp" line="1046"/>
         <source>Add a new pane showing a spectrogram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1014"/>
+        <location filename="../main/MainWindow.cpp" line="1048"/>
+        <source>Shift+G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="1049"/>
         <source>Add a new layer showing a spectrogram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1020"/>
+        <location filename="../main/MainWindow.cpp" line="1055"/>
         <source>Add &amp;Melodic Range Spectrogram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1022"/>
+        <location filename="../main/MainWindow.cpp" line="1057"/>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1023"/>
+        <location filename="../main/MainWindow.cpp" line="1058"/>
         <source>Add a new pane showing a spectrogram set up for an overview of note pitches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1025"/>
+        <location filename="../main/MainWindow.cpp" line="1060"/>
+        <source>Shift+M</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="1061"/>
         <source>Add a new layer showing a spectrogram set up for an overview of note pitches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1031"/>
+        <location filename="../main/MainWindow.cpp" line="1067"/>
         <source>Add Pea&amp;k Frequency Spectrogram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1033"/>
+        <location filename="../main/MainWindow.cpp" line="1069"/>
         <source>K</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1034"/>
+        <location filename="../main/MainWindow.cpp" line="1070"/>
         <source>Add a new pane showing a spectrogram set up for tracking frequencies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1036"/>
+        <location filename="../main/MainWindow.cpp" line="1072"/>
+        <source>Shift+K</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="1073"/>
         <source>Add a new layer showing a spectrogram set up for tracking frequencies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1042"/>
+        <location filename="../main/MainWindow.cpp" line="1079"/>
         <source>Add Spectr&amp;um</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1044"/>
+        <location filename="../main/MainWindow.cpp" line="1081"/>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1045"/>
+        <location filename="../main/MainWindow.cpp" line="1082"/>
         <source>Add a new pane showing a frequency spectrum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1047"/>
+        <location filename="../main/MainWindow.cpp" line="1084"/>
+        <source>Shift+U</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="1085"/>
         <source>Add a new layer showing a frequency spectrum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1129"/>
+        <location filename="../main/MainWindow.cpp" line="1155"/>
         <source>&amp;All Channels Mixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1131"/>
+        <location filename="../main/MainWindow.cpp" line="1157"/>
         <source>&amp;All Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1134"/>
+        <location filename="../main/MainWindow.cpp" line="1160"/>
         <source>Channel &amp;%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1138"/>
+        <location filename="../main/MainWindow.cpp" line="1164"/>
         <source>%1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1180"/>
+        <location filename="../main/MainWindow.cpp" line="1219"/>
         <source>Switch to Previous Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1181"/>
+        <location filename="../main/MainWindow.cpp" line="1220"/>
         <source>[</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1182"/>
+        <location filename="../main/MainWindow.cpp" line="1221"/>
         <source>Make the next pane up in the pane stack current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1188"/>
+        <location filename="../main/MainWindow.cpp" line="1227"/>
         <source>Switch to Next Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1189"/>
+        <location filename="../main/MainWindow.cpp" line="1228"/>
         <source>]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1190"/>
+        <location filename="../main/MainWindow.cpp" line="1229"/>
         <source>Make the next pane down in the pane stack current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1198"/>
+        <location filename="../main/MainWindow.cpp" line="1237"/>
         <source>&amp;Delete Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1199"/>
+        <location filename="../main/MainWindow.cpp" line="1238"/>
         <source>Ctrl+Shift+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1200"/>
+        <location filename="../main/MainWindow.cpp" line="1239"/>
         <source>Delete the currently active pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1208"/>
+        <location filename="../main/MainWindow.cpp" line="1247"/>
         <source>Add &amp;Time Ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1209"/>
+        <location filename="../main/MainWindow.cpp" line="1248"/>
         <source>Add a new layer showing a time ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1217"/>
+        <location filename="../main/MainWindow.cpp" line="1256"/>
         <source>Add &amp;Existing Layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1221"/>
+        <location filename="../main/MainWindow.cpp" line="1260"/>
         <source>Add S&amp;lice of Layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1249"/>
+        <location filename="../main/MainWindow.cpp" line="1288"/>
         <source>&amp;Rename Layer...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1250"/>
+        <location filename="../main/MainWindow.cpp" line="1289"/>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1251"/>
+        <location filename="../main/MainWindow.cpp" line="1290"/>
         <source>Rename the currently active layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1257"/>
+        <location filename="../main/MainWindow.cpp" line="1296"/>
         <source>Edit Layer Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1258"/>
+        <location filename="../main/MainWindow.cpp" line="1297"/>
         <source>E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1259"/>
+        <location filename="../main/MainWindow.cpp" line="1298"/>
         <source>Edit the currently active layer as a data grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1265"/>
+        <location filename="../main/MainWindow.cpp" line="1304"/>
         <source>&amp;Delete Layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1266"/>
+        <location filename="../main/MainWindow.cpp" line="1305"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1267"/>
+        <location filename="../main/MainWindow.cpp" line="1306"/>
         <source>Delete the currently active layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1304"/>
+        <location filename="../main/MainWindow.cpp" line="1343"/>
         <source>&amp;Recent Transforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1321"/>
+        <location filename="../main/MainWindow.cpp" line="1360"/>
         <source>%1 by Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1336"/>
-        <location filename="../main/MainWindow.cpp" line="1424"/>
+        <location filename="../main/MainWindow.cpp" line="1375"/>
+        <location filename="../main/MainWindow.cpp" line="1463"/>
         <source>Unclassified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1367"/>
+        <location filename="../main/MainWindow.cpp" line="1406"/>
         <source>%1 by Plugin Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1375"/>
+        <location filename="../main/MainWindow.cpp" line="1414"/>
         <source>%1 by Maker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1389"/>
-        <location filename="../main/MainWindow.cpp" line="1427"/>
+        <location filename="../main/MainWindow.cpp" line="1428"/>
+        <location filename="../main/MainWindow.cpp" line="1466"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1390"/>
-        <location filename="../main/MainWindow.cpp" line="1428"/>
+        <location filename="../main/MainWindow.cpp" line="1429"/>
+        <location filename="../main/MainWindow.cpp" line="1467"/>
         <source> [\(&lt;].*$</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1443"/>
-        <location filename="../main/MainWindow.cpp" line="1469"/>
+        <location filename="../main/MainWindow.cpp" line="1482"/>
+        <location filename="../main/MainWindow.cpp" line="1508"/>
         <source>%1...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1508"/>
+        <location filename="../main/MainWindow.cpp" line="1547"/>
         <source>Find a Transform...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1509"/>
+        <location filename="../main/MainWindow.cpp" line="1548"/>
         <source>Search for a transform from the installed plugins, by name or description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1510"/>
+        <location filename="../main/MainWindow.cpp" line="1549"/>
         <source>Ctrl+M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1523"/>
+        <location filename="../main/MainWindow.cpp" line="1562"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1526"/>
+        <location filename="../main/MainWindow.cpp" line="1565"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1531"/>
+        <location filename="../main/MainWindow.cpp" line="1570"/>
         <source>&amp;Help Reference</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1532"/>
+        <location filename="../main/MainWindow.cpp" line="1571"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1533"/>
+        <location filename="../main/MainWindow.cpp" line="1572"/>
         <source>Open the Sonic Visualiser reference manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1538"/>
+        <location filename="../main/MainWindow.cpp" line="1577"/>
         <source>&amp;Key and Mouse Reference</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1539"/>
+        <location filename="../main/MainWindow.cpp" line="1578"/>
         <source>F2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1540"/>
+        <location filename="../main/MainWindow.cpp" line="1579"/>
         <source>Open a window showing the keystrokes you can use in Sonic Visualiser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1545"/>
+        <location filename="../main/MainWindow.cpp" line="1584"/>
         <source>Sonic Visualiser on the &amp;Web</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1546"/>
+        <location filename="../main/MainWindow.cpp" line="1585"/>
         <source>Open the Sonic Visualiser website</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1550"/>
+        <location filename="../main/MainWindow.cpp" line="1589"/>
         <source>&amp;About Sonic Visualiser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1551"/>
+        <location filename="../main/MainWindow.cpp" line="1590"/>
         <source>Show information about Sonic Visualiser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1565"/>
+        <location filename="../main/MainWindow.cpp" line="1604"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1567"/>
+        <location filename="../main/MainWindow.cpp" line="1606"/>
         <source>Re-open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1569"/>
+        <location filename="../main/MainWindow.cpp" line="1608"/>
         <source>Re-open the current or most recently opened file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1590"/>
+        <location filename="../main/MainWindow.cpp" line="1629"/>
         <source>Ctrl+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1592"/>
+        <location filename="../main/MainWindow.cpp" line="1631"/>
         <source>Repeat Transform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1594"/>
+        <location filename="../main/MainWindow.cpp" line="1633"/>
         <source>Re-select the most recently run transform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1684"/>
+        <location filename="../main/MainWindow.cpp" line="1723"/>
         <source>Playback and Transport Controls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1688"/>
+        <location filename="../main/MainWindow.cpp" line="1727"/>
         <source>Play&amp;back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1691"/>
+        <location filename="../main/MainWindow.cpp" line="1730"/>
         <source>Playback</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1693"/>
+        <location filename="../main/MainWindow.cpp" line="1732"/>
         <source>Playback Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1696"/>
+        <location filename="../main/MainWindow.cpp" line="1735"/>
         <source>Rewind to Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1697"/>
+        <location filename="../main/MainWindow.cpp" line="1736"/>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1698"/>
+        <location filename="../main/MainWindow.cpp" line="1737"/>
         <source>Rewind to the start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1702"/>
-        <location filename="../main/MainWindow.cpp" line="2018"/>
-        <location filename="../main/MainWindow.cpp" line="2019"/>
+        <location filename="../main/MainWindow.cpp" line="1741"/>
+        <location filename="../main/MainWindow.cpp" line="2057"/>
+        <location filename="../main/MainWindow.cpp" line="2058"/>
         <source>Rewind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1703"/>
+        <location filename="../main/MainWindow.cpp" line="1742"/>
         <source>PgUp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1704"/>
+        <location filename="../main/MainWindow.cpp" line="1743"/>
         <source>Rewind to the previous time instant or time ruler notch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1708"/>
+        <location filename="../main/MainWindow.cpp" line="1747"/>
         <source>Rewind to Similar Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1709"/>
+        <location filename="../main/MainWindow.cpp" line="1748"/>
         <source>Shift+PgUp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1710"/>
+        <location filename="../main/MainWindow.cpp" line="1749"/>
         <source>Rewind to the previous similarly valued time instant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1715"/>
+        <location filename="../main/MainWindow.cpp" line="1754"/>
         <source>Play / Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1717"/>
+        <location filename="../main/MainWindow.cpp" line="1756"/>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1718"/>
+        <location filename="../main/MainWindow.cpp" line="1757"/>
         <source>Start or stop playback from the current position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1727"/>
-        <location filename="../main/MainWindow.cpp" line="2016"/>
+        <location filename="../main/MainWindow.cpp" line="1766"/>
+        <location filename="../main/MainWindow.cpp" line="2055"/>
         <source>Fast Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1728"/>
+        <location filename="../main/MainWindow.cpp" line="1767"/>
         <source>PgDown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1729"/>
+        <location filename="../main/MainWindow.cpp" line="1768"/>
         <source>Fast-forward to the next time instant or time ruler notch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1733"/>
+        <location filename="../main/MainWindow.cpp" line="1772"/>
         <source>Fast Forward to Similar Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1734"/>
+        <location filename="../main/MainWindow.cpp" line="1773"/>
         <source>Shift+PgDown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1735"/>
+        <location filename="../main/MainWindow.cpp" line="1774"/>
         <source>Fast-forward to the next similarly valued time instant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1740"/>
+        <location filename="../main/MainWindow.cpp" line="1779"/>
         <source>Fast Forward to End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1741"/>
+        <location filename="../main/MainWindow.cpp" line="1780"/>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1742"/>
+        <location filename="../main/MainWindow.cpp" line="1781"/>
         <source>Fast-forward to the end</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1746"/>
+        <location filename="../main/MainWindow.cpp" line="1785"/>
         <source>Play Mode Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1749"/>
+        <location filename="../main/MainWindow.cpp" line="1788"/>
         <source>Constrain Playback to Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1752"/>
+        <location filename="../main/MainWindow.cpp" line="1791"/>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1753"/>
+        <location filename="../main/MainWindow.cpp" line="1792"/>
         <source>Constrain playback to the selected regions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1760"/>
+        <location filename="../main/MainWindow.cpp" line="1799"/>
         <source>Loop Playback</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1763"/>
+        <location filename="../main/MainWindow.cpp" line="1802"/>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1764"/>
+        <location filename="../main/MainWindow.cpp" line="1803"/>
         <source>Loop playback</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1771"/>
+        <location filename="../main/MainWindow.cpp" line="1810"/>
         <source>Solo Current Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1775"/>
+        <location filename="../main/MainWindow.cpp" line="1814"/>
         <source>o</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1776"/>
+        <location filename="../main/MainWindow.cpp" line="1815"/>
         <source>Solo the current pane during playback</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1785"/>
+        <location filename="../main/MainWindow.cpp" line="1824"/>
         <source>Align File Timelines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1788"/>
+        <location filename="../main/MainWindow.cpp" line="1827"/>
         <source>Treat multiple audio files as versions of the same work, and align their timelines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1836"/>
+        <location filename="../main/MainWindow.cpp" line="1875"/>
         <source>Speed Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1837"/>
+        <location filename="../main/MainWindow.cpp" line="1876"/>
         <source>Ctrl+PgUp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1838"/>
+        <location filename="../main/MainWindow.cpp" line="1877"/>
         <source>Time-stretch playback to speed it up without changing pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1842"/>
+        <location filename="../main/MainWindow.cpp" line="1881"/>
         <source>Slow Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1843"/>
+        <location filename="../main/MainWindow.cpp" line="1882"/>
         <source>Ctrl+PgDown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1844"/>
+        <location filename="../main/MainWindow.cpp" line="1883"/>
         <source>Time-stretch playback to slow it down without changing pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1848"/>
+        <location filename="../main/MainWindow.cpp" line="1887"/>
         <source>Restore Normal Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1849"/>
+        <location filename="../main/MainWindow.cpp" line="1888"/>
         <source>Ctrl+Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1850"/>
+        <location filename="../main/MainWindow.cpp" line="1889"/>
         <source>Restore non-time-stretched playback</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1862"/>
+        <location filename="../main/MainWindow.cpp" line="1901"/>
         <source>Edit Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1865"/>
+        <location filename="../main/MainWindow.cpp" line="1904"/>
         <source>Tool Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1867"/>
+        <location filename="../main/MainWindow.cpp" line="1906"/>
         <source>Tools Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1871"/>
-        <location filename="../main/MainWindow.cpp" line="1875"/>
+        <location filename="../main/MainWindow.cpp" line="1910"/>
+        <location filename="../main/MainWindow.cpp" line="1914"/>
         <source>Navigate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1874"/>
+        <location filename="../main/MainWindow.cpp" line="1913"/>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1882"/>
+        <location filename="../main/MainWindow.cpp" line="1921"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1884"/>
+        <location filename="../main/MainWindow.cpp" line="1923"/>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1885"/>
+        <location filename="../main/MainWindow.cpp" line="1924"/>
         <source>Select ranges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1892"/>
+        <location filename="../main/MainWindow.cpp" line="1931"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1894"/>
+        <location filename="../main/MainWindow.cpp" line="1933"/>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1895"/>
+        <location filename="../main/MainWindow.cpp" line="1934"/>
         <source>Edit items in layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1903"/>
+        <location filename="../main/MainWindow.cpp" line="1942"/>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1905"/>
+        <location filename="../main/MainWindow.cpp" line="1944"/>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1906"/>
+        <location filename="../main/MainWindow.cpp" line="1945"/>
         <source>Draw new items in layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1914"/>
+        <location filename="../main/MainWindow.cpp" line="1953"/>
         <source>Erase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1916"/>
+        <location filename="../main/MainWindow.cpp" line="1955"/>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1917"/>
+        <location filename="../main/MainWindow.cpp" line="1956"/>
         <source>Erase items from layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1924"/>
+        <location filename="../main/MainWindow.cpp" line="1963"/>
         <source>Measure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1926"/>
+        <location filename="../main/MainWindow.cpp" line="1965"/>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1927"/>
+        <location filename="../main/MainWindow.cpp" line="1966"/>
         <source>Make measurements in layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1996"/>
+        <location filename="../main/MainWindow.cpp" line="2035"/>
         <source>&amp;Delete Current Measurement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1997"/>
+        <location filename="../main/MainWindow.cpp" line="2036"/>
         <source>Delete the measurement currently under the mouse pointer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2006"/>
+        <location filename="../main/MainWindow.cpp" line="2045"/>
         <source>Fast Forward to Next Instant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2007"/>
+        <location filename="../main/MainWindow.cpp" line="2046"/>
         <source>Fast forward to the next time instant in the current layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2008"/>
+        <location filename="../main/MainWindow.cpp" line="2047"/>
         <source>Rewind to Previous Instant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2009"/>
+        <location filename="../main/MainWindow.cpp" line="2048"/>
         <source>Rewind to the previous time instant in the current layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2011"/>
+        <location filename="../main/MainWindow.cpp" line="2050"/>
         <source>Fast Forward to Next Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2012"/>
+        <location filename="../main/MainWindow.cpp" line="2051"/>
         <source>Fast forward to the next point in the current layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2013"/>
+        <location filename="../main/MainWindow.cpp" line="2052"/>
         <source>Rewind to Previous Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2014"/>
+        <location filename="../main/MainWindow.cpp" line="2053"/>
         <source>Rewind to the previous point in the current layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2017"/>
+        <location filename="../main/MainWindow.cpp" line="2056"/>
         <source>Fast forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2028"/>
+        <location filename="../main/MainWindow.cpp" line="2067"/>
         <source>No audio file loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2039"/>
+        <location filename="../main/MainWindow.cpp" line="2078"/>
         <source>%1Hz (resampling to %2Hz)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2110"/>
-        <location filename="../main/MainWindow.cpp" line="2124"/>
-        <location filename="../main/MainWindow.cpp" line="2323"/>
-        <location filename="../main/MainWindow.cpp" line="2328"/>
-        <location filename="../main/MainWindow.cpp" line="2614"/>
-        <location filename="../main/MainWindow.cpp" line="2634"/>
-        <location filename="../main/MainWindow.cpp" line="2638"/>
+        <location filename="../main/MainWindow.cpp" line="2149"/>
+        <location filename="../main/MainWindow.cpp" line="2163"/>
+        <location filename="../main/MainWindow.cpp" line="2362"/>
+        <location filename="../main/MainWindow.cpp" line="2367"/>
+        <location filename="../main/MainWindow.cpp" line="2653"/>
+        <location filename="../main/MainWindow.cpp" line="2673"/>
+        <location filename="../main/MainWindow.cpp" line="2677"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2111"/>
-        <location filename="../main/MainWindow.cpp" line="2125"/>
+        <location filename="../main/MainWindow.cpp" line="2150"/>
+        <location filename="../main/MainWindow.cpp" line="2164"/>
         <source>&lt;b&gt;File open failed&lt;/b&gt;&lt;p&gt;Audio file &quot;%1&quot; could not be opened</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2161"/>
-        <source>1. %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../main/MainWindow.cpp" line="2168"/>
-        <source>%1. %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../main/MainWindow.cpp" line="2181"/>
+        <location filename="../main/MainWindow.cpp" line="2220"/>
         <source>Select audio file to export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2182"/>
+        <location filename="../main/MainWindow.cpp" line="2221"/>
         <source>Which audio file do you want to export from?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2210"/>
+        <location filename="../main/MainWindow.cpp" line="2249"/>
         <source>Export the selected region only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2211"/>
-        <location filename="../main/MainWindow.cpp" line="2228"/>
+        <location filename="../main/MainWindow.cpp" line="2250"/>
+        <location filename="../main/MainWindow.cpp" line="2267"/>
         <source>Export the whole audio file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2215"/>
-        <location filename="../main/MainWindow.cpp" line="2231"/>
-        <location filename="../main/MainWindow.cpp" line="2473"/>
+        <location filename="../main/MainWindow.cpp" line="2254"/>
+        <location filename="../main/MainWindow.cpp" line="2270"/>
+        <location filename="../main/MainWindow.cpp" line="2512"/>
         <source>Select region to export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2216"/>
+        <location filename="../main/MainWindow.cpp" line="2255"/>
         <source>Which region from the original audio file do you want to export?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2226"/>
+        <location filename="../main/MainWindow.cpp" line="2265"/>
         <source>Export the selected regions into a single audio file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2227"/>
+        <location filename="../main/MainWindow.cpp" line="2266"/>
         <source>Export the selected regions into separate files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2232"/>
+        <location filename="../main/MainWindow.cpp" line="2271"/>
         <source>Multiple regions of the original audio file are selected.
 What do you want to export?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2259"/>
+        <location filename="../main/MainWindow.cpp" line="2298"/>
         <source>Fragment file %1 already exists, aborting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2288"/>
+        <location filename="../main/MainWindow.cpp" line="2327"/>
         <source>Export multiple audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2290"/>
+        <location filename="../main/MainWindow.cpp" line="2329"/>
         <source>Export audio to &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2294"/>
-        <location filename="../main/MainWindow.cpp" line="2417"/>
+        <location filename="../main/MainWindow.cpp" line="2333"/>
+        <location filename="../main/MainWindow.cpp" line="2456"/>
         <source>Failed to write file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2324"/>
+        <location filename="../main/MainWindow.cpp" line="2363"/>
         <source>&lt;b&gt;File open failed&lt;/b&gt;&lt;p&gt;Layer file %1 could not be opened.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2329"/>
-        <location filename="../main/MainWindow.cpp" line="2639"/>
-        <location filename="../main/MainWindow.cpp" line="2671"/>
-        <location filename="../main/MainWindow.cpp" line="2699"/>
-        <location filename="../main/MainWindow.cpp" line="2744"/>
+        <location filename="../main/MainWindow.cpp" line="2368"/>
+        <location filename="../main/MainWindow.cpp" line="2678"/>
+        <location filename="../main/MainWindow.cpp" line="2710"/>
+        <location filename="../main/MainWindow.cpp" line="2738"/>
+        <location filename="../main/MainWindow.cpp" line="2783"/>
         <source>&lt;b&gt;Audio required&lt;/b&gt;&lt;p&gt;Unable to load layer data from &quot;%1&quot; without an audio file.&lt;br&gt;Please load at least one audio file before importing annotations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3867"/>
+        <location filename="../main/MainWindow.cpp" line="3958"/>
         <source>http://www.sonicvisualiser.org/doc/reference/%1/en/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4030"/>
+        <location filename="../main/MainWindow.cpp" line="4121"/>
         <source>Newer version available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4031"/>
+        <location filename="../main/MainWindow.cpp" line="4122"/>
         <source>&lt;h3&gt;Newer version available&lt;/h3&gt;&lt;p&gt;You are using version %1 of Sonic Visualiser, but version %3 is now available.&lt;/p&gt;&lt;p&gt;Please see the &lt;a href=&quot;http://sonicvisualiser.org/&quot;&gt;Sonic Visualiser website&lt;/a&gt; for more information.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2364"/>
+        <location filename="../main/MainWindow.cpp" line="2403"/>
         <source>Failed to open file %1 for writing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2388"/>
+        <location filename="../main/MainWindow.cpp" line="2427"/>
         <source>Can&apos;t export non-note layers to MIDI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2420"/>
+        <location filename="../main/MainWindow.cpp" line="2459"/>
         <source>Export layer to &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2455"/>
+        <location filename="../main/MainWindow.cpp" line="2494"/>
         <source>Export the whole pane (%1x%2 pixels)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2457"/>
+        <location filename="../main/MainWindow.cpp" line="2496"/>
         <source>Export the visible area only (%1x%2 pixels)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2460"/>
+        <location filename="../main/MainWindow.cpp" line="2499"/>
         <source>Export the selection extent (%1x%2 pixels)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2463"/>
+        <location filename="../main/MainWindow.cpp" line="2502"/>
         <source>Export the selection extent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2474"/>
+        <location filename="../main/MainWindow.cpp" line="2513"/>
         <source>Which region of the current pane do you want to export as an image?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2482"/>
+        <location filename="../main/MainWindow.cpp" line="2521"/>
         <source>Note: the whole pane is too wide to be exported as a single image.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2507"/>
+        <location filename="../main/MainWindow.cpp" line="2546"/>
         <source>Failed to save image file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2508"/>
+        <location filename="../main/MainWindow.cpp" line="2547"/>
         <source>Failed to save image file %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2615"/>
+        <location filename="../main/MainWindow.cpp" line="2654"/>
         <source>&lt;b&gt;File open failed&lt;/b&gt;&lt;p&gt;Session file &quot;%1&quot; could not be opened</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2635"/>
+        <location filename="../main/MainWindow.cpp" line="2674"/>
         <source>&lt;b&gt;File open failed&lt;/b&gt;&lt;p&gt;File &quot;%1&quot; could not be opened</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2652"/>
+        <location filename="../main/MainWindow.cpp" line="2691"/>
         <source>Open Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2653"/>
+        <location filename="../main/MainWindow.cpp" line="2692"/>
         <source>Please enter the URL of the location to open:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2666"/>
-        <location filename="../main/MainWindow.cpp" line="2670"/>
-        <location filename="../main/MainWindow.cpp" line="2694"/>
-        <location filename="../main/MainWindow.cpp" line="2698"/>
+        <location filename="../main/MainWindow.cpp" line="2705"/>
+        <location filename="../main/MainWindow.cpp" line="2709"/>
+        <location filename="../main/MainWindow.cpp" line="2733"/>
+        <location filename="../main/MainWindow.cpp" line="2737"/>
         <source>Failed to open location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2667"/>
+        <location filename="../main/MainWindow.cpp" line="2706"/>
         <source>&lt;b&gt;Open failed&lt;/b&gt;&lt;p&gt;URL &quot;%1&quot; could not be opened</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2695"/>
+        <location filename="../main/MainWindow.cpp" line="2734"/>
         <source>&lt;b&gt;Open failed&lt;/b&gt;&lt;p&gt;File or URL &quot;%1&quot; could not be opened</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2738"/>
-        <location filename="../main/MainWindow.cpp" line="2743"/>
+        <location filename="../main/MainWindow.cpp" line="2777"/>
+        <location filename="../main/MainWindow.cpp" line="2782"/>
         <source>Failed to open dropped URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2739"/>
+        <location filename="../main/MainWindow.cpp" line="2778"/>
         <source>&lt;b&gt;Open failed&lt;/b&gt;&lt;p&gt;Dropped URL &quot;%1&quot; could not be opened</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2853"/>
+        <location filename="../main/MainWindow.cpp" line="2892"/>
         <source>Export image to &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2874"/>
+        <location filename="../main/MainWindow.cpp" line="2913"/>
         <source>Session modified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2875"/>
+        <location filename="../main/MainWindow.cpp" line="2914"/>
         <source>&lt;b&gt;Session modified&lt;/b&gt;&lt;p&gt;The current session has been modified.&lt;br&gt;Do you want to save it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2908"/>
+        <location filename="../main/MainWindow.cpp" line="2947"/>
         <source>Close the current session and create a new one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2909"/>
+        <location filename="../main/MainWindow.cpp" line="2948"/>
         <source>Add this data to the current session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2913"/>
+        <location filename="../main/MainWindow.cpp" line="2952"/>
         <source>Select target for import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2914"/>
+        <location filename="../main/MainWindow.cpp" line="2953"/>
         <source>&lt;b&gt;Select a target for import&lt;/b&gt;&lt;p&gt;This RDF document refers to one or more audio files.&lt;br&gt;You already have an audio waveform loaded.&lt;br&gt;What would you like to do with the new data?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2936"/>
-        <location filename="../main/MainWindow.cpp" line="2959"/>
+        <location filename="../main/MainWindow.cpp" line="2975"/>
+        <location filename="../main/MainWindow.cpp" line="2998"/>
         <source>Failed to save file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2937"/>
-        <location filename="../main/MainWindow.cpp" line="2960"/>
+        <location filename="../main/MainWindow.cpp" line="2976"/>
+        <location filename="../main/MainWindow.cpp" line="2999"/>
         <source>&lt;b&gt;Save failed&lt;/b&gt;&lt;p&gt;Session file &quot;%1&quot; could not be saved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2962"/>
+        <location filename="../main/MainWindow.cpp" line="3001"/>
         <source>Sonic Visualiser: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2968"/>
+        <location filename="../main/MainWindow.cpp" line="3007"/>
         <source>Save session as &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3296"/>
+        <location filename="../main/MainWindow.cpp" line="3360"/>
         <source>Rename Layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3297"/>
+        <location filename="../main/MainWindow.cpp" line="3361"/>
         <source>New name for this layer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3388"/>
+        <location filename="../main/MainWindow.cpp" line="3452"/>
         <source>Playback speed: Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3390"/>
+        <location filename="../main/MainWindow.cpp" line="3454"/>
         <source>Playback speed: %1%2%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3486"/>
+        <location filename="../main/MainWindow.cpp" line="3550"/>
         <source>Selection: %1 to %2 (duration %3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3489"/>
+        <location filename="../main/MainWindow.cpp" line="3553"/>
         <source>Visible: %1 to %2 (duration %3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3510"/>
+        <location filename="../main/MainWindow.cpp" line="3601"/>
         <source>Sample rate mismatch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3511"/>
+        <location filename="../main/MainWindow.cpp" line="3602"/>
         <source>&lt;b&gt;Wrong sample rate&lt;/b&gt;&lt;p&gt;The sample rate of this audio file (%1 Hz) does not match
 the current playback rate (%2 Hz).&lt;p&gt;The file will play at the wrong speed and pitch.&lt;p&gt;Change the &lt;i&gt;Resample mismatching files on import&lt;/i&gt; option under &lt;i&gt;File&lt;/i&gt; -&gt; &lt;i&gt;Preferences&lt;/i&gt; if you want to alter this behaviour.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3522"/>
-        <location filename="../main/MainWindow.cpp" line="3532"/>
+        <location filename="../main/MainWindow.cpp" line="3613"/>
+        <location filename="../main/MainWindow.cpp" line="3623"/>
         <source>Audio processing overload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3523"/>
+        <location filename="../main/MainWindow.cpp" line="3614"/>
         <source>&lt;b&gt;Overloaded&lt;/b&gt;&lt;p&gt;Audio effects plugin auditioning has been disabled due to a processing overload.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3533"/>
+        <location filename="../main/MainWindow.cpp" line="3624"/>
         <source>&lt;b&gt;Overloaded&lt;/b&gt;&lt;p&gt;Audio playback speed processing has been reduced to a single channel, due to a processing overload.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3603"/>
+        <location filename="../main/MainWindow.cpp" line="3694"/>
         <source>Add Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3704"/>
+        <location filename="../main/MainWindow.cpp" line="3795"/>
         <source>Reset Counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3717"/>
-        <location filename="../main/MainWindow.cpp" line="3724"/>
+        <location filename="../main/MainWindow.cpp" line="3808"/>
+        <location filename="../main/MainWindow.cpp" line="3815"/>
         <source>Failed to generate layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3718"/>
+        <location filename="../main/MainWindow.cpp" line="3809"/>
         <source>&lt;b&gt;Layer generation failed&lt;/b&gt;&lt;p&gt;Failed to generate derived layer.&lt;p&gt;The layer transform &quot;%1&quot; failed:&lt;p&gt;%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3725"/>
+        <location filename="../main/MainWindow.cpp" line="3816"/>
         <source>&lt;b&gt;Layer generation failed&lt;/b&gt;&lt;p&gt;Failed to generate a derived layer.&lt;p&gt;The layer transform &quot;%1&quot; failed.&lt;p&gt;No error information is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3737"/>
-        <location filename="../main/MainWindow.cpp" line="3771"/>
+        <location filename="../main/MainWindow.cpp" line="3828"/>
+        <location filename="../main/MainWindow.cpp" line="3862"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3750"/>
-        <location filename="../main/MainWindow.cpp" line="3757"/>
+        <location filename="../main/MainWindow.cpp" line="3841"/>
+        <location filename="../main/MainWindow.cpp" line="3848"/>
         <source>Failed to regenerate layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3751"/>
+        <location filename="../main/MainWindow.cpp" line="3842"/>
         <source>&lt;b&gt;Layer generation failed&lt;/b&gt;&lt;p&gt;Failed to regenerate derived layer &quot;%1&quot; using new data model as input.&lt;p&gt;The layer transform &quot;%2&quot; failed:&lt;p&gt;%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3758"/>
+        <location filename="../main/MainWindow.cpp" line="3849"/>
         <source>&lt;b&gt;Layer generation failed&lt;/b&gt;&lt;p&gt;Failed to regenerate derived layer &quot;%1&quot; using new data model as input.&lt;p&gt;The layer transform &quot;%2&quot; failed.&lt;p&gt;No error information is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3771"/>
+        <location filename="../main/MainWindow.cpp" line="3862"/>
         <source>&lt;b&gt;Warning when regenerating layer&lt;/b&gt;&lt;p&gt;When regenerating the derived layer &quot;%1&quot; using new data model as input:&lt;p&gt;%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3781"/>
+        <location filename="../main/MainWindow.cpp" line="3872"/>
         <source>Failed to calculate alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3782"/>
+        <location filename="../main/MainWindow.cpp" line="3873"/>
         <source>&lt;b&gt;Alignment calculation failed&lt;/b&gt;&lt;p&gt;Failed to calculate an audio alignment using transform &quot;%1&quot;:&lt;p&gt;%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3846"/>
+        <location filename="../main/MainWindow.cpp" line="3937"/>
         <source>Adjust the master playback level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3848"/>
+        <location filename="../main/MainWindow.cpp" line="3939"/>
         <source>Adjust the master playback speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3861"/>
+        <location filename="../main/MainWindow.cpp" line="3952"/>
         <source>http://www.sonicvisualiser.org/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3881"/>
+        <location filename="../main/MainWindow.cpp" line="3972"/>
         <source>Release %1 : Revision %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3883"/>
+        <location filename="../main/MainWindow.cpp" line="3974"/>
         <source>Release %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3887"/>
+        <location filename="../main/MainWindow.cpp" line="3978"/>
         <source>Unreleased : Revision %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3893"/>
+        <location filename="../main/MainWindow.cpp" line="3984"/>
         <source>&lt;h3&gt;About Sonic Visualiser&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3894"/>
+        <location filename="../main/MainWindow.cpp" line="3985"/>
         <source>&lt;p&gt;Sonic Visualiser is a program for viewing and exploring audio data for semantic music analysis and annotation.&lt;br&gt;&lt;a href=&quot;http://www.sonicvisualiser.org/&quot;&gt;http://www.sonicvisualiser.org/&lt;/a&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3895"/>
+        <location filename="../main/MainWindow.cpp" line="3986"/>
         <source>&lt;p&gt;&lt;small&gt;%1 : %2 configuration&lt;/small&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3897"/>
+        <location filename="../main/MainWindow.cpp" line="3988"/>
         <source>Debug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3897"/>
+        <location filename="../main/MainWindow.cpp" line="3988"/>
         <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3901"/>
+        <location filename="../main/MainWindow.cpp" line="3992"/>
         <source>With Qt v%1 &amp;copy; Nokia Corporation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3905"/>
+        <location filename="../main/MainWindow.cpp" line="3996"/>
         <source>&lt;br&gt;With JACK audio output library v%1 &amp;copy; Paul Davis and Jack O&apos;Quin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3907"/>
+        <location filename="../main/MainWindow.cpp" line="3998"/>
         <source>&lt;br&gt;With JACK audio output library &amp;copy; Paul Davis and Jack O&apos;Quin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3911"/>
+        <location filename="../main/MainWindow.cpp" line="4002"/>
         <source>&lt;br&gt;With PortAudio audio output library &amp;copy; Ross Bencina and Phil Burk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3915"/>
+        <location filename="../main/MainWindow.cpp" line="4006"/>
         <source>&lt;br&gt;With PulseAudio audio output library v%1 &amp;copy; Lennart Poettering and Pierre Ossman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3917"/>
+        <location filename="../main/MainWindow.cpp" line="4008"/>
         <source>&lt;br&gt;With PulseAudio audio output library &amp;copy; Lennart Poettering and Pierre Ossman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3922"/>
+        <location filename="../main/MainWindow.cpp" line="4013"/>
         <source>&lt;br&gt;With Ogg file decoder (oggz v%1, fishsound v%2) &amp;copy; CSIRO Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3924"/>
+        <location filename="../main/MainWindow.cpp" line="4015"/>
         <source>&lt;br&gt;With Ogg file decoder &amp;copy; CSIRO Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3929"/>
+        <location filename="../main/MainWindow.cpp" line="4020"/>
         <source>&lt;br&gt;With MAD mp3 decoder v%1 &amp;copy; Underbit Technologies Inc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3931"/>
+        <location filename="../main/MainWindow.cpp" line="4022"/>
         <source>&lt;br&gt;With MAD mp3 decoder &amp;copy; Underbit Technologies Inc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3936"/>
+        <location filename="../main/MainWindow.cpp" line="4027"/>
         <source>&lt;br&gt;With libsamplerate v%1 &amp;copy; Erik de Castro Lopo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3938"/>
+        <location filename="../main/MainWindow.cpp" line="4029"/>
         <source>&lt;br&gt;With libsamplerate &amp;copy; Erik de Castro Lopo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3943"/>
+        <location filename="../main/MainWindow.cpp" line="4034"/>
         <source>&lt;br&gt;With libsndfile v%1 &amp;copy; Erik de Castro Lopo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3945"/>
+        <location filename="../main/MainWindow.cpp" line="4036"/>
         <source>&lt;br&gt;With libsndfile &amp;copy; Erik de Castro Lopo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3950"/>
+        <location filename="../main/MainWindow.cpp" line="4041"/>
         <source>&lt;br&gt;With FFTW3 v%1 &amp;copy; Matteo Frigo and MIT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3952"/>
+        <location filename="../main/MainWindow.cpp" line="4043"/>
         <source>&lt;br&gt;With FFTW3 &amp;copy; Matteo Frigo and MIT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3957"/>
+        <location filename="../main/MainWindow.cpp" line="4048"/>
         <source>&lt;br&gt;With Rubber Band v%1 &amp;copy; Chris Cannam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3959"/>
+        <location filename="../main/MainWindow.cpp" line="4050"/>
         <source>&lt;br&gt;With Rubber Band &amp;copy; Chris Cannam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3963"/>
+        <location filename="../main/MainWindow.cpp" line="4054"/>
         <source>&lt;br&gt;With Vamp plugin support (API v%1, host SDK v%2) &amp;copy; Chris Cannam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3965"/>
+        <location filename="../main/MainWindow.cpp" line="4056"/>
         <source>&lt;br&gt;With LADSPA plugin support (API v%1) &amp;copy; Richard Furse, Paul Davis, Stefan Westerfeld</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3966"/>
+        <location filename="../main/MainWindow.cpp" line="4057"/>
         <source>&lt;br&gt;With DSSI plugin support (API v%1) &amp;copy; Chris Cannam, Steve Harris, Sean Bolton</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3968"/>
+        <location filename="../main/MainWindow.cpp" line="4059"/>
         <source>&lt;br&gt;With Raptor RDF parser v%1 &amp;copy; Dave Beckett and the University of Bristol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3970"/>
+        <location filename="../main/MainWindow.cpp" line="4061"/>
         <source>&lt;br&gt;With Raptor RDF parser &amp;copy; Dave Beckett and the University of Bristol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3973"/>
+        <location filename="../main/MainWindow.cpp" line="4064"/>
         <source>&lt;br&gt;With Rasqal RDF query engine v%1 &amp;copy; Dave Beckett and the University of Bristol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3975"/>
+        <location filename="../main/MainWindow.cpp" line="4066"/>
         <source>&lt;br&gt;With Rasqal RDF query engine &amp;copy; Dave Beckett and the University of Bristol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3979"/>
+        <location filename="../main/MainWindow.cpp" line="4070"/>
         <source>&lt;br&gt;With Redland RDF datastore v%1 &amp;copy; Dave Beckett and the University of Bristol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3981"/>
+        <location filename="../main/MainWindow.cpp" line="4072"/>
         <source>&lt;br&gt;With Redland RDF datastore &amp;copy; Dave Beckett and the University of Bristol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3985"/>
+        <location filename="../main/MainWindow.cpp" line="4076"/>
         <source>&lt;br&gt;With RtMidi &amp;copy; Gary P. Scavone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3989"/>
+        <location filename="../main/MainWindow.cpp" line="4080"/>
         <source>&lt;br&gt;With liblo Lite OSC library v%1 &amp;copy; Steve Harris</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3991"/>
+        <location filename="../main/MainWindow.cpp" line="4082"/>
         <source>&lt;br&gt;With liblo Lite OSC library &amp;copy; Steve Harris</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3995"/>
+        <location filename="../main/MainWindow.cpp" line="4086"/>
         <source>&lt;/small&gt;&lt;p&gt;&lt;small&gt;The OSC URL for this instance is: &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4002"/>
+        <location filename="../main/MainWindow.cpp" line="4093"/>
         <source>With </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4002"/>
+        <location filename="../main/MainWindow.cpp" line="4093"/>
         <source>Using </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4014"/>
+        <location filename="../main/MainWindow.cpp" line="4105"/>
         <source>About Sonic Visualiser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3840,290 +3884,294 @@
 <context>
     <name>MainWindowBase</name>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="432"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="432"/>
         <source>%1 (modified)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="447"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="447"/>
         <source> (modified)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="639"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="645"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="686"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="716"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="790"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="813"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="903"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="922"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="820"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="843"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="933"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="952"/>
         <source>Add Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="844"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="874"/>
         <source>Add Point at %1 s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="887"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="917"/>
         <source>Add Item at %1 s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="963"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="993"/>
         <source>Opening file or URL...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1077"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1107"/>
         <source>Replace the existing main waveform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1078"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1108"/>
         <source>Load this file into a new waveform pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1082"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1112"/>
         <source>Select target for import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1143"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="1561"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="1608"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1184"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1603"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1650"/>
         <source>%1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1150"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1191"/>
         <source>%1: %2 [%3]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1165"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="1206"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1206"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1247"/>
         <source>Import &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1260"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1301"/>
         <source>Opening playlist...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1625"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="1649"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1667"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1691"/>
         <source>Importing from RDF...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1464"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1506"/>
         <source>Opening session...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1083"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1113"/>
         <source>&lt;b&gt;Select a target for import&lt;/b&gt;&lt;p&gt;You already have an audio waveform loaded.&lt;br&gt;What would you like to do with the new audio file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1126"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1167"/>
         <source>Import audio file &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1346"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1387"/>
         <source>Import layer XML file &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1379"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1421"/>
         <source>Import MIDI file &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1546"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1588"/>
         <source>SV XML file read error:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1559"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1601"/>
         <source>Import session file &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1640"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="1653"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1682"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1695"/>
         <source>Failed to import RDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1641"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1683"/>
         <source>&lt;b&gt;Failed to import RDF&lt;/b&gt;&lt;p&gt;Importing data from RDF document at &quot;%1&quot; failed: %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1654"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1696"/>
         <source>&lt;b&gt;Failed to import RDF&lt;/b&gt;&lt;p&gt;No suitable data models found for import from RDF document at &quot;%1&quot;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1658"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1700"/>
         <source>Import RDF document &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1786"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="1791"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1828"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1833"/>
         <source>Couldn&apos;t open audio device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1787"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1829"/>
         <source>&lt;b&gt;No audio available&lt;/b&gt;&lt;p&gt;Could not open an audio device for playback.&lt;p&gt;Automatic audio device detection failed. Audio playback will not be available during this session.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1792"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1834"/>
         <source>&lt;b&gt;No audio available&lt;/b&gt;&lt;p&gt;Failed to open your preferred audio device (&quot;%1&quot;).&lt;p&gt;Audio playback will not be available during this session.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1868"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1910"/>
         <source>Failed to write file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1869"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1911"/>
         <source>&lt;b&gt;Save failed&lt;/b&gt;&lt;p&gt;Failed to write to file &quot;%1&quot;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="2439"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="2818"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="2455"/>
+        <source>Add Pane</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="2500"/>
+        <source>Remove Pane</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="2523"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="2904"/>
         <source>Delete Pane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="2651"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="2737"/>
         <source>Playing: %1 of %2 (%3 remaining)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MainWindowBase::AddPaneCommand</name>
-    <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="2371"/>
-        <source>Add Pane</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindowBase::RemovePaneCommand</name>
-    <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="2416"/>
-        <source>Remove Pane</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>ModelDataTableDialog</name>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="43"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="45"/>
         <source>Data Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="47"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="49"/>
         <source>Playback Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="49"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="51"/>
         <source>Play Mode Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="53"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="55"/>
         <source>Track Playback</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="54"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="56"/>
         <source>Toggle tracking of playback position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="60"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="62"/>
         <source>Edit Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="62"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="64"/>
         <source>Insert New Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="63"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="65"/>
         <source>Insert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="64"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="66"/>
         <source>Insert a new item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="68"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="70"/>
         <source>Delete Selected Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="69"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="71"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="70"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="72"/>
         <source>Delete the selected item or items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="94"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="96"/>
         <source>Data in Layer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="107"/>
+        <source>Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="108"/>
+        <source> </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModelMetadataModel</name>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="227"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="227"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="228"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="228"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="229"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="229"/>
         <source>Maker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="230"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="230"/>
         <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4131,12 +4179,12 @@
 <context>
     <name>ModelTransformerFactory</name>
     <message>
-        <location filename="../../transform/ModelTransformerFactory.cpp" line="96"/>
+        <location filename="../../svcore/transform/ModelTransformerFactory.cpp" line="76"/>
         <source>%1 &lt;%2&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/ModelTransformerFactory.cpp" line="370"/>
+        <location filename="../../svcore/transform/ModelTransformerFactory.cpp" line="217"/>
         <source>%1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4144,75 +4192,75 @@
 <context>
     <name>NoteLayer</name>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="45"/>
-        <location filename="../../layer/NoteLayer.cpp" line="46"/>
-        <location filename="../../layer/NoteLayer.cpp" line="807"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="45"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="46"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="807"/>
         <source>New Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="83"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="83"/>
         <source>Vertical Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="84"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="84"/>
         <source>Scale Units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="100"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="100"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="142"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="142"/>
         <source>Auto-Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="143"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="143"/>
         <source>Linear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="144"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="144"/>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="145"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="145"/>
         <source>MIDI Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="447"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="447"/>
         <source>In progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="449"/>
-        <location filename="../../layer/NoteLayer.cpp" line="472"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="449"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="472"/>
         <source>No local points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="486"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="486"/>
         <source>%1 (%2, %3 Hz)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="493"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="493"/>
         <source>%1 Hz (%2, %3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="499"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="499"/>
         <source>%1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="506"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="506"/>
         <source>Time:	%1
 Pitch:	%2
 Duration:	%3
@@ -4220,7 +4268,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="511"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="511"/>
         <source>Time:	%1
 Pitch:	%2
 Duration:	%3
@@ -4228,68 +4276,68 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="812"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="812"/>
         <source>Draw Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="888"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="888"/>
         <source>Erase Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="940"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="940"/>
         <source>Drag Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="961"/>
-        <location filename="../../layer/NoteLayer.cpp" line="1009"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="961"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1009"/>
         <source>Edit Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="963"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="963"/>
         <source>Relocate Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="966"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="966"/>
         <source>Change Point Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1025"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1025"/>
         <source>Drag Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1050"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1050"/>
         <source>Resize Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1089"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1089"/>
         <source>Delete Selected Points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1135"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1135"/>
         <source>Re-align pasted items?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1136"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1136"/>
         <source>The items you are pasting came from a layer with different source material from this one.  Do you want to re-align them in time, to match the source material for this layer?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1150"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1150"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1221"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1221"/>
         <source>Record Note</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4297,47 +4345,47 @@
 <context>
     <name>NoteModel</name>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="125"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="126"/>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="165"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="166"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="166"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="167"/>
         <source>Frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="167"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="168"/>
         <source>Pitch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="168"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="169"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="169"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="170"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="170"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="171"/>
         <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="171"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="172"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="201"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="202"/>
         <source>Edit Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4345,7 +4393,7 @@
 <context>
     <name>OggVorbisFileReader</name>
     <message>
-        <location filename="../../data/fileio/OggVorbisFileReader.cpp" line="76"/>
+        <location filename="../../svcore/data/fileio/OggVorbisFileReader.cpp" line="76"/>
         <source>Decoding %1...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4353,12 +4401,12 @@
 <context>
     <name>Overview</name>
     <message>
-        <location filename="../../view/Overview.cpp" line="32"/>
+        <location filename="../../svgui/view/Overview.cpp" line="32"/>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Overview.cpp" line="278"/>
+        <location filename="../../svgui/view/Overview.cpp" line="278"/>
         <source>Click and drag to navigate; double-click to jump</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4366,477 +4414,483 @@
 <context>
     <name>Pane</name>
     <message>
-        <location filename="../../view/Pane.cpp" line="128"/>
+        <location filename="../../svgui/view/Pane.cpp" line="128"/>
         <source>Horizontal Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="154"/>
+        <location filename="../../svgui/view/Pane.cpp" line="154"/>
         <source>Vertical Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="175"/>
+        <location filename="../../svgui/view/Pane.cpp" line="175"/>
         <source>Reset zoom to default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="653"/>
+        <location filename="../../svgui/view/Pane.cpp" line="653"/>
         <source>Some lengthy prefix:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="783"/>
+        <location filename="../../svgui/view/Pane.cpp" line="783"/>
         <source>Reference</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="785"/>
-        <location filename="../../view/Pane.cpp" line="789"/>
+        <location filename="../../svgui/view/Pane.cpp" line="785"/>
+        <location filename="../../svgui/view/Pane.cpp" line="789"/>
         <source>Unaligned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="791"/>
+        <location filename="../../svgui/view/Pane.cpp" line="791"/>
         <source>Aligning: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="793"/>
+        <location filename="../../svgui/view/Pane.cpp" line="793"/>
         <source>Aligned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="836"/>
+        <location filename="../../svgui/view/Pane.cpp" line="836"/>
         <source>%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="974"/>
+        <location filename="../../svgui/view/Pane.cpp" line="946"/>
+        <location filename="../../svgui/view/Pane.cpp" line="962"/>
+        <source>+%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/view/Pane.cpp" line="1012"/>
         <source>(R)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="977"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1015"/>
         <source>(X)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="981"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1019"/>
         <source>%1 / %2Hz%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1165"/>
-        <location filename="../../view/Pane.cpp" line="1171"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1203"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1209"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1166"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1204"/>
         <source>Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1166"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1204"/>
         <source>Wheel Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1167"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1205"/>
         <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1167"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1205"/>
         <source>Wheel Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1169"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1207"/>
         <source>General Pane Mouse Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1171"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1209"/>
         <source>Wheel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1172"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1210"/>
         <source>Zoom in or out in time axis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1173"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1211"/>
         <source>Scroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1173"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1211"/>
         <source>Ctrl+Wheel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1174"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1212"/>
         <source>Scroll rapidly left or right in time axis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1175"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1213"/>
         <source>Zoom Vertically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1175"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1213"/>
         <source>Shift+Wheel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1176"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1214"/>
         <source>Zoom in or out in the vertical axis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1177"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1215"/>
         <source>Scroll Vertically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1177"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1215"/>
         <source>Alt+Wheel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1178"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1216"/>
         <source>Scroll up or down in the vertical axis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1179"/>
-        <location filename="../../view/Pane.cpp" line="1188"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1217"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1226"/>
         <source>Navigate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1179"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1217"/>
         <source>Middle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1180"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1218"/>
         <source>Click middle button and drag to navigate with any tool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1181"/>
-        <location filename="../../view/Pane.cpp" line="1192"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1219"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1230"/>
         <source>Relocate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1181"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1219"/>
         <source>Double-Click Middle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1182"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1220"/>
         <source>Double-click middle button to relocate with any tool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1183"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1221"/>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1183"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1221"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1184"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1222"/>
         <source>Show pane context menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1186"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1224"/>
         <source>Navigate Tool Mouse Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1188"/>
-        <location filename="../../view/Pane.cpp" line="1198"/>
-        <location filename="../../view/Pane.cpp" line="1206"/>
-        <location filename="../../view/Pane.cpp" line="1212"/>
-        <location filename="../../view/Pane.cpp" line="1216"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1226"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1236"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1244"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1250"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1254"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1189"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1227"/>
         <source>Click left button and drag to move around</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1190"/>
-        <location filename="../../view/Pane.cpp" line="1220"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1228"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1258"/>
         <source>Zoom to Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1190"/>
-        <location filename="../../view/Pane.cpp" line="1202"/>
-        <location filename="../../view/Pane.cpp" line="1220"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1228"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1240"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1258"/>
         <source>Shift+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1191"/>
-        <location filename="../../view/Pane.cpp" line="1221"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1229"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1259"/>
         <source>Shift-click left button and drag to zoom to a rectangular area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1192"/>
-        <location filename="../../view/Pane.cpp" line="1194"/>
-        <location filename="../../view/Pane.cpp" line="1208"/>
-        <location filename="../../view/Pane.cpp" line="1218"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1230"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1232"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1246"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1256"/>
         <source>Double-Click Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1193"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1231"/>
         <source>Double-click left button to jump to clicked location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1194"/>
-        <location filename="../../view/Pane.cpp" line="1208"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1232"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1246"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1195"/>
-        <location filename="../../view/Pane.cpp" line="1209"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1233"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1247"/>
         <source>Double-click left button on an item to edit it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1197"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1235"/>
         <source>Select Tool Mouse Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1198"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1236"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1199"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1237"/>
         <source>Click left button and drag to select region; drag region edge to resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1200"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1238"/>
         <source>Multi Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1200"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1238"/>
         <source>Ctrl+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1201"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1239"/>
         <source>Ctrl-click left button and drag to select an additional region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1202"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1240"/>
         <source>Fine Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1203"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1241"/>
         <source>Shift-click left button and drag to select without snapping to items or grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1205"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1243"/>
         <source>Edit Tool Mouse Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1206"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1244"/>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1207"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1245"/>
         <source>Click left button on an item or selected region and drag to move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1211"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1249"/>
         <source>Draw Tool Mouse Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1212"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1250"/>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1213"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1251"/>
         <source>Click left button and drag to create new item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1215"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1253"/>
         <source>Measure Tool Mouse Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1216"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1254"/>
         <source>Measure Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1217"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1255"/>
         <source>Click left button and drag to measure a rectangular area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1218"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1256"/>
         <source>Measure Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1219"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1257"/>
         <source>Click left button and drag to measure extents of an item or shape</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2186"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2224"/>
         <source>Enter new range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2187"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2225"/>
         <source>New vertical display range, from %1 to %2 %4:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2306"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2344"/>
         <source>Drag Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2313"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2351"/>
         <source>Resize Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2472"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2510"/>
         <source>Click and drag to navigate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2482"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2520"/>
         <source>Click and drag to select a range; hold Shift to avoid snapping to items; hold Ctrl for multi-select; middle-click and drag to navigate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2484"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2522"/>
         <source>Click and drag to select a range; hold Ctrl for multi-select; middle-click and drag to navigate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2492"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2530"/>
         <source>Click and drag to move the selection boundary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2497"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2535"/>
         <source>Click and drag to select a range; hold Shift to avoid snapping to items; middle-click to navigate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2499"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2537"/>
         <source>Click and drag to select a range; middle-click and drag to navigate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2507"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2545"/>
         <source>Click to add a new item in the active layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2514"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2552"/>
         <source>Click to erase an item from the active layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2521"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2559"/>
         <source>Click and drag an item in the active layer to move it; hold Shift to override initial resistance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2526"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2564"/>
         <source>Click and drag to move all items in the selected range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2542"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2580"/>
         <source>Click and drag to adjust the visible range of the vertical scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2544"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2582"/>
         <source>Click and drag to adjust the vertical zoom level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2546"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2584"/>
         <source>Click and drag to adjust the horizontal zoom level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2548"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2586"/>
         <source>Reset horizontal and vertical zoom levels to their defaults</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>PlayParameterRepository::EditCommand</name>
-    <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="206"/>
+    <name>PlayParameterRepository</name>
+    <message>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="206"/>
         <source>Adjust Playback Parameters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="211"/>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="211"/>
         <source>Change Playback Mute State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="216"/>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="216"/>
         <source>Change Playback Gain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="221"/>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="221"/>
         <source>Change Playback Pan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="226"/>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="226"/>
         <source>Change Playback Plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="231"/>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="231"/>
         <source>Configure Playback Plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4844,12 +4898,12 @@
 <context>
     <name>PluginParameterBox</name>
     <message>
-        <location filename="../../widgets/PluginParameterBox.cpp" line="61"/>
+        <location filename="../../svgui/widgets/PluginParameterBox.cpp" line="61"/>
         <source>This plugin has no adjustable parameters.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterBox.cpp" line="82"/>
+        <location filename="../../svgui/widgets/PluginParameterBox.cpp" line="82"/>
         <source>Program</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4857,127 +4911,127 @@
 <context>
     <name>PluginParameterDialog</name>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="54"/>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="191"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="54"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="191"/>
         <source>Plugin Parameters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="102"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="102"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="125"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="125"/>
         <source>Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="138"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="138"/>
         <source>Maker:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="144"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="144"/>
         <source>Copyright:  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="156"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="156"/>
         <source>Output:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="175"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="175"/>
         <source>Input Material</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="184"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="184"/>
         <source>Restrict to selection extents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="217"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="217"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="223"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="223"/>
         <source>Processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="233"/>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="604"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="233"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="604"/>
         <source>Advanced &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="322"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="322"/>
         <source>Channel mismatch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="323"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="323"/>
         <source>This plugin requires at least %1 input channels, but only %2 %3 available.  The plugin probably will not work correctly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="323"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="323"/>
         <source>are</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="323"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="323"/>
         <source>is</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="340"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="340"/>
         <source>This plugin accepts no more than %1 input channels,
 but %2 are available.  Only the first %3 will be used.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="347"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="347"/>
         <source>This plugin only has a single channel input,
 but the source has %1 channels.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="350"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="350"/>
         <source>Use mean of source channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="352"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="352"/>
         <source>Use channel %1 only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="404"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="404"/>
         <source>Window size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="406"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="406"/>
         <source>Audio frames per block:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="431"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="431"/>
         <source>Window increment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="455"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="455"/>
         <source>Window shape:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="599"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="599"/>
         <source>Advanced &lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4985,214 +5039,214 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../../base/Preferences.cpp" line="106"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="106"/>
         <source>Spectrogram y-axis interpolation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="109"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="109"/>
         <source>Spectrogram x-axis interpolation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="112"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="112"/>
         <source>Frequency of concert A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="115"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="115"/>
         <source>Property box layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="118"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="118"/>
         <source>Spectral analysis window shape</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="121"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="121"/>
         <source>Playback resampler type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="124"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="124"/>
         <source>Omit temporaries from Recent Files menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="127"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="127"/>
         <source>Resample mismatching files on import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="130"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="130"/>
         <source>Location for cache file directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="133"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="133"/>
         <source>Background colour preference</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="136"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="136"/>
         <source>Time display format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="139"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="139"/>
         <source>Font size for text overlays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="142"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="142"/>
         <source>Show splash screen on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="270"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="270"/>
         <source>Show boxes for all panes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="271"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="271"/>
         <source>Show box for current pane only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="275"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="275"/>
         <source>Rectangular</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="276"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="276"/>
         <source>Triangular</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="277"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="277"/>
         <source>Hamming</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="278"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="278"/>
         <source>Hann</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="279"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="279"/>
         <source>Blackman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="280"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="280"/>
         <source>Gaussian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="281"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="281"/>
         <source>Parzen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="282"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="282"/>
         <source>Nuttall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="283"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="283"/>
         <source>Blackman-Harris</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="288"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="288"/>
         <source>Fastest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="289"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="289"/>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="290"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="290"/>
         <source>Highest quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="295"/>
-        <location filename="../../base/Preferences.cpp" line="303"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="295"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="303"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="296"/>
-        <location filename="../../base/Preferences.cpp" line="304"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="296"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="304"/>
         <source>Linear interpolation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="297"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="297"/>
         <source>4 x Oversampling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="298"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="298"/>
         <source>4 x Oversampling with interpolation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="309"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="309"/>
         <source>Follow desktop theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="310"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="310"/>
         <source>Dark background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="311"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="311"/>
         <source>Light background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="316"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="316"/>
         <source>Standard (to millisecond)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="317"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="317"/>
         <source>High resolution (to microsecond)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="318"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="318"/>
         <source>24 FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="319"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="319"/>
         <source>25 FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="320"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="320"/>
         <source>30 FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="321"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="321"/>
         <source>50 FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="322"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="322"/>
         <source>60 FPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="332"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="332"/>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5288,7 +5342,7 @@
 <context>
     <name>ProgressDialog</name>
     <message>
-        <location filename="../../widgets/ProgressDialog.cpp" line="28"/>
+        <location filename="../../svgui/widgets/ProgressDialog.cpp" line="28"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5296,78 +5350,78 @@
 <context>
     <name>PropertyBox</name>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="155"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="155"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="172"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="172"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="210"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="210"/>
         <source>Playback Gain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="212"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="212"/>
         <source>dB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="236"/>
-        <location filename="../../widgets/PropertyBox.cpp" line="238"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="236"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="238"/>
         <source>Playback Pan / Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="468"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="468"/>
         <source>Add New Colour...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="655"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="655"/>
         <source>Name New Colour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="656"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="656"/>
         <source>Enter a name for the new colour:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="658"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="658"/>
         <source>Prefer black background for this colour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="830"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="830"/>
         <source> (current value: %1%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="832"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="832"/>
         <source> (current value: %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="837"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="837"/>
         <source>Toggle Visibility of %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="839"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="839"/>
         <source>Toggle Playback of %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="843"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="843"/>
         <source>Toggle %1 property of %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="846"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="846"/>
         <source>Adjust %1 property of %2%3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5375,40 +5429,37 @@
 <context>
     <name>PropertyContainer</name>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="151"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="151"/>
         <source>yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="152"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="152"/>
         <source>on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="153"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="153"/>
         <source>true</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="155"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="155"/>
         <source>no</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="156"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="156"/>
         <source>off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="157"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="157"/>
         <source>false</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PropertyContainer::SetPropertyCommand</name>
-    <message>
-        <location filename="../../base/PropertyContainer.cpp" line="244"/>
+    <message>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="244"/>
         <source>Set %1 Property</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5416,12 +5467,12 @@
 <context>
     <name>PropertyStack</name>
     <message>
-        <location filename="../../widgets/PropertyStack.cpp" line="235"/>
+        <location filename="../../svgui/widgets/PropertyStack.cpp" line="242"/>
         <source>Change Layer Visibility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyStack.cpp" line="252"/>
+        <location filename="../../svgui/widgets/PropertyStack.cpp" line="259"/>
         <source>Click to change the current active layer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5429,7 +5480,7 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../main/main.cpp" line="236"/>
+        <location filename="../main/main.cpp" line="247"/>
         <source>
 Sonic Visualiser is a program for viewing and exploring audio data
 for semantic music analysis and annotation.
@@ -5445,7 +5496,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/main.cpp" line="246"/>
+        <location filename="../main/main.cpp" line="257"/>
         <source>Sonic Visualiser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5453,22 +5504,22 @@
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../../data/fileio/CSVFileReader.cpp" line="43"/>
-        <location filename="../../data/fileio/MatchFileReader.cpp" line="73"/>
-        <location filename="../../data/fileio/PlaylistFileReader.cpp" line="69"/>
+        <location filename="../../svcore/data/fileio/CSVFileReader.cpp" line="47"/>
+        <location filename="../../svcore/data/fileio/MatchFileReader.cpp" line="73"/>
+        <location filename="../../svcore/data/fileio/PlaylistFileReader.cpp" line="69"/>
         <source>File &quot;%1&quot; does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/CSVFileReader.cpp" line="45"/>
-        <location filename="../../data/fileio/MatchFileReader.cpp" line="75"/>
-        <location filename="../../data/fileio/PlaylistFileReader.cpp" line="72"/>
+        <location filename="../../svcore/data/fileio/CSVFileReader.cpp" line="49"/>
+        <location filename="../../svcore/data/fileio/MatchFileReader.cpp" line="75"/>
+        <location filename="../../svcore/data/fileio/PlaylistFileReader.cpp" line="72"/>
         <source>Failed to open file &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/fileio/PlaylistFileReader.cpp" line="31"/>
-        <location filename="../../data/fileio/PlaylistFileReader.cpp" line="43"/>
+        <location filename="../../svcore/data/fileio/PlaylistFileReader.cpp" line="31"/>
+        <location filename="../../svcore/data/fileio/PlaylistFileReader.cpp" line="43"/>
         <source>File or URL &quot;%1&quot; could not be retrieved</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5476,18 +5527,18 @@
 <context>
     <name>QMessageBox</name>
     <message>
-        <location filename="../main/main.cpp" line="395"/>
-        <location filename="../main/main.cpp" line="400"/>
+        <location filename="../main/main.cpp" line="489"/>
+        <location filename="../main/main.cpp" line="494"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/main.cpp" line="396"/>
+        <location filename="../main/main.cpp" line="490"/>
         <source>File or URL &quot;%1&quot; could not be opened</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main/main.cpp" line="401"/>
+        <location filename="../main/main.cpp" line="495"/>
         <source>&lt;b&gt;Audio required&lt;/b&gt;&lt;p&gt;Please load at least one audio file before importing annotation data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5495,7 +5546,7 @@
 <context>
     <name>QuickTimeFileReader</name>
     <message>
-        <location filename="../../data/fileio/QuickTimeFileReader.cpp" line="223"/>
+        <location filename="../../svcore/data/fileio/QuickTimeFileReader.cpp" line="223"/>
         <source>Decoding %1...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5503,17 +5554,17 @@
 <context>
     <name>RDFImporter</name>
     <message>
-        <location filename="../../rdf/RDFImporter.cpp" line="263"/>
+        <location filename="../../svcore/rdf/RDFImporter.cpp" line="263"/>
         <source>Importing audio referenced in RDF...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../rdf/RDFImporter.cpp" line="287"/>
+        <location filename="../../svcore/rdf/RDFImporter.cpp" line="287"/>
         <source>Importing dense signal data from RDF...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../rdf/RDFImporter.cpp" line="550"/>
+        <location filename="../../svcore/rdf/RDFImporter.cpp" line="550"/>
         <source>Importing event data from RDF...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5521,7 +5572,7 @@
 <context>
     <name>RangeInputDialog</name>
     <message>
-        <location filename="../../widgets/RangeInputDialog.cpp" line="48"/>
+        <location filename="../../svgui/widgets/RangeInputDialog.cpp" line="48"/>
         <source> to </source>
         <translation type="unfinished"></translation>
     </message>
@@ -5529,7 +5580,7 @@
 <context>
     <name>RangeSummarisableTimeValueModel</name>
     <message>
-        <location filename="../../data/model/RangeSummarisableTimeValueModel.h" line="124"/>
+        <location filename="../../svcore/data/model/RangeSummarisableTimeValueModel.h" line="124"/>
         <source>Range-Summarisable Time-Value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5537,79 +5588,79 @@
 <context>
     <name>RegionLayer</name>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="43"/>
-        <location filename="../../layer/RegionLayer.cpp" line="44"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="43"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="44"/>
         <source>New Region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="82"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="82"/>
         <source>Vertical Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="83"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="83"/>
         <source>Scale Units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="84"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="84"/>
         <source>Plot Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="102"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="102"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="163"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="163"/>
         <source>Bars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="164"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="164"/>
         <source>Segmentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="170"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="170"/>
         <source>Auto-Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="171"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="171"/>
         <source>Equal Spaced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="172"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="172"/>
         <source>Linear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="173"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="173"/>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="366"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="378"/>
         <source>In progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="368"/>
-        <location filename="../../layer/RegionLayer.cpp" line="394"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="380"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="406"/>
         <source>No local points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="403"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="415"/>
         <source>%1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="408"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="420"/>
         <source>Time:	%1
 Value:	%2
 Duration:	%3
@@ -5617,7 +5668,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="413"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="425"/>
         <source>Time:	%1
 Value:	%2
 Duration:	%3
@@ -5625,63 +5676,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="922"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1036"/>
         <source>Draw Region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1004"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1118"/>
         <source>Erase Region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1064"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1178"/>
         <source>Drag Region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1085"/>
-        <location filename="../../layer/RegionLayer.cpp" line="1138"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1199"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1246"/>
         <source>Edit Region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1087"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1201"/>
         <source>Relocate Region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1090"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1204"/>
         <source>Change Point Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1155"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1263"/>
         <source>Drag Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1181"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1289"/>
         <source>Resize Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1221"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1329"/>
         <source>Delete Selected Points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1268"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1376"/>
         <source>Re-align pasted items?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1269"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1377"/>
         <source>The items you are pasting came from a layer with different source material from this one.  Do you want to re-align them in time, to match the source material for this layer?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1283"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1391"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5689,42 +5740,42 @@
 <context>
     <name>RegionModel</name>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="123"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="125"/>
         <source>Region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="151"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="153"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="152"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="154"/>
         <source>Frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="153"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="155"/>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="154"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="156"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="155"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="157"/>
         <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="156"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="158"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="185"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="187"/>
         <source>Edit Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5732,7 +5783,7 @@
 <context>
     <name>RemoveLayerCommand</name>
     <message>
-        <location filename="../../framework/Document.cpp" line="1011"/>
+        <location filename="../../svapp/framework/Document.cpp" line="1013"/>
         <source>Delete %1 Layer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5740,7 +5791,7 @@
 <context>
     <name>ResamplingWavFileReader</name>
     <message>
-        <location filename="../../data/fileio/ResamplingWavFileReader.cpp" line="63"/>
+        <location filename="../../svcore/data/fileio/ResamplingWavFileReader.cpp" line="63"/>
         <source>Resampling %1...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5748,13 +5799,13 @@
 <context>
     <name>SVFileReader</name>
     <message>
-        <location filename="../../framework/SVFileReader.cpp" line="318"/>
-        <location filename="../../framework/SVFileReader.cpp" line="322"/>
+        <location filename="../../svapp/framework/SVFileReader.cpp" line="318"/>
+        <location filename="../../svapp/framework/SVFileReader.cpp" line="322"/>
         <source>(derived model in SV-XML)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../framework/SVFileReader.cpp" line="450"/>
+        <location filename="../../svapp/framework/SVFileReader.cpp" line="460"/>
         <source>Opening file or URL...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5762,12 +5813,12 @@
 <context>
     <name>SingleColourLayer</name>
     <message>
-        <location filename="../../layer/SingleColourLayer.cpp" line="62"/>
+        <location filename="../../svgui/layer/SingleColourLayer.cpp" line="62"/>
         <source>Colour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SingleColourLayer.cpp" line="114"/>
+        <location filename="../../svgui/layer/SingleColourLayer.cpp" line="114"/>
         <source>&lt;unknown&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5775,13 +5826,13 @@
 <context>
     <name>SliceLayer</name>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="146"/>
-        <location filename="../../layer/SliceLayer.cpp" line="153"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="146"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="153"/>
         <source>%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="158"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="158"/>
         <source>Time:	%1 - %2
 Range:	%3 samples (%4)
 Bin:	%5
@@ -5789,139 +5840,139 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="164"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="164"/>
         <source>First</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="165"/>
-        <location filename="../../layer/SliceLayer.cpp" line="717"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="165"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="717"/>
         <source>Mean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="165"/>
-        <location filename="../../layer/SliceLayer.cpp" line="718"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="165"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="718"/>
         <source>Peak</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="172"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="172"/>
         <source>Time:	%1 - %2
 Range:	%3 samples (%4)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="507"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="507"/>
         <source>0dB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="508"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="508"/>
         <source>-Inf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="539"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="539"/>
         <source>x10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="564"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="564"/>
         <source>Plot Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="565"/>
-        <location filename="../../layer/SliceLayer.cpp" line="602"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="565"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="602"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="566"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="566"/>
         <source>Normalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="567"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="567"/>
         <source>Threshold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="568"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="568"/>
         <source>Gain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="569"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="569"/>
         <source>Sampling Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="707"/>
-        <location filename="../../layer/SliceLayer.cpp" line="733"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="707"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="733"/>
         <source>Linear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="708"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="708"/>
         <source>Meter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="735"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="735"/>
         <source>Rev Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="745"/>
-        <location filename="../../layer/SliceLayer.cpp" line="748"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="745"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="748"/>
         <source>dB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="716"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="716"/>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="570"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="570"/>
         <source>Bin Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="604"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="604"/>
         <source>Bins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="709"/>
-        <location filename="../../layer/SliceLayer.cpp" line="734"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="709"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="734"/>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="710"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="710"/>
         <source>Absolute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="724"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="724"/>
         <source>Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="725"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="725"/>
         <source>Steps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="726"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="726"/>
         <source>Blocks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="727"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="727"/>
         <source>Colours</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5929,70 +5980,79 @@
 <context>
     <name>SparseModel</name>
     <message>
-        <location filename="../../data/model/SparseModel.h" line="143"/>
+        <location filename="../../svcore/data/model/SparseModel.h" line="143"/>
         <source>Sparse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseModel.h" line="172"/>
+        <location filename="../../svcore/data/model/SparseModel.h" line="328"/>
+        <source>Edit Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svcore/data/model/SparseModel.h" line="344"/>
+        <source>Insert Data Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svcore/data/model/SparseModel.h" line="355"/>
+        <source>Delete Data Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SparseModel::AddPointCommand</name>
+    <message>
+        <location filename="../../svcore/data/model/SparseModel.h" line="172"/>
         <source>Add Point</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../data/model/SparseModel.h" line="197"/>
+</context>
+<context>
+    <name>SparseModel::DeletePointCommand</name>
+    <message>
+        <location filename="../../svcore/data/model/SparseModel.h" line="197"/>
         <source>Delete Point</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../data/model/SparseModel.h" line="254"/>
+</context>
+<context>
+    <name>SparseModel::RelabelCommand</name>
+    <message>
+        <location filename="../../svcore/data/model/SparseModel.h" line="254"/>
         <source>Re-Label Point</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../data/model/SparseModel.h" line="328"/>
-        <source>Edit Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../data/model/SparseModel.h" line="344"/>
-        <source>Insert Data Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../data/model/SparseModel.h" line="355"/>
-        <source>Delete Data Point</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SparseOneDimensionalModel</name>
     <message>
-        <location filename="../../data/model/SparseOneDimensionalModel.h" line="113"/>
+        <location filename="../../svcore/data/model/SparseOneDimensionalModel.h" line="113"/>
         <source>Sparse 1-D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseOneDimensionalModel.h" line="127"/>
+        <location filename="../../svcore/data/model/SparseOneDimensionalModel.h" line="127"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseOneDimensionalModel.h" line="128"/>
+        <location filename="../../svcore/data/model/SparseOneDimensionalModel.h" line="128"/>
         <source>Frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseOneDimensionalModel.h" line="129"/>
+        <location filename="../../svcore/data/model/SparseOneDimensionalModel.h" line="129"/>
         <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseOneDimensionalModel.h" line="130"/>
+        <location filename="../../svcore/data/model/SparseOneDimensionalModel.h" line="130"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseOneDimensionalModel.h" line="160"/>
+        <location filename="../../svcore/data/model/SparseOneDimensionalModel.h" line="160"/>
         <source>Edit Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6000,37 +6060,37 @@
 <context>
     <name>SparseTimeValueModel</name>
     <message>
-        <location filename="../../data/model/SparseTimeValueModel.h" line="102"/>
+        <location filename="../../svcore/data/model/SparseTimeValueModel.h" line="102"/>
         <source>Sparse Time-Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseTimeValueModel.h" line="116"/>
+        <location filename="../../svcore/data/model/SparseTimeValueModel.h" line="116"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseTimeValueModel.h" line="117"/>
+        <location filename="../../svcore/data/model/SparseTimeValueModel.h" line="117"/>
         <source>Frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseTimeValueModel.h" line="118"/>
+        <location filename="../../svcore/data/model/SparseTimeValueModel.h" line="118"/>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseTimeValueModel.h" line="119"/>
+        <location filename="../../svcore/data/model/SparseTimeValueModel.h" line="119"/>
         <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseTimeValueModel.h" line="120"/>
+        <location filename="../../svcore/data/model/SparseTimeValueModel.h" line="120"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseTimeValueModel.h" line="153"/>
+        <location filename="../../svcore/data/model/SparseTimeValueModel.h" line="153"/>
         <source>Edit Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6038,7 +6098,7 @@
 <context>
     <name>SparseValueModel</name>
     <message>
-        <location filename="../../data/model/SparseValueModel.h" line="56"/>
+        <location filename="../../svcore/data/model/SparseValueModel.h" line="56"/>
         <source>Sparse Value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6046,363 +6106,363 @@
 <context>
     <name>SpectrogramLayer</name>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="171"/>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="218"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="171"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="218"/>
         <source>Colour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="172"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="172"/>
         <source>Colour Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="173"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="173"/>
         <source>Window Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="174"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="174"/>
         <source>Window Overlap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="175"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="175"/>
         <source>Normalize Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="176"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="176"/>
         <source>Normalize Visible Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="177"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="177"/>
         <source>Bin Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="178"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="178"/>
         <source>Threshold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="179"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="179"/>
         <source>Gain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="180"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="180"/>
         <source>Colour Rotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="181"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="181"/>
         <source>Min Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="182"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="182"/>
         <source>Max Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="183"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="183"/>
         <source>Frequency Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="184"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="184"/>
         <source>Smoothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="212"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="212"/>
         <source>Bins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="215"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="215"/>
         <source>Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="222"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="222"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="392"/>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="450"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="392"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="450"/>
         <source>Linear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="393"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="393"/>
         <source>Meter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="394"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="394"/>
         <source>dBV^2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="395"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="395"/>
         <source>dBV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="396"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="396"/>
         <source>Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="405"/>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="414"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="405"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="414"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="406"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="406"/>
         <source>25 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="407"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="407"/>
         <source>50 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="408"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="408"/>
         <source>75 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="409"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="409"/>
         <source>87.5 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="410"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="410"/>
         <source>93.75 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="420"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="420"/>
         <source>No min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="421"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="421"/>
         <source>10 Hz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="422"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="422"/>
         <source>20 Hz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="423"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="423"/>
         <source>40 Hz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="424"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="424"/>
         <source>100 Hz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="425"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="425"/>
         <source>250 Hz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="426"/>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="435"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="426"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="435"/>
         <source>500 Hz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="427"/>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="436"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="427"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="436"/>
         <source>1 KHz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="428"/>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="439"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="428"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="439"/>
         <source>4 KHz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="429"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="429"/>
         <source>10 KHz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="437"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="437"/>
         <source>1.5 KHz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="438"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="438"/>
         <source>2 KHz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="440"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="440"/>
         <source>6 KHz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="441"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="441"/>
         <source>8 KHz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="442"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="442"/>
         <source>12 KHz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="443"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="443"/>
         <source>16 KHz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="444"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="444"/>
         <source>No max</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="451"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="451"/>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="457"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="457"/>
         <source>All Bins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="458"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="458"/>
         <source>Peak Bins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="459"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="459"/>
         <source>Frequencies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="462"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="462"/>
         <source>&lt;unknown&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="469"/>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="472"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="469"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="472"/>
         <source>dB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="1666"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="1666"/>
         <source>FFT cache failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="1667"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="1667"/>
         <source>Failed to create the FFT model for this spectrogram.
 There may be insufficient memory or disc space to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3166"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3167"/>
         <source>Peak Frequency:	%1 - %2 Hz
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3169"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3170"/>
         <source>Peak Frequency:	%1 Hz
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3177"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3178"/>
         <source>Peak Pitch:	%3 - %4
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3179"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3180"/>
         <source>Peak Pitch:	%2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3190"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3191"/>
         <source>Time:	%1 - %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3194"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3195"/>
         <source>Time:	%1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3199"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3200"/>
         <source>%1Bin Frequency:	%2 - %3 Hz
 %4Bin Pitch:	%5 - %6
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3207"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3208"/>
         <source>%1Bin Frequency:	%2 Hz
 %3Bin Pitch:	%4
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3220"/>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3225"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3221"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3226"/>
         <source>-Inf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3230"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3231"/>
         <source>dB:	%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3232"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3233"/>
         <source>dB:	%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3235"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3236"/>
         <source>
 Phase:	%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3237"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3238"/>
         <source>
 Phase:	%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3266"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3267"/>
         <source>43Hz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3411"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3412"/>
         <source>%1Hz</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6410,90 +6470,90 @@
 <context>
     <name>SpectrumLayer</name>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="146"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="146"/>
         <source>Window Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="147"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="147"/>
         <source>Window Overlap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="148"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="148"/>
         <source>Show Peak Frequencies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="172"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="172"/>
         <source>Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="173"/>
-        <source>Plot Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="228"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="173"/>
+        <source>Bins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="228"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="229"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="229"/>
         <source>25 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="230"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="230"/>
         <source>50 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="231"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="231"/>
         <source>75 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="232"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="232"/>
         <source>87.5 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="233"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="233"/>
         <source>93.75 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="591"/>
-        <location filename="../../layer/SpectrumLayer.cpp" line="603"/>
-        <location filename="../../layer/SpectrumLayer.cpp" line="624"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="591"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="603"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="624"/>
         <source>%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="596"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="596"/>
         <source>%1 - %2 Hz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="598"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="598"/>
         <source>%1 Hz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="614"/>
-        <location filename="../../layer/SpectrumLayer.cpp" line="619"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="614"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="619"/>
         <source>-Inf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="626"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="626"/>
         <source>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="632"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="632"/>
         <source>%1
 Bin:	%2 (%3)
 %4 value:	%5
@@ -6501,22 +6561,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="636"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="636"/>
         <source>First</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="637"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="637"/>
         <source>Mean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="637"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="637"/>
         <source>Peak</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="641"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="641"/>
         <source>%1
 Bin:	%2 (%3)
 Value:	%4
@@ -6527,7 +6587,7 @@
 <context>
     <name>SubdividingMenu</name>
     <message>
-        <location filename="../../widgets/SubdividingMenu.cpp" line="115"/>
+        <location filename="../../svgui/widgets/SubdividingMenu.cpp" line="115"/>
         <source>%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6548,98 +6608,98 @@
 <context>
     <name>TextLayer</name>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="39"/>
-        <location filename="../../layer/TextLayer.cpp" line="40"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="39"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="40"/>
         <source>Empty Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="135"/>
-        <location filename="../../layer/TextLayer.cpp" line="342"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="135"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="373"/>
         <source>&lt;no text&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="167"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="195"/>
         <source>In progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="180"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="208"/>
         <source>Time:	%1
 Height:	%2
 Label:	%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="434"/>
-        <location filename="../../layer/TextLayer.cpp" line="584"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="465"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="611"/>
         <source>Enter label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="435"/>
-        <location filename="../../layer/TextLayer.cpp" line="585"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="466"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="612"/>
         <source>Please enter a new label:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="487"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="514"/>
         <source>Erase Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="536"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="563"/>
         <source>Drag Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="557"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="584"/>
         <source>Move Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="559"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="586"/>
         <source>Move Label Horizontally</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="562"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="589"/>
         <source>Move Label Vertically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="602"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="629"/>
         <source>Drag Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="627"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="654"/>
         <source>Resize Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="661"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="688"/>
         <source>Delete Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="704"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="731"/>
         <source>Re-align pasted items?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="705"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="732"/>
         <source>The items you are pasting came from a layer with different source material from this one.  Do you want to re-align them in time, to match the source material for this layer?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="719"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="746"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="764"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="791"/>
         <source>New Point</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6647,37 +6707,37 @@
 <context>
     <name>TextModel</name>
     <message>
-        <location filename="../../data/model/TextModel.h" line="103"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="103"/>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="117"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="117"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="118"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="118"/>
         <source>Frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="119"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="119"/>
         <source>Height</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="120"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="120"/>
         <source>Label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="121"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="121"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="152"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="152"/>
         <source>Edit Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6685,39 +6745,39 @@
 <context>
     <name>Thumbwheel</name>
     <message>
-        <location filename="../../widgets/Thumbwheel.cpp" line="232"/>
+        <location filename="../../svgui/widgets/Thumbwheel.cpp" line="232"/>
         <source>%1: %2%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/Thumbwheel.cpp" line="234"/>
+        <location filename="../../svgui/widgets/Thumbwheel.cpp" line="234"/>
         <source>%2%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/Thumbwheel.cpp" line="344"/>
+        <location filename="../../svgui/widgets/Thumbwheel.cpp" line="344"/>
         <source>New value for %1, from %2 to %3 %4:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/Thumbwheel.cpp" line="347"/>
+        <location filename="../../svgui/widgets/Thumbwheel.cpp" line="347"/>
         <source>New value for %1, from %2 to %3:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/Thumbwheel.cpp" line="352"/>
+        <location filename="../../svgui/widgets/Thumbwheel.cpp" line="352"/>
         <source>Enter a new value from %1 to %2 %3:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/Thumbwheel.cpp" line="355"/>
-        <location filename="../../widgets/Thumbwheel.cpp" line="379"/>
+        <location filename="../../svgui/widgets/Thumbwheel.cpp" line="355"/>
+        <location filename="../../svgui/widgets/Thumbwheel.cpp" line="379"/>
         <source>Enter a new value from %1 to %2:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/Thumbwheel.cpp" line="362"/>
-        <location filename="../../widgets/Thumbwheel.cpp" line="378"/>
+        <location filename="../../svgui/widgets/Thumbwheel.cpp" line="362"/>
+        <location filename="../../svgui/widgets/Thumbwheel.cpp" line="378"/>
         <source>Enter new value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6725,105 +6785,105 @@
 <context>
     <name>TimeInstantLayer</name>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="44"/>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="467"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="44"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="481"/>
         <source>New Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="84"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="84"/>
         <source>Plot Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="124"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="124"/>
         <source>Instants</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="125"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="125"/>
         <source>Segmentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="214"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="226"/>
         <source>In progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="216"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="228"/>
         <source>No local points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="227"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="239"/>
         <source>Time:	%1
 No label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="230"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="242"/>
         <source>Time:	%1
 Label:	%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="471"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="485"/>
         <source>Draw Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="501"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="515"/>
         <source>Add Point at %1 s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="546"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="560"/>
         <source>Erase Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="592"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="606"/>
         <source>Drag Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="608"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="622"/>
         <source>Move Point to %1 s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="644"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="658"/>
         <source>Edit Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="661"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="675"/>
         <source>Drag Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="687"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="701"/>
         <source>Resize Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="722"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="736"/>
         <source>Delete Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="765"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="779"/>
         <source>Re-align pasted instants?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="766"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="780"/>
         <source>The instants you are pasting came from a layer with different source material from this one.  Do you want to re-align them in time, to match the source material for this layer?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="780"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="794"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6831,202 +6891,207 @@
 <context>
     <name>TimeValueLayer</name>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="51"/>
-        <location filename="../../layer/TimeValueLayer.cpp" line="52"/>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1224"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="51"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="52"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1285"/>
         <source>New Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="103"/>
-        <location filename="../../layer/TimeValueLayer.cpp" line="135"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="105"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="141"/>
         <source>Plot Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="104"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="106"/>
         <source>Vertical Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="105"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="107"/>
         <source>Scale Units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="106"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="108"/>
         <source>Draw Segment Division Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="132"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="109"/>
+        <source>Show Derivative</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="137"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="202"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="215"/>
         <source>Points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="203"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="216"/>
         <source>Stems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="204"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="217"/>
         <source>Connected Points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="205"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="218"/>
         <source>Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="206"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="219"/>
         <source>Curve</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="207"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="220"/>
         <source>Segmentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="212"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="225"/>
         <source>Auto-Align</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="213"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="226"/>
         <source>Linear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="214"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="227"/>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="215"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="228"/>
         <source>+/-1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="518"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="556"/>
         <source>In progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="520"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="558"/>
         <source>No local points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="533"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="571"/>
         <source>Time:	%1
 Value:	%2%3
 No label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="538"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="576"/>
         <source>Time:	%1
 Value:	%2%3
 Label:	%4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1231"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1292"/>
         <source>Draw Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1349"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1410"/>
         <source>Erase Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1398"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1459"/>
         <source>Drag Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1421"/>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1466"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1482"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1527"/>
         <source>Edit Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1423"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1484"/>
         <source>Relocate Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1426"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1487"/>
         <source>Change Point Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1483"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1544"/>
         <source>Drag Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1509"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1570"/>
         <source>Resize Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1544"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1605"/>
         <source>Delete Selected Points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1591"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1652"/>
         <source>Re-align pasted items?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1592"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1653"/>
         <source>The items you are pasting came from a layer with different source material from this one.  Do you want to re-align them in time, to match the source material for this layer?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1606"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1667"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1662"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1723"/>
         <source>The items you are pasting do not have values.
 What values do you want to use for these items?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1664"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1725"/>
         <source>Some of the items you are pasting do not have values.
 What values do you want to use for these items?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1674"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1735"/>
         <source>Zero for all items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1683"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1744"/>
         <source>Choose value calculation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1704"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1765"/>
         <source>Select cycle size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1705"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1766"/>
         <source>Cycle size:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7034,27 +7099,27 @@
 <context>
     <name>TipDialog</name>
     <message>
-        <location filename="../../widgets/TipDialog.cpp" line="35"/>
+        <location filename="../../svgui/widgets/TipDialog.cpp" line="35"/>
         <source>Tip of the Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TipDialog.cpp" line="65"/>
+        <location filename="../../svgui/widgets/TipDialog.cpp" line="65"/>
         <source>Show tip on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TipDialog.cpp" line="71"/>
+        <location filename="../../svgui/widgets/TipDialog.cpp" line="71"/>
         <source>&lt;&lt; Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TipDialog.cpp" line="75"/>
+        <location filename="../../svgui/widgets/TipDialog.cpp" line="75"/>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TipDialog.cpp" line="79"/>
+        <location filename="../../svgui/widgets/TipDialog.cpp" line="79"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7062,136 +7127,136 @@
 <context>
     <name>TransformFactory</name>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="386"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="386"/>
         <source> [\(&lt;].*$</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="445"/>
-        <location filename="../../transform/TransformFactory.cpp" line="539"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="445"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="539"/>
         <source>&lt;unknown maker&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="451"/>
-        <location filename="../../transform/TransformFactory.cpp" line="715"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="451"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="715"/>
         <source>Extract features using &quot;%1&quot; plugin (from %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="454"/>
-        <location filename="../../transform/TransformFactory.cpp" line="718"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="454"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="718"/>
         <source>Extract features using &quot;%1&quot; output of &quot;%2&quot; plugin (from %3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="459"/>
-        <location filename="../../transform/TransformFactory.cpp" line="723"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="459"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="723"/>
         <source>%1 using &quot;%2&quot; plugin (from %3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="462"/>
-        <location filename="../../transform/TransformFactory.cpp" line="726"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="462"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="726"/>
         <source>%1 using &quot;%2&quot; output of &quot;%3&quot; plugin (from %4)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="320"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="320"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="323"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="323"/>
         <source>Generator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="324"/>
-        <location filename="../../transform/TransformFactory.cpp" line="326"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="324"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="326"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="555"/>
-        <location filename="../../transform/TransformFactory.cpp" line="708"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="555"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="708"/>
         <source>%1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="565"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="565"/>
         <source>%1: Output %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="577"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="577"/>
         <source>Extract &quot;%1&quot; data output from &quot;%2&quot; effect plugin (from %3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="582"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="582"/>
         <source>Extract data output %1 from &quot;%2&quot; effect plugin (from %3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="322"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="322"/>
         <source>Effects Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="321"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="321"/>
         <source>Effects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="609"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="609"/>
         <source>Transform audio signal with &quot;%1&quot; effect plugin (from %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="615"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="615"/>
         <source>Generate audio signal using &quot;%1&quot; plugin (from %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="1134"/>
-        <location filename="../../transform/TransformFactory.cpp" line="1172"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="1134"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="1172"/>
         <source>Plugin type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="1136"/>
-        <location filename="../../transform/TransformFactory.cpp" line="1174"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="1136"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="1174"/>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="1137"/>
-        <location filename="../../transform/TransformFactory.cpp" line="1175"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="1137"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="1175"/>
         <source>System Identifier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="1138"/>
-        <location filename="../../transform/TransformFactory.cpp" line="1176"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="1138"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="1176"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="1139"/>
-        <location filename="../../transform/TransformFactory.cpp" line="1177"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="1139"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="1177"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="1140"/>
-        <location filename="../../transform/TransformFactory.cpp" line="1178"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="1140"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="1178"/>
         <source>Maker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="1141"/>
-        <location filename="../../transform/TransformFactory.cpp" line="1179"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="1141"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="1179"/>
         <source>Units</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7199,64 +7264,64 @@
 <context>
     <name>TransformFinder</name>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="38"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="38"/>
         <source>Find a Transform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="44"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="44"/>
         <source>Find:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="77"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="77"/>
         <source>&lt;br&gt;&amp;nbsp;&amp;nbsp;No results found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="85"/>
-        <location filename="../../widgets/TransformFinder.cpp" line="86"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="85"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="86"/>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="90"/>
-        <location filename="../../widgets/TransformFinder.cpp" line="91"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="90"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="91"/>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="137"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="137"/>
         <source>&lt;p&gt;Type some text into the search box to search the descriptions of:&lt;ul&gt;&lt;li&gt;All currently installed &lt;a href=&quot;http://www.vamp-plugins.org/&quot;&gt;Vamp&lt;/a&gt; audio feature extraction plugins&lt;/li&gt;&lt;li&gt;All currently installed &lt;a href=&quot;http://www.ladspa.org/&quot;&gt;LADSPA&lt;/a&gt; audio effects plugins&lt;/li&gt;&lt;li&gt;Vamp plugins that are not currently installed but that have descriptions published via the semantic web&lt;/li&gt;&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="140"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="140"/>
         <source>&lt;b&gt;Unable to retrieve published descriptions from network!&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="143"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="143"/>
         <source>&lt;b&gt;No plugins are currently installed!&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="151"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="151"/>
         <source>&lt;p&gt;%1&lt;br&gt;Perhaps the network connection is down, services are responding too slowly, or a processing problem has occurred.&lt;br&gt;Only the descriptions of installed plugins will be searched.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="157"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="157"/>
         <source>&lt;p&gt;%1&lt;br&gt;Only the published descriptions of Vamp feature extraction plugins will be searched.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="161"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="161"/>
         <source>&lt;p&gt;%1&lt;br&gt;%2&lt;br&gt;Perhaps the network connection is down, or services are responding too slowly.&lt;br&gt;No search results will be available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../../widgets/TransformFinder.cpp" line="227"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="227"/>
         <source>Found %n description(s) containing &lt;b&gt;%1&lt;/b&gt;, showing the first %2 only</source>
         <translation type="unfinished">
             <numerusform>Found %n description containing &lt;b&gt;%1&lt;/b&gt;, showing the first %2 only</numerusform>
@@ -7264,7 +7329,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../../widgets/TransformFinder.cpp" line="231"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="231"/>
         <source>Found %n description(s) containing &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished">
             <numerusform>Found %n description containing &lt;b&gt;%1&lt;/b&gt;</numerusform>
@@ -7272,54 +7337,54 @@
         </translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="257"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="257"/>
         <source>&lt;i&gt; (not installed)&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="261"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="261"/>
         <source>%1%2&lt;br&gt;&lt;small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="272"/>
-        <location filename="../../widgets/TransformFinder.cpp" line="303"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="272"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="303"/>
         <source>&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="275"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="275"/>
         <source>&lt;b&gt;%1&lt;/b&gt;%2&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="281"/>
-        <location filename="../../widgets/TransformFinder.cpp" line="284"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="281"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="284"/>
         <source>&lt;small&gt;%1&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="288"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="288"/>
         <source>&lt;small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="290"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="290"/>
         <source>&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;mdash; Plugin type: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="294"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="294"/>
         <source>&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;mdash; Category: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="297"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="297"/>
         <source>&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;mdash; System identifier: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="300"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="300"/>
         <source>&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;mdash; More information: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7327,58 +7392,58 @@
 <context>
     <name>View</name>
     <message>
-        <location filename="../../view/View.cpp" line="90"/>
+        <location filename="../../svgui/view/View.cpp" line="90"/>
         <source>Global Scroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="91"/>
+        <location filename="../../svgui/view/View.cpp" line="91"/>
         <source>Global Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="92"/>
+        <location filename="../../svgui/view/View.cpp" line="92"/>
         <source>Follow Playback</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="131"/>
+        <location filename="../../svgui/view/View.cpp" line="131"/>
         <source>Scroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="132"/>
+        <location filename="../../svgui/view/View.cpp" line="132"/>
         <source>Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="133"/>
+        <location filename="../../svgui/view/View.cpp" line="133"/>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="136"/>
+        <location filename="../../svgui/view/View.cpp" line="136"/>
         <source>&lt;unknown&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="1434"/>
+        <location filename="../../svgui/view/View.cpp" line="1457"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="2182"/>
+        <location filename="../../svgui/view/View.cpp" line="2233"/>
         <source>Waiting for layers to be ready...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="2183"/>
-        <location filename="../../view/View.cpp" line="2212"/>
+        <location filename="../../svgui/view/View.cpp" line="2234"/>
+        <location filename="../../svgui/view/View.cpp" line="2263"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="2211"/>
+        <location filename="../../svgui/view/View.cpp" line="2262"/>
         <source>Rendering image...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7386,82 +7451,97 @@
 <context>
     <name>ViewManager</name>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="347"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="328"/>
+        <source>Clear Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/view/ViewManager.cpp" line="329"/>
+        <source>Select Multiple Regions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/view/ViewManager.cpp" line="330"/>
+        <source>Select Region</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../svgui/view/ViewManager.cpp" line="347"/>
         <source>Enter Navigate mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="348"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="348"/>
         <source>Enter Select mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="349"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="349"/>
         <source>Enter Edit mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="350"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="350"/>
         <source>Enter Draw mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="351"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="351"/>
         <source>Enter Erase mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="352"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="352"/>
         <source>Enter Measure mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="366"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="366"/>
         <source>Switch on Loop mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="367"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="367"/>
         <source>Switch off Loop mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="381"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="381"/>
         <source>Switch on Play Selection mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="382"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="382"/>
         <source>Switch off Play Selection mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="396"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="396"/>
         <source>Switch on Play Solo mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="397"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="397"/>
         <source>Switch off Play Solo mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="411"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="411"/>
         <source>Switch on Alignment mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="412"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="412"/>
         <source>Switch off Alignment mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="514"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="514"/>
         <source>Scroll to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../../view/ViewManager.cpp" line="576"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="576"/>
         <source>Zoom to %n sample(s) per pixel</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -7469,33 +7549,15 @@
         </translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="586"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="586"/>
         <source>Change overlay level</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ViewManager::SetSelectionCommand</name>
-    <message>
-        <location filename="../../view/ViewManager.cpp" line="328"/>
-        <source>Clear Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../view/ViewManager.cpp" line="329"/>
-        <source>Select Multiple Regions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../view/ViewManager.cpp" line="330"/>
-        <source>Select Region</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WaveFileModel</name>
     <message>
-        <location filename="../../data/model/WaveFileModel.h" line="83"/>
+        <location filename="../../svcore/data/model/WaveFileModel.h" line="83"/>
         <source>Wave File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7503,110 +7565,110 @@
 <context>
     <name>WaveformLayer</name>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="104"/>
-        <location filename="../../layer/WaveformLayer.cpp" line="133"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="104"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="133"/>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="105"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="105"/>
         <source>Gain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="106"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="106"/>
         <source>Normalize Visible Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="107"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="107"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="194"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="194"/>
         <source>Linear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="195"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="195"/>
         <source>Meter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="196"/>
-        <location filename="../../layer/WaveformLayer.cpp" line="214"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="196"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="214"/>
         <source>dB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="202"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="202"/>
         <source>Separate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="203"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="203"/>
         <source>Mean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="204"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="204"/>
         <source>Butterfly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="940"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="940"/>
         <source>Time:	%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="944"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="944"/>
         <source>Time:	%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="965"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="965"/>
         <source>Level:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="967"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="967"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="968"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="968"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="969"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="969"/>
         <source>Channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="992"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="992"/>
         <source>
 %1	%2 - %3 (%4 dB peak)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="995"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="995"/>
         <source>
 %1	%2 (%3 dB peak)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="1162"/>
-        <location filename="../../layer/WaveformLayer.cpp" line="1215"/>
-        <location filename="../../layer/WaveformLayer.cpp" line="1225"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="1162"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="1215"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="1225"/>
         <source>0dB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="1163"/>
-        <location filename="../../layer/WaveformLayer.cpp" line="1217"/>
-        <location filename="../../layer/WaveformLayer.cpp" line="1227"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="1163"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="1217"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="1227"/>
         <source>-Inf</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7614,12 +7676,12 @@
 <context>
     <name>WindowShapePreview</name>
     <message>
-        <location filename="../../widgets/WindowShapePreview.cpp" line="118"/>
+        <location filename="../../svgui/widgets/WindowShapePreview.cpp" line="118"/>
         <source>V / time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../widgets/WindowShapePreview.cpp" line="202"/>
+        <location filename="../../svgui/widgets/WindowShapePreview.cpp" line="202"/>
         <source>dB / freq</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7627,7 +7689,7 @@
 <context>
     <name>WritableWaveFileModel</name>
     <message>
-        <location filename="../../data/model/WritableWaveFileModel.h" line="82"/>
+        <location filename="../../svcore/data/model/WritableWaveFileModel.h" line="82"/>
         <source>Writable Wave File</source>
         <translation type="unfinished"></translation>
     </message>