changeset 398:249fe3768d91

* Update translation strings
author Chris Cannam
date Mon, 07 Feb 2011 20:19:33 +0000 (2011-02-07)
parents bd12bfae2d64
children 5b048b2e2e2a
files i18n/sonic-visualiser_cs_CZ.qm i18n/sonic-visualiser_cs_CZ.ts i18n/sonic-visualiser_en_GB.ts i18n/sonic-visualiser_en_US.ts i18n/sonic-visualiser_ru.qm i18n/sonic-visualiser_ru.ts misc/update-i18n.sh
diffstat 7 files changed, 7048 insertions(+), 6651 deletions(-) [+]
line wrap: on
line diff
Binary file i18n/sonic-visualiser_cs_CZ.qm has changed
--- a/i18n/sonic-visualiser_cs_CZ.ts	Mon Feb 07 11:56:04 2011 +0000
+++ b/i18n/sonic-visualiser_cs_CZ.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>Zápis činnosti</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>&lt;p&gt;Zápis činností uvádí vaši spolupráci a další události uvnitř %1.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../../widgets/ActivityLog.cpp" line="63"/>
+        <location filename="../../svgui/widgets/ActivityLog.cpp" line="63"/>
         <source>%1: %2</source>
         <translation>%1: %2</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>Přidat %1 vrstvu</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>Úhrnná vlna</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>Zarovnání</translation>
     </message>
@@ -46,17 +46,17 @@
 <context>
     <name>AudioCallbackPlaySource</name>
     <message>
-        <location filename="../../audioio/AudioCallbackPlaySource.cpp" line="447"/>
+        <location filename="../../svapp/audioio/AudioCallbackPlaySource.cpp" line="459"/>
         <source>Play from %1</source>
         <translation>Přehrát od %1</translation>
     </message>
     <message>
-        <location filename="../../audioio/AudioCallbackPlaySource.cpp" line="462"/>
+        <location filename="../../svapp/audioio/AudioCallbackPlaySource.cpp" line="482"/>
         <source>Stop at %1</source>
         <translation>Zastavit na %1</translation>
     </message>
     <message>
-        <location filename="../../audioio/AudioCallbackPlaySource.cpp" line="1040"/>
+        <location filename="../../svapp/audioio/AudioCallbackPlaySource.cpp" line="1061"/>
         <source>Change time-stretch factor to %1</source>
         <translation>Změnit násobek roztažení času na %1</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>%1: %2%3</translation>
     </message>
     <message>
-        <location filename="../../widgets/AudioDial.cpp" line="418"/>
+        <location filename="../../svgui/widgets/AudioDial.cpp" line="418"/>
         <source>%2%3</source>
         <translation>%2%3</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>Nová hodnota pro %1, od %2 do %3 %4:</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>Nová hodnota pro %1, od %2 do %3:</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>Zadejte novou hodnotu od %1, do %2 %3:</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>Zadejte novou hodnotu od %1 do %2:</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>Zadat novou hodnotu</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>(auto)</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>Spojovací sada pro zvuk JACK</translation>
     </message>
     <message>
-        <location filename="../../audioio/AudioTargetFactory.cpp" line="80"/>
+        <location filename="../../svapp/audioio/AudioTargetFactory.cpp" line="80"/>
         <source>PulseAudio Server</source>
         <translation>Server PulseAudio</translation>
     </message>
     <message>
-        <location filename="../../audioio/AudioTargetFactory.cpp" line="84"/>
+        <location filename="../../svapp/audioio/AudioTargetFactory.cpp" line="84"/>
         <source>Core Audio Device</source>
         <translation>Jaderné zvukové zařízení</translation>
     </message>
     <message>
-        <location filename="../../audioio/AudioTargetFactory.cpp" line="88"/>
+        <location filename="../../svapp/audioio/AudioTargetFactory.cpp" line="88"/>
         <source>Default Soundcard Device</source>
         <translation>Výchozí zařízení zvukové karty</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>Soubor je již otevřen</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>Režim připojení není podporován</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>Režim přístupu k souborům není zadán</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>Režimy pro čtení a zápis jsou zadány</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>Otevření souboru pro zápis se nezdařilo</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>Otevření proudu bzip2 pro zápis se nezdařilo</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>Otevření souboru pro čtení se nezdařilo</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>Otevření proudu bzip2 pro čtení se nezdařilo</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>Vnitřní chyba (otevření ani pro čtení, ani pro zápis)</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>Soubor neotevřen</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>Chyba závěru zápisu proudu bzip2</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>Chyba závěru čtení proudu bzip2</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>Vnitřní chyba (závěr ani pro čtení, ani pro zápis)</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>Chyba čtení proudu bzip2</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>
             <numerusform>%1 (jedna změna)</numerusform>
@@ -217,7 +217,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>Otevření souboru %1 pro zápis se nezdařilo</translation>
     </message>
@@ -225,7 +225,7 @@
 <context>
     <name>CSVFormatDialog</name>
     <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="37"/>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="37"/>
         <source>Select Data Format</source>
         <translation>Vybrat datový formát</translation>
     </message>
@@ -266,67 +266,67 @@
         <translation type="obsolete">Data (řádky po sobě následují v čase)</translation>
     </message>
     <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="43"/>
+        <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="../../widgets/CSVFormatDialog.cpp" line="73"/>
+        <translation>Vyberte, prosím, správný datový formát pro tento soubor.</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="73"/>
         <source>&lt;ignore&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="74"/>
+        <translation>&lt;nevšímat si&gt;</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="74"/>
         <source>Time</source>
-        <translation type="unfinished">Čas</translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="75"/>
+        <translation>Čas</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="75"/>
         <source>End time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="76"/>
+        <translation>Koncový čas</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="76"/>
         <source>Duration</source>
-        <translation type="unfinished">Doba trvání</translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="77"/>
+        <translation>Doba trvání</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="77"/>
         <source>Value</source>
-        <translation type="unfinished">Hodnota</translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="78"/>
+        <translation>Hodnota</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="78"/>
         <source>Label</source>
-        <translation type="unfinished">Štítek</translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="99"/>
+        <translation>Štítek</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="99"/>
         <source>Timing is specified:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="102"/>
+        <translation>Čas je zadán:</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="102"/>
         <source>Explicitly, in seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="103"/>
+        <translation>Otevřeně, v sekundách</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="../../widgets/CSVFormatDialog.cpp" line="104"/>
+        <translation>Otevřeně, ve zvukových vzorkovacích snímcích</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="../../widgets/CSVFormatDialog.cpp" line="112"/>
+        <translation>Skrytě: řádky jsou pravidelně rozloženy v čase</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="112"/>
         <source>Audio sample rate (Hz):</source>
         <translation>Vzorkovací kmitočet zvuku (Hz):</translation>
     </message>
     <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="135"/>
+        <location filename="../../svgui/widgets/CSVFormatDialog.cpp" line="135"/>
         <source>Frame increment between rows:</source>
         <translation>Nárůst snímků mezi řádky:</translation>
     </message>
@@ -340,91 +340,91 @@
 <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>Barva</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>Stupnice</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="172"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="172"/>
         <source>Normalize Columns</source>
         <translation>Normalizovat sloupce</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="173"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="173"/>
         <source>Normalize Visible Area</source>
         <translation>Normalizovat viditelnou oblast</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="174"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="174"/>
         <source>Invert Vertical Scale</source>
         <translation>Obrátit svislou stupnici</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="175"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="175"/>
         <source>Gain</source>
         <translation>Zesílení signálu</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="176"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="176"/>
         <source>Always Opaque</source>
         <translation>Vždý neprůhledná</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="177"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="177"/>
         <source>Smooth</source>
         <translation>Jemná</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="178"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="178"/>
         <source>Bin Scale</source>
         <translation>Stupnice koše</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="213"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="213"/>
         <source>Bins</source>
         <translation>Koše</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>Čárový</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>Zápis</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="311"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="311"/>
         <source>+/-1</source>
         <translation>+/-1</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="312"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="312"/>
         <source>Absolute</source>
         <translation>Naprostý</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="322"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="322"/>
         <source>&lt;unknown&gt;</source>
         <translation>&lt;neznámý&gt;</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="329"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="329"/>
         <source>dB</source>
         <translation>dB</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>
@@ -436,68 +436,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>&lt;neznámý&gt;</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="52"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="52"/>
         <source>Default</source>
         <translation>Výchozí</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="53"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="53"/>
         <source>White on Black</source>
         <translation>Bílá na černé</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="54"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="54"/>
         <source>Black on White</source>
         <translation>Černá na bílé</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="55"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="55"/>
         <source>Red on Blue</source>
         <translation>Červená na modré</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="56"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="56"/>
         <source>Yellow on Black</source>
         <translation>Žlutá na černé</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="57"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="57"/>
         <source>Blue on Black</source>
         <translation>Modrá na černé</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="58"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="58"/>
         <source>Sunset</source>
         <translation>Západ slunce</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="59"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="59"/>
         <source>Fruit Salad</source>
         <translation>Ovocný salát</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="60"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="60"/>
         <source>Banded</source>
         <translation>Pruhovaný</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="61"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="61"/>
         <source>Highlight</source>
         <translation>Zvýraznění</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="62"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="62"/>
         <source>Printer</source>
         <translation>Tiskárna</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="63"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="63"/>
         <source>High Gain</source>
         <translation>Zesílení výšek</translation>
     </message>
@@ -505,68 +505,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>&amp;Zpět</translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="57"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="57"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</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>Poslední krok úprav vrátit zpět</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>&amp;Znovu</translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="70"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="70"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</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>Opakovat poslední krok úprav, který byl vrácen zpět</translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="344"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="344"/>
         <source>Undo %1</source>
         <translation>Zpět %1</translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="370"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="370"/>
         <source>Redo %1</source>
         <translation>Znovu %1</translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="503"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="503"/>
         <source>Nothing to undo</source>
         <translation>Neexistuje nic, co by se dalo vrátit zpět</translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="503"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="503"/>
         <source>Nothing to redo</source>
         <translation>Neexistuje nic, u čeho by šlo zrušit vrácení zpět</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>&amp;Zpět %1</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>&amp;Znovu %1</translation>
     </message>
@@ -574,7 +574,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>Vyrovnávací paměť hustého trojrozměrného vrcholu</translation>
     </message>
@@ -582,34 +582,38 @@
 <context>
     <name>DenseThreeDimensionalModel</name>
     <message>
+        <location filename="../../svcore/data/model/DenseThreeDimensionalModel.h" line="110"/>
         <source>Dense 3-D</source>
-        <translation type="obsolete">Hustý trojrozměrný</translation>
-    </message>
-    <message>
+        <translation type="unfinished">Hustý trojrozměrný</translation>
+    </message>
+    <message>
+        <location filename="../../svcore/data/model/DenseThreeDimensionalModel.h" line="127"/>
         <source>Time</source>
-        <translation type="obsolete">Čas</translation>
-    </message>
-    <message>
+        <translation type="unfinished">Čas</translation>
+    </message>
+    <message>
+        <location filename="../../svcore/data/model/DenseThreeDimensionalModel.h" line="128"/>
         <source>Frame</source>
-        <translation type="obsolete">Snímek</translation>
+        <translation type="unfinished">Snímek</translation>
     </message>
 </context>
 <context>
     <name>DenseTimeValueModel</name>
     <message>
+        <location filename="../../svcore/data/model/DenseTimeValueModel.h" line="89"/>
         <source>Dense Time-Value</source>
-        <translation type="obsolete">Hustá hodnota času</translation>
+        <translation type="unfinished">Hustá hodnota času</translation>
     </message>
 </context>
 <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>Nastavit hlavní model na %1</translation>
     </message>
     <message>
-        <location filename="../../framework/Document.cpp" line="271"/>
+        <location filename="../../svapp/framework/Document.cpp" line="272"/>
         <source>Clear main model</source>
         <translation>Smazat hlavní model</translation>
     </message>
@@ -617,19 +621,20 @@
 <context>
     <name>EditableDenseThreeDimensionalModel</name>
     <message>
+        <location filename="../../svcore/data/model/EditableDenseThreeDimensionalModel.h" line="139"/>
         <source>Editable Dense 3-D</source>
-        <translation type="obsolete">Upravovatelný hustý trojrozměrný</translation>
+        <translation type="unfinished">Upravovatelný hustý trojrozměrný</translation>
     </message>
 </context>
 <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>FFT</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>%1 Hz</translation>
     </message>
@@ -637,22 +642,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>Zadat novou úroveň prolínače</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>Nová úroveň prolínače, od %1 do %2 dBFS:</translation>
     </message>
     <message>
-        <location filename="../../widgets/Fader.cpp" line="217"/>
+        <location filename="../../svgui/widgets/Fader.cpp" line="217"/>
         <source>Level: Off</source>
         <translation>Úroveň: Vypnuto</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>Úroveň: %1%2.%3%4 dB</translation>
     </message>
@@ -660,48 +665,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>Není dostupný žádný závod pro ID přídavného modulu vytažení funkce &quot;%1&quot; (neznámý typ přídavného modulu, nebo vnitřní chyba?)</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>Vstupní model pro přídavný modul vytažení funkce &quot;%1&quot; je chybného typu (vnitřní chyba?)</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>Přídavný modul &quot;%1&quot; se nepodařilo doložit příkladem</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>Nelze poskytnout dostatek kanálů pro přídavný modul vytažení funkce &quot;%1&quot; (minimum pro přídavný modul je %2, maximum pro přídavný modul je %3; vstupní model has %4)</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>Přídavný modul vytažení funkce se nepodařilo spustit &quot;%1&quot;</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>Přídavný modul vytažení funkce &quot;%1&quot; odmítl daný krok a velikosti bloků (%2 a %3); používají se výchozí nastavení přídavného modulu (%4 a %5)</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>Proměna byla nastavena pro verzi %1 přídavného modulu &quot;%2&quot;, ale používaný přídavný modul je ve verzi %3</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>Přídavný modul &quot;%1&quot; nemá žádné výstupy</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>Přídavný modul &quot;%1&quot; nemá žádný výstup pojmenovaný jako &quot;%2&quot;</translation>
     </message>
@@ -709,49 +714,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>Nepodporované schéma v adrese (URL)</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>Stahuje se %1...</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>Připojení k FTP serveru se nezdařilo</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>Přihlášení se nezdařilo</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>Změna na správný adresář se nepodařila</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>FTP stahování zrušeno</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>Stahování zrušeno</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>Vytvoření místního souboru %1 se nezdařilo</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>Soubor neobsahuje žádné údaje!</translation>
     </message>
@@ -759,7 +764,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>Upravit data</translation>
     </message>
@@ -767,52 +772,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>Obrázek</translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="56"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="56"/>
         <source>Label:</source>
         <translation>Štítek:</translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="63"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="63"/>
         <source>File or URL:</source>
         <translation>Soubor nebo adresa (URL):</translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="73"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="73"/>
         <source>Browse...</source>
         <translation>Procházet...</translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="79"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="79"/>
         <source>Preview</source>
         <translation>Náhled</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>Nepodporované schéma v adrese (URL)</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>Schéma adresy (URL) &quot;%1&quot; není podporována</translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="192"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="192"/>
         <source>Opening image URL...</source>
         <translation>Otevírá se adresa obrázku (URL)...</translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="196"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="196"/>
         <source>File download failed</source>
         <translation>Stažení souboru se nezdařilo</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>Nepodařilo se stáhnout adresu (URL) &quot;%1&quot;: %2</translation>
     </message>
@@ -820,58 +825,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>Probíhá</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>Vybrat obrázek</translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="678"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="678"/>
         <source>Move Image</source>
         <translation>Přesunout obrázek</translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="735"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="735"/>
         <source>Drag Selection</source>
         <translation>Táhnout výběr</translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="760"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="760"/>
         <source>Resize Selection</source>
         <translation>Změnit velikost výběru</translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="794"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="794"/>
         <source>Delete Selection</source>
         <translation>Smazat výběr</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>Zarovnat vložené položky znovu?</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>Položky, které vkládáte, přišly z vrstvy s odlišným zdrojovým materiálem, než má tento. Chcete je zarovnat znovu v čase, aby se hodily ke zdrojovému materiálu pro tuto vrstvu?</translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="852"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="852"/>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="884"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="884"/>
         <source>New Point</source>
         <translation>Nový bod</translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="915"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="915"/>
         <source>Opening image URL...</source>
         <translation>Otevírá se adresa obrázku (URL)...</translation>
     </message>
@@ -879,38 +884,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>Obrázek</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>Upravit obrázek</translation>
     </message>
     <message>
-        <location filename="../../data/model/ImageModel.h" line="152"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="152"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../../data/model/ImageModel.h" line="153"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="153"/>
         <source>Frame</source>
         <translation>Snímek</translation>
     </message>
     <message>
-        <location filename="../../data/model/ImageModel.h" line="155"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="155"/>
         <source>Label</source>
         <translation>Štítek</translation>
     </message>
     <message>
-        <location filename="../../data/model/ImageModel.h" line="156"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="156"/>
         <source>Unknown</source>
         <translation>Neznámý</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>Upravit data</translation>
     </message>
@@ -918,25 +923,25 @@
 <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>Vybrat soubor</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>Všechny soubory (*.*)</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>Vybrat soubor se sezením</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>
@@ -945,14 +950,14 @@
 Všechny soubory (*.*)</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>Zvukové soubory (%1)
 Všechny soubory (*.*)</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)
@@ -971,7 +976,7 @@
 Všechny soubory (*.*)</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)
@@ -988,7 +993,7 @@
 Všechny soubory (*.*)</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)
@@ -1001,14 +1006,14 @@
 Všechny soubory (*.*)</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>Obrázkové soubory (%1)
 Všechny soubory (*.*)</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)
@@ -1023,81 +1028,81 @@
 Všechny soubory (*.*)</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>Soubor neexistuje</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>&lt;b&gt;Soubor nenalezen&lt;/b&gt;&lt;p&gt;Soubor &quot;%1&quot; neexistuje</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>Soubor není čitelný</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>&lt;b&gt;Soubor není čitelný&lt;/b&gt;&lt;p&gt;Soubor &quot;%1&quot; nelze přečíst</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>Adresář vybrán</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>&lt;b&gt;Soubor vybrán&lt;/b&gt;&lt;p&gt;Soubor &quot;%1&quot; je adresář</translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="166"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="166"/>
         <source>Non-file selected</source>
         <translation>Vybrán ne-soubor</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>&lt;b&gt;Není soubor&lt;/b&gt;&lt;p&gt;Cesta &quot;%1&quot; není soubor</translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="172"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="172"/>
         <source>File is empty</source>
         <translation>Soubor je prázdný</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>&lt;b&gt;Soubor je prázdný&lt;/b&gt;&lt;p&gt;Soubor &quot;%1&quot; je prázdný</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>Soubory se sezením programu Sonic Visualiser (*.sv)
 Všechny soubory (*.*)</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>Vybrat soubor, do kterého se má provést vyvedení</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>Zvukové soubory WAV (*.wav)
 Všechny soubory (*.*)</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)
@@ -1112,7 +1117,7 @@
 Všechny soubory (*.*)</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)
@@ -1125,75 +1130,75 @@
 Všechny soubory (*.*)</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>Soubory PNG (Portable Network Graphics) (*.png)
 Všechny soubory (*.*)</translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="318"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="318"/>
         <source>File exists</source>
         <translation>Soubor již existuje</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>&lt;b&gt;Soubor existuje&lt;/b&gt;&lt;p&gt;Soubor &quot;%1&quot; již existuje.
 Chcete jej přepsat?</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>&lt;b&gt;Soubor nenalezen&lt;/b&gt;&lt;p&gt;Zvukový soubor &quot;%1&quot; se nepodařilo otevřít.
 Chcete jej najít?</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>&lt;b&gt;Soubor nenalezen&lt;/b&gt;&lt;p&gt;Soubor &quot;%1&quot; se nepodařilo otevřít.
 Chcete jej najít?</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>Soubor se nepodařilo otevřít</translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="465"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="465"/>
         <source>Locate file...</source>
         <translation>Najít soubor...</translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="466"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="466"/>
         <source>Use URL...</source>
         <translation>Použít adresu (URL)...</translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="467"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="467"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="486"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="486"/>
         <source>Use URL</source>
         <translation>Použít adresu (URL)</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>Zadejte, prosím, adresu (URL), která se má použít pro tento soubor:</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>Umístění se nepodařilo otevřít</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>&lt;b&gt;Umístění se nepodařilo otevřít&lt;/b&gt;&lt;p&gt;Adresu (URL) &quot;%1&quot; se nepodařilo otevřít</translation>
     </message>
@@ -1201,65 +1206,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>Načasování</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="69"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="69"/>
         <source>Time:</source>
         <translation>Čas:</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> snímky</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> sek</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> usek</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="100"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="100"/>
         <source>Duration:</source>
         <translation>Doba trvání:</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="132"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="132"/>
         <source>Properties</source>
         <translation>Vlastnosti</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="145"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="145"/>
         <source>Value:</source>
         <translation>Hodnota:</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="161"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="161"/>
         <source>Text:</source>
         <translation>Text:</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="180"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="180"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="181"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="181"/>
         <source>Reset</source>
         <translation>Nastavit znovu</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="182"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="182"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
@@ -1267,23 +1272,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>&amp;</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>&lt;i&gt;nebo&lt;/i&gt;&amp;nbsp;&lt;b&gt;%1&lt;/b&gt;</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>&lt;/b&gt;&amp;nbsp;(%1)&lt;b&gt;</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>Sonic Visualiser: Odkaz na klávesy a myš</translation>
     </message>
@@ -1291,17 +1296,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>Nastavit počítadla</translation>
     </message>
     <message>
-        <location filename="../../widgets/LabelCounterInputDialog.cpp" line="33"/>
+        <location filename="../../svgui/widgets/LabelCounterInputDialog.cpp" line="33"/>
         <source>Fine counter (beats):</source>
         <translation>Citlivé počítadlo (doby):</translation>
     </message>
     <message>
-        <location filename="../../widgets/LabelCounterInputDialog.cpp" line="36"/>
+        <location filename="../../svgui/widgets/LabelCounterInputDialog.cpp" line="36"/>
         <source>Coarse counter (bars):</source>
         <translation>Hrubé počítadlo (doby):</translation>
     </message>
@@ -1309,77 +1314,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>Žádné číslování</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>Jednoduché počítadlo</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>Cyklické počítadlo</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>Cyklické dvouúrovňové počítadlo (takt/doba)</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>Číslo snímku zvukového vzorku</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>Čas v sekundách</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>Doba trvání po následující položku</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>Tempo (počet úderů za minutu; úzm: bpm) založené na době trvání po následující položku</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>Doba trvání od předchozí položky</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>Tempo (počet úderů za minutu; úzm: bpm) založené na době trvání od předchozí položky</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>Stejné jako nejbližší předchozí položka</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>Hodnota vytažená ze štítku u položky (kde je to možné)</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>%1 %2</translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="157"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="157"/>
         <source>%1</source>
         <translation>%1</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>Body štítků</translation>
     </message>
@@ -1387,81 +1392,81 @@
 <context>
     <name>Layer</name>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="70"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="70"/>
         <source>Waveform</source>
         <translation>Časový průběh vlny</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>Spektrogram</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="72"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="72"/>
         <source>Ruler</source>
         <translation>Pravítko</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="73"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="73"/>
         <source>Time Instants</source>
         <translation>Okamžiky času</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="74"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="74"/>
         <source>Time Values</source>
         <translation>Hodnoty času</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="75"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="75"/>
         <source>Notes</source>
         <translation>Noty</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="76"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="76"/>
         <source>Regions</source>
         <translation>Oblasti</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="77"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="77"/>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="78"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="78"/>
         <source>Images</source>
         <translation>Obrázky</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="79"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="79"/>
         <source>Colour 3D Plot</source>
         <translation>Barevný trojrozměrný nákres</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="80"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="80"/>
         <source>Spectrum</source>
         <translation>Spektrum</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="81"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="81"/>
         <source>Time Slice</source>
         <translation>Kus času</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="96"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="96"/>
         <source>Layer</source>
         <translation>Vrstva</translation>
     </message>
     <message>
-        <location filename="../../layer/Layer.cpp" line="340"/>
+        <location filename="../../svgui/layer/Layer.cpp" line="340"/>
         <source>Make Measurement</source>
-        <translation type="unfinished">Udělat měření</translation>
-    </message>
-    <message>
-        <location filename="../../layer/Layer.cpp" line="358"/>
+        <translation>Udělat měření</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/layer/Layer.cpp" line="358"/>
         <source>Delete Measurement</source>
-        <translation type="unfinished">Smazat měření</translation>
+        <translation>Smazat měření</translation>
     </message>
 </context>
 <context>
@@ -1481,17 +1486,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>Přehled vrstev</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTreeDialog.cpp" line="40"/>
+        <location filename="../../svgui/widgets/LayerTreeDialog.cpp" line="40"/>
         <source>Audio Data Sources</source>
         <translation>Zdroje zvukových dat</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTreeDialog.cpp" line="61"/>
+        <location filename="../../svgui/widgets/LayerTreeDialog.cpp" line="61"/>
         <source>Panes and Layers</source>
         <translation>Tabulky a vrstvy</translation>
     </message>
@@ -1499,22 +1504,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>Vrstva</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="515"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="515"/>
         <source>Shown</source>
         <translation>Ukázaná</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="516"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="516"/>
         <source>Played</source>
         <translation>Přehrávaná</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="517"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="517"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
@@ -1522,27 +1527,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>Sloučit všechny stopy</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>Sloučit všechny stopy, které nejsou bicích</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>Vybrat stopu nebo stopy pro zavedení</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>&lt;b&gt;Vybrat stopu pro zavedení&lt;/b&gt;&lt;p&gt; Tento soubor můžete zavést jen jako jednu poznámkovou vrstvu, ale soubor obsahuje více než jednu stopu, nebo noty na více než jednom kanálu.&lt;p&gt;Vyberte, prosím, stopu nebo sloučené stopy, jež si přejete zavést:</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>Chyba při zavádění souboru MIDI</translation>
     </message>
@@ -1550,89 +1555,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>Chybná délka pro dlouhá data v proudu MIDI (%1, mělo by být %2)</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>Chybná délka pro vnitřní data v proudu MIDI (%1, mělo by být %2)</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>Voláno getMIDIByte (získat byt MIDI), ale neotevřen žádný soubor MIDI</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>Při čtení byl dosažen konec souboru MIDI</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>Pokus o získání více bytů ze stopy, než bylo očekáváno</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>Pokus o čtení po konci souboru MIDI</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>Voláno getMIDIBytes (získat byty MIDI), ale neotevřen žádný soubor MIDI</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>Pokus o získání více bytů, než je na stopě dostupných (%1, má pouze %2)</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>Voláno getNumberFromMIDIBytes (získat z bytů MIDI číslo), ale neotevřen žádný soubor MIDI</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>Voláno skipToNextTrack (skočit na další skladbuI), ale neotevřen žádný soubor MIDI</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>Nalezen neplatný kód události %1</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>Pro první událost ve stopě byl použit provozní stav (&apos;Running&apos;)</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>Soubor MIDI &quot;%1&quot; nemá noty v žádné stopě</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> - používá kanál bicích GM</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>Stopa %1 (%2)%3</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>Stopa %1 (bez názvu)%3</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>%1 - vel %2</translation>
     </message>
@@ -1640,7 +1645,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>Vstup</translation>
     </message>
@@ -1648,7 +1653,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>Dekóduje se %1...</translation>
     </message>
@@ -1656,1682 +1661,1712 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../main/MainWindow.cpp" line="163"/>
-        <location filename="../main/MainWindow.cpp" line="2612"/>
+        <location filename="../main/MainWindow.cpp" line="164"/>
+        <location filename="../main/MainWindow.cpp" line="2631"/>
         <source>Sonic Visualiser</source>
         <translation>Sonic Visualiser - Znázorňovač zvuku</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="171"/>
+        <location filename="../main/MainWindow.cpp" line="172"/>
         <source>Black</source>
         <translation>Černá</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="172"/>
+        <location filename="../main/MainWindow.cpp" line="173"/>
         <source>Red</source>
         <translation>Červená</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="173"/>
+        <location filename="../main/MainWindow.cpp" line="174"/>
         <source>Blue</source>
         <translation>Modrá</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="174"/>
-        <location filename="../main/MainWindow.cpp" line="220"/>
-        <location filename="../main/MainWindow.cpp" line="3003"/>
+        <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>Zelená</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="175"/>
+        <location filename="../main/MainWindow.cpp" line="176"/>
         <source>Purple</source>
         <translation>Purpurová</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="176"/>
+        <location filename="../main/MainWindow.cpp" line="177"/>
         <source>Orange</source>
         <translation>Oranžová</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="177"/>
+        <location filename="../main/MainWindow.cpp" line="178"/>
         <source>White</source>
         <translation>Bílá</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="178"/>
+        <location filename="../main/MainWindow.cpp" line="179"/>
         <source>Bright Red</source>
         <translation>Světlečervená</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="179"/>
+        <location filename="../main/MainWindow.cpp" line="180"/>
         <source>Bright Blue</source>
         <translation>Světlemodrá</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="180"/>
-        <location filename="../main/MainWindow.cpp" line="217"/>
-        <location filename="../main/MainWindow.cpp" line="3000"/>
+        <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>Světlezelená</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="181"/>
+        <location filename="../main/MainWindow.cpp" line="182"/>
         <source>Bright Purple</source>
         <translation>Světlepurpurová</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="182"/>
+        <location filename="../main/MainWindow.cpp" line="183"/>
         <source>Bright Orange</source>
         <translation>Světleoranžová</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="235"/>
+        <location filename="../main/MainWindow.cpp" line="236"/>
         <source>Playback Speedup</source>
         <translation>Zvýšení rychlosti přehrávání</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="348"/>
-        <location filename="../main/MainWindow.cpp" line="908"/>
-        <location filename="../main/MainWindow.cpp" line="915"/>
+        <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>&amp;Vrstva</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="337"/>
-        <location filename="../main/MainWindow.cpp" line="1306"/>
+        <location filename="../main/MainWindow.cpp" line="338"/>
+        <location filename="../main/MainWindow.cpp" line="1325"/>
         <source>&amp;Transform</source>
         <translation>&amp;Proměna</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="372"/>
+        <location filename="../main/MainWindow.cpp" line="373"/>
         <source>&amp;File</source>
         <translation>&amp;Soubor</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="374"/>
+        <location filename="../main/MainWindow.cpp" line="375"/>
         <source>File Toolbar</source>
         <translation>Nástrojový pruh pro soubor</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="376"/>
+        <location filename="../main/MainWindow.cpp" line="377"/>
         <source>File and Session Management</source>
         <translation>Správa souborů a sezení</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="382"/>
+        <location filename="../main/MainWindow.cpp" line="383"/>
         <source>&amp;New Session</source>
         <translation>&amp;Nové sezení</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="383"/>
+        <location filename="../main/MainWindow.cpp" line="384"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="384"/>
+        <location filename="../main/MainWindow.cpp" line="385"/>
         <source>Abandon the current Sonic Visualiser session and start a new one</source>
         <translation>Opustit nynější sezení programu Sonic Visualiser a spustit nové</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="391"/>
+        <location filename="../main/MainWindow.cpp" line="392"/>
         <source>&amp;Open Session...</source>
         <translation>&amp;Otevřít sezení...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="392"/>
+        <location filename="../main/MainWindow.cpp" line="393"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="393"/>
+        <location filename="../main/MainWindow.cpp" line="394"/>
         <source>Open a previously saved Sonic Visualiser session file</source>
         <translation>Otevřít soubor s dříve uloženým sezením programu Sonic Visualiser</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="401"/>
+        <location filename="../main/MainWindow.cpp" line="402"/>
         <source>&amp;Open...</source>
         <translation>&amp;Otevřít...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="402"/>
+        <location filename="../main/MainWindow.cpp" line="403"/>
         <source>Open a session file, audio file, or layer</source>
         <translation>Otevřít soubor se sezením, zvukový soubor, nebo vrstvu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="408"/>
+        <location filename="../main/MainWindow.cpp" line="409"/>
         <source>&amp;Save Session</source>
         <translation>&amp;Uložit sezení</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="409"/>
+        <location filename="../main/MainWindow.cpp" line="410"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="410"/>
+        <location filename="../main/MainWindow.cpp" line="411"/>
         <source>Save the current session into a Sonic Visualiser session file</source>
         <translation>Uložit nynější sezení do souboru se sezením programu Sonic Visualiser</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="419"/>
+        <location filename="../main/MainWindow.cpp" line="420"/>
         <source>Save Session &amp;As...</source>
         <translation>Uložit sezení &amp;jako...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="420"/>
+        <location filename="../main/MainWindow.cpp" line="421"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="421"/>
+        <location filename="../main/MainWindow.cpp" line="422"/>
         <source>Save the current session into a new Sonic Visualiser session file</source>
         <translation>Uložit nynější sezení do nového souboru se sezením programu Sonic Visualiser</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="429"/>
+        <location filename="../main/MainWindow.cpp" line="430"/>
         <source>&amp;Import Audio File...</source>
         <translation>&amp;Zavést zvukový soubor...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="430"/>
+        <location filename="../main/MainWindow.cpp" line="431"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="431"/>
+        <location filename="../main/MainWindow.cpp" line="432"/>
         <source>Import an existing audio file</source>
         <translation>Zavést stávající zvukový soubor</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="436"/>
+        <location filename="../main/MainWindow.cpp" line="437"/>
         <source>Import Secondary Audio File...</source>
         <translation>Zavést vedlejší zvukový soubor...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="437"/>
+        <location filename="../main/MainWindow.cpp" line="438"/>
         <source>Ctrl+Shift+I</source>
         <translation>Ctrl+Shift+I</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="438"/>
+        <location filename="../main/MainWindow.cpp" line="439"/>
         <source>Import an extra audio file as a separate layer</source>
         <translation>Zavést další zvukový soubor jako oddělenou vrstvu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="444"/>
+        <location filename="../main/MainWindow.cpp" line="445"/>
         <source>&amp;Export Audio File...</source>
         <translation>&amp;Vyvést zvukový soubor...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="445"/>
+        <location filename="../main/MainWindow.cpp" line="446"/>
         <source>Export selection as an audio file</source>
         <translation>Vyvést výběr jako zvukový soubor</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="452"/>
+        <location filename="../main/MainWindow.cpp" line="453"/>
         <source>Import Annotation &amp;Layer...</source>
         <translation>Zavést poznámkovou &amp;vrstvu...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="453"/>
+        <location filename="../main/MainWindow.cpp" line="454"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="454"/>
+        <location filename="../main/MainWindow.cpp" line="455"/>
         <source>Import layer data from an existing file</source>
         <translation>Zavést data vrstvy ze stávajícího souboru</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="460"/>
+        <location filename="../main/MainWindow.cpp" line="461"/>
         <source>Export Annotation Layer...</source>
         <translation>Vyvést poznámkovou vrstvu...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="461"/>
+        <location filename="../main/MainWindow.cpp" line="462"/>
         <source>Export layer data to a file</source>
         <translation>Vyvést data vrstvy do souboru</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="468"/>
+        <location filename="../main/MainWindow.cpp" line="469"/>
         <source>Export Image File...</source>
         <translation>Vyvést obrázkový soubor...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="469"/>
+        <location filename="../main/MainWindow.cpp" line="470"/>
         <source>Export a single pane to an image file</source>
         <translation>Vyvést každou jednu tabulku do obrázkového souboru</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="476"/>
+        <location filename="../main/MainWindow.cpp" line="477"/>
         <source>Open Lo&amp;cation...</source>
         <translation>Otevřít &amp;umístění...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="477"/>
+        <location filename="../main/MainWindow.cpp" line="478"/>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="478"/>
+        <location filename="../main/MainWindow.cpp" line="479"/>
         <source>Open or import a file from a remote URL</source>
         <translation>Otevřít nebo zavést soubor ze vzdálené adresy (URL)</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="485"/>
+        <location filename="../main/MainWindow.cpp" line="486"/>
         <source>&amp;Recent Files</source>
         <translation>&amp;Naposledy otevřené soubory</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="492"/>
+        <location filename="../main/MainWindow.cpp" line="493"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Nastavení...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="493"/>
+        <location filename="../main/MainWindow.cpp" line="494"/>
         <source>Adjust the application preferences</source>
         <translation>Upravit nastavení programu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="499"/>
+        <location filename="../main/MainWindow.cpp" line="500"/>
         <source>&amp;Quit</source>
         <translation>&amp;Ukončit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="500"/>
+        <location filename="../main/MainWindow.cpp" line="501"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="501"/>
+        <location filename="../main/MainWindow.cpp" line="502"/>
         <source>Exit Sonic Visualiser</source>
         <translation>Ukončit Sonic Visualiser</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="512"/>
+        <location filename="../main/MainWindow.cpp" line="513"/>
         <source>&amp;Edit</source>
         <translation>&amp;Úpravy</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="516"/>
+        <location filename="../main/MainWindow.cpp" line="517"/>
         <source>Editing</source>
         <translation>Úpravy</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="523"/>
+        <location filename="../main/MainWindow.cpp" line="524"/>
         <source>Cu&amp;t</source>
         <translation>Vyj&amp;mout</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="524"/>
+        <location filename="../main/MainWindow.cpp" line="525"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="525"/>
+        <location filename="../main/MainWindow.cpp" line="526"/>
         <source>Cut the selection from the current layer to the clipboard</source>
         <translation>Vyjmout výběr z nynější vrstvy do schránky</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="533"/>
+        <location filename="../main/MainWindow.cpp" line="534"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopírovat</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="534"/>
+        <location filename="../main/MainWindow.cpp" line="535"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="535"/>
+        <location filename="../main/MainWindow.cpp" line="536"/>
         <source>Copy the selection from the current layer to the clipboard</source>
         <translation>Kopírovat výběr z nynější vrstvy do schránky</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="543"/>
+        <location filename="../main/MainWindow.cpp" line="544"/>
         <source>&amp;Paste</source>
         <translation>V&amp;ložit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="544"/>
+        <location filename="../main/MainWindow.cpp" line="545"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="545"/>
+        <location filename="../main/MainWindow.cpp" line="546"/>
         <source>Paste from the clipboard to the current layer</source>
         <translation>Vložit ze schránky do nynější vrstvy</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="552"/>
-        <location filename="../main/MainWindow.cpp" line="2020"/>
+        <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>&amp;Smazat vybrané položky</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="553"/>
+        <location filename="../main/MainWindow.cpp" line="563"/>
         <source>Del</source>
         <translation>Smazat (Delete)</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="554"/>
-        <location filename="../main/MainWindow.cpp" line="2021"/>
+        <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>Smazat položky v nynějším výběru z nynější vrstvy</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="564"/>
+        <location filename="../main/MainWindow.cpp" line="574"/>
         <source>Selection</source>
         <translation>Výběr</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="566"/>
+        <location filename="../main/MainWindow.cpp" line="576"/>
         <source>Select &amp;All</source>
         <translation>Vybrat &amp;vše</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="567"/>
+        <location filename="../main/MainWindow.cpp" line="577"/>
         <source>Ctrl+A</source>
         <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="568"/>
+        <location filename="../main/MainWindow.cpp" line="578"/>
         <source>Select the whole duration of the current session</source>
         <translation>Vybrat celou dobu trvání nynějšího sezení</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="575"/>
+        <location filename="../main/MainWindow.cpp" line="585"/>
         <source>Select &amp;Visible Range</source>
         <translation>Vybrat &amp;viditelný rozsah</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="576"/>
+        <location filename="../main/MainWindow.cpp" line="586"/>
         <source>Ctrl+Shift+A</source>
         <translation>Ctrl+Shift+A</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="577"/>
+        <location filename="../main/MainWindow.cpp" line="587"/>
         <source>Select the time range corresponding to the current window width</source>
         <translation>Vybrat časový rozsah odpovídající šířce nynějšího okna</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="583"/>
+        <location filename="../main/MainWindow.cpp" line="593"/>
         <source>Select to &amp;Start</source>
         <translation>Vybrat po &amp;začátek</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="584"/>
+        <location filename="../main/MainWindow.cpp" line="594"/>
         <source>Shift+Left</source>
         <translation>Shift+šipka vlevo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="585"/>
+        <location filename="../main/MainWindow.cpp" line="595"/>
         <source>Select from the start of the session to the current playback position</source>
         <translation>Vybrat od začátku sezení po nynější polohu přehrávání</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="591"/>
+        <location filename="../main/MainWindow.cpp" line="601"/>
         <source>Select to &amp;End</source>
         <translation>Vybrat do &amp;konce</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="592"/>
+        <location filename="../main/MainWindow.cpp" line="602"/>
         <source>Shift+Right</source>
         <translation>Shift+šipka vpravo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="593"/>
+        <location filename="../main/MainWindow.cpp" line="603"/>
         <source>Select from the current playback position to the end of the session</source>
         <translation>Vybrat od nynější polohy přehrávání po konec sezení</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="599"/>
+        <location filename="../main/MainWindow.cpp" line="609"/>
         <source>C&amp;lear Selection</source>
         <translation>Vyprázd&amp;nit výběr</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="600"/>
+        <location filename="../main/MainWindow.cpp" line="610"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="601"/>
+        <location filename="../main/MainWindow.cpp" line="611"/>
         <source>Clear the selection</source>
         <translation>Vyprázdnit výběr</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="610"/>
+        <location filename="../main/MainWindow.cpp" line="620"/>
         <source>Tapping Time Instants</source>
         <translation>Zaklepání okamžiků času</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="612"/>
+        <location filename="../main/MainWindow.cpp" line="622"/>
         <source>&amp;Insert Instant at Playback Position</source>
         <translation>&amp;Vložit okamžik v poloze přehrávání</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="613"/>
+        <location filename="../main/MainWindow.cpp" line="623"/>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="614"/>
+        <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>Vložit nový časový okamžik v nynější poloze přehrávání, v nové vrstvě, pokud je třeba</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="621"/>
+        <location filename="../main/MainWindow.cpp" line="631"/>
         <source>;</source>
         <translation>;</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="626"/>
+        <location filename="../main/MainWindow.cpp" line="636"/>
         <source>Insert Instants at Selection &amp;Boundaries</source>
         <translation>Vložit okamžiky na &amp;hranicích výběru</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="627"/>
+        <location filename="../main/MainWindow.cpp" line="637"/>
         <source>Shift+Enter</source>
         <translation>Shift+Enter</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="628"/>
+        <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>Vložit nové časové okamžiky na začátku a na konci nyní vybraných oblastí, v nové vrstvě, pokud je třeba</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="634"/>
+        <location filename="../main/MainWindow.cpp" line="644"/>
         <source>Insert Item at Selection</source>
         <translation>Vložit položku u výběru</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="635"/>
+        <location filename="../main/MainWindow.cpp" line="645"/>
         <source>Ctrl+Shift+Enter</source>
         <translation>Ctrl+Shift+Enter</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="636"/>
+        <location filename="../main/MainWindow.cpp" line="646"/>
         <source>Insert a new note or region item corresponding to the current selection</source>
         <translation>Vložit novou položku noty nebo oblasti odpovídající nynějšímu výběru</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="644"/>
+        <location filename="../main/MainWindow.cpp" line="654"/>
         <source>Number New Instants with</source>
         <translation>Číslovat nové okamžiky s</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="664"/>
+        <location filename="../main/MainWindow.cpp" line="674"/>
         <source>Cycle size</source>
         <translation>Obíhat velikost</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="685"/>
+        <location filename="../main/MainWindow.cpp" line="695"/>
         <source>Set Numbering Counters...</source>
         <translation>Nastavit číslovací počítadla...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="686"/>
+        <location filename="../main/MainWindow.cpp" line="696"/>
         <source>Set the counters used for counter-based labelling</source>
         <translation>Nastavit počítadla používaná pro štítkování založené na počítadlech</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="690"/>
+        <location filename="../main/MainWindow.cpp" line="700"/>
         <source>Renumber Selected Instants</source>
         <translation>Přečíslovat vybrané okamžiky</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="691"/>
+        <location filename="../main/MainWindow.cpp" line="701"/>
         <source>Renumber the selected instants using the current labelling scheme</source>
         <translation>Přečíslovat vybrané okamžiky za použití nynějšího štítkovacího plánu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="707"/>
+        <location filename="../main/MainWindow.cpp" line="717"/>
         <source>Panning and Navigation</source>
         <translation>Najíždění a navádění</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="709"/>
+        <location filename="../main/MainWindow.cpp" line="719"/>
         <source>&amp;View</source>
         <translation>&amp;Pohled</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="711"/>
+        <location filename="../main/MainWindow.cpp" line="721"/>
         <source>Scroll &amp;Left</source>
         <translation>Projíždět &amp;doleva</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="712"/>
+        <location filename="../main/MainWindow.cpp" line="722"/>
         <source>Left</source>
         <translation>Vlevo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="713"/>
+        <location filename="../main/MainWindow.cpp" line="723"/>
         <source>Scroll the current pane to the left</source>
         <translation>Projíždět nynější tabulkou vlevo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="719"/>
+        <location filename="../main/MainWindow.cpp" line="729"/>
         <source>Scroll &amp;Right</source>
         <translation>Projíždět do&amp;prava</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="720"/>
+        <location filename="../main/MainWindow.cpp" line="730"/>
         <source>Right</source>
         <translation>Vpravo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="721"/>
+        <location filename="../main/MainWindow.cpp" line="731"/>
         <source>Scroll the current pane to the right</source>
         <translation>Projíždět nynější tabulkou vpravo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="727"/>
+        <location filename="../main/MainWindow.cpp" line="737"/>
         <source>&amp;Jump Left</source>
         <translation>&amp;Skočit vlevo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="728"/>
+        <location filename="../main/MainWindow.cpp" line="738"/>
         <source>Ctrl+Left</source>
         <translation>Ctrl+šipka vlevo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="729"/>
+        <location filename="../main/MainWindow.cpp" line="739"/>
         <source>Scroll the current pane a big step to the left</source>
         <translation>Projíždět nynější tabulkou velkým skokem vlevo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="735"/>
+        <location filename="../main/MainWindow.cpp" line="745"/>
         <source>J&amp;ump Right</source>
         <translation>S&amp;kočit vpravo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="736"/>
+        <location filename="../main/MainWindow.cpp" line="746"/>
         <source>Ctrl+Right</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="737"/>
+        <location filename="../main/MainWindow.cpp" line="747"/>
         <source>Scroll the current pane a big step to the right</source>
         <translation>Projíždět nynější tabulkou velkým skokem vpravo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="743"/>
+        <location filename="../main/MainWindow.cpp" line="753"/>
         <source>Peek Left</source>
         <translation>Letmo prohlédnout vlevo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="744"/>
+        <location filename="../main/MainWindow.cpp" line="754"/>
         <source>Alt+Left</source>
         <translation>Alt+šipka vlevo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="745"/>
+        <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>Projíždět nynější tabulkou vlevo bez pohybu ukazatelem přehrávání nebo jinými tabulkami</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="751"/>
+        <location filename="../main/MainWindow.cpp" line="761"/>
         <source>Peek Right</source>
         <translation>Letmo prohlédnout vpravo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="752"/>
+        <location filename="../main/MainWindow.cpp" line="762"/>
         <source>Alt+Right</source>
         <translation>Alt+šipka vpravo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="753"/>
+        <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>Projíždět nynější tabulkou vpravo bez pohybu ukazatelem přehrávání nebo jinými tabulkami</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="761"/>
+        <location filename="../main/MainWindow.cpp" line="771"/>
         <source>Zoom</source>
         <translation>Zvětšení</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="764"/>
+        <location filename="../main/MainWindow.cpp" line="774"/>
         <source>Zoom &amp;In</source>
         <translation>&amp;Přiblížit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="765"/>
+        <location filename="../main/MainWindow.cpp" line="775"/>
         <source>Up</source>
         <translation>Zvýšit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="766"/>
+        <location filename="../main/MainWindow.cpp" line="776"/>
         <source>Increase the zoom level</source>
         <translation>Zvýšit úroveň zvětšení</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="773"/>
+        <location filename="../main/MainWindow.cpp" line="783"/>
         <source>Zoom &amp;Out</source>
         <translation>&amp;Oddálit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="774"/>
+        <location filename="../main/MainWindow.cpp" line="784"/>
         <source>Down</source>
         <translation>Snížit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="775"/>
+        <location filename="../main/MainWindow.cpp" line="785"/>
         <source>Decrease the zoom level</source>
         <translation>Snížit úroveň zvětšení</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="781"/>
+        <location filename="../main/MainWindow.cpp" line="791"/>
         <source>Restore &amp;Default Zoom</source>
         <translation>Obnovit &amp;výchozí zvětšení</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="782"/>
+        <location filename="../main/MainWindow.cpp" line="792"/>
         <source>Restore the zoom level to the default</source>
         <translation>Obnovit úroveň zvětšení na výchozí</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="788"/>
+        <location filename="../main/MainWindow.cpp" line="798"/>
         <source>Zoom to &amp;Fit</source>
         <translation>&amp;Přizpůsobit oknu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="789"/>
+        <location filename="../main/MainWindow.cpp" line="799"/>
         <source>F</source>
         <translation>P</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="790"/>
+        <location filename="../main/MainWindow.cpp" line="800"/>
         <source>Zoom to show the whole file</source>
         <translation>Ukázat celý soubor</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="798"/>
+        <location filename="../main/MainWindow.cpp" line="808"/>
         <source>Display Features</source>
         <translation>Funkce zobrazení</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="802"/>
+        <location filename="../main/MainWindow.cpp" line="812"/>
         <source>Show &amp;No Overlays</source>
         <translation>&amp;Neukazovat žádná překrytí</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="803"/>
+        <location filename="../main/MainWindow.cpp" line="813"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="804"/>
+        <location filename="../main/MainWindow.cpp" line="814"/>
         <source>Hide centre indicator, frame times, layer names and scale</source>
         <translation>Skrýt středový ukazatel, časy snímků, názvy vrstev a stupnici</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="812"/>
+        <location filename="../main/MainWindow.cpp" line="822"/>
         <source>Show &amp;Minimal Overlays</source>
         <translation>Ukázat nej&amp;menší překrytí</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="813"/>
+        <location filename="../main/MainWindow.cpp" line="823"/>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="814"/>
+        <location filename="../main/MainWindow.cpp" line="824"/>
         <source>Show centre indicator only</source>
         <translation>Ukázat pouze středový ukazatel</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="822"/>
+        <location filename="../main/MainWindow.cpp" line="832"/>
         <source>Show &amp;Standard Overlays</source>
         <translation>Ukázat ob&amp;vyklá překrytí</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="823"/>
+        <location filename="../main/MainWindow.cpp" line="833"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="824"/>
+        <location filename="../main/MainWindow.cpp" line="834"/>
         <source>Show centre indicator, frame times and scale</source>
         <translation>Ukázat středový ukazatel, časy snímků a stupnici</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="832"/>
+        <location filename="../main/MainWindow.cpp" line="842"/>
         <source>Show &amp;All Overlays</source>
         <translation>Ukázat &amp;všechna překrytí</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="833"/>
+        <location filename="../main/MainWindow.cpp" line="843"/>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="834"/>
+        <location filename="../main/MainWindow.cpp" line="844"/>
         <source>Show all texts and scale</source>
         <translation>Ukázat všechny texty a stupnici</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="844"/>
+        <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>Ukázat kolečka pro &amp;zvětšování</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="845"/>
+        <location filename="../main/MainWindow.cpp" line="864"/>
         <source>Z</source>
         <translation>Z</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="846"/>
+        <location filename="../main/MainWindow.cpp" line="865"/>
         <source>Show thumbwheels for zooming horizontally and vertically</source>
         <translation>Ukázat ovládací kolečko pro vodorovné a svislé zvětšování</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="853"/>
+        <location filename="../main/MainWindow.cpp" line="872"/>
         <source>Show Property Bo&amp;xes</source>
         <translation>Ukázat &amp;okénka vlastností</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="854"/>
+        <location filename="../main/MainWindow.cpp" line="873"/>
         <source>X</source>
         <translation>X</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="855"/>
+        <location filename="../main/MainWindow.cpp" line="874"/>
         <source>Show the layer property boxes at the side of the main window</source>
         <translation>Ukázat okénka vlastností vrstev po straně hlavního okna</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="862"/>
+        <location filename="../main/MainWindow.cpp" line="881"/>
         <source>Show Status &amp;Bar</source>
         <translation>Ukázat st&amp;avový řádek</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="863"/>
+        <location filename="../main/MainWindow.cpp" line="882"/>
         <source>Show context help information in the status bar at the bottom of the window</source>
         <translation>Ukázat související nápovědu ve stavovém řádku okna dole</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="880"/>
+        <location filename="../main/MainWindow.cpp" line="899"/>
         <source>Show La&amp;yer Summary</source>
         <translation>Ukázat přehled &amp;vrstev</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="881"/>
+        <location filename="../main/MainWindow.cpp" line="900"/>
         <source>Y</source>
         <translation>Y</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="882"/>
+        <location filename="../main/MainWindow.cpp" line="901"/>
         <source>Open a window displaying the hierarchy of panes and layers in this session</source>
         <translation>Otevřít okno zobrazující pořadí tabulek a vrstev v tomto sezení</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="887"/>
+        <location filename="../main/MainWindow.cpp" line="906"/>
         <source>Show Acti&amp;vity Log</source>
         <translation>Ukázat zápis čin&amp;nosti</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="888"/>
+        <location filename="../main/MainWindow.cpp" line="907"/>
         <source>Open a window listing interactions and other events</source>
         <translation>Otevřít okno uvádějící výměnu informací a další události</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="900"/>
+        <location filename="../main/MainWindow.cpp" line="919"/>
         <source>&amp;Pane</source>
         <translation>&amp;Tabulka</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="924"/>
+        <location filename="../main/MainWindow.cpp" line="943"/>
         <source>Managing Panes and Layers</source>
         <translation>Správa tabulek a vrstev</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="926"/>
+        <location filename="../main/MainWindow.cpp" line="945"/>
         <source>Add &amp;New Pane</source>
         <translation>Přidat &amp;novou tabulku</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="927"/>
+        <location filename="../main/MainWindow.cpp" line="946"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="928"/>
+        <location filename="../main/MainWindow.cpp" line="947"/>
         <source>Add a new pane containing only a time ruler</source>
         <translation>Přidat novou tabulku obsahující pouze časové pravítko</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="954"/>
+        <location filename="../main/MainWindow.cpp" line="973"/>
         <source>Add New %1 Layer</source>
         <translation>Přidat novou %1 vrstvu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="955"/>
+        <location filename="../main/MainWindow.cpp" line="974"/>
         <source>Add a new empty layer of type %1</source>
         <translation>Přidat novou prázdnou vrstvu typu %1</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="961"/>
+        <location filename="../main/MainWindow.cpp" line="980"/>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1011"/>
+        <location filename="../main/MainWindow.cpp" line="1030"/>
         <source>Add &amp;Waveform</source>
         <translation>Přidat &amp;časový průběh vlny</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1013"/>
+        <location filename="../main/MainWindow.cpp" line="1032"/>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1014"/>
+        <location filename="../main/MainWindow.cpp" line="1033"/>
         <source>Add a new pane showing a waveform view</source>
         <translation>Přidat novou tabulku ukazující pohled na časový průběh vlny</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1016"/>
+        <location filename="../main/MainWindow.cpp" line="1035"/>
         <source>Shift+W</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../main/MainWindow.cpp" line="1017"/>
+        <translation>Shift+W</translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="1036"/>
         <source>Add a new layer showing a waveform view</source>
         <translation>Přidat novou vrstvu ukazující pohled na časový průběh vlny</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1024"/>
+        <location filename="../main/MainWindow.cpp" line="1043"/>
         <source>Add Spectro&amp;gram</source>
         <translation>Přidat spektro&amp;gram</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1026"/>
+        <location filename="../main/MainWindow.cpp" line="1045"/>
         <source>G</source>
         <translation>G</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1027"/>
+        <location filename="../main/MainWindow.cpp" line="1046"/>
         <source>Add a new pane showing a spectrogram</source>
         <translation>Přidat novou tabulku ukazující spektrogram</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1029"/>
+        <location filename="../main/MainWindow.cpp" line="1048"/>
         <source>Shift+G</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../main/MainWindow.cpp" line="1030"/>
+        <translation>Shift+G</translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="1049"/>
         <source>Add a new layer showing a spectrogram</source>
         <translation>Přidat novou vrstvu ukazující spektrogram</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1036"/>
+        <location filename="../main/MainWindow.cpp" line="1055"/>
         <source>Add &amp;Melodic Range Spectrogram</source>
         <translation>Přidat spektrogram &amp;melodického rozsahu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1038"/>
+        <location filename="../main/MainWindow.cpp" line="1057"/>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1039"/>
+        <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>Přidat novou tabulku ukazující spektrogram nastavený na přehled výšek not</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1041"/>
+        <location filename="../main/MainWindow.cpp" line="1060"/>
         <source>Shift+M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../main/MainWindow.cpp" line="1042"/>
+        <translation>Shift+M</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>Přidat novou vrstvu ukazující spektrogram nastavený na přehled výšek not</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1048"/>
+        <location filename="../main/MainWindow.cpp" line="1067"/>
         <source>Add Pea&amp;k Frequency Spectrogram</source>
         <translation>Přidat spektrogram nejvyššího &amp;kmitočtu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1050"/>
+        <location filename="../main/MainWindow.cpp" line="1069"/>
         <source>K</source>
         <translation>K</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1051"/>
+        <location filename="../main/MainWindow.cpp" line="1070"/>
         <source>Add a new pane showing a spectrogram set up for tracking frequencies</source>
         <translation>Přidat novou tabulku ukazující spektrogram nastavený na sledování kmitočtů</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1053"/>
+        <location filename="../main/MainWindow.cpp" line="1072"/>
         <source>Shift+K</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../main/MainWindow.cpp" line="1054"/>
+        <translation>Shift+K</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>Přidat novou vrstvu ukazující spektrogram nastavený na sledování kmitočtů</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1060"/>
+        <location filename="../main/MainWindow.cpp" line="1079"/>
         <source>Add Spectr&amp;um</source>
         <translation>Přidat spektr&amp;um</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1062"/>
+        <location filename="../main/MainWindow.cpp" line="1081"/>
         <source>U</source>
         <translation>U</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1063"/>
+        <location filename="../main/MainWindow.cpp" line="1082"/>
         <source>Add a new pane showing a frequency spectrum</source>
         <translation>Přidat novou tabulku ukazující kmitočtové spektrum</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1065"/>
+        <location filename="../main/MainWindow.cpp" line="1084"/>
         <source>Shift+U</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../main/MainWindow.cpp" line="1066"/>
+        <translation>Shift+U</translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="1085"/>
         <source>Add a new layer showing a frequency spectrum</source>
         <translation>Přidat novou vrstvu ukazující kmitočtové spektrum</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1136"/>
+        <location filename="../main/MainWindow.cpp" line="1155"/>
         <source>&amp;All Channels Mixed</source>
         <translation>&amp;Všechny kanály smíchány</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1138"/>
+        <location filename="../main/MainWindow.cpp" line="1157"/>
         <source>&amp;All Channels</source>
         <translation>&amp;Všechny kanály</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1141"/>
+        <location filename="../main/MainWindow.cpp" line="1160"/>
         <source>Channel &amp;%1</source>
         <translation>Kanál &amp;%1</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1145"/>
+        <location filename="../main/MainWindow.cpp" line="1164"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1200"/>
+        <location filename="../main/MainWindow.cpp" line="1219"/>
         <source>Switch to Previous Pane</source>
         <translation>Přepnout na předchozí tabulku</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1201"/>
+        <location filename="../main/MainWindow.cpp" line="1220"/>
         <source>[</source>
         <translation>[</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1202"/>
+        <location filename="../main/MainWindow.cpp" line="1221"/>
         <source>Make the next pane up in the pane stack current</source>
         <translation>Udělat další tabulku směrem nahoru v zásobníku tabulek současnou</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1208"/>
+        <location filename="../main/MainWindow.cpp" line="1227"/>
         <source>Switch to Next Pane</source>
         <translation>Přepnout na další tabulku</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1209"/>
+        <location filename="../main/MainWindow.cpp" line="1228"/>
         <source>]</source>
         <translation>]</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1210"/>
+        <location filename="../main/MainWindow.cpp" line="1229"/>
         <source>Make the next pane down in the pane stack current</source>
         <translation>Udělat další tabulku směrem dolů v zásobníku tabulek současnou</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1218"/>
+        <location filename="../main/MainWindow.cpp" line="1237"/>
         <source>&amp;Delete Pane</source>
         <translation>&amp;Smazat tabulku</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1219"/>
+        <location filename="../main/MainWindow.cpp" line="1238"/>
         <source>Ctrl+Shift+D</source>
         <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1220"/>
+        <location filename="../main/MainWindow.cpp" line="1239"/>
         <source>Delete the currently active pane</source>
         <translation>Smazat nyní činnou tabulku</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1228"/>
+        <location filename="../main/MainWindow.cpp" line="1247"/>
         <source>Add &amp;Time Ruler</source>
         <translation>Přidat ča&amp;sové pravítko</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1229"/>
+        <location filename="../main/MainWindow.cpp" line="1248"/>
         <source>Add a new layer showing a time ruler</source>
         <translation>Přidat novou vrstvu ukazující časové pravítko</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1237"/>
+        <location filename="../main/MainWindow.cpp" line="1256"/>
         <source>Add &amp;Existing Layer</source>
         <translation>Přidat &amp;stávající vrstvu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1241"/>
+        <location filename="../main/MainWindow.cpp" line="1260"/>
         <source>Add S&amp;lice of Layer</source>
         <translation>Přidat k&amp;us vrstvy</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1269"/>
+        <location filename="../main/MainWindow.cpp" line="1288"/>
         <source>&amp;Rename Layer...</source>
         <translation>&amp;Přejmenovat vrstvu...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1270"/>
+        <location filename="../main/MainWindow.cpp" line="1289"/>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1271"/>
+        <location filename="../main/MainWindow.cpp" line="1290"/>
         <source>Rename the currently active layer</source>
         <translation>Přejmenovat nyní činnou vrstvu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1277"/>
+        <location filename="../main/MainWindow.cpp" line="1296"/>
         <source>Edit Layer Data</source>
         <translation>Upravit data vrstvy</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1278"/>
+        <location filename="../main/MainWindow.cpp" line="1297"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1279"/>
+        <location filename="../main/MainWindow.cpp" line="1298"/>
         <source>Edit the currently active layer as a data grid</source>
         <translation>Upravit nyní činnou vrstvu jako datovou mřížku</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1285"/>
+        <location filename="../main/MainWindow.cpp" line="1304"/>
         <source>&amp;Delete Layer</source>
         <translation>&amp;Smazat vrstvu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1286"/>
+        <location filename="../main/MainWindow.cpp" line="1305"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1287"/>
+        <location filename="../main/MainWindow.cpp" line="1306"/>
         <source>Delete the currently active layer</source>
         <translation>Smazat nyní činnou vrstvu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1324"/>
+        <location filename="../main/MainWindow.cpp" line="1343"/>
         <source>&amp;Recent Transforms</source>
         <translation>&amp;Poslední proměny</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1341"/>
+        <location filename="../main/MainWindow.cpp" line="1360"/>
         <source>%1 by Category</source>
         <translation>%1 podle skupiny</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1356"/>
-        <location filename="../main/MainWindow.cpp" line="1444"/>
+        <location filename="../main/MainWindow.cpp" line="1375"/>
+        <location filename="../main/MainWindow.cpp" line="1463"/>
         <source>Unclassified</source>
         <translation>Bez zařazení</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1387"/>
+        <location filename="../main/MainWindow.cpp" line="1406"/>
         <source>%1 by Plugin Name</source>
         <translation>%1 podle názvu přídavného modulu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1395"/>
+        <location filename="../main/MainWindow.cpp" line="1414"/>
         <source>%1 by Maker</source>
         <translation>%1 podle tvůrce</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1409"/>
-        <location filename="../main/MainWindow.cpp" line="1447"/>
+        <location filename="../main/MainWindow.cpp" line="1428"/>
+        <location filename="../main/MainWindow.cpp" line="1466"/>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1410"/>
-        <location filename="../main/MainWindow.cpp" line="1448"/>
+        <location filename="../main/MainWindow.cpp" line="1429"/>
+        <location filename="../main/MainWindow.cpp" line="1467"/>
         <source> [\(&lt;].*$</source>
         <translation> [\(&lt;].*$</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1463"/>
-        <location filename="../main/MainWindow.cpp" line="1489"/>
+        <location filename="../main/MainWindow.cpp" line="1482"/>
+        <location filename="../main/MainWindow.cpp" line="1508"/>
         <source>%1...</source>
         <translation>%1...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1528"/>
+        <location filename="../main/MainWindow.cpp" line="1547"/>
         <source>Find a Transform...</source>
         <translation>Najít proměnu...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1529"/>
+        <location filename="../main/MainWindow.cpp" line="1548"/>
         <source>Search for a transform from the installed plugins, by name or description</source>
         <translation>Hledat proměnu z nainstalovaných přídavných modulů, podle názvu nebo popisu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1530"/>
+        <location filename="../main/MainWindow.cpp" line="1549"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1543"/>
+        <location filename="../main/MainWindow.cpp" line="1562"/>
         <source>&amp;Help</source>
         <translation>&amp;Nápověda</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1546"/>
+        <location filename="../main/MainWindow.cpp" line="1565"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1551"/>
+        <location filename="../main/MainWindow.cpp" line="1570"/>
         <source>&amp;Help Reference</source>
         <translation>Odkaz na &amp;nápovědu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1552"/>
+        <location filename="../main/MainWindow.cpp" line="1571"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1553"/>
+        <location filename="../main/MainWindow.cpp" line="1572"/>
         <source>Open the Sonic Visualiser reference manual</source>
         <translation>Otevřít odbornou příručku k programu Sonic Visualiser</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1558"/>
+        <location filename="../main/MainWindow.cpp" line="1577"/>
         <source>&amp;Key and Mouse Reference</source>
         <translation>Odkaz na &amp;klávesy a myš</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1559"/>
+        <location filename="../main/MainWindow.cpp" line="1578"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1560"/>
+        <location filename="../main/MainWindow.cpp" line="1579"/>
         <source>Open a window showing the keystrokes you can use in Sonic Visualiser</source>
         <translation>Otevřít okno ukazující klávesové zkratky, které lze použít v programu Sonic Visualiser</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1565"/>
+        <location filename="../main/MainWindow.cpp" line="1584"/>
         <source>Sonic Visualiser on the &amp;Web</source>
         <translation>Sonic Visualiser na &amp;internetu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1566"/>
+        <location filename="../main/MainWindow.cpp" line="1585"/>
         <source>Open the Sonic Visualiser website</source>
         <translation>Otevřít internetové stránky programu Sonic Visualiser</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1570"/>
+        <location filename="../main/MainWindow.cpp" line="1589"/>
         <source>&amp;About Sonic Visualiser</source>
         <translation>&amp;O programu Sonic Visualiser</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1571"/>
+        <location filename="../main/MainWindow.cpp" line="1590"/>
         <source>Show information about Sonic Visualiser</source>
         <translation>Ukázat informace o programu Sonic Visualiser</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1585"/>
+        <location filename="../main/MainWindow.cpp" line="1604"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1587"/>
+        <location filename="../main/MainWindow.cpp" line="1606"/>
         <source>Re-open</source>
         <translation>Otevřít znovu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1589"/>
+        <location filename="../main/MainWindow.cpp" line="1608"/>
         <source>Re-open the current or most recently opened file</source>
         <translation>Otevřít znovu nynější nebo naposledy otevřený soubor</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1610"/>
+        <location filename="../main/MainWindow.cpp" line="1629"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1612"/>
+        <location filename="../main/MainWindow.cpp" line="1631"/>
         <source>Repeat Transform</source>
         <translation>Opakovat proměnu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1614"/>
+        <location filename="../main/MainWindow.cpp" line="1633"/>
         <source>Re-select the most recently run transform</source>
         <translation>Vybrat znovu naposledy provedenou proměnu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1704"/>
+        <location filename="../main/MainWindow.cpp" line="1723"/>
         <source>Playback and Transport Controls</source>
         <translation>Ovládání přehrávání a přesunu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1708"/>
+        <location filename="../main/MainWindow.cpp" line="1727"/>
         <source>Play&amp;back</source>
         <translation>&amp;Přehrávání</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1711"/>
+        <location filename="../main/MainWindow.cpp" line="1730"/>
         <source>Playback</source>
         <translation>Přehrávání</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1713"/>
+        <location filename="../main/MainWindow.cpp" line="1732"/>
         <source>Playback Toolbar</source>
         <translation>Nástrojový pruh pro přehrávání</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1716"/>
+        <location filename="../main/MainWindow.cpp" line="1735"/>
         <source>Rewind to Start</source>
         <translation>Přetočit na začátek</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1717"/>
+        <location filename="../main/MainWindow.cpp" line="1736"/>
         <source>Home</source>
         <translation>Home</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1718"/>
+        <location filename="../main/MainWindow.cpp" line="1737"/>
         <source>Rewind to the start</source>
         <translation>Přetočit na začátek</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1722"/>
-        <location filename="../main/MainWindow.cpp" line="2038"/>
-        <location filename="../main/MainWindow.cpp" line="2039"/>
+        <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>Přetočit zpět</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1723"/>
+        <location filename="../main/MainWindow.cpp" line="1742"/>
         <source>PgUp</source>
         <translation>PgUp</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1724"/>
+        <location filename="../main/MainWindow.cpp" line="1743"/>
         <source>Rewind to the previous time instant or time ruler notch</source>
         <translation>Přetočit k předchozímu okamžiku v čase nebo místu časového pravítka</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1728"/>
+        <location filename="../main/MainWindow.cpp" line="1747"/>
         <source>Rewind to Similar Point</source>
         <translation>Přetočit k podobnému bodu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1729"/>
+        <location filename="../main/MainWindow.cpp" line="1748"/>
         <source>Shift+PgUp</source>
         <translation>Shift+PgUp</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1730"/>
+        <location filename="../main/MainWindow.cpp" line="1749"/>
         <source>Rewind to the previous similarly valued time instant</source>
         <translation>Přetočit k předchozímu podobně ohodnocenému okamžiku v čase</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1735"/>
+        <location filename="../main/MainWindow.cpp" line="1754"/>
         <source>Play / Pause</source>
         <translation>Přehrát/Pozastavit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1737"/>
+        <location filename="../main/MainWindow.cpp" line="1756"/>
         <source>Space</source>
         <translation>Mezerník</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1738"/>
+        <location filename="../main/MainWindow.cpp" line="1757"/>
         <source>Start or stop playback from the current position</source>
         <translation>Spustit nebo zastavit přehrávání od nynější polohy</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1747"/>
-        <location filename="../main/MainWindow.cpp" line="2036"/>
+        <location filename="../main/MainWindow.cpp" line="1766"/>
+        <location filename="../main/MainWindow.cpp" line="2055"/>
         <source>Fast Forward</source>
         <translation>Rychle vpřed</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1748"/>
+        <location filename="../main/MainWindow.cpp" line="1767"/>
         <source>PgDown</source>
         <translation>PgDown</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1749"/>
+        <location filename="../main/MainWindow.cpp" line="1768"/>
         <source>Fast-forward to the next time instant or time ruler notch</source>
         <translation>Rychle vpřed k dalšímu okamžiku v čase nebo místu časového pravítka</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1753"/>
+        <location filename="../main/MainWindow.cpp" line="1772"/>
         <source>Fast Forward to Similar Point</source>
         <translation>Rychle vpřed k podobnému bodu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1754"/>
+        <location filename="../main/MainWindow.cpp" line="1773"/>
         <source>Shift+PgDown</source>
         <translation>Shift+PgDown</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1755"/>
+        <location filename="../main/MainWindow.cpp" line="1774"/>
         <source>Fast-forward to the next similarly valued time instant</source>
         <translation>Rychle vpřed k dalšímu podobně ohodnocenému okamžiku v čase</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1760"/>
+        <location filename="../main/MainWindow.cpp" line="1779"/>
         <source>Fast Forward to End</source>
         <translation>Přetáčet rychle na konec</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1761"/>
+        <location filename="../main/MainWindow.cpp" line="1780"/>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1762"/>
+        <location filename="../main/MainWindow.cpp" line="1781"/>
         <source>Fast-forward to the end</source>
         <translation>Přetáčet rychle na konec</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1766"/>
+        <location filename="../main/MainWindow.cpp" line="1785"/>
         <source>Play Mode Toolbar</source>
         <translation>Nástrojový pruh pro režim hry</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1769"/>
+        <location filename="../main/MainWindow.cpp" line="1788"/>
         <source>Constrain Playback to Selection</source>
         <translation>Omezit přehrávání na výběr</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1772"/>
+        <location filename="../main/MainWindow.cpp" line="1791"/>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1773"/>
+        <location filename="../main/MainWindow.cpp" line="1792"/>
         <source>Constrain playback to the selected regions</source>
         <translation>Omezit přehrávání na vybrané oblasti</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1780"/>
+        <location filename="../main/MainWindow.cpp" line="1799"/>
         <source>Loop Playback</source>
         <translation>Udělat z přehrávání smyčku</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1783"/>
+        <location filename="../main/MainWindow.cpp" line="1802"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1784"/>
+        <location filename="../main/MainWindow.cpp" line="1803"/>
         <source>Loop playback</source>
         <translation>Udělat z přehrávaného smyčku</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1791"/>
+        <location filename="../main/MainWindow.cpp" line="1810"/>
         <source>Solo Current Pane</source>
         <translation>Nynější tabulka samostatně</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1795"/>
+        <location filename="../main/MainWindow.cpp" line="1814"/>
         <source>o</source>
         <translation>o</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1796"/>
+        <location filename="../main/MainWindow.cpp" line="1815"/>
         <source>Solo the current pane during playback</source>
         <translation>Nynější tabulka samostatně během přehrávání</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1805"/>
+        <location filename="../main/MainWindow.cpp" line="1824"/>
         <source>Align File Timelines</source>
         <translation>Zarovnat časové přímky souborů</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1808"/>
+        <location filename="../main/MainWindow.cpp" line="1827"/>
         <source>Treat multiple audio files as versions of the same work, and align their timelines</source>
         <translation>S více zvukovými soubory zacházet jako s verzemi téže práce a zarovnat jejich časové přímky</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1856"/>
+        <location filename="../main/MainWindow.cpp" line="1875"/>
         <source>Speed Up</source>
         <translation>Zrychlit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1857"/>
+        <location filename="../main/MainWindow.cpp" line="1876"/>
         <source>Ctrl+PgUp</source>
         <translation>Ctrl+PgUp</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1858"/>
+        <location filename="../main/MainWindow.cpp" line="1877"/>
         <source>Time-stretch playback to speed it up without changing pitch</source>
         <translation>Přehrávání roztažení času kvůli jeho zrychlení bez změny výšky</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1862"/>
+        <location filename="../main/MainWindow.cpp" line="1881"/>
         <source>Slow Down</source>
         <translation>Zpomalit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1863"/>
+        <location filename="../main/MainWindow.cpp" line="1882"/>
         <source>Ctrl+PgDown</source>
         <translation>Ctrl+PgDown</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1864"/>
+        <location filename="../main/MainWindow.cpp" line="1883"/>
         <source>Time-stretch playback to slow it down without changing pitch</source>
         <translation>Přehrávání roztažení času kvůli jeho zpomalení bez změny výšky</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1868"/>
+        <location filename="../main/MainWindow.cpp" line="1887"/>
         <source>Restore Normal Speed</source>
         <translation>Obnovit obyčejnou rychlost</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1869"/>
+        <location filename="../main/MainWindow.cpp" line="1888"/>
         <source>Ctrl+Home</source>
         <translation>Ctrl+Home</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1870"/>
+        <location filename="../main/MainWindow.cpp" line="1889"/>
         <source>Restore non-time-stretched playback</source>
         <translation>Obnovit nečasově roztažené přehrávání</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1882"/>
+        <location filename="../main/MainWindow.cpp" line="1901"/>
         <source>Edit Toolbar</source>
         <translation>Nástrojový pruh pro úpravy</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1885"/>
+        <location filename="../main/MainWindow.cpp" line="1904"/>
         <source>Tool Selection</source>
         <translation>Výběr nástroje</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1887"/>
+        <location filename="../main/MainWindow.cpp" line="1906"/>
         <source>Tools Toolbar</source>
         <translation>Nástrojový pruh s nástroji</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1891"/>
-        <location filename="../main/MainWindow.cpp" line="1895"/>
+        <location filename="../main/MainWindow.cpp" line="1910"/>
+        <location filename="../main/MainWindow.cpp" line="1914"/>
         <source>Navigate</source>
         <translation>Navádět</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1894"/>
+        <location filename="../main/MainWindow.cpp" line="1913"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1902"/>
+        <location filename="../main/MainWindow.cpp" line="1921"/>
         <source>Select</source>
         <translation>Vybrat</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1904"/>
+        <location filename="../main/MainWindow.cpp" line="1923"/>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1905"/>
+        <location filename="../main/MainWindow.cpp" line="1924"/>
         <source>Select ranges</source>
         <translation>Vybrat rozsah</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1912"/>
+        <location filename="../main/MainWindow.cpp" line="1931"/>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1914"/>
+        <location filename="../main/MainWindow.cpp" line="1933"/>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1915"/>
+        <location filename="../main/MainWindow.cpp" line="1934"/>
         <source>Edit items in layer</source>
         <translation>Upravit položky ve vrstvě</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1923"/>
+        <location filename="../main/MainWindow.cpp" line="1942"/>
         <source>Draw</source>
         <translation>Nakreslit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1925"/>
+        <location filename="../main/MainWindow.cpp" line="1944"/>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1926"/>
+        <location filename="../main/MainWindow.cpp" line="1945"/>
         <source>Draw new items in layer</source>
         <translation>Nakreslit položky ve vrstvě</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1934"/>
+        <location filename="../main/MainWindow.cpp" line="1953"/>
         <source>Erase</source>
         <translation>Vymazat</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1936"/>
+        <location filename="../main/MainWindow.cpp" line="1955"/>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1937"/>
+        <location filename="../main/MainWindow.cpp" line="1956"/>
         <source>Erase items from layer</source>
         <translation>Vymazat položky z vrstvy</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1944"/>
+        <location filename="../main/MainWindow.cpp" line="1963"/>
         <source>Measure</source>
         <translation>Změřit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1946"/>
+        <location filename="../main/MainWindow.cpp" line="1965"/>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1947"/>
+        <location filename="../main/MainWindow.cpp" line="1966"/>
         <source>Make measurements in layer</source>
         <translation>Udělat měření ve vrstvě</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2016"/>
+        <location filename="../main/MainWindow.cpp" line="2035"/>
         <source>&amp;Delete Current Measurement</source>
         <translation>&amp;Smazat nynější měření</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2017"/>
+        <location filename="../main/MainWindow.cpp" line="2036"/>
         <source>Delete the measurement currently under the mouse pointer</source>
         <translation>Smazat měření, které je nyní pod ukazovátkem myši</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2026"/>
+        <location filename="../main/MainWindow.cpp" line="2045"/>
         <source>Fast Forward to Next Instant</source>
         <translation>Rychle vpřed k dalšímu okamžiku</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2027"/>
+        <location filename="../main/MainWindow.cpp" line="2046"/>
         <source>Fast forward to the next time instant in the current layer</source>
         <translation>Rychle vpřed k dalšímu okamžiku v čase v nynější vrstvě</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2028"/>
+        <location filename="../main/MainWindow.cpp" line="2047"/>
         <source>Rewind to Previous Instant</source>
         <translation>Přetočit k předchozímu okamžiku</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2029"/>
+        <location filename="../main/MainWindow.cpp" line="2048"/>
         <source>Rewind to the previous time instant in the current layer</source>
         <translation>Přetočit k předchozímu okamžiku v čase v nynější vrstvě</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2031"/>
+        <location filename="../main/MainWindow.cpp" line="2050"/>
         <source>Fast Forward to Next Point</source>
         <translation>Rychle vpřed k dalšímu bodu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2032"/>
+        <location filename="../main/MainWindow.cpp" line="2051"/>
         <source>Fast forward to the next point in the current layer</source>
         <translation>Rychle vpřed k dalšímu bodu v nynější vrstvě</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2033"/>
+        <location filename="../main/MainWindow.cpp" line="2052"/>
         <source>Rewind to Previous Point</source>
         <translation>Přetočit k předchozímu bodu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2034"/>
+        <location filename="../main/MainWindow.cpp" line="2053"/>
         <source>Rewind to the previous point in the current layer</source>
         <translation>Přetočit k předchozímu bodu v nynější vrstvě</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2037"/>
+        <location filename="../main/MainWindow.cpp" line="2056"/>
         <source>Fast forward</source>
         <translation>Rychle vpřed</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2048"/>
+        <location filename="../main/MainWindow.cpp" line="2067"/>
         <source>No audio file loaded.</source>
         <translation>Nebyl nahrán žádný zvukový soubor.</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2059"/>
+        <location filename="../main/MainWindow.cpp" line="2078"/>
         <source>%1Hz (resampling to %2Hz)</source>
         <translation>%1Hz (převzorkování na %2Hz)</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2130"/>
-        <location filename="../main/MainWindow.cpp" line="2144"/>
-        <location filename="../main/MainWindow.cpp" line="2343"/>
-        <location filename="../main/MainWindow.cpp" line="2348"/>
-        <location filename="../main/MainWindow.cpp" line="2634"/>
-        <location filename="../main/MainWindow.cpp" line="2654"/>
-        <location filename="../main/MainWindow.cpp" line="2658"/>
+        <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>Soubor se nepodařilo otevřít</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2131"/>
-        <location filename="../main/MainWindow.cpp" line="2145"/>
+        <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>&lt;b&gt;Soubor se nepodařilo otevřít&lt;/b&gt;&lt;p&gt;Zvukový soubor &quot;%1&quot; se nepodařilo otevřít</translation>
     </message>
@@ -3344,609 +3379,609 @@
         <translation type="obsolete">%1. %2</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2201"/>
+        <location filename="../main/MainWindow.cpp" line="2220"/>
         <source>Select audio file to export</source>
         <translation>Vybrat zvukový soubor pro vyvedení</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2202"/>
+        <location filename="../main/MainWindow.cpp" line="2221"/>
         <source>Which audio file do you want to export from?</source>
         <translation>Ze kterého zvukového souboru chcete provést vyvedení?</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2230"/>
+        <location filename="../main/MainWindow.cpp" line="2249"/>
         <source>Export the selected region only</source>
         <translation>Vyvést pouze vybranou oblast</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2231"/>
-        <location filename="../main/MainWindow.cpp" line="2248"/>
+        <location filename="../main/MainWindow.cpp" line="2250"/>
+        <location filename="../main/MainWindow.cpp" line="2267"/>
         <source>Export the whole audio file</source>
         <translation>Vyvést celý zvukový soubor</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2235"/>
-        <location filename="../main/MainWindow.cpp" line="2251"/>
-        <location filename="../main/MainWindow.cpp" line="2493"/>
+        <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>Vybrat oblast, která se má vyvést</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2236"/>
+        <location filename="../main/MainWindow.cpp" line="2255"/>
         <source>Which region from the original audio file do you want to export?</source>
         <translation>Kterou oblast z původního zvukového souboru chcete vyvést?</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2246"/>
+        <location filename="../main/MainWindow.cpp" line="2265"/>
         <source>Export the selected regions into a single audio file</source>
         <translation>Vyvést vybrané oblasti do jednoho zvukového souboru</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2247"/>
+        <location filename="../main/MainWindow.cpp" line="2266"/>
         <source>Export the selected regions into separate files</source>
         <translation>Vyvést vybrané oblasti do oddělených souborů</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2252"/>
+        <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>Je vybráno více oblastí původního zvukového souboru.
 Co chcete vyvést?</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2279"/>
+        <location filename="../main/MainWindow.cpp" line="2298"/>
         <source>Fragment file %1 already exists, aborting</source>
         <translation>Zlomkový soubor %1 již existuje. Přerušuje se</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2308"/>
+        <location filename="../main/MainWindow.cpp" line="2327"/>
         <source>Export multiple audio files</source>
         <translation>Vyvést více zvukových souborů</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2310"/>
+        <location filename="../main/MainWindow.cpp" line="2329"/>
         <source>Export audio to &quot;%1&quot;</source>
         <translation>Vyvést zvuk do &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2314"/>
-        <location filename="../main/MainWindow.cpp" line="2437"/>
+        <location filename="../main/MainWindow.cpp" line="2333"/>
+        <location filename="../main/MainWindow.cpp" line="2456"/>
         <source>Failed to write file</source>
         <translation>Soubor se nepodařilo zapsat</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2344"/>
+        <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>&lt;b&gt;Soubor se nepodařilo otevřít&lt;/b&gt;&lt;p&gt;Soubor s vrstvou &quot;%1&quot; se nepodařilo otevřít.</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2349"/>
-        <location filename="../main/MainWindow.cpp" line="2659"/>
-        <location filename="../main/MainWindow.cpp" line="2691"/>
-        <location filename="../main/MainWindow.cpp" line="2719"/>
-        <location filename="../main/MainWindow.cpp" line="2764"/>
+        <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>&lt;b&gt;Vyžadován zvuk&lt;/b&gt;&lt;p&gt;Data s vrstvou nelze z &quot;%1&quot; nahrát bez zvukového souboru.&lt;br&gt;Před zavedením poznámek nahrajte, prosím, alespoň jeden zvukový soubor.</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3936"/>
+        <location filename="../main/MainWindow.cpp" line="3958"/>
         <source>http://www.sonicvisualiser.org/doc/reference/%1/en/</source>
         <translation>http://www.sonicvisualiser.org/doc/reference/%1/en/</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4099"/>
+        <location filename="../main/MainWindow.cpp" line="4121"/>
         <source>Newer version available</source>
         <translation>Je dostupná novější verze</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4100"/>
+        <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>&lt;h3&gt;Je dostupná novější verze&lt;/h3&gt;&lt;p&gt;Používáte verzi %1 programu Sonic Visualiser, ale nyní je dostupná verze %3.&lt;/p&gt;&lt;p&gt;Podívejte se, prosím, na stránky &lt;a href=&quot;http://sonicvisualiser.org/&quot;&gt;projektu Sonic Visualiser&lt;/a&gt;, abyste získal více informací.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2384"/>
+        <location filename="../main/MainWindow.cpp" line="2403"/>
         <source>Failed to open file %1 for writing</source>
         <translation>Otevření souboru %1 pro zápis se nezdařilo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2408"/>
+        <location filename="../main/MainWindow.cpp" line="2427"/>
         <source>Can&apos;t export non-note layers to MIDI</source>
         <translation>Ne-notové vrstvy nelze do MIDI vyvést</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2440"/>
+        <location filename="../main/MainWindow.cpp" line="2459"/>
         <source>Export layer to &quot;%1&quot;</source>
         <translation>Vyvést vrstvu do &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2475"/>
+        <location filename="../main/MainWindow.cpp" line="2494"/>
         <source>Export the whole pane (%1x%2 pixels)</source>
         <translation>Vyvést celou tabulku (%1x%2 pixelů)</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2477"/>
+        <location filename="../main/MainWindow.cpp" line="2496"/>
         <source>Export the visible area only (%1x%2 pixels)</source>
         <translation>Vyvést pouze viditelnou oblast (%1x%2 pixelů)</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2480"/>
+        <location filename="../main/MainWindow.cpp" line="2499"/>
         <source>Export the selection extent (%1x%2 pixels)</source>
         <translation>Vyvést plochu výběru (%1x%2 pixelů)</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2483"/>
+        <location filename="../main/MainWindow.cpp" line="2502"/>
         <source>Export the selection extent</source>
         <translation>Vyvést plochu výběru</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2494"/>
+        <location filename="../main/MainWindow.cpp" line="2513"/>
         <source>Which region of the current pane do you want to export as an image?</source>
         <translation>Kterou oblast nynější tabulky chcete vyvést jako obrázek?</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2502"/>
+        <location filename="../main/MainWindow.cpp" line="2521"/>
         <source>Note: the whole pane is too wide to be exported as a single image.</source>
         <translation>Poznámka: celá tabulka je příliš široká na to, aby mohla být vyvedena jako jeden obrázek.</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2527"/>
+        <location filename="../main/MainWindow.cpp" line="2546"/>
         <source>Failed to save image file</source>
         <translation>Soubor s obrázkem se nepodařilo uložit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2528"/>
+        <location filename="../main/MainWindow.cpp" line="2547"/>
         <source>Failed to save image file %1</source>
         <translation>Soubor s obrázkem %1 se nepodařilo uložit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2635"/>
+        <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>&lt;b&gt;Soubor se nepodařilo otevřít&lt;/b&gt;&lt;p&gt;Soubor se sezením &quot;%1&quot; se nepodařilo otevřít</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2655"/>
+        <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>&lt;b&gt;Soubor se nepodařilo otevřít&lt;/b&gt;&lt;p&gt;Soubor &quot;%1&quot; se nepodařilo otevřít</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2672"/>
+        <location filename="../main/MainWindow.cpp" line="2691"/>
         <source>Open Location</source>
         <translation>Otevřít umístění</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2673"/>
+        <location filename="../main/MainWindow.cpp" line="2692"/>
         <source>Please enter the URL of the location to open:</source>
         <translation>Zadejte, prosím adresu (URL) umístění, které se má otevřít:</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2686"/>
-        <location filename="../main/MainWindow.cpp" line="2690"/>
-        <location filename="../main/MainWindow.cpp" line="2714"/>
-        <location filename="../main/MainWindow.cpp" line="2718"/>
+        <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>Umístění se nepodařilo otevřít</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2687"/>
+        <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>&lt;b&gt;Otevření se nezdařilo&lt;/b&gt;&lt;p&gt;Adresu (URL) &quot;%1&quot; se nepodařilo otevřít</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2715"/>
+        <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>&lt;b&gt;Otevření se nezdařilo&lt;/b&gt;&lt;p&gt;Soubor nebo adresu (URL) &quot;%1&quot; se nepodařilo otevřít</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2758"/>
-        <location filename="../main/MainWindow.cpp" line="2763"/>
+        <location filename="../main/MainWindow.cpp" line="2777"/>
+        <location filename="../main/MainWindow.cpp" line="2782"/>
         <source>Failed to open dropped URL</source>
         <translation>Upuštěnou adresu (URL) se nepodařilo otevřít</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2759"/>
+        <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>&lt;b&gt;Otevření se nezdařilo&lt;/b&gt;&lt;p&gt;Upuštěnou adresu (URL) &quot;%1&quot; se nepodařilo otevřít</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2873"/>
+        <location filename="../main/MainWindow.cpp" line="2892"/>
         <source>Export image to &quot;%1&quot;</source>
         <translation>Vyvést obrázek do &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2894"/>
+        <location filename="../main/MainWindow.cpp" line="2913"/>
         <source>Session modified</source>
         <translation>Sezení bylo upraveno</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2895"/>
+        <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>&lt;b&gt;Sezení bylo upraveno&lt;/b&gt;&lt;p&gt;Nynější sezení bylo upraveno.&lt;br&gt;Chcete je uložit?</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2928"/>
+        <location filename="../main/MainWindow.cpp" line="2947"/>
         <source>Close the current session and create a new one</source>
         <translation>Zavřít nynější sezení a vytvořit nové</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2929"/>
+        <location filename="../main/MainWindow.cpp" line="2948"/>
         <source>Add this data to the current session</source>
         <translation>Přidat tato data do nynějšího sezení</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2933"/>
+        <location filename="../main/MainWindow.cpp" line="2952"/>
         <source>Select target for import</source>
         <translation>Vybrat cíl pro zavedení</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2934"/>
+        <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>&lt;b&gt;Vybrat cíl pro zavedení&lt;/b&gt;&lt;p&gt; Tento dokument RDF odkazuje na jeden nebo více zvukových souborů.&lt;p&gt;Již jste nahrál jeden zvukový časový průběh vlny.&lt;br&gt;Co chcete udělat s novými daty?</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2956"/>
-        <location filename="../main/MainWindow.cpp" line="2979"/>
+        <location filename="../main/MainWindow.cpp" line="2975"/>
+        <location filename="../main/MainWindow.cpp" line="2998"/>
         <source>Failed to save file</source>
         <translation>Soubor se nepodařilo uložit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2957"/>
-        <location filename="../main/MainWindow.cpp" line="2980"/>
+        <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>&lt;b&gt;Uložení se nezdařilo&lt;/b&gt;&lt;p&gt;Soubor se sezením &quot;%1&quot; se nepodařilo uložit.</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2982"/>
+        <location filename="../main/MainWindow.cpp" line="3001"/>
         <source>Sonic Visualiser: %1</source>
         <translation>Sonic Visualiser: %1</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2988"/>
+        <location filename="../main/MainWindow.cpp" line="3007"/>
         <source>Save session as &quot;%1&quot;</source>
         <translation>Uložit sezení jako &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3338"/>
+        <location filename="../main/MainWindow.cpp" line="3360"/>
         <source>Rename Layer</source>
         <translation>Přejmenovat vrstvu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3339"/>
+        <location filename="../main/MainWindow.cpp" line="3361"/>
         <source>New name for this layer:</source>
         <translation>Nový název pro tuto vrstvu:</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3430"/>
+        <location filename="../main/MainWindow.cpp" line="3452"/>
         <source>Playback speed: Normal</source>
         <translation>Rychlost přehrávání: Obvyklá</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3432"/>
+        <location filename="../main/MainWindow.cpp" line="3454"/>
         <source>Playback speed: %1%2%</source>
         <translation>Rychlost přehrávání: %1%2%</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3528"/>
+        <location filename="../main/MainWindow.cpp" line="3550"/>
         <source>Selection: %1 to %2 (duration %3)</source>
         <translation>Výběr: %1 až %2 (doba trvání %3)</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3531"/>
+        <location filename="../main/MainWindow.cpp" line="3553"/>
         <source>Visible: %1 to %2 (duration %3)</source>
         <translation>Viditelný: %1 až %2 (doba trvání %3)</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3579"/>
+        <location filename="../main/MainWindow.cpp" line="3601"/>
         <source>Sample rate mismatch</source>
         <translation>Nesoulad ve vzorkovacím kmitočtu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3580"/>
+        <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>&lt;b&gt;Špatný vzorkovací kmitočet&lt;/b&gt;&lt;p&gt;Vzorkovací kmitočet tohoto zvukového souboru (%1 Hz) neodpovídá
 nynější rychlosti přehrávání (%2 Hz).&lt;p&gt;Soubor bude přehráván se špatnou rychlostí a výškou.&lt;p&gt;Změňte volbu &lt;i&gt;Převzorkovat neodpovídající soubory při zavedení&lt;/i&gt;, která je v nabídce &lt;i&gt;Soubor&lt;/i&gt; -&gt; &lt;i&gt;Nastavení&lt;/i&gt;, pokud toto chování chcete změnit.</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3591"/>
-        <location filename="../main/MainWindow.cpp" line="3601"/>
+        <location filename="../main/MainWindow.cpp" line="3613"/>
+        <location filename="../main/MainWindow.cpp" line="3623"/>
         <source>Audio processing overload</source>
         <translation>Přetížení zpracování zvuku</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3592"/>
+        <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>&lt;b&gt;Přetíženo&lt;/b&gt;&lt;p&gt;Poslech přídavných modulů zvukových efektů byl zakázán kvůli přetížení při zpracování.</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3602"/>
+        <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>&lt;b&gt;Přetíženo&lt;/b&gt;&lt;p&gt;Zpracování rychlosti přehrávání zvuku bylo omezeno na jeden kanál kvůli přetížení při zpracování.</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3672"/>
+        <location filename="../main/MainWindow.cpp" line="3694"/>
         <source>Add Point</source>
         <translation>Přidat bod</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3773"/>
+        <location filename="../main/MainWindow.cpp" line="3795"/>
         <source>Reset Counters</source>
         <translation>Nastavit znovu počítadla</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3786"/>
-        <location filename="../main/MainWindow.cpp" line="3793"/>
+        <location filename="../main/MainWindow.cpp" line="3808"/>
+        <location filename="../main/MainWindow.cpp" line="3815"/>
         <source>Failed to generate layer</source>
         <translation>Vrstvu se nepodařilo vytvořit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3787"/>
+        <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>&lt;b&gt;Vytvoření vrstvy se nezdařilo&lt;/b&gt;&lt;p&gt;Nepodařilo se vytvořit odvozenou vrstvu.&lt;p&gt;Proměna vrstvy &quot;%1&quot; se nezdařila:&lt;p&gt;%2</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3794"/>
+        <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>&lt;b&gt;Vytvoření vrstvy se nezdařilo&lt;/b&gt;&lt;p&gt;Nepodařilo se vytvořit odvozenou vrstvu.&lt;p&gt;Proměna vrstvy &quot;%1&quot; se nezdařila.&lt;p&gt;Nejsou dostupné žádné informace o chybě.</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3806"/>
-        <location filename="../main/MainWindow.cpp" line="3840"/>
+        <location filename="../main/MainWindow.cpp" line="3828"/>
+        <location filename="../main/MainWindow.cpp" line="3862"/>
         <source>Warning</source>
         <translation>Varování</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3819"/>
-        <location filename="../main/MainWindow.cpp" line="3826"/>
+        <location filename="../main/MainWindow.cpp" line="3841"/>
+        <location filename="../main/MainWindow.cpp" line="3848"/>
         <source>Failed to regenerate layer</source>
         <translation>Vrstvu se nepodařilo vytvořit znovu</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3820"/>
+        <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>&lt;b&gt;Vytvoření vrstvy se nezdařilo&lt;/b&gt;&lt;p&gt;Nepodařilo se znovu vytvořit odvozenou vrstvu &quot;%1&quot; za použití nového datového modelu jako vstupu.&lt;p&gt;Proměna vrstvy &quot;%2&quot; se nezdařila:&lt;p&gt;%3</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3827"/>
+        <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>&lt;b&gt;Vytvoření vrstvy se nezdařilo&lt;/b&gt;&lt;p&gt;Nepodařilo se znovu vytvořit odvozenou vrstvu &quot;%1&quot; za použití nového datového modelu jako vstupu.&lt;p&gt;Proměna vrstvy &quot;%2&quot; se nezdařila.&lt;p&gt;Nejsou dostupné žádné informace o chybě.</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3840"/>
+        <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>&lt;b&gt;Varování při znovuvytváření vrstvy&lt;/b&gt;&lt;p&gt;Při znovuvytváření odvozené vrstvy &quot;%1&quot; za použití nového datového modelu jako vstupu:&lt;p&gt;%2</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3850"/>
+        <location filename="../main/MainWindow.cpp" line="3872"/>
         <source>Failed to calculate alignment</source>
         <translation>Zarovnání se spočítat nepodařilo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3851"/>
+        <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>&lt;b&gt;Spočítání zarovnání se nezdařilo&lt;/b&gt;&lt;p&gt;Zarovnání zvuku se spočítat s pomocí &quot;%1&quot; nepodařilo:&lt;p&gt;%2</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3915"/>
+        <location filename="../main/MainWindow.cpp" line="3937"/>
         <source>Adjust the master playback level</source>
         <translation>Přizpůsobit hlavní úroveň přehrávání</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3917"/>
+        <location filename="../main/MainWindow.cpp" line="3939"/>
         <source>Adjust the master playback speed</source>
         <translation>Přizpůsobit hlavní rychlost přehrávání</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3930"/>
+        <location filename="../main/MainWindow.cpp" line="3952"/>
         <source>http://www.sonicvisualiser.org/</source>
         <translation>http://www.sonicvisualiser.org/</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3950"/>
+        <location filename="../main/MainWindow.cpp" line="3972"/>
         <source>Release %1 : Revision %2</source>
         <translation>Vydání %1: Revize %2</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3952"/>
+        <location filename="../main/MainWindow.cpp" line="3974"/>
         <source>Release %1</source>
         <translation>Vydání %1</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3956"/>
+        <location filename="../main/MainWindow.cpp" line="3978"/>
         <source>Unreleased : Revision %1</source>
         <translation>Nevydáno: Revize %1</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3962"/>
+        <location filename="../main/MainWindow.cpp" line="3984"/>
         <source>&lt;h3&gt;About Sonic Visualiser&lt;/h3&gt;</source>
         <translation>&lt;h3&gt;O programu Sonic Visualiser&lt;/h3&gt;</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3963"/>
+        <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>&lt;p&gt;Sonic Visualiser je programem určeným pro prohlížení a zkoumání zvukových dat, pro významový hudební rozbor a připojování poznámek.&lt;br&gt;&lt;a href=&quot;http://www.sonicvisualiser.org/&quot;&gt;http://www.sonicvisualiser.org/&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3964"/>
+        <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>&lt;p&gt;&lt;small&gt;%1 : %2 nastavení&lt;/small&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3966"/>
+        <location filename="../main/MainWindow.cpp" line="3988"/>
         <source>Debug</source>
         <translation>Ladit</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3966"/>
+        <location filename="../main/MainWindow.cpp" line="3988"/>
         <source>Release</source>
         <translation>Vydání</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3970"/>
+        <location filename="../main/MainWindow.cpp" line="3992"/>
         <source>With Qt v%1 &amp;copy; Nokia Corporation</source>
         <translation>S Qt v%1 &amp;copy; Nokia Corporation</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3974"/>
+        <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>&lt;br&gt;Se zvukovou výstupní knihovnou JACK v%1 &amp;copy; Paul Davis a Jack O&apos;Quin</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3976"/>
+        <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>&lt;br&gt;Se zvukovou výstupní knihovnou JACK &amp;copy; Paul Davis a Jack O&apos;Quin</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3980"/>
+        <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>&lt;br&gt;Se zvukovou výstupní knihovnou PortAudio &amp;copy; Ross Bencina a Phil Burk</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3984"/>
+        <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>&lt;br&gt;Se zvukovou výstupní knihovnou PulseAudio v%1 &amp;copy; Lennart Poettering a Pierre Ossman</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3986"/>
+        <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>&lt;br&gt;Se zvukovou výstupní knihovnou PulseAudio &amp;copy; Lennart Poettering a Pierre Ossman</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3991"/>
+        <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>&lt;br&gt;S dekodérem souborů Ogg (oggz v%1, fishsound v%2) &amp;copy; CSIRO Australia</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3993"/>
+        <location filename="../main/MainWindow.cpp" line="4015"/>
         <source>&lt;br&gt;With Ogg file decoder &amp;copy; CSIRO Australia</source>
         <translation>&lt;br&gt;S dekodérem souborů Ogg &amp;copy; CSIRO Australia</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3998"/>
+        <location filename="../main/MainWindow.cpp" line="4020"/>
         <source>&lt;br&gt;With MAD mp3 decoder v%1 &amp;copy; Underbit Technologies Inc</source>
         <translation>&lt;br&gt;S dekodérem souborů mp3 MAD v%1 &amp;copy; Underbit Technologies Inc</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4000"/>
+        <location filename="../main/MainWindow.cpp" line="4022"/>
         <source>&lt;br&gt;With MAD mp3 decoder &amp;copy; Underbit Technologies Inc</source>
         <translation>&lt;br&gt;S dekodérem souborů mp3 MAD &amp;copy; Underbit Technologies Inc</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4005"/>
+        <location filename="../main/MainWindow.cpp" line="4027"/>
         <source>&lt;br&gt;With libsamplerate v%1 &amp;copy; Erik de Castro Lopo</source>
         <translation>&lt;br&gt;S libsamplerate v%1 &amp;copy; Erik de Castro Lopo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4007"/>
+        <location filename="../main/MainWindow.cpp" line="4029"/>
         <source>&lt;br&gt;With libsamplerate &amp;copy; Erik de Castro Lopo</source>
         <translation>&lt;br&gt;S libsamplerate &amp;copy; Erik de Castro Lopo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4012"/>
+        <location filename="../main/MainWindow.cpp" line="4034"/>
         <source>&lt;br&gt;With libsndfile v%1 &amp;copy; Erik de Castro Lopo</source>
         <translation>&lt;br&gt;S libsndfile v%1 &amp;copy; Erik de Castro Lopo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4014"/>
+        <location filename="../main/MainWindow.cpp" line="4036"/>
         <source>&lt;br&gt;With libsndfile &amp;copy; Erik de Castro Lopo</source>
         <translation>&lt;br&gt;S libsndfile &amp;copy; Erik de Castro Lopo</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4019"/>
+        <location filename="../main/MainWindow.cpp" line="4041"/>
         <source>&lt;br&gt;With FFTW3 v%1 &amp;copy; Matteo Frigo and MIT</source>
         <translation>&lt;br&gt;S FFTW3 v%1 &amp;copy; Matteo Frigo and MIT</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4021"/>
+        <location filename="../main/MainWindow.cpp" line="4043"/>
         <source>&lt;br&gt;With FFTW3 &amp;copy; Matteo Frigo and MIT</source>
         <translation>&lt;br&gt;S FFTW3 &amp;copy; Matteo Frigo and MIT</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4026"/>
+        <location filename="../main/MainWindow.cpp" line="4048"/>
         <source>&lt;br&gt;With Rubber Band v%1 &amp;copy; Chris Cannam</source>
         <translation>&lt;br&gt;S Gumičkou (Rubber Band) v%1 &amp;copy; Chris Cannam</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4028"/>
+        <location filename="../main/MainWindow.cpp" line="4050"/>
         <source>&lt;br&gt;With Rubber Band &amp;copy; Chris Cannam</source>
         <translation>&lt;br&gt;S Gumičkou (Rubber Band) &amp;copy; Chris Cannam</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4032"/>
+        <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>&lt;br&gt;S podporou pro přídavné moduly Vamp (API v%1, host SDK v%2) &amp;copy; Chris Cannam</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4034"/>
+        <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>&lt;br&gt;S podporou pro přídavné moduly LADSPA (API v%1) &amp;copy; Richard Furse, Paul Davis, Stefan Westerfeld</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4035"/>
+        <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>&lt;br&gt;S podporou pro přídavné moduly DSSI (API v%1) &amp;copy; Chris Cannam, Steve Harris, Sean Bolton</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4037"/>
+        <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>&lt;br&gt;Se syntaktickým analyzátorem RDF Raptor v%1 &amp;copy; Dave Beckett a the University of Bristol</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4039"/>
+        <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>&lt;br&gt;Se syntaktickým analyzátorem RDF Raptor &amp;copy; Dave Beckett a the University of Bristol</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4042"/>
+        <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>&lt;br&gt;Se strojem na dotazy RDF Rasqal v%1 &amp;copy; Dave Beckett a the University of Bristol</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4044"/>
+        <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>&lt;br&gt;Se strojem na dotazy RDF Rasqal &amp;copy; Dave Beckett a the University of Bristol</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4048"/>
+        <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>&lt;br&gt;S datovým skladištěm RDF Redland v%1 &amp;copy; Dave Beckett a the University of Bristol</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4050"/>
+        <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>&lt;br&gt;S datovým skladištěm RDF Redland &amp;copy; Dave Beckett a the University of Bristol</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4054"/>
+        <location filename="../main/MainWindow.cpp" line="4076"/>
         <source>&lt;br&gt;With RtMidi &amp;copy; Gary P. Scavone</source>
         <translation>&lt;br&gt;S RtMidi &amp;copy; Gary P. Scavone</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4058"/>
+        <location filename="../main/MainWindow.cpp" line="4080"/>
         <source>&lt;br&gt;With liblo Lite OSC library v%1 &amp;copy; Steve Harris</source>
         <translation>&lt;br&gt;S knihovnou liblo Lite OSC v%1 &amp;copy; Steve Harris</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4060"/>
+        <location filename="../main/MainWindow.cpp" line="4082"/>
         <source>&lt;br&gt;With liblo Lite OSC library &amp;copy; Steve Harris</source>
         <translation>&lt;br&gt;S knihovnou liblo Lite OSC &amp;copy; Steve Harris</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4064"/>
+        <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>&lt;/small&gt;&lt;p&gt;&lt;small&gt;Adresa (URL) OSC pro tuto instanci je: &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4071"/>
+        <location filename="../main/MainWindow.cpp" line="4093"/>
         <source>With </source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4071"/>
+        <location filename="../main/MainWindow.cpp" line="4093"/>
         <source>Using </source>
         <translation>Za použití </translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4083"/>
+        <location filename="../main/MainWindow.cpp" line="4105"/>
         <source>About Sonic Visualiser</source>
         <translation>O programu Sonic Visualiser</translation>
     </message>
@@ -3959,194 +3994,194 @@
 <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>%1 (upraveno)</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="447"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="447"/>
         <source> (modified)</source>
         <translation> (upraveno)</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="645"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="645"/>
         <source>Cut</source>
         <translation>Vyjmout</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="692"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="716"/>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="796"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="819"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="909"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="928"/>
+        <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>Přidat bod</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="850"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="874"/>
         <source>Add Point at %1 s</source>
         <translation>Přidat bod v %1 s</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="893"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="917"/>
         <source>Add Item at %1 s</source>
         <translation>Přidat položku v %1 s</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="969"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="993"/>
         <source>Opening file or URL...</source>
         <translation>Otevírá se soubor nebo adresa (URL)...</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1083"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1107"/>
         <source>Replace the existing main waveform</source>
         <translation>Nahradit stávající hlavní tvar vlny</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1084"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1108"/>
         <source>Load this file into a new waveform pane</source>
         <translation>Nahrát tento soubor do nové tabulky s tvarem vlny</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1088"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1112"/>
         <source>Select target for import</source>
         <translation>Vybrat cíl pro zavedení</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1149"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="1568"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="1615"/>
+        <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>%1: %2</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1156"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1191"/>
         <source>%1: %2 [%3]</source>
         <translation>%1: %2 [%3]</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1171"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="1212"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1206"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1247"/>
         <source>Import &quot;%1&quot;</source>
         <translation>Zavést &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1266"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1301"/>
         <source>Opening playlist...</source>
         <translation>Otevírá se seznam skladeb...</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1632"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="1656"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1667"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1691"/>
         <source>Importing from RDF...</source>
         <translation>Zavádí se z RDF...</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1471"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1506"/>
         <source>Opening session...</source>
         <translation>Otevírá se sezení...</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1089"/>
+        <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>&lt;b&gt;Vybrat cíl pro zavedení&lt;/b&gt;&lt;p&gt;Již máte nahrán jeden zvukový časový průběh vlny.&lt;br&gt;Co chcete udělat s novým zvukovým souborem?</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1132"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1167"/>
         <source>Import audio file &quot;%1&quot;</source>
         <translation>Zavést zvukový soubor &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1352"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1387"/>
         <source>Import layer XML file &quot;%1&quot;</source>
         <translation>Zavést soubor XML vrstvy &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1386"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1421"/>
         <source>Import MIDI file &quot;%1&quot;</source>
         <translation>Zavést soubor MIDI &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1553"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1588"/>
         <source>SV XML file read error:
 %1</source>
         <translation>Chyba při čtení souboru XML SV:
 %1</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1566"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1601"/>
         <source>Import session file &quot;%1&quot;</source>
         <translation>Zavést soubor se sezením &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1647"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="1660"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1682"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1695"/>
         <source>Failed to import RDF</source>
         <translation>Nepodařilo se zavést RDF</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1648"/>
+        <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>&lt;b&gt;Nepodařilo se zavést RDF&lt;/b&gt;&lt;p&gt;Zavedení dat z dokumentu RDF na &quot;%1&quot; se nepodařilo: %2&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1661"/>
+        <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>&lt;b&gt;Nepodařilo se zavést RDF&lt;/b&gt;&lt;p&gt;Nebyly nalezeny žádné vhodné datové modely pro zavedení dat z dokumentu RDF na &quot;%1&quot;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1665"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1700"/>
         <source>Import RDF document &quot;%1&quot;</source>
         <translation>Zavést dokument RDF &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1793"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="1798"/>
+        <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>Nepodařilo se otevřít zvukové zařízení</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1794"/>
+        <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>&lt;b&gt;Žádný zvuk není dostupný&lt;/b&gt;&lt;p&gt; Zvukové zařízení se nepodařilo otevřít pro přehrávání.&lt;p&gt;Automatické určení zvukového zařízení se nezdařilo. Přehrávání zvuku během tohoto sezení nebude dostupné.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1799"/>
+        <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>&lt;b&gt;Žádný zvuk není dostupný&lt;/b&gt;&lt;p&gt; Vámi upřednostňované zvukové zařízení se nepodařilo otevřít (&quot;%1&quot;).&lt;p&gt;Přehrávání zvuku během tohoto sezení nebude dostupné.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1875"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1910"/>
         <source>Failed to write file</source>
         <translation>Soubor se nepodařilo zapsat</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1876"/>
+        <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>&lt;b&gt;Uložení se nezdařilo&lt;/b&gt;&lt;p&gt;Nepodařilo se zapsat do souboru &quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="2379"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="2455"/>
         <source>Add Pane</source>
-        <translation type="unfinished">Přidat tabulku</translation>
-    </message>
-    <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="2424"/>
+        <translation>Přidat tabulku</translation>
+    </message>
+    <message>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="2500"/>
         <source>Remove Pane</source>
-        <translation type="unfinished">Odstranit tabulku</translation>
-    </message>
-    <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="2447"/>
-        <location filename="../../framework/MainWindowBase.cpp" line="2828"/>
+        <translation>Odstranit tabulku</translation>
+    </message>
+    <message>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="2523"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="2904"/>
         <source>Delete Pane</source>
         <translation>Smazat tabulku</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="2661"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="2737"/>
         <source>Playing: %1 of %2 (%3 remaining)</source>
         <translation>Přehrává se: %1 z %2 (%3 zůstává)</translation>
     </message>
@@ -4168,100 +4203,100 @@
 <context>
     <name>ModelDataTableDialog</name>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="45"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="45"/>
         <source>Data Editor</source>
         <translation>Editor dat</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="49"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="49"/>
         <source>Playback Toolbar</source>
         <translation>Nástrojový pruh pro přehrávání</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="51"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="51"/>
         <source>Play Mode Toolbar</source>
         <translation>Nástrojový pruh pro režim hry</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="55"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="55"/>
         <source>Track Playback</source>
         <translation>Přehrávání stopy</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="56"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="56"/>
         <source>Toggle tracking of playback position</source>
         <translation>Přepnout sledování polohy přehrávání</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="62"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="62"/>
         <source>Edit Toolbar</source>
         <translation>Nástrojový pruh pro úpravy</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="64"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="64"/>
         <source>Insert New Item</source>
         <translation>Vložit novou položku</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="65"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="65"/>
         <source>Insert</source>
         <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="66"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="66"/>
         <source>Insert a new item</source>
         <translation>Vložit novou položku</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="70"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="70"/>
         <source>Delete Selected Items</source>
         <translation>Smazat vybrané položky</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="71"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="71"/>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="72"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="72"/>
         <source>Delete the selected item or items</source>
         <translation>Smazat vybranou položku nebo položky</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="96"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="96"/>
         <source>Data in Layer</source>
         <translation>Data ve vrstvě</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="107"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="107"/>
         <source>Find:</source>
-        <translation type="unfinished">Hledat:</translation>
-    </message>
-    <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="108"/>
+        <translation>Hledat:</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="108"/>
         <source> </source>
-        <translation type="unfinished"></translation>
+        <translation> </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>Typ</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="228"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="228"/>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="229"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="229"/>
         <source>Maker</source>
         <translation>Tvůrce</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="230"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="230"/>
         <source>Source</source>
         <translation>Zdroj</translation>
     </message>
@@ -4269,12 +4304,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>%1 &lt;%2&gt;</translation>
     </message>
     <message>
-        <location filename="../../transform/ModelTransformerFactory.cpp" line="370"/>
+        <location filename="../../svcore/transform/ModelTransformerFactory.cpp" line="217"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
@@ -4282,75 +4317,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>Nový bod</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="83"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="83"/>
         <source>Vertical Scale</source>
         <translation>Svislá stupnice</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="84"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="84"/>
         <source>Scale Units</source>
         <translation>Jednotky stupnice</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="100"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="100"/>
         <source>Scale</source>
         <translation>Stupnice</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="142"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="142"/>
         <source>Auto-Align</source>
         <translation>Automatické zarovnání</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="143"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="143"/>
         <source>Linear</source>
         <translation>Přímočaré</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="144"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="144"/>
         <source>Log</source>
         <translation>Zápis</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="145"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="145"/>
         <source>MIDI Notes</source>
         <translation>Noty MIDI</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="447"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="447"/>
         <source>In progress</source>
         <translation>Probíhá</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>Žádné místní body</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>%1 (%2, %3 Hz)</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>%1 Hz (%2, %3)</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="499"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="499"/>
         <source>%1 %2</source>
         <translation>%1 %2</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
@@ -4361,7 +4396,7 @@
 Žádný štítek</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
@@ -4372,68 +4407,68 @@
 Štítek:	%4</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="812"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="812"/>
         <source>Draw Point</source>
         <translation>Nakreslit bod</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="888"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="888"/>
         <source>Erase Point</source>
         <translation>Vymazat bod</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="940"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="940"/>
         <source>Drag Point</source>
         <translation>Táhnout bod</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>Upravit bod</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="963"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="963"/>
         <source>Relocate Point</source>
         <translation>Přemístit bod</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="966"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="966"/>
         <source>Change Point Value</source>
         <translation>Změnit hodnotu bodu</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1025"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1025"/>
         <source>Drag Selection</source>
         <translation>Táhnout výběr</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1050"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1050"/>
         <source>Resize Selection</source>
         <translation>Změnit velikost výběru</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1089"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1089"/>
         <source>Delete Selected Points</source>
         <translation>Smazat vybrané body</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>Zarovnat vložené položky znovu?</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>Položky, které vkládáte, přišly z vrstvy s odlišným zdrojovým materiálem, než má tento. Chcete je zarovnat znovu v čase, aby se hodily ke zdrojovému materiálu pro tuto vrstvu?</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1150"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1150"/>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1221"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1221"/>
         <source>Record Note</source>
         <translation>Nahrát notu</translation>
     </message>
@@ -4441,47 +4476,47 @@
 <context>
     <name>NoteModel</name>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="126"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="126"/>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="166"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="166"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="167"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="167"/>
         <source>Frame</source>
         <translation>Snímek</translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="168"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="168"/>
         <source>Pitch</source>
         <translation>Výška tónu</translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="169"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="169"/>
         <source>Duration</source>
         <translation>Doba trvání</translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="170"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="170"/>
         <source>Level</source>
         <translation>Úroveň</translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="171"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="171"/>
         <source>Label</source>
         <translation>Štítek</translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="172"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="172"/>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="202"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="202"/>
         <source>Edit Data</source>
         <translation>Upravit data</translation>
     </message>
@@ -4489,7 +4524,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>Dekóduje se %1...</translation>
     </message>
@@ -4497,12 +4532,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>Přehled</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>Klepněte a táhněte pro navádění; dvakrát klepněte pro skok</translation>
     </message>
@@ -4510,444 +4545,450 @@
 <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>Vodorovné zvětšení</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="154"/>
+        <location filename="../../svgui/view/Pane.cpp" line="154"/>
         <source>Vertical Zoom</source>
         <translation>Svislé zvětšení</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>Nastavit zvětšení znovu na výchozí</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="653"/>
+        <location filename="../../svgui/view/Pane.cpp" line="653"/>
         <source>Some lengthy prefix:</source>
         <translation>Příliš dlouhá předpona:</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="783"/>
+        <location filename="../../svgui/view/Pane.cpp" line="783"/>
         <source>Reference</source>
         <translation>Odkaz</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>Nezarovnáno</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="791"/>
+        <location filename="../../svgui/view/Pane.cpp" line="791"/>
         <source>Aligning: %1%</source>
         <translation>Zarovnání: %1%</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="793"/>
+        <location filename="../../svgui/view/Pane.cpp" line="793"/>
         <source>Aligned</source>
         <translation>Zarovnáno</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="836"/>
+        <location filename="../../svgui/view/Pane.cpp" line="836"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</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>(R)</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="977"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1015"/>
         <source>(X)</source>
         <translation>(X)</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="981"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1019"/>
         <source>%1 / %2Hz%3</source>
         <translation>%1 / %2Hz%3</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>Zvětšení</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1166"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1204"/>
         <source>Zoom In</source>
         <translation>Přiblížit</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1166"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1204"/>
         <source>Wheel Up</source>
         <translation>Kolečko nahoru</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1167"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1205"/>
         <source>Zoom Out</source>
         <translation>Oddálit</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1167"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1205"/>
         <source>Wheel Down</source>
         <translation>Kolečko dolů</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>Činnosti prováděné myší obecně v tabulce</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1171"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1209"/>
         <source>Wheel</source>
         <translation>Kolečko</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>Přiblížit nebo oddálit na časové ose</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1173"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1211"/>
         <source>Scroll</source>
         <translation>Projíždět</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1173"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1211"/>
         <source>Ctrl+Wheel</source>
         <translation>Ctrl+kolečko</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>Projíždět rychle vlevo nebo vpravo na časové ose</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1175"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1213"/>
         <source>Zoom Vertically</source>
         <translation>Přiblížit/Oddálit svisle</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1175"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1213"/>
         <source>Shift+Wheel</source>
         <translation>Shift+kolečko</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>Přiblížit nebo oddálit na svislé ose</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1177"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1215"/>
         <source>Scroll Vertically</source>
         <translation>Projíždět svisle</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1177"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1215"/>
         <source>Alt+Wheel</source>
         <translation>Alt+kolečko</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>Projíždět nahoru nebo dolů na svislé ose</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>Navádět</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1179"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1217"/>
         <source>Middle</source>
         <translation>Prostřední</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>Klepněte prostředním tlačítkem a táhněte pro vedení s jakýmkoli nástrojem</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>Přemístit</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1181"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1219"/>
         <source>Double-Click Middle</source>
         <translation>Dvakrát klepněte prostředním</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>Dvakrát klepněte prostředním pro přemístění s jakýmkoli nástrojem</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1183"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1221"/>
         <source>Menu</source>
         <translation>Nabídka</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1183"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1221"/>
         <source>Right</source>
         <translation>Pravé</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>Ukázat nabídku související s tabulkou</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>Činnosti nástroje pro navádění prováděné myší</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>Levé</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>Klepněte levým tlačítkem a táhněte pro přesouvání se</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>Přiblížit oblast</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>Shift+šipka vlevo</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>Shift-klepněte levým tlačítkem a táhněte pro přiblížení obdélníkové oblasti</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>Dvakrát klepněte levým</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>Dvakrát klepněte levým tlačítkem pro skok na klepnuté místo</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>Upravit</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>Dvakrát klepněte levým tlačítkem na položce pro její upravení</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>Činnosti nástroje výběru prováděné myší</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1198"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1236"/>
         <source>Select</source>
         <translation>Vybrat</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>Klepněte levým tlačítkem a táhněte pro výběr oblasti; táhněte za okraj oblasti pro změnu její velikosti</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1200"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1238"/>
         <source>Multi Select</source>
         <translation>Vícenásobný výběr</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1200"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1238"/>
         <source>Ctrl+Left</source>
         <translation>Ctrl+šipka vlevo</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>Ctrl-klepněte levým tlačítkem a táhněte pro výběr další oblasti</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1202"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1240"/>
         <source>Fine Select</source>
         <translation>Citlivý výběr</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>Shift-klepněte levým tlačítkem a táhněte pro výběr bez zapadávání k položkám nebo mřížce</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>Činnosti nástroje úprav prováděné myší</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1206"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1244"/>
         <source>Move</source>
         <translation>Posunout</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>Klepněte levým tlačítkem na položku nebo vybranou oblast a táhněte pro její přesun</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>Činnosti nástroje kreslení prováděné myší</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1212"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1250"/>
         <source>Draw</source>
         <translation>Nakreslit</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>Klepněte levým tlačítkem a táhněte pro vytvoření nové položky</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>Činnosti nástroje měření prováděné myší</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1216"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1254"/>
         <source>Measure Area</source>
         <translation>Oblast měření</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>Klepněte levým tlačítkem a táhněte pro změření obdélníkové oblasti</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1218"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1256"/>
         <source>Measure Item</source>
         <translation>Položka měření</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>Klepněte levým tlačítkem a táhněte pro změření rozsahu položky nebo tvaru</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2186"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2224"/>
         <source>Enter new range</source>
         <translation>Zadejte nový rozsah</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>Nový rozsah svislého zobrazení, od %1 do %2 %4:</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2306"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2344"/>
         <source>Drag Selection</source>
         <translation>Táhnout výběr</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2313"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2351"/>
         <source>Resize Selection</source>
         <translation>Změnit velikost výběru</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>Klepněte a táhněte pro navádění</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>Klepněte a táhněte pro výběr rozsahu; držte klávesu Shift, abyste se vyhnul zapadávání k položkám; držte klávesu Ctrl pro provedení vícenásobného výběru; klepněte prostředním tlačítkem a táhněte pro navádění</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>Klepněte a táhněte pro výběr rozsahu; držte klávesu Ctrl pro provedení vícenásobného výběru; klepněte prostředním tlačítkem a táhněte pro navádění</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>Klepněte levým tlačítkem a táhněte pro přesun hranice výběru</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>Klepněte a táhněte pro výběr rozsahu; držte klávesu Shift, abyste se vyhnul zapadávání k položkám; klepněte prostředním tlačítkem a táhněte pro navádění</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>Klepněte a táhněte pro výběr rozsahu; klepněte prostředním tlačítkem a táhněte pro navádění</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>Klepněte pro přidání nové položky do činné vrstvy</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>Klepněte pro vymazání položky z činné vrstvy</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>Klepněte a táhněte položku v činné vrstvě pro její přesun; držte klávesu Shift pro potlačení počátečního odporu</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>Klepněte a táhněte pro přesun všech položek ve vybraném rozsahu</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>Klepněte a táhněte pro přizpůsobení viditelného rozsahu svislé stupnice</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>Klepněte a táhněte pro přizpůsobení úrovně svislého zvětšení</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>Klepněte a táhněte pro přizpůsobení úrovně vodorovného zvětšení</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>Nastavit znovu úrovně vodorovného a svislého zvětšení na jejich výchozí hodnoty</translation>
     </message>
@@ -4955,34 +4996,34 @@
 <context>
     <name>PlayParameterRepository</name>
     <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="206"/>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="206"/>
         <source>Adjust Playback Parameters</source>
-        <translation type="unfinished">Upravit parametry přehrávání</translation>
-    </message>
-    <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="211"/>
+        <translation>Upravit parametry přehrávání</translation>
+    </message>
+    <message>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="211"/>
         <source>Change Playback Mute State</source>
-        <translation type="unfinished">Změnit stav ztlumení přehrávání</translation>
-    </message>
-    <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="216"/>
+        <translation>Změnit stav ztlumení přehrávání</translation>
+    </message>
+    <message>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="216"/>
         <source>Change Playback Gain</source>
-        <translation type="unfinished">Změnit zesílení přehrávání</translation>
-    </message>
-    <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="221"/>
+        <translation>Změnit zesílení přehrávání</translation>
+    </message>
+    <message>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="221"/>
         <source>Change Playback Pan</source>
-        <translation type="unfinished">Změnit vyvážení přehrávání</translation>
-    </message>
-    <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="226"/>
+        <translation>Změnit vyvážení přehrávání</translation>
+    </message>
+    <message>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="226"/>
         <source>Change Playback Plugin</source>
-        <translation type="unfinished">Změnit přídavný modul přehrávání</translation>
-    </message>
-    <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="231"/>
+        <translation>Změnit přídavný modul přehrávání</translation>
+    </message>
+    <message>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="231"/>
         <source>Configure Playback Plugin</source>
-        <translation type="unfinished">Nastavit přídavný modul přehrávání</translation>
+        <translation>Nastavit přídavný modul přehrávání</translation>
     </message>
 </context>
 <context>
@@ -5015,12 +5056,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>Tento přídavný modul nemá žádné upravitelné parametry.</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterBox.cpp" line="82"/>
+        <location filename="../../svgui/widgets/PluginParameterBox.cpp" line="82"/>
         <source>Program</source>
         <translation>Program</translation>
     </message>
@@ -5028,84 +5069,84 @@
 <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>Parametry přídavného modulu</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="102"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="102"/>
         <source>Name:</source>
         <translation>Název:</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="125"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="125"/>
         <source>Version:</source>
         <translation>Verze:</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="138"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="138"/>
         <source>Maker:</source>
         <translation>Tvůrce:</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="144"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="144"/>
         <source>Copyright:  </source>
         <translation>Autorské právo:  </translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="156"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="156"/>
         <source>Output:</source>
         <translation>Výstup:</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="175"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="175"/>
         <source>Input Material</source>
         <translation>Vstupní materiál</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>Omezit na rozsah výběru</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="217"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="217"/>
         <source>Channels</source>
         <translation>Kanály</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="223"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="223"/>
         <source>Processing</source>
         <translation>Zpracování</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>Pokročilé &gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="322"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="322"/>
         <source>Channel mismatch</source>
         <translation>Nesoulad v kanálu</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>Tento přídavný modul vyžaduje alespoň %1 vstupních kanálů, ale dostupné jsou pouze %2 %3. Přídavný modul pravděpodobně nebude pracovat správně.</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="323"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="323"/>
         <source>are</source>
         <translation>jsou</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="323"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="323"/>
         <source>is</source>
         <translation>je</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>
@@ -5114,7 +5155,7 @@
 </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>Tento přídavný modul má jednokanálový vstup,
@@ -5122,37 +5163,37 @@
 </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>Použít průměr ze zdrojových kanálů</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>Použít pouze kanál %1</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="404"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="404"/>
         <source>Window size:</source>
         <translation>Velikost okna:</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>Snímků zvuku na blok:</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="431"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="431"/>
         <source>Window increment:</source>
         <translation>Přírůstek okna:</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="455"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="455"/>
         <source>Window shape:</source>
         <translation>Podoba okna:</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="599"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="599"/>
         <source>Advanced &lt;&lt;</source>
         <translation>Pokročilé &lt;&lt;</translation>
     </message>
@@ -5160,214 +5201,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>Interpolace osy y spektrogramu:</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>Interpolace osy x spektrogramu:</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>Kmitočet koncertního A</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="115"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="115"/>
         <source>Property box layout</source>
         <translation>Rozvržení okénka vlastností</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>Podoba okna pro rozbor spektra</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="121"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="121"/>
         <source>Playback resampler type</source>
         <translation>Typ převzorkování přehrávání</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>Vynechat dočasné z nabídky naposledy otevřených souborů</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>Převzorkovat neodpovídající soubory při zavedení</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>Umístění adresáře s vyrovnávací pamětí</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="133"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="133"/>
         <source>Background colour preference</source>
         <translation>Upřednostňovaná barva pozadí</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="136"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="136"/>
         <source>Time display format</source>
         <translation>Formát zobrazení času</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>Velikost písma pro překrytí textem</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>Ukázat úvodní obrazovku při spuštění</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>Ukázat okénka pro všechny tabulky</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>Ukázat okénko pouze pro nynější tabulku</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="275"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="275"/>
         <source>Rectangular</source>
         <translation>Obdélníková</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="276"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="276"/>
         <source>Triangular</source>
         <translation>Trojúhelníková</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="277"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="277"/>
         <source>Hamming</source>
         <translation>Hamming</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="278"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="278"/>
         <source>Hann</source>
         <translation>Hann</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="279"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="279"/>
         <source>Blackman</source>
         <translation>Blackman</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="280"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="280"/>
         <source>Gaussian</source>
         <translation>Gauss</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="281"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="281"/>
         <source>Parzen</source>
         <translation>Parzen</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="282"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="282"/>
         <source>Nuttall</source>
         <translation>Nuttall</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="283"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="283"/>
         <source>Blackman-Harris</source>
         <translation>Blackman-Harris</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="288"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="288"/>
         <source>Fastest</source>
         <translation>Nejrychlejší</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="289"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="289"/>
         <source>Standard</source>
         <translation>Obvyklé</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="290"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="290"/>
         <source>Highest quality</source>
         <translation>Nejvyšší kvalita</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>Žádná</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>Přímočará interpolace</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="297"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="297"/>
         <source>4 x Oversampling</source>
         <translation>4 x převzorkování</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>4 x převzorkování s interpolací</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="309"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="309"/>
         <source>Follow desktop theme</source>
         <translation>Držet se námětu plochy</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="310"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="310"/>
         <source>Dark background</source>
         <translation>Tmavé pozadí</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="311"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="311"/>
         <source>Light background</source>
         <translation>Světlé pozadí</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="316"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="316"/>
         <source>Standard (to millisecond)</source>
         <translation>Obvyklý (na milisekundy)</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>Vysoké rozlišení (na mikrosekundy)</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="318"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="318"/>
         <source>24 FPS</source>
         <translation>24 snímků za sekundu (FPS)</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="319"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="319"/>
         <source>25 FPS</source>
         <translation>25 snímků za sekundu (FPS)</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="320"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="320"/>
         <source>30 FPS</source>
         <translation>30 snímků za sekundu (FPS)</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="321"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="321"/>
         <source>50 FPS</source>
         <translation>50 snímků za sekundu (FPS)</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="322"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="322"/>
         <source>60 FPS</source>
         <translation>60 snímků za sekundu (FPS)</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="332"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="332"/>
         <source>Preferences</source>
         <translation>Nastavení</translation>
     </message>
@@ -5464,7 +5505,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>Zrušit</translation>
     </message>
@@ -5472,78 +5513,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>Ukázat</translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="172"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="172"/>
         <source>Play</source>
         <translation>Přehrát</translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="210"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="210"/>
         <source>Playback Gain</source>
         <translation>Zesílení přehrávání</translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="212"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="212"/>
         <source>dB</source>
         <translation>dB</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>Vyvážení přehrávání/rovnováha</translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="468"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="468"/>
         <source>Add New Colour...</source>
         <translation>Přidat novou barvu...</translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="655"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="655"/>
         <source>Name New Colour</source>
         <translation>Pojmenovat novou barvu</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>Zadejte název pro novou barvu:</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>Upřednostňovat černé pozadí pro tuto barvu</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> (nynější hodnota: %1%2)</translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="832"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="832"/>
         <source> (current value: %1)</source>
         <translation> (nynější hodnota: %1)</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>Přepnout viditelnost %1</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>Přepnout přehrávání %1</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>Přepnout %1 vlastnost %2</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>Upravit %1 vlastnost %2%3</translation>
     </message>
@@ -5551,39 +5592,39 @@
 <context>
     <name>PropertyContainer</name>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="151"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="151"/>
         <source>yes</source>
         <translation>Ano</translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="152"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="152"/>
         <source>on</source>
         <translation>Zapnuto</translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="153"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="153"/>
         <source>true</source>
         <translation>Pravdivý</translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="155"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="155"/>
         <source>no</source>
         <translation>Ne</translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="156"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="156"/>
         <source>off</source>
         <translation>Vypnuto</translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="157"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="157"/>
         <source>false</source>
         <translation>Nepravdivý</translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="244"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="244"/>
         <source>Set %1 Property</source>
-        <translation type="unfinished">Nastavit %1 vlastnost</translation>
+        <translation>Nastavit %1 vlastnost</translation>
     </message>
 </context>
 <context>
@@ -5596,12 +5637,12 @@
 <context>
     <name>PropertyStack</name>
     <message>
-        <location filename="../../widgets/PropertyStack.cpp" line="242"/>
+        <location filename="../../svgui/widgets/PropertyStack.cpp" line="242"/>
         <source>Change Layer Visibility</source>
         <translation>Změnit viditelnost vrstvy</translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyStack.cpp" line="259"/>
+        <location filename="../../svgui/widgets/PropertyStack.cpp" line="259"/>
         <source>Click to change the current active layer</source>
         <translation>Klepněte pro změnu nynější činné vrstvy</translation>
     </message>
@@ -5609,7 +5650,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.
@@ -5636,7 +5677,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../main/main.cpp" line="246"/>
+        <location filename="../main/main.cpp" line="257"/>
         <source>Sonic Visualiser</source>
         <translation>Sonic Visualiser - Znázorňovač zvuku</translation>
     </message>
@@ -5671,22 +5712,22 @@
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../../data/fileio/CSVFileReader.cpp" line="47"/>
-        <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>Soubor &quot;%1&quot; neexistuje</translation>
     </message>
     <message>
-        <location filename="../../data/fileio/CSVFileReader.cpp" line="49"/>
-        <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>Soubor &quot;%1&quot; se nepodařilo otevřít</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>Soubor nebo adresu (URL) &quot;%1&quot; se nepodařilo získat</translation>
     </message>
@@ -5694,18 +5735,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>Soubor se nepodařilo otevřít</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>Soubor nebo adresu (URL) &quot;%1&quot; se nepodařilo otevřít</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>&lt;b&gt;Vyžadován zvuk&lt;/b&gt;&lt;p&gt;Před zavedením dat s poznámkami nahrajte, prosím, alespoň jeden zvukový soubor</translation>
     </message>
@@ -5713,7 +5754,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>Dekóduje se %1...</translation>
     </message>
@@ -5721,17 +5762,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>Zavádí se zvuk odkazovaný v RDF...</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>Zavádí se signálová data s vysokou hustotou z RDF...</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>Zavádí se data událostí z RDF...</translation>
     </message>
@@ -5739,7 +5780,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> do </translation>
     </message>
@@ -5747,86 +5788,87 @@
 <context>
     <name>RangeSummarisableTimeValueModel</name>
     <message>
+        <location filename="../../svcore/data/model/RangeSummarisableTimeValueModel.h" line="124"/>
         <source>Range-Summarisable Time-Value</source>
-        <translation type="obsolete">Rozsahově shrnutelná časová hodnota</translation>
+        <translation type="unfinished">Rozsahově shrnutelná časová hodnota</translation>
     </message>
 </context>
 <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>Nová oblast</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="82"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="82"/>
         <source>Vertical Scale</source>
         <translation>Svislá stupnice</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="83"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="83"/>
         <source>Scale Units</source>
         <translation>Jednotky stupnice</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="84"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="84"/>
         <source>Plot Type</source>
         <translation>Typ nákresu</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="102"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="102"/>
         <source>Scale</source>
         <translation>Stupnice</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="163"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="163"/>
         <source>Bars</source>
         <translation>Úsečky</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="164"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="164"/>
         <source>Segmentation</source>
         <translation>Rozčlenění</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="170"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="170"/>
         <source>Auto-Align</source>
         <translation>Automatické zarovnání</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="171"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="171"/>
         <source>Equal Spaced</source>
         <translation>Vyrovnaně rozložené</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="172"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="172"/>
         <source>Linear</source>
         <translation>Přímočarý</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="173"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="173"/>
         <source>Log</source>
         <translation>Zápis</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="378"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="378"/>
         <source>In progress</source>
         <translation>Probíhá</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="380"/>
-        <location filename="../../layer/RegionLayer.cpp" line="406"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="380"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="406"/>
         <source>No local points</source>
         <translation>Žádné místní body</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="415"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="415"/>
         <source>%1 %2</source>
         <translation>%1 %2</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="420"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="420"/>
         <source>Time:	%1
 Value:	%2
 Duration:	%3
@@ -5837,7 +5879,7 @@
 Žádný štítek</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="425"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="425"/>
         <source>Time:	%1
 Value:	%2
 Duration:	%3
@@ -5848,63 +5890,63 @@
 Štítek:	%4</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1036"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1036"/>
         <source>Draw Region</source>
         <translation>Nakreslit oblast</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1118"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1118"/>
         <source>Erase Region</source>
         <translation>Vymazat oblast</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1178"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1178"/>
         <source>Drag Region</source>
         <translation>Táhnout oblast</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1199"/>
-        <location filename="../../layer/RegionLayer.cpp" line="1246"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1199"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1246"/>
         <source>Edit Region</source>
         <translation>Upravit oblast</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1201"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1201"/>
         <source>Relocate Region</source>
         <translation>Přemístit oblast</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1204"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1204"/>
         <source>Change Point Value</source>
         <translation>Změnit hodnotu bodu</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1263"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1263"/>
         <source>Drag Selection</source>
         <translation>Táhnout výběr</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1289"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1289"/>
         <source>Resize Selection</source>
         <translation>Změnit velikost výběru</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1329"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1329"/>
         <source>Delete Selected Points</source>
         <translation>Smazat vybrané body</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1376"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1376"/>
         <source>Re-align pasted items?</source>
         <translation>Zarovnat vložené položky znovu?</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1377"/>
+        <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>Položky, které vkládáte, přišly z vrstvy s odlišným zdrojovým materiálem, než má tento. Chcete je zarovnat znovu v čase, aby se hodily ke zdrojovému materiálu pro tuto vrstvu?</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1391"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1391"/>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
@@ -5912,42 +5954,42 @@
 <context>
     <name>RegionModel</name>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="125"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="125"/>
         <source>Region</source>
         <translation>Oblast</translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="153"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="153"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="154"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="154"/>
         <source>Frame</source>
         <translation>Rámeček</translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="155"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="155"/>
         <source>Value</source>
         <translation>Hodnota</translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="156"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="156"/>
         <source>Duration</source>
         <translation>Doba trvání</translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="157"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="157"/>
         <source>Label</source>
         <translation>Štítek</translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="158"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="158"/>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="187"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="187"/>
         <source>Edit Data</source>
         <translation>Upravit data</translation>
     </message>
@@ -5955,7 +5997,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>Smazat %1 vrstvu</translation>
     </message>
@@ -5963,7 +6005,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>Převzorkovává se %1...</translation>
     </message>
@@ -5971,13 +6013,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>(odvozený model v SV-XML)</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>Otevírá se soubor nebo adresa (URL)...</translation>
     </message>
@@ -5985,12 +6027,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>Barva</translation>
     </message>
     <message>
-        <location filename="../../layer/SingleColourLayer.cpp" line="114"/>
+        <location filename="../../svgui/layer/SingleColourLayer.cpp" line="114"/>
         <source>&lt;unknown&gt;</source>
         <translation>&lt;neznámý&gt;</translation>
     </message>
@@ -5998,13 +6040,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>%1 - %2</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
@@ -6015,140 +6057,140 @@
 %6 hodnota:	%7</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="164"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="164"/>
         <source>First</source>
         <translation>První</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>Průměr</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>Vrchol</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>Čas:	%1 - %2
 Rozsah:	%3 vzorky (%4)</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="507"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="507"/>
         <source>0dB</source>
         <translation>0dB</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="508"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="508"/>
         <source>-Inf</source>
         <translation>-Inf</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="539"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="539"/>
         <source>x10</source>
         <translation>x10</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="564"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="564"/>
         <source>Plot Type</source>
         <translation>Typ nákresu</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>Stupnice</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="566"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="566"/>
         <source>Normalize</source>
         <translation>Normalizovat</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="567"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="567"/>
         <source>Threshold</source>
         <translation>Práh</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="568"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="568"/>
         <source>Gain</source>
         <translation>Zesílení</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="569"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="569"/>
         <source>Sampling Mode</source>
         <translation>Režim vzorkování</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>Přímočarý</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="708"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="708"/>
         <source>Meter</source>
         <translation>Měřič</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="735"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="735"/>
         <source>Rev Log</source>
         <translation>Rev Log</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>dB</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="716"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="716"/>
         <source>Any</source>
         <translation>Jakýkoli</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="570"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="570"/>
         <source>Bin Scale</source>
         <translation>Stupnice koše</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="604"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="604"/>
         <source>Bins</source>
         <translation>Koše</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>Zápis</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="710"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="710"/>
         <source>Absolute</source>
         <translation>Naprostý</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="724"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="724"/>
         <source>Lines</source>
         <translation>Čáry</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="725"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="725"/>
         <source>Steps</source>
         <translation>Kroky</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="726"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="726"/>
         <source>Blocks</source>
         <translation>Bloky</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="727"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="727"/>
         <source>Colours</source>
         <translation>Barvy</translation>
     </message>
@@ -6156,8 +6198,9 @@
 <context>
     <name>SparseModel</name>
     <message>
+        <location filename="../../svcore/data/model/SparseModel.h" line="143"/>
         <source>Sparse</source>
-        <translation type="obsolete">Řídký</translation>
+        <translation type="unfinished">Řídký</translation>
     </message>
     <message>
         <source>Add Point</source>
@@ -6172,47 +6215,74 @@
         <translation type="obsolete">Opatřit bod znovu štítkem</translation>
     </message>
     <message>
+        <location filename="../../svcore/data/model/SparseModel.h" line="328"/>
         <source>Edit Data</source>
-        <translation type="obsolete">Upravit data</translation>
-    </message>
-    <message>
+        <translation type="unfinished">Upravit data</translation>
+    </message>
+    <message>
+        <location filename="../../svcore/data/model/SparseModel.h" line="344"/>
         <source>Insert Data Point</source>
-        <translation type="obsolete">Vložit datový bod</translation>
-    </message>
-    <message>
+        <translation type="unfinished">Vložit datový bod</translation>
+    </message>
+    <message>
+        <location filename="../../svcore/data/model/SparseModel.h" line="355"/>
         <source>Delete Data Point</source>
-        <translation type="obsolete">Smazat datový bod</translation>
+        <translation type="unfinished">Smazat datový bod</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">Přidat bod</translation>
+    </message>
+</context>
+<context>
+    <name>SparseModel::DeletePointCommand</name>
+    <message>
+        <location filename="../../svcore/data/model/SparseModel.h" line="197"/>
+        <source>Delete Point</source>
+        <translation type="unfinished">Smazat bod</translation>
+    </message>
+</context>
+<context>
+    <name>SparseModel::RelabelCommand</name>
+    <message>
+        <location filename="../../svcore/data/model/SparseModel.h" line="254"/>
+        <source>Re-Label Point</source>
+        <translation type="unfinished">Opatřit bod znovu štítkem</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>Řídký 1-D</translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseOneDimensionalModel.h" line="127"/>
+        <location filename="../../svcore/data/model/SparseOneDimensionalModel.h" line="127"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseOneDimensionalModel.h" line="128"/>
+        <location filename="../../svcore/data/model/SparseOneDimensionalModel.h" line="128"/>
         <source>Frame</source>
         <translation>Snímek</translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseOneDimensionalModel.h" line="129"/>
+        <location filename="../../svcore/data/model/SparseOneDimensionalModel.h" line="129"/>
         <source>Label</source>
         <translation>Štítek</translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseOneDimensionalModel.h" line="130"/>
+        <location filename="../../svcore/data/model/SparseOneDimensionalModel.h" line="130"/>
         <source>Unknown</source>
         <translation>Neznámý</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>Upravit data</translation>
     </message>
@@ -6220,37 +6290,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>Řídká hodnota času</translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseTimeValueModel.h" line="116"/>
+        <location filename="../../svcore/data/model/SparseTimeValueModel.h" line="116"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseTimeValueModel.h" line="117"/>
+        <location filename="../../svcore/data/model/SparseTimeValueModel.h" line="117"/>
         <source>Frame</source>
         <translation>Snímek</translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseTimeValueModel.h" line="118"/>
+        <location filename="../../svcore/data/model/SparseTimeValueModel.h" line="118"/>
         <source>Value</source>
         <translation>Hodnota</translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseTimeValueModel.h" line="119"/>
+        <location filename="../../svcore/data/model/SparseTimeValueModel.h" line="119"/>
         <source>Label</source>
         <translation>Štítek</translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseTimeValueModel.h" line="120"/>
+        <location filename="../../svcore/data/model/SparseTimeValueModel.h" line="120"/>
         <source>Unknown</source>
         <translation>Neznámý</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>Upravit data</translation>
     </message>
@@ -6258,330 +6328,331 @@
 <context>
     <name>SparseValueModel</name>
     <message>
+        <location filename="../../svcore/data/model/SparseValueModel.h" line="56"/>
         <source>Sparse Value</source>
-        <translation type="obsolete">Řídká hodnota</translation>
+        <translation type="unfinished">Řídká hodnota</translation>
     </message>
 </context>
 <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>Barva</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="172"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="172"/>
         <source>Colour Scale</source>
         <translation>Stupnice barev</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="173"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="173"/>
         <source>Window Size</source>
         <translation>Velikost okna</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="174"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="174"/>
         <source>Window Overlap</source>
         <translation>Překrytí okna</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="175"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="175"/>
         <source>Normalize Columns</source>
         <translation>Normalizovat sloupce</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="176"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="176"/>
         <source>Normalize Visible Area</source>
         <translation>Normalizovat viditelnou oblast</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="177"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="177"/>
         <source>Bin Display</source>
         <translation>Zobrazení koše</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="178"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="178"/>
         <source>Threshold</source>
         <translation>Práh</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="179"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="179"/>
         <source>Gain</source>
         <translation>Zesílení</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="180"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="180"/>
         <source>Colour Rotation</source>
         <translation>Otáčení barev</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="181"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="181"/>
         <source>Min Frequency</source>
         <translation>Nejmenší kmitočet</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="182"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="182"/>
         <source>Max Frequency</source>
         <translation>Největší kmitočet</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="183"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="183"/>
         <source>Frequency Scale</source>
         <translation>Kmitočtová stupnice</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="184"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="184"/>
         <source>Smoothing</source>
         <translation>Vyhlazování</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="212"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="212"/>
         <source>Bins</source>
         <translation>Koše</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="215"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="215"/>
         <source>Window</source>
         <translation>Okno</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="222"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="222"/>
         <source>Scale</source>
         <translation>Stupnice</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>Přímočarý</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="393"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="393"/>
         <source>Meter</source>
         <translation>Měřič</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="394"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="394"/>
         <source>dBV^2</source>
         <translation>dBV^2</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="395"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="395"/>
         <source>dBV</source>
         <translation>dBV</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="396"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="396"/>
         <source>Phase</source>
         <translation>Fáze</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>Žádná</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="406"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="406"/>
         <source>25 %</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="407"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="407"/>
         <source>50 %</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="408"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="408"/>
         <source>75 %</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="409"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="409"/>
         <source>87.5 %</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="410"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="410"/>
         <source>93.75 %</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="420"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="420"/>
         <source>No min</source>
         <translation>Žádné minimum</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="421"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="421"/>
         <source>10 Hz</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="422"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="422"/>
         <source>20 Hz</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="423"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="423"/>
         <source>40 Hz</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="424"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="424"/>
         <source>100 Hz</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="425"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="425"/>
         <source>250 Hz</source>
         <translation></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></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></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></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="429"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="429"/>
         <source>10 KHz</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="437"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="437"/>
         <source>1.5 KHz</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="438"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="438"/>
         <source>2 KHz</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="440"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="440"/>
         <source>6 KHz</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="441"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="441"/>
         <source>8 KHz</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="442"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="442"/>
         <source>12 KHz</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="443"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="443"/>
         <source>16 KHz</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="444"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="444"/>
         <source>No max</source>
         <translation>Žádné maximum</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="451"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="451"/>
         <source>Log</source>
         <translation>Zápis</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="457"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="457"/>
         <source>All Bins</source>
         <translation>Všechny koše</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="458"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="458"/>
         <source>Peak Bins</source>
         <translation>Koše vrcholů</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="459"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="459"/>
         <source>Frequencies</source>
         <translation>Kmitočty</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="462"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="462"/>
         <source>&lt;unknown&gt;</source>
         <translation>&lt;neznámý&gt;</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>dB</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="1666"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="1666"/>
         <source>FFT cache failed</source>
         <translation>FFT vyrovnávací paměť selhala</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>Nepodařilo se vytvořit model FFT pro tento spektrogram.
 Důvodem pro to může být nedostatek paměti, nebo nedostatek místa na disku.</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3167"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3167"/>
         <source>Peak Frequency:	%1 - %2 Hz
 </source>
         <translation>Nejvyšší kmitočet:	%1 - %2 Hz
 </translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3170"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3170"/>
         <source>Peak Frequency:	%1 Hz
 </source>
         <translation>Nejvyšší kmitočet:	%1 Hz
 </translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3178"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3178"/>
         <source>Peak Pitch:	%3 - %4
 </source>
         <translation>Nejvyšší výška:	%3 - %4
 </translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3180"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3180"/>
         <source>Peak Pitch:	%2
 </source>
         <translation>Nejvyšší výška:	%2
 </translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3191"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3191"/>
         <source>Time:	%1 - %2
 </source>
         <translation>Čas:	%1 - %2
 </translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3195"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3195"/>
         <source>Time:	%1
 </source>
         <translation>Čas:	%1
 </translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3200"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3200"/>
         <source>%1Bin Frequency:	%2 - %3 Hz
 %4Bin Pitch:	%5 - %6
 </source>
@@ -6590,7 +6661,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3208"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3208"/>
         <source>%1Bin Frequency:	%2 Hz
 %3Bin Pitch:	%4
 </source>
@@ -6599,42 +6670,42 @@
 </translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3221"/>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3226"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3221"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3226"/>
         <source>-Inf</source>
         <translation>-Inf</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3231"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3231"/>
         <source>dB:	%1 - %2</source>
         <translation>dB:	%1 - %2</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3233"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3233"/>
         <source>dB:	%1</source>
         <translation>dB:	%1</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3236"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3236"/>
         <source>
 Phase:	%1 - %2</source>
         <translation>
 Fáze:	%1 - %2</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3238"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3238"/>
         <source>
 Phase:	%1</source>
         <translation>
 Fáze:	%1</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3267"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3267"/>
         <source>43Hz</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3412"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3412"/>
         <source>%1Hz</source>
         <translation>%1Hz</translation>
     </message>
@@ -6642,22 +6713,22 @@
 <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>Velikost okna</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="147"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="147"/>
         <source>Window Overlap</source>
         <translation>Překrytí okna</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="148"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="148"/>
         <source>Show Peak Frequencies</source>
         <translation>Ukázat nejvyšší kmitočty</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="172"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="172"/>
         <source>Window</source>
         <translation>Okno</translation>
     </message>
@@ -6666,70 +6737,70 @@
         <translation type="obsolete">Typ nákresu</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="173"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="173"/>
         <source>Bins</source>
-        <translation type="unfinished">Koše</translation>
-    </message>
-    <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="228"/>
+        <translation>Koše</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="228"/>
         <source>None</source>
         <translation>Žádný</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="229"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="229"/>
         <source>25 %</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="230"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="230"/>
         <source>50 %</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="231"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="231"/>
         <source>75 %</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="232"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="232"/>
         <source>87.5 %</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="233"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="233"/>
         <source>93.75 %</source>
         <translation></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>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="596"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="596"/>
         <source>%1 - %2 Hz</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="598"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="598"/>
         <source>%1 Hz</source>
         <translation>%1 Hz</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>-Inf</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="626"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="626"/>
         <source>%1</source>
         <translation>%1</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
@@ -6740,22 +6811,22 @@
 dB:	%6</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="636"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="636"/>
         <source>First</source>
         <translation>První</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="637"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="637"/>
         <source>Mean</source>
         <translation>Průměr</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="637"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="637"/>
         <source>Peak</source>
         <translation>Vrchol</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
@@ -6769,7 +6840,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>%1 - %2</translation>
     </message>
@@ -6790,24 +6861,24 @@
 <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>Prázdný štítek</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="135"/>
-        <location filename="../../layer/TextLayer.cpp" line="373"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="135"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="373"/>
         <source>&lt;no text&gt;</source>
         <translation>&lt;žádný text&gt;</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="195"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="195"/>
         <source>In progress</source>
         <translation>Probíhá</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="208"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="208"/>
         <source>Time:	%1
 Height:	%2
 Label:	%3</source>
@@ -6816,74 +6887,74 @@
 Štítek:	%3</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="465"/>
-        <location filename="../../layer/TextLayer.cpp" line="611"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="465"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="611"/>
         <source>Enter label</source>
         <translation>Zadat štítek</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="466"/>
-        <location filename="../../layer/TextLayer.cpp" line="612"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="466"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="612"/>
         <source>Please enter a new label:</source>
         <translation>Zadejte, prosím, nový štítek:</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="514"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="514"/>
         <source>Erase Point</source>
         <translation>Vymazat bod</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="563"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="563"/>
         <source>Drag Label</source>
         <translation>Táhnout štítek</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="584"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="584"/>
         <source>Move Label</source>
         <translation>Přesunout štítek</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="586"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="586"/>
         <source>Move Label Horizontally</source>
         <translation>Přesunout štítek vodorovně</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="589"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="589"/>
         <source>Move Label Vertically</source>
         <translation>Přesunout štítek svisle</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="629"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="629"/>
         <source>Drag Selection</source>
         <translation>Táhnout výběr</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="654"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="654"/>
         <source>Resize Selection</source>
         <translation>Změnit velikost výběru</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="688"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="688"/>
         <source>Delete Selection</source>
         <translation>Smazat výběr</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="731"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="731"/>
         <source>Re-align pasted items?</source>
         <translation>Zarovnat vložené položky znovu?</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="732"/>
+        <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>Položky, které vkládáte, přišly z vrstvy s odlišným zdrojovým materiálem, než má tento. Chcete je zarovnat znovu v čase, aby se hodily ke zdrojovému materiálu pro tuto vrstvu?</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="746"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="746"/>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="791"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="791"/>
         <source>New Point</source>
         <translation>Nový bod</translation>
     </message>
@@ -6891,37 +6962,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>Text</translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="117"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="117"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="118"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="118"/>
         <source>Frame</source>
         <translation>Snímek</translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="119"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="119"/>
         <source>Height</source>
         <translation>Výška</translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="120"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="120"/>
         <source>Label</source>
         <translation>Štítek</translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="121"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="121"/>
         <source>Unknown</source>
         <translation>Neznámý</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>Upravit data</translation>
     </message>
@@ -6929,39 +7000,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>%1: %2%3</translation>
     </message>
     <message>
-        <location filename="../../widgets/Thumbwheel.cpp" line="234"/>
+        <location filename="../../svgui/widgets/Thumbwheel.cpp" line="234"/>
         <source>%2%3</source>
         <translation>%2%3</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>Nová hodnota pro %1, od %2 do %3 %4:</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>Nová hodnota pro %1, od %2 do %3:</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>Zadejte novou hodnotu od %1do %2 %3:</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>Zadejte novou hodnotu od %1 do %2:</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>Zadat novou hodnotu</translation>
     </message>
@@ -6969,107 +7040,107 @@
 <context>
     <name>TimeInstantLayer</name>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="44"/>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="479"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="44"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="481"/>
         <source>New Point</source>
         <translation>Nový bod</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="84"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="84"/>
         <source>Plot Type</source>
         <translation>Typ nákresu</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="124"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="124"/>
         <source>Instants</source>
         <translation>Okamžiky</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="125"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="125"/>
         <source>Segmentation</source>
         <translation>Rozčlenění</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="226"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="226"/>
         <source>In progress</source>
         <translation>Probíhá</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="228"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="228"/>
         <source>No local points</source>
         <translation>Žádné místní body</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="239"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="239"/>
         <source>Time:	%1
 No label</source>
         <translation>Čas:	%1
 Žádný štítek</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="242"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="242"/>
         <source>Time:	%1
 Label:	%2</source>
         <translation>Čas:	%1
 Štítek:	%2</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="483"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="485"/>
         <source>Draw Point</source>
         <translation>Nakreslit bod</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="513"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="515"/>
         <source>Add Point at %1 s</source>
         <translation>Přidat bod v %1 s</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="558"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="560"/>
         <source>Erase Point</source>
         <translation>Vymazat bod</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="604"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="606"/>
         <source>Drag Point</source>
         <translation>Nakreslit bod</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="620"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="622"/>
         <source>Move Point to %1 s</source>
         <translation>Přesunout bod na %1 s</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="656"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="658"/>
         <source>Edit Point</source>
         <translation>Upravit bod</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="673"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="675"/>
         <source>Drag Selection</source>
         <translation>Táhnout výběr</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="699"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="701"/>
         <source>Resize Selection</source>
         <translation>Změnit velikost výběru</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="734"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="736"/>
         <source>Delete Selection</source>
         <translation>Smazat výběr</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="777"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="779"/>
         <source>Re-align pasted instants?</source>
         <translation>Zarovnat vložené položky znovu?</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="778"/>
+        <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>Okamžiky, které vkládáte, přišly z vrstvy s odlišným zdrojovým materiálem, než má tento. Chcete je zarovnat znovu v čase, aby se hodily ke zdrojovému materiálu pro tuto vrstvu?</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="792"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="794"/>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
@@ -7077,105 +7148,105 @@
 <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="1284"/>
+        <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>Nový bod</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="105"/>
-        <location filename="../../layer/TimeValueLayer.cpp" line="141"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="105"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="141"/>
         <source>Plot Type</source>
         <translation>Typ nákresu</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="106"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="106"/>
         <source>Vertical Scale</source>
         <translation>Svislá stupnice</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="107"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="107"/>
         <source>Scale Units</source>
         <translation>Jednotky stupnice</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="108"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="108"/>
         <source>Draw Segment Division Lines</source>
         <translation>Kreslit čáry rozdělující části</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="109"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="109"/>
         <source>Show Derivative</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="137"/>
+        <translation>Ukázat odvozeninu</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="137"/>
         <source>Scale</source>
         <translation>Stupnice</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="215"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="215"/>
         <source>Points</source>
         <translation>Body</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="216"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="216"/>
         <source>Stems</source>
         <translation>Stopky</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="217"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="217"/>
         <source>Connected Points</source>
         <translation>Spojené body</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="218"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="218"/>
         <source>Lines</source>
         <translation>Čáry</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="219"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="219"/>
         <source>Curve</source>
         <translation>Křivka</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="220"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="220"/>
         <source>Segmentation</source>
         <translation>Rozčlenění</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="225"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="225"/>
         <source>Auto-Align</source>
         <translation>Automatické zarovnání</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="226"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="226"/>
         <source>Linear</source>
         <translation>Přímočaré</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="227"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="227"/>
         <source>Log</source>
         <translation>Zápis</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="228"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="228"/>
         <source>+/-1</source>
         <translation>v</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="556"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="556"/>
         <source>In progress</source>
         <translation>Probíhá</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="558"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="558"/>
         <source>No local points</source>
         <translation>Žádné místní body</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="571"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="571"/>
         <source>Time:	%1
 Value:	%2%3
 No label</source>
@@ -7184,7 +7255,7 @@
 Žádný štítek</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="576"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="576"/>
         <source>Time:	%1
 Value:	%2%3
 Label:	%4</source>
@@ -7193,97 +7264,97 @@
 Štítek:	%4</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1291"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1292"/>
         <source>Draw Point</source>
         <translation>Nakreslit bod</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1409"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1410"/>
         <source>Erase Point</source>
         <translation>Vymazat bod</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1458"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1459"/>
         <source>Drag Point</source>
         <translation>Táhnout bod</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1481"/>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1526"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1482"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1527"/>
         <source>Edit Point</source>
         <translation>Upravit bod</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1483"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1484"/>
         <source>Relocate Point</source>
         <translation>Přemístit bod</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1486"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1487"/>
         <source>Change Point Value</source>
         <translation>Změnit hodnotu bodu</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1543"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1544"/>
         <source>Drag Selection</source>
         <translation>Táhnout výběr</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1569"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1570"/>
         <source>Resize Selection</source>
         <translation>Změnit velikost výběru</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1604"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1605"/>
         <source>Delete Selected Points</source>
         <translation>Smazat vybrané body</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1651"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1652"/>
         <source>Re-align pasted items?</source>
         <translation>Zarovnat vložené položky znovu?</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1652"/>
+        <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>Položky, které vkládáte, přišly z vrstvy s odlišným zdrojovým materiálem, než má tento. Chcete je zarovnat znovu v čase, aby se hodily ke zdrojovému materiálu pro tuto vrstvu?</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1666"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1667"/>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1722"/>
+        <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>Položky, které vkládáte, nemají hodnoty.
 Jaké hodnoty chcete pro tyto položky použít?</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1724"/>
+        <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>Některé z položek, které vkládáte, nemají hodnoty.
 Jaké hodnoty chcete pro tyto položky použít?</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1734"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1735"/>
         <source>Zero for all items</source>
         <translation>Nula pro všechny položky</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1743"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1744"/>
         <source>Choose value calculation</source>
         <translation>Vybrat výpočet hodnoty</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1764"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1765"/>
         <source>Select cycle size</source>
         <translation>Vybrat velikost cyklu</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1765"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1766"/>
         <source>Cycle size:</source>
         <translation>Velikost cyklu:</translation>
     </message>
@@ -7291,27 +7362,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>Rada na tento den</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>Ukázat radu při spuštění</translation>
     </message>
     <message>
-        <location filename="../../widgets/TipDialog.cpp" line="71"/>
+        <location filename="../../svgui/widgets/TipDialog.cpp" line="71"/>
         <source>&lt;&lt; Previous</source>
         <translation>&lt;&lt; Předchozí</translation>
     </message>
     <message>
-        <location filename="../../widgets/TipDialog.cpp" line="75"/>
+        <location filename="../../svgui/widgets/TipDialog.cpp" line="75"/>
         <source>Next &gt;&gt;</source>
         <translation>Další &gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../../widgets/TipDialog.cpp" line="79"/>
+        <location filename="../../svgui/widgets/TipDialog.cpp" line="79"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
@@ -7319,136 +7390,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> [\(&lt;].*$</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>&lt;neznámý tvůrce&gt;</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>Vytáhnout funkce pomocí &quot;%1&quot; přídavného modulu (z %2)</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>Vytáhnout funkce pomocí &quot;%1&quot; výstupu &quot;%2&quot; přídavného modulu (z %3)</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>%1 používá &quot;%2&quot; přídavný modul (z %3)</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>%1 používá &quot;%2&quot; výstup &quot;%3&quot; přídavného modulu (z %4)</translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="320"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="320"/>
         <source>Analysis</source>
         <translation>Rozbor</translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="323"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="323"/>
         <source>Generator</source>
         <translation>Tvůrce</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>Jiný</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>%1: %2</translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="565"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="565"/>
         <source>%1: Output %2</source>
         <translation>%1: Výstup %2</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>Vytáhnout &quot;%1&quot; datový výstup z &quot;%2&quot; efektového přídavného modulu (z %3)</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>Vytáhnout datový výstup %1 z &quot;%2&quot; efektového přídavného modulu (z %3)</translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="322"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="322"/>
         <source>Effects Data</source>
         <translation>Efektová data</translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="321"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="321"/>
         <source>Effects</source>
         <translation>Efekty</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>Proměnit zvukový signál s &quot;%1&quot; efektovým přídavným modulem (z %2)</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>Vytvořit zvukový signál za použití &quot;%1&quot; efektového přídavného modulu (z %2)</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>Druh přídavného modulu</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>Skupina</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>Systémový identifikátor</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>Název</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>Popis</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>Tvůrce</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>jednotky</translation>
     </message>
@@ -7456,64 +7527,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>Najít proměnu</translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="44"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="44"/>
         <source>Find:</source>
         <translation>Hledat:</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>&lt;br&gt;&amp;nbsp;&amp;nbsp;Nebyly nalezeny žádné výsledky</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>Nahoru</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>Dolů</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>&lt;p&gt;Napište do okénka pro hledání nějaký text pro hledání popisů:&lt;ul&gt;&lt;li&gt;Všech nyní nainstalovaných &lt;a href=&quot;http://www.vamp-plugins.org/&quot;&gt;Vamp&lt;/a&gt; zvukových funkčních vytahovacích přídavných modulů&lt;/li&gt;&lt;li&gt;Všech nyní nainstalovaných &lt;a href=&quot;http://www.ladspa.org/&quot;&gt;LADSPA&lt;/a&gt; zvukových efektových přídavných modulů&lt;/li&gt;&lt;li&gt;Vamp přídavných modulů, které nyní nainstalovány nejsou, ale mají svůj popis zvěřejněný prostřednictvím významového internetu&lt;/li&gt;&lt;/ul&gt;</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>&lt;b&gt;Zveřejněné popisy se ze sítě získat nepodařilo!&lt;/b&gt;</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>&lt;b&gt;Nyní nejsou nainstalovány žádné přídavné moduly!&lt;/b&gt;</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>&lt;p&gt;%1&lt;br&gt;Je možné, že síťové spojení vypadlo, služby odpovídají příliš pomalu, nebo se vyskytly potíže se zpracováním.&lt;br&gt;Budou se prohledávat pouze popisy nainstalovaných přídavných modulů.</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>&lt;p&gt;%1&lt;br&gt;Budou se prohledávat pouze zveřejněné popisy funkčních vytahovacích přídavných modulů Vamp.</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>&lt;p&gt;%1&lt;br&gt;%2&lt;br&gt;Je možné, že síťové spojení vypadlo, nebo služby odpovídají příliš pomalu.&lt;br&gt;Nebudou dostupné žádné výsledky hledání.</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>
             <numerusform>Nalezen jeden popis obsahující &lt;b&gt;%1&lt;/b&gt;, ukazují se pouze první %2</numerusform>
@@ -7522,7 +7593,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>
             <numerusform>Nalezen jeden popis obsahující &lt;b&gt;%1&lt;/b&gt;</numerusform>
@@ -7531,54 +7602,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>&lt;i&gt; (nenainstalován)&lt;/i&gt;</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>%1%2&lt;br&gt;&lt;small&gt;</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>&lt;/small&gt;</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>&lt;b&gt;%1&lt;/b&gt;%2&lt;br&gt;</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>&lt;small&gt;%1&lt;/small&gt;</translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="288"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="288"/>
         <source>&lt;small&gt;</source>
         <translation>&lt;/small&gt;</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>&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;mdash; Typ přídavného modulu: %1</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>&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;mdash; Skupina: %1</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>&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;mdash; Systémový identifikátor: %1</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>&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;mdash; Více informací naleznete na stránkách: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;</translation>
     </message>
@@ -7586,58 +7657,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>Celkové projíždění</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="91"/>
+        <location filename="../../svgui/view/View.cpp" line="91"/>
         <source>Global Zoom</source>
         <translation>Celkové přibližování a oddalování</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="92"/>
+        <location filename="../../svgui/view/View.cpp" line="92"/>
         <source>Follow Playback</source>
         <translation>Sledovat přehrávání</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="131"/>
+        <location filename="../../svgui/view/View.cpp" line="131"/>
         <source>Scroll</source>
         <translation>Projíždět</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="132"/>
+        <location filename="../../svgui/view/View.cpp" line="132"/>
         <source>Page</source>
         <translation>Strana</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="133"/>
+        <location filename="../../svgui/view/View.cpp" line="133"/>
         <source>Off</source>
         <translation>Vypnuto</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="136"/>
+        <location filename="../../svgui/view/View.cpp" line="136"/>
         <source>&lt;unknown&gt;</source>
         <translation>&lt;neznámý&gt;</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="1447"/>
+        <location filename="../../svgui/view/View.cpp" line="1457"/>
         <source>Alignment</source>
         <translation>Zarovnání</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="2223"/>
+        <location filename="../../svgui/view/View.cpp" line="2233"/>
         <source>Waiting for layers to be ready...</source>
         <translation>Čeká se na vrstvy, až budou připraveny...</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="2224"/>
-        <location filename="../../view/View.cpp" line="2253"/>
+        <location filename="../../svgui/view/View.cpp" line="2234"/>
+        <location filename="../../svgui/view/View.cpp" line="2263"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="2252"/>
+        <location filename="../../svgui/view/View.cpp" line="2262"/>
         <source>Rendering image...</source>
         <translation>Dělá se obrázek...</translation>
     </message>
@@ -7645,97 +7716,97 @@
 <context>
     <name>ViewManager</name>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="328"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="328"/>
         <source>Clear Selection</source>
-        <translation type="unfinished">Vyprázdnit výběr</translation>
-    </message>
-    <message>
-        <location filename="../../view/ViewManager.cpp" line="329"/>
+        <translation>Vyprázdnit výběr</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/view/ViewManager.cpp" line="329"/>
         <source>Select Multiple Regions</source>
-        <translation type="unfinished">Vybrat více oblastí</translation>
-    </message>
-    <message>
-        <location filename="../../view/ViewManager.cpp" line="330"/>
+        <translation>Vybrat více oblastí</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/view/ViewManager.cpp" line="330"/>
         <source>Select Region</source>
-        <translation type="unfinished">Vybrat oblast</translation>
-    </message>
-    <message>
-        <location filename="../../view/ViewManager.cpp" line="347"/>
+        <translation>Vybrat oblast</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/view/ViewManager.cpp" line="347"/>
         <source>Enter Navigate mode</source>
         <translation>Vstoupit do režimu navádění</translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="348"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="348"/>
         <source>Enter Select mode</source>
         <translation>Vstoupit do režimu výběru</translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="349"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="349"/>
         <source>Enter Edit mode</source>
         <translation>Vstoupit do režimu úprav</translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="350"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="350"/>
         <source>Enter Draw mode</source>
         <translation>Vstoupit do režimu kreslení</translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="351"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="351"/>
         <source>Enter Erase mode</source>
         <translation>Vstoupit do režimu mazání</translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="352"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="352"/>
         <source>Enter Measure mode</source>
         <translation>Vstoupit do režimu měření</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>Zapnout režim smyčky</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>Vypnout režim smyčky</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>Zapnout režim přehrávání vybrané oblasti</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>Vypnout režim přehrávání vybrané oblasti</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>Zapnout režim samostatného přehrávání</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>Vypnout režim samostatného přehrávání</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>Zapnout režim zarovnávání</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>Vypnout režim zarovnávání</translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="514"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="514"/>
         <source>Scroll to %1</source>
         <translation>Projíždět k %1</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>
             <numerusform>Zvětšení na jeden vzorek na pixel</numerusform>
@@ -7744,7 +7815,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="586"/>
+        <location filename="../../svgui/view/ViewManager.cpp" line="586"/>
         <source>Change overlay level</source>
         <translation>Změnit úroveň překrytí</translation>
     </message>
@@ -7767,7 +7838,7 @@
 <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>Soubor Wave</translation>
     </message>
@@ -7775,112 +7846,112 @@
 <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>Stupnice</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="105"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="105"/>
         <source>Gain</source>
         <translation>Zesílení</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="106"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="106"/>
         <source>Normalize Visible Area</source>
         <translation>Normalizovat viditelnou oblast</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="107"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="107"/>
         <source>Channels</source>
         <translation>Kanály</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="194"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="194"/>
         <source>Linear</source>
         <translation>Přímočarý</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="195"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="195"/>
         <source>Meter</source>
         <translation>Měřič</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>dB</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="202"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="202"/>
         <source>Separate</source>
         <translation>Rozdělit</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="203"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="203"/>
         <source>Mean</source>
         <translation>Průměr</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="204"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="204"/>
         <source>Butterfly</source>
         <translation>Rozříznout a roztáhnout</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="940"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="940"/>
         <source>Time:	%1 - %2</source>
         <translation>Čas:	%1 - %2</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="944"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="944"/>
         <source>Time:	%1</source>
         <translation>Čas:	%1</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="965"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="965"/>
         <source>Level:</source>
         <translation>Úroveň:</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="967"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="967"/>
         <source>Left:</source>
         <translation>Levý:</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="968"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="968"/>
         <source>Right:</source>
         <translation>Pravý:</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="969"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="969"/>
         <source>Channel %1</source>
         <translation>Kanál %1</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>
 %1	%2 - %3 (%4 dB nejvyšší)</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>
 %1	%2 (%3 dB nejvyšší)</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>0dB</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>-Inf</translation>
     </message>
@@ -7888,12 +7959,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>V/čas</translation>
     </message>
     <message>
-        <location filename="../../widgets/WindowShapePreview.cpp" line="202"/>
+        <location filename="../../svgui/widgets/WindowShapePreview.cpp" line="202"/>
         <source>dB / freq</source>
         <translation>dB/kmitočet</translation>
     </message>
@@ -7901,7 +7972,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>Zapisovatelný soubor Wave</translation>
     </message>
--- a/i18n/sonic-visualiser_en_GB.ts	Mon Feb 07 11:56:04 2011 +0000
+++ b/i18n/sonic-visualiser_en_GB.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"></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"></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"></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"></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"></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>
@@ -5480,22 +5531,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>
@@ -5503,18 +5554,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>
@@ -5522,7 +5573,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>
@@ -5530,17 +5581,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>
@@ -5548,7 +5599,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>
@@ -5556,7 +5607,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>
@@ -5564,79 +5615,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
@@ -5644,7 +5695,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
@@ -5652,63 +5703,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>
@@ -5716,42 +5767,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>
@@ -5759,7 +5810,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>
@@ -5767,7 +5818,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>
@@ -5775,13 +5826,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>
@@ -5789,12 +5840,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>
@@ -5802,13 +5853,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
@@ -5816,139 +5867,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>
@@ -5956,70 +6007,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>
@@ -6027,37 +6087,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>
@@ -6065,7 +6125,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>
@@ -6073,363 +6133,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>
@@ -6437,90 +6497,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
@@ -6528,22 +6588,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
@@ -6554,7 +6614,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>
@@ -6575,98 +6635,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>
@@ -6674,37 +6734,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>
@@ -6712,39 +6772,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>
@@ -6752,105 +6812,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>
@@ -6858,202 +6918,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>
@@ -7061,27 +7126,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>
@@ -7089,136 +7154,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>
@@ -7226,64 +7291,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>
@@ -7291,7 +7356,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>
@@ -7299,54 +7364,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>
@@ -7354,58 +7419,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>
@@ -7413,82 +7478,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>
@@ -7496,33 +7576,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>
@@ -7530,110 +7592,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>
@@ -7641,12 +7703,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>
@@ -7654,7 +7716,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>
--- 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>
Binary file i18n/sonic-visualiser_ru.qm has changed
--- a/i18n/sonic-visualiser_ru.ts	Mon Feb 07 11:56:04 2011 +0000
+++ b/i18n/sonic-visualiser_ru.ts	Mon Feb 07 20:19:33 2011 +0000
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0" language="ru_RU">
-<defaultcodec></defaultcodec>
 <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>Журнал изменений</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>&lt;p&gt;Список всех предпринятых вами действий с %1.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../../widgets/ActivityLog.cpp" line="63"/>
+        <location filename="../../svgui/widgets/ActivityLog.cpp" line="63"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
@@ -23,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>Добавить слой %1</translation>
     </message>
@@ -31,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>
@@ -39,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>Выравнивание</translation>
     </message>
@@ -47,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>Воспроизведение от %1</translation>
     </message>
     <message>
-        <location filename="../../audioio/AudioCallbackPlaySource.cpp" line="459"/>
+        <location filename="../../svapp/audioio/AudioCallbackPlaySource.cpp" line="482"/>
         <source>Stop at %1</source>
         <translation>Остановка в позиции %1</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>Смена коэффициента растяжения во времени на %1</translation>
     </message>
@@ -65,39 +64,39 @@
 <context>
     <name>AudioDial</name>
     <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>Введите новое значение</translation>
     </message>
     <message>
-        <location filename="../../widgets/AudioDial.cpp" line="416"/>
+        <location filename="../../svgui/widgets/AudioDial.cpp" line="416"/>
         <source>%1: %2%3</source>
         <translation>%1: %2%3</translation>
     </message>
     <message>
-        <location filename="../../widgets/AudioDial.cpp" line="418"/>
+        <location filename="../../svgui/widgets/AudioDial.cpp" line="418"/>
         <source>%2%3</source>
         <translation>%2%3</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>Новое значение для «%1», от %2 до %3 %4:</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>Новое значение для «%1», от %2 до %3:</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>Введите новое значение от %1 до %2 %3:</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>Введите новое значение от %1 до %2:</translation>
     </message>
@@ -105,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>(авто)</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>Ограничить воспроизведение выделением</translation>
     </message>
     <message>
-        <location filename="../../audioio/AudioTargetFactory.cpp" line="80"/>
+        <location filename="../../svapp/audioio/AudioTargetFactory.cpp" line="80"/>
         <source>PulseAudio Server</source>
         <translation>Сервер PulseAudio</translation>
     </message>
     <message>
-        <location filename="../../audioio/AudioTargetFactory.cpp" line="84"/>
+        <location filename="../../svapp/audioio/AudioTargetFactory.cpp" line="84"/>
         <source>Core Audio Device</source>
         <translation>Устройство Core Audio</translation>
     </message>
     <message>
-        <location filename="../../audioio/AudioTargetFactory.cpp" line="88"/>
+        <location filename="../../svapp/audioio/AudioTargetFactory.cpp" line="88"/>
         <source>Default Soundcard Device</source>
         <translation>Звуковая карта по умолчанию</translation>
     </message>
@@ -133,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>Этот файл уже открыт</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>Режим добавления в конец не поддерживается</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>Способ доступа к файлам не указан</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>Режимы чтения и записи определены</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>Не удалось открыть файл для записи</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>Не удалось открыть поток bzip2 для записи</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>Не удалось открыть файл для чтения</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>Не удалось открыть поток bzip2 для чтения</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>Внутренняя ошибка (не открывается ни на чтение, ни на запись)</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>Файл не открыт</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>Ошибка закрытия записи в поток bzip2</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>Ошибка закрытия чтения потока bzip2</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>Внутренняя ошибка (не закрывается ни чтение, ни запись)</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>Ошибка чтения потока bzip2</translation>
     </message>
@@ -206,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>
             <numerusform>%1 (%n изменение)</numerusform>
@@ -218,7 +217,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>Не удалось открыть файл %1 для записи</translation>
     </message>
@@ -226,77 +225,122 @@
 <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>Выберите формат данных</translation>
     </message>
     <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="56"/>
         <source>Each row specifies:</source>
-        <translation>Каждая строка определяет:</translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="59"/>
+        <translation type="obsolete">Каждая строка определяет:</translation>
+    </message>
+    <message>
         <source>A point in time</source>
-        <translation>Точку во времени</translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="60"/>
+        <translation type="obsolete">Точку во времени</translation>
+    </message>
+    <message>
         <source>A value at a time</source>
-        <translation>Значение во точке времени</translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="61"/>
+        <translation type="obsolete">Значение во точке времени</translation>
+    </message>
+    <message>
         <source>A set of values</source>
-        <translation>Серию значений</translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="67"/>
+        <translation type="obsolete">Серию значений</translation>
+    </message>
+    <message>
         <source>The first column contains:</source>
-        <translation>Первый столбец содержит:</translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="70"/>
+        <translation type="obsolete">Первый столбец содержит:</translation>
+    </message>
+    <message>
         <source>Time, in seconds</source>
-        <translation>Время, в секундах</translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="71"/>
+        <translation type="obsolete">Время, в секундах</translation>
+    </message>
+    <message>
         <source>Time, in audio sample frames</source>
-        <translation>Время, в выборках звуковых сэмплов</translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="72"/>
+        <translation type="obsolete">Время, в выборках звуковых сэмплов</translation>
+    </message>
+    <message>
         <source>Data (rows are consecutive in time)</source>
-        <translation>Данные (строки последовательны во времени)</translation>
-    </message>
-    <message>
-        <location filename="../../widgets/CSVFormatDialog.cpp" line="79"/>
+        <translation type="obsolete">Данные (строки последовательны во времени)</translation>
+    </message>
+    <message>
+        <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>Частота сэмплирования звука (Гц):</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>
+        <translation type="obsolete">
 Пример данных из файла:</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>&lt;b&gt;Выберите формат данных&lt;/b&gt;&lt;p&gt;Выберите правильный формат данных для этого файла.</translation>
+        <translation type="obsolete">&lt;b&gt;Выберите формат данных&lt;/b&gt;&lt;p&gt;Выберите правильный формат данных для этого файла.</translation>
     </message>
 </context>
 <context>
     <name>Colour3DPlotLayer</name>
     <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>
@@ -305,86 +349,86 @@
 Значение:	%4</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>Линейный</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="322"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="322"/>
         <source>&lt;unknown&gt;</source>
         <translation>&lt;неизвестно&gt;</translation>
     </message>
     <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>Цвет</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>Масштаб</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="172"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="172"/>
         <source>Normalize Columns</source>
         <translation>Нормализовать столбцы</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="173"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="173"/>
         <source>Normalize Visible Area</source>
         <translation>Нормализовать видимую область</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>Логарифмический</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="311"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="311"/>
         <source>+/-1</source>
         <translation>±1</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="174"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="174"/>
         <source>Invert Vertical Scale</source>
         <translation>Инвертировать масштаб по вертикали</translation>
     </message>
     <message>
-        <location filename="../../layer/Colour3DPlotLayer.cpp" line="176"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="176"/>
         <source>Always Opaque</source>
         <translation>Всегда непрозрачно</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="175"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="175"/>
         <source>Gain</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="329"/>
+        <location filename="../../svgui/layer/Colour3DPlotLayer.cpp" line="329"/>
         <source>dB</source>
         <translation>Дб</translation>
     </message>
@@ -392,68 +436,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>&lt;неизвестно&gt;</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="52"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="52"/>
         <source>Default</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="53"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="53"/>
         <source>White on Black</source>
         <translation>Белое на чёрном</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="54"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="54"/>
         <source>Black on White</source>
         <translation>Чёрное на белом</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="55"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="55"/>
         <source>Red on Blue</source>
         <translation>Красное на синем</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="56"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="56"/>
         <source>Yellow on Black</source>
         <translation>Жёлтое на чёрном</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="57"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="57"/>
         <source>Blue on Black</source>
         <translation>Синее на чёрном</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="58"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="58"/>
         <source>Sunset</source>
         <translation>Закат</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="59"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="59"/>
         <source>Fruit Salad</source>
         <translation>Фруктовый салат</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="60"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="60"/>
         <source>Banded</source>
         <translation>В полоску</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="61"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="61"/>
         <source>Highlight</source>
         <translation>Подсветка</translation>
     </message>
     <message>
-        <location filename="../../layer/ColourMapper.cpp" line="62"/>
+        <location filename="../../svgui/layer/ColourMapper.cpp" line="62"/>
         <source>Printer</source>
         <translation>Принтер</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>
@@ -461,68 +505,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>&amp;Отменить</translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="57"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="57"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</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>Ве&amp;рнуть</translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="70"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="70"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="503"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="503"/>
         <source>Nothing to undo</source>
         <translation>Нет отменяемых действий</translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="503"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="503"/>
         <source>Nothing to redo</source>
         <translation>Нет повторяемых действий</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>&amp;Отменить действие «%1»</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>Повто&amp;рить действие «%1»</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>Отменить последнее действие правки</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>Повторить последнее действие правки</translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="344"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="344"/>
         <source>Undo %1</source>
         <translation>Отмена действия «%1»</translation>
     </message>
     <message>
-        <location filename="../../widgets/CommandHistory.cpp" line="370"/>
+        <location filename="../../svgui/widgets/CommandHistory.cpp" line="370"/>
         <source>Redo %1</source>
         <translation>Повтор действия «%1»</translation>
     </message>
@@ -530,7 +574,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>
@@ -538,17 +582,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>Время</translation>
     </message>
     <message>
-        <location filename="../../data/model/DenseThreeDimensionalModel.h" line="128"/>
+        <location filename="../../svcore/data/model/DenseThreeDimensionalModel.h" line="128"/>
         <source>Frame</source>
         <translation>Выборка</translation>
     </message>
@@ -556,7 +600,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>
@@ -564,12 +608,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>Сделать %1 основной моделью</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>
@@ -577,7 +621,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>
@@ -585,12 +629,12 @@
 <context>
     <name>FFTModel</name>
     <message>
-        <location filename="../../data/model/FFTModel.cpp" line="203"/>
+        <location filename="../../svcore/data/model/FFTModel.cpp" line="203"/>
         <source>%1 Hz</source>
         <translation>%1 Гц</translation>
     </message>
     <message>
-        <location filename="../../data/model/FFTModel.h" line="187"/>
+        <location filename="../../svcore/data/model/FFTModel.h" line="187"/>
         <source>FFT</source>
         <translation>FFT</translation>
     </message>
@@ -598,22 +642,22 @@
 <context>
     <name>Fader</name>
     <message>
-        <location filename="../../widgets/Fader.cpp" line="217"/>
+        <location filename="../../svgui/widgets/Fader.cpp" line="217"/>
         <source>Level: Off</source>
         <translation>Уровень: выкл</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>Уровень: %1%2.%3%4 Дб</translation>
     </message>
     <message>
-        <location filename="../../widgets/Fader.cpp" line="141"/>
+        <location filename="../../svgui/widgets/Fader.cpp" line="141"/>
         <source>Enter new fader level</source>
         <translation>Ввведите новый уровень фейдера</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>Новый уровень фейдера, от %1 до %2 dBFS:</translation>
     </message>
@@ -621,48 +665,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>У расширения &quot;%1&quot; нет выходов</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>У расширения &quot;%1&quot; нет выхода с названием &quot;%2&quot;</translation>
     </message>
@@ -670,49 +714,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>Неподдерживаемая схема URL</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>Скачивается %1...</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>Не удалось соединиться с FTP-сервером</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>Не удалось авторизоваться</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>Не удалось поменять на корректный каталог</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>Скачивание с FTP-сервера прервано</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>Скачивание отменено</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>Не удалось создать локальный файл %1</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>Файл не содержит данных!</translation>
     </message>
@@ -720,7 +764,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>Изменить данные</translation>
     </message>
@@ -728,52 +772,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>Изображение</translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="56"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="56"/>
         <source>Label:</source>
         <translation>Метка:</translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="63"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="63"/>
         <source>File or URL:</source>
         <translation>Файл или URL:</translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="73"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="73"/>
         <source>Browse...</source>
         <translation>Просмотр...</translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="79"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="79"/>
         <source>Preview</source>
         <translation>Предпросмотр</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>Неподдерживаемая схема URL</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>Схема URL &quot;%1&quot; не поддерживается</translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="192"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="192"/>
         <source>Opening image URL...</source>
         <translation>Открывается изображение по URL...</translation>
     </message>
     <message>
-        <location filename="../../widgets/ImageDialog.cpp" line="196"/>
+        <location filename="../../svgui/widgets/ImageDialog.cpp" line="196"/>
         <source>File download failed</source>
         <translation>Не удалось скачать файл</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>Не удалось скачать URL &quot;%1&quot;: %2</translation>
     </message>
@@ -781,58 +825,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>В процессе</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>Выбрать изображение</translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="678"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="678"/>
         <source>Move Image</source>
         <translation>Переместить изображение</translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="735"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="735"/>
         <source>Drag Selection</source>
         <translation>Перетащить выделение</translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="760"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="760"/>
         <source>Resize Selection</source>
         <translation>Изменить размер выделения</translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="794"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="794"/>
         <source>Delete Selection</source>
         <translation>Удалите выделение</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>Заново выровнять вставленные объекты?</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>Вставить</translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="884"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="884"/>
         <source>New Point</source>
         <translation>Новая точка</translation>
     </message>
     <message>
-        <location filename="../../layer/ImageLayer.cpp" line="915"/>
+        <location filename="../../svgui/layer/ImageLayer.cpp" line="915"/>
         <source>Opening image URL...</source>
         <translation>Открывается изображение по URL...</translation>
     </message>
@@ -840,38 +884,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>Изображение</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>Изменить изображение</translation>
     </message>
     <message>
-        <location filename="../../data/model/ImageModel.h" line="152"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="152"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../../data/model/ImageModel.h" line="153"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="153"/>
         <source>Frame</source>
         <translation>Выборка</translation>
     </message>
     <message>
-        <location filename="../../data/model/ImageModel.h" line="155"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="155"/>
         <source>Label</source>
         <translation>Метка</translation>
     </message>
     <message>
-        <location filename="../../data/model/ImageModel.h" line="156"/>
+        <location filename="../../svcore/data/model/ImageModel.h" line="156"/>
         <source>Unknown</source>
         <translation>Неизвестно</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>Изменить данные</translation>
     </message>
@@ -879,25 +923,25 @@
 <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>Выберите файл</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>Все файлы (*.*)</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>Выберите файл сеанса</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>
@@ -906,14 +950,14 @@
 Все файлы (*.*)</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>Звуковые файлы (%1)
 Все файлы (*.*)</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)
@@ -932,7 +976,7 @@
 Все файлы (*.*)</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)
@@ -949,7 +993,7 @@
 Все файлы (*.*)</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)
@@ -962,14 +1006,14 @@
 Все файлы (*.*)</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>Файлы изображений (%1)
 Все файлы (*.*)</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)
@@ -984,81 +1028,81 @@
 Все файлы (*.*)</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>Файл не существует</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>&lt;b&gt;Файл не найден&lt;/b&gt;&lt;p&gt;Файл &quot;%1&quot; не существует</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>Файл нечитаем</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>&lt;b&gt;Файл нечитаем&lt;/b&gt;&lt;p&gt;Файл &quot;%1&quot; не может быть прочитан</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>Выбран каталог</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>&lt;b&gt;Выбран каталог&lt;/b&gt;&lt;p&gt;Файл &quot;%1&quot; является каталогом</translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="166"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="166"/>
         <source>Non-file selected</source>
         <translation>Выбран не файл</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>&lt;b&gt;Это не файл&lt;/b&gt;&lt;p&gt;Путь &quot;%1&quot; не является файлом</translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="172"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="172"/>
         <source>File is empty</source>
         <translation>Файл пуст</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>&lt;b&gt;Пустой файл&lt;/b&gt;&lt;p&gt;Файл &quot;%1&quot; пуст</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>Файлы сеансов Sonic Visualiser (*.sv)
 Все файлы (*.*)</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>Выберите файл, в который экспортировать</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>Звуковые файлы WAV (*.wav)
 Все файлы (*.*)</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)
@@ -1073,7 +1117,7 @@
 Все файлы (*.*)</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)
@@ -1086,75 +1130,75 @@
 Все файлы (*.*)</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>Файлы Portable Network Graphics (*.png)
 Все файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="318"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="318"/>
         <source>File exists</source>
         <translation>Такой файл уже существует</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>&lt;b&gt;Файл существует&lt;/b&gt;Файл &quot;%1&quot; уже существует.
 Вы хотите перезаписать его?</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>&lt;b&gt;Файл не найден&lt;/b&gt;&lt;p&gt;Не удалось открыть звуковой файл &quot;%1&quot;.
 Вы хотите указать его программе?</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>&lt;b&gt;Файл не найден&lt;/b&gt;&lt;p&gt;Не удалось открыть файл &quot;%1&quot;.
 Вы хотите указать его программе?</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>Не удалось открыть файл</translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="465"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="465"/>
         <source>Locate file...</source>
         <translation>Указать файл...</translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="466"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="466"/>
         <source>Use URL...</source>
         <translation>Использовать URL...</translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="467"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="467"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../../widgets/InteractiveFileFinder.cpp" line="486"/>
+        <location filename="../../svgui/widgets/InteractiveFileFinder.cpp" line="486"/>
         <source>Use URL</source>
         <translation>Использовать URL</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>Укажите URL, который будет использоваться для этого файла:</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>Не удалось открыть местоположение</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>&lt;b&gt;Не удалось открыть местоположение&lt;/b&gt;&lt;p&gt;Не удалось открыть URL &quot;%1&quot;.</translation>
     </message>
@@ -1162,65 +1206,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>Тайминг</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="69"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="69"/>
         <source>Time:</source>
         <translation>Время:</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> выборок</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>с</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> мс</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="100"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="100"/>
         <source>Duration:</source>
         <translation>Длительность:</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="132"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="132"/>
         <source>Properties</source>
         <translation>Свойства</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="145"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="145"/>
         <source>Value:</source>
         <translation>Значение:</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="161"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="161"/>
         <source>Text:</source>
         <translation>Текст:</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="180"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="180"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="181"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="181"/>
         <source>Reset</source>
         <translation>Сбросить</translation>
     </message>
     <message>
-        <location filename="../../widgets/ItemEditDialog.cpp" line="182"/>
+        <location filename="../../svgui/widgets/ItemEditDialog.cpp" line="182"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
@@ -1228,23 +1272,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>&amp;</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>&lt;i&gt;или&lt;/i&gt;&amp;nbsp;&lt;b&gt;%1&lt;/b&gt;</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>&lt;/b&gt;&amp;nbsp;(%1)&lt;b&gt;</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>Справка по использованию клавиатуры и мыши</translation>
     </message>
@@ -1252,17 +1296,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>Установка счётчиков</translation>
     </message>
     <message>
-        <location filename="../../widgets/LabelCounterInputDialog.cpp" line="33"/>
+        <location filename="../../svgui/widgets/LabelCounterInputDialog.cpp" line="33"/>
         <source>Fine counter (beats):</source>
         <translation>Точный счётчик (доли):</translation>
     </message>
     <message>
-        <location filename="../../widgets/LabelCounterInputDialog.cpp" line="36"/>
+        <location filename="../../svgui/widgets/LabelCounterInputDialog.cpp" line="36"/>
         <source>Coarse counter (bars):</source>
         <translation>Грубый счётчик (такты):</translation>
     </message>
@@ -1270,77 +1314,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>Без нумерации</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>Простой счетчик</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>Циклический счетчик</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>Циклический двухуровневый счетчик (такт/доля)</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>Номер выборки звукового сэмпла</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>Время в секундах</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>Длительность до следующей отметки</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>Темп (bpm) на основе длительности до следующей отметки</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>Длительность после предыдущей отметки</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>Темп (bpm) на основе длительности после предыдущей отметки</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>Как и ближайший предыдущий объект</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>%1.%2</translation>
     </message>
     <message>
-        <location filename="../../data/model/Labeller.h" line="157"/>
+        <location filename="../../svcore/data/model/Labeller.h" line="157"/>
         <source>%1</source>
         <translation>%1</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>
@@ -1348,103 +1392,111 @@
 <context>
     <name>Layer</name>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="70"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="70"/>
         <source>Waveform</source>
         <translation>Волновая форма</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>Спектрограмма</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="72"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="72"/>
         <source>Ruler</source>
         <translation>Линейка</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="73"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="73"/>
         <source>Time Instants</source>
         <translation>Отметки времени</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="74"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="74"/>
         <source>Time Values</source>
         <translation>Значения времени</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="75"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="75"/>
         <source>Notes</source>
         <translation>Ноты</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="77"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="77"/>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="79"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="79"/>
         <source>Colour 3D Plot</source>
         <translation>Цветной 3D-график</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="96"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="96"/>
         <source>Layer</source>
         <translation>Слой</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="80"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="80"/>
         <source>Spectrum</source>
         <translation>Спектр</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="78"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="78"/>
         <source>Images</source>
         <translation>Изображения</translation>
     </message>
     <message>
-        <location filename="../../layer/LayerFactory.cpp" line="76"/>
+        <location filename="../../svgui/layer/LayerFactory.cpp" line="76"/>
         <source>Regions</source>
         <translation>Области</translation>
     </message>
+    <message>
+        <location filename="../../svgui/layer/Layer.cpp" line="340"/>
+        <source>Make Measurement</source>
+        <translation type="unfinished">Создать замер</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/layer/Layer.cpp" line="358"/>
+        <source>Delete Measurement</source>
+        <translation type="unfinished">Удалить замер</translation>
+    </message>
 </context>
 <context>
     <name>Layer::AddMeasurementRectCommand</name>
     <message>
-        <location filename="../../layer/Layer.cpp" line="340"/>
         <source>Make Measurement</source>
-        <translation>Создать замер</translation>
+        <translation type="obsolete">Создать замер</translation>
     </message>
 </context>
 <context>
     <name>Layer::DeleteMeasurementRectCommand</name>
     <message>
-        <location filename="../../layer/Layer.cpp" line="358"/>
         <source>Delete Measurement</source>
-        <translation>Удалить замер</translation>
+        <translation type="obsolete">Удалить замер</translation>
     </message>
 </context>
 <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>Сводка по слою</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTreeDialog.cpp" line="40"/>
+        <location filename="../../svgui/widgets/LayerTreeDialog.cpp" line="40"/>
         <source>Audio Data Sources</source>
         <translation>Источники звуковых данных</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTreeDialog.cpp" line="61"/>
+        <location filename="../../svgui/widgets/LayerTreeDialog.cpp" line="61"/>
         <source>Panes and Layers</source>
         <translation>Окна и слои</translation>
     </message>
@@ -1452,22 +1504,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>Слой</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="517"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="517"/>
         <source>Model</source>
         <translation>Модель</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="515"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="515"/>
         <source>Shown</source>
         <translation>Отображение</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="516"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="516"/>
         <source>Played</source>
         <translation>Воспризведение</translation>
     </message>
@@ -1475,27 +1527,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>Объединить все дорожки</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>Объединить все неперкуссионные дорожки</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>Выберите одну или несколько дорожек для импорта</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>&lt;b&gt;Выберите импортируемую дорожку&lt;/b&gt;&lt;p&gt;Вы можете импортировать этот файл лишь как одиночный слой аннотации, но в файле либо больше одной дорожки, либо ноты в более чем одном канале.&lt;p&gt;Выберите одну дорожку или несколько объединяемых дорожек для импорта:</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>Ошибка при импорте файла MIDI</translation>
     </message>
@@ -1503,89 +1555,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>Неправильная длительность больших данных в потоке MIDI (%1, должно быть %2)</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>Неправильная длительность int-данных в потоке MIDI (%1, должно быть %2)</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>Функция getMIDIByte вызвана, но ни один файл MIDI не открыт</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>При чтении обнаружен конец файла MIDI</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>Попытка получить из дорожки больше байтов, чем ожидалось</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>Попытка прочитать файл MIDI после его окончания</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>Функция getMIDIBytes вызвана, но ни один файл MIDI не открыт</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>Попытка получить из дорожки больше байтов, чем ожидалось  (%1, а есть лишь %2)</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>Функция getNumberFromMIDIBytes вызвана, но ни один файл MIDI не открыт</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>Функция skipToNextTrack вызвана, но ни один файл MIDI не открыт</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>Обнаружен некорректный код события %1</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>Ни в одной дорожке файла MIDI &quot;%1&quot; нет нот</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> — использует канал перкуссии GM</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>Дорожка %1 (%2)%3</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>Дорожка %1 (без имени)%3</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>%1 - vel %2</translation>
     </message>
@@ -1593,7 +1645,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>Вход</translation>
     </message>
@@ -1601,7 +1653,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>Декодируется %1...</translation>
     </message>
@@ -1609,980 +1661,981 @@
 <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>Sonic Visualiser</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>С&amp;лой</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="366"/>
+        <location filename="../main/MainWindow.cpp" line="373"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="368"/>
+        <location filename="../main/MainWindow.cpp" line="375"/>
         <source>File Toolbar</source>
         <translation>Панель файлов</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="376"/>
+        <location filename="../main/MainWindow.cpp" line="383"/>
         <source>&amp;New Session</source>
         <translation>&amp;Создать сеанс</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="377"/>
+        <location filename="../main/MainWindow.cpp" line="384"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="385"/>
+        <location filename="../main/MainWindow.cpp" line="392"/>
         <source>&amp;Open Session...</source>
         <translation>&amp;Открыть сеанс...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="386"/>
+        <location filename="../main/MainWindow.cpp" line="393"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</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>Открыть файл сохранённого ранее сеанса Sonic Visualiser</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="395"/>
+        <location filename="../main/MainWindow.cpp" line="402"/>
         <source>&amp;Open...</source>
         <translation>О&amp;ткрыть...</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>Открыть файл сеанса, звуковой файл или слой</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="402"/>
+        <location filename="../main/MainWindow.cpp" line="409"/>
         <source>&amp;Save Session</source>
         <translation>Сохр&amp;анить сеанс</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="403"/>
+        <location filename="../main/MainWindow.cpp" line="410"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</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>Сохранить в файл текущий сеанс Sonic Visualiser</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="413"/>
+        <location filename="../main/MainWindow.cpp" line="420"/>
         <source>Save Session &amp;As...</source>
         <translation>Сохранить сеанс &amp;как...</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>Сохранить текущий сеанс Sonic Visualiser в файл с другим именем</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="423"/>
+        <location filename="../main/MainWindow.cpp" line="430"/>
         <source>&amp;Import Audio File...</source>
         <translation>&amp;Импортировать звуковой файл...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="424"/>
+        <location filename="../main/MainWindow.cpp" line="431"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</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>Импортировать существующий звуковой файл</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="430"/>
+        <location filename="../main/MainWindow.cpp" line="437"/>
         <source>Import Secondary Audio File...</source>
         <translation>Импортировать второй звуковой файл...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="431"/>
+        <location filename="../main/MainWindow.cpp" line="438"/>
         <source>Ctrl+Shift+I</source>
         <translation>Ctrl+Shift+I</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>Импортировать ещё один звуковой файл в отдельный слой</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="438"/>
+        <location filename="../main/MainWindow.cpp" line="445"/>
         <source>&amp;Export Audio File...</source>
         <translation>Э&amp;кспортировать звуковой файл...</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>Экспортировать выделенное в звуковой файл</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="446"/>
+        <location filename="../main/MainWindow.cpp" line="453"/>
         <source>Import Annotation &amp;Layer...</source>
         <translation>И&amp;мпортировать слой аннотаций...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="447"/>
+        <location filename="../main/MainWindow.cpp" line="454"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</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>Импортировать данные слоя из существующего файла</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="454"/>
+        <location filename="../main/MainWindow.cpp" line="461"/>
         <source>Export Annotation Layer...</source>
         <translation>Экспортировать слой аннотаций...</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>Экспортировать данные слоя в файл</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="493"/>
+        <location filename="../main/MainWindow.cpp" line="500"/>
         <source>&amp;Quit</source>
         <translation>В&amp;ыход</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="494"/>
+        <location filename="../main/MainWindow.cpp" line="501"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="506"/>
+        <location filename="../main/MainWindow.cpp" line="513"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="517"/>
+        <location filename="../main/MainWindow.cpp" line="524"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Вырезать</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="518"/>
+        <location filename="../main/MainWindow.cpp" line="525"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="527"/>
+        <location filename="../main/MainWindow.cpp" line="534"/>
         <source>&amp;Copy</source>
         <translation>С&amp;копировать</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="528"/>
+        <location filename="../main/MainWindow.cpp" line="535"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="537"/>
+        <location filename="../main/MainWindow.cpp" line="544"/>
         <source>&amp;Paste</source>
         <translation>Вст&amp;авить</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="538"/>
+        <location filename="../main/MainWindow.cpp" line="545"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="546"/>
-        <location filename="../main/MainWindow.cpp" line="2000"/>
+        <location filename="../main/MainWindow.cpp" line="562"/>
+        <location filename="../main/MainWindow.cpp" line="2039"/>
         <source>&amp;Delete Selected Items</source>
         <translation>&amp;Удалить выбранное</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="547"/>
+        <location filename="../main/MainWindow.cpp" line="563"/>
         <source>Del</source>
         <translation>Del</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="560"/>
+        <location filename="../main/MainWindow.cpp" line="576"/>
         <source>Select &amp;All</source>
         <translation>В&amp;ыделить всё</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="561"/>
+        <location filename="../main/MainWindow.cpp" line="577"/>
         <source>Ctrl+A</source>
         <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="569"/>
+        <location filename="../main/MainWindow.cpp" line="585"/>
         <source>Select &amp;Visible Range</source>
         <translation>Вы&amp;делить всё видимое</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="570"/>
+        <location filename="../main/MainWindow.cpp" line="586"/>
         <source>Ctrl+Shift+A</source>
         <translation>Ctrl+Shift+A</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="577"/>
+        <location filename="../main/MainWindow.cpp" line="593"/>
         <source>Select to &amp;Start</source>
         <translation>Выделить до &amp;начала</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="578"/>
+        <location filename="../main/MainWindow.cpp" line="594"/>
         <source>Shift+Left</source>
         <translation>Shift+Left</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="585"/>
+        <location filename="../main/MainWindow.cpp" line="601"/>
         <source>Select to &amp;End</source>
         <translation>Выделить до &amp;конца</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="586"/>
+        <location filename="../main/MainWindow.cpp" line="602"/>
         <source>Shift+Right</source>
         <translation>Shift+Right</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="593"/>
+        <location filename="../main/MainWindow.cpp" line="609"/>
         <source>C&amp;lear Selection</source>
         <translation>Сн&amp;ять выделение</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="594"/>
+        <location filename="../main/MainWindow.cpp" line="610"/>
         <source>Esc</source>
         <translation>Esc</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>Вставить &amp;отметку в точку воспроизведения</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="607"/>
+        <location filename="../main/MainWindow.cpp" line="623"/>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="703"/>
+        <location filename="../main/MainWindow.cpp" line="719"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="797"/>
+        <location filename="../main/MainWindow.cpp" line="813"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="807"/>
+        <location filename="../main/MainWindow.cpp" line="823"/>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="817"/>
+        <location filename="../main/MainWindow.cpp" line="833"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="705"/>
+        <location filename="../main/MainWindow.cpp" line="721"/>
         <source>Scroll &amp;Left</source>
         <translation>Прокрутить в&amp;лево</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="706"/>
+        <location filename="../main/MainWindow.cpp" line="722"/>
         <source>Left</source>
         <translation>Влево</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>Прокрутить активное окно влево</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="713"/>
+        <location filename="../main/MainWindow.cpp" line="729"/>
         <source>Scroll &amp;Right</source>
         <translation>Прокрутить в&amp;право</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="714"/>
+        <location filename="../main/MainWindow.cpp" line="730"/>
         <source>Right</source>
         <translation>Вправо</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>Прокрутить активное окно вправо</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="722"/>
+        <location filename="../main/MainWindow.cpp" line="738"/>
         <source>Ctrl+Left</source>
         <translation>Ctrl+Влево</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>Сделать большой шаг прокрутки влево</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="730"/>
+        <location filename="../main/MainWindow.cpp" line="746"/>
         <source>Ctrl+Right</source>
         <translation>Ctrl+Вправо</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>Сделать большой шаг прокрутки вправо</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="758"/>
+        <location filename="../main/MainWindow.cpp" line="774"/>
         <source>Zoom &amp;In</source>
         <translation>При&amp;близить</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="759"/>
+        <location filename="../main/MainWindow.cpp" line="775"/>
         <source>Up</source>
         <translation>Вверх</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="760"/>
+        <location filename="../main/MainWindow.cpp" line="776"/>
         <source>Increase the zoom level</source>
         <translation>Увеличить масштаб отображения</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="767"/>
+        <location filename="../main/MainWindow.cpp" line="783"/>
         <source>Zoom &amp;Out</source>
         <translation>&amp;Отдалить</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="768"/>
+        <location filename="../main/MainWindow.cpp" line="784"/>
         <source>Down</source>
         <translation>Вниз</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="769"/>
+        <location filename="../main/MainWindow.cpp" line="785"/>
         <source>Decrease the zoom level</source>
         <translation>Уменьшить масштаб отображения</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="775"/>
+        <location filename="../main/MainWindow.cpp" line="791"/>
         <source>Restore &amp;Default Zoom</source>
         <translation>&amp;Восстановить обычный масштаб</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="782"/>
+        <location filename="../main/MainWindow.cpp" line="798"/>
         <source>Zoom to &amp;Fit</source>
         <translation>&amp;Уместить в окне</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>Увидеть весь файл</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="894"/>
+        <location filename="../main/MainWindow.cpp" line="919"/>
         <source>&amp;Pane</source>
         <translation>&amp;Окно</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="912"/>
+        <location filename="../main/MainWindow.cpp" line="945"/>
         <source>Add &amp;New Pane</source>
         <translation>Добавить &amp;новое окно</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>Добавить новое окно, содержащее только линейку времени</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="940"/>
+        <location filename="../main/MainWindow.cpp" line="973"/>
         <source>Add New %1 Layer</source>
         <translation>Добавить новый слой «%1»</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>Добавить новый пустой слой типа «%1»</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="997"/>
+        <location filename="../main/MainWindow.cpp" line="1030"/>
         <source>Add &amp;Waveform</source>
         <translation>Добавить &amp;волновую форму</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>Добавить новое окно с видом волновой формы</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1002"/>
+        <location filename="../main/MainWindow.cpp" line="1036"/>
         <source>Add a new layer showing a waveform view</source>
         <translation>Добавить новый слой с видом волновой формы</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>Добавить спектограмму &amp;мелодического диапазона</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>Добавить новое окно, отображающее спектрограмму для отслеживания частот</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1036"/>
+        <location filename="../main/MainWindow.cpp" line="1073"/>
         <source>Add a new layer showing a spectrogram set up for tracking frequencies</source>
         <translation>Добавить новый слой, отображающий спектрограмму для отслеживания частот</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1129"/>
+        <location filename="../main/MainWindow.cpp" line="1155"/>
         <source>&amp;All Channels Mixed</source>
         <translation>Все &amp;каналы сведены</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1131"/>
+        <location filename="../main/MainWindow.cpp" line="1157"/>
         <source>&amp;All Channels</source>
         <translation>&amp;Все каналы</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1134"/>
+        <location filename="../main/MainWindow.cpp" line="1160"/>
         <source>Channel &amp;%1</source>
         <translation>Канал &amp;%1</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1198"/>
+        <location filename="../main/MainWindow.cpp" line="1237"/>
         <source>&amp;Delete Pane</source>
         <translation>У&amp;далить окно</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1208"/>
+        <location filename="../main/MainWindow.cpp" line="1247"/>
         <source>Add &amp;Time Ruler</source>
         <translation>Добавить линейку &amp;времени</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>Добавить новый слой с линейкой</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1217"/>
+        <location filename="../main/MainWindow.cpp" line="1256"/>
         <source>Add &amp;Existing Layer</source>
         <translation>Добавить &amp;существующий слой</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1249"/>
+        <location filename="../main/MainWindow.cpp" line="1288"/>
         <source>&amp;Rename Layer...</source>
         <translation>&amp;Переименовать слой...</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>Переименовать активный слой</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1265"/>
+        <location filename="../main/MainWindow.cpp" line="1304"/>
         <source>&amp;Delete Layer</source>
         <translation>&amp;Удалить слой</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>Удалить активный слой</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1523"/>
+        <location filename="../main/MainWindow.cpp" line="1562"/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1531"/>
+        <location filename="../main/MainWindow.cpp" line="1570"/>
         <source>&amp;Help Reference</source>
         <translation>&amp;Руководство пользователя</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>Открыть справку по Sonic Visualiser</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>&amp;Веб-сайт Sonic Visualiser</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>Открыть веб-сайт Sonic Visualiser</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1550"/>
+        <location filename="../main/MainWindow.cpp" line="1589"/>
         <source>&amp;About Sonic Visualiser</source>
         <translation>&amp;О Sonic Visualiser</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>Показать информацию о Sonic Visualiser</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1696"/>
+        <location filename="../main/MainWindow.cpp" line="1735"/>
         <source>Rewind to Start</source>
         <translation>Перемотать в начало</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1697"/>
+        <location filename="../main/MainWindow.cpp" line="1736"/>
         <source>Home</source>
         <translation>Домой</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1698"/>
+        <location filename="../main/MainWindow.cpp" line="1737"/>
         <source>Rewind to the start</source>
         <translation>Перемотать в начало</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>Перемотать назад</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>Перемотать до предыдущей отметки времени в текущем слое</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1715"/>
+        <location filename="../main/MainWindow.cpp" line="1754"/>
         <source>Play / Pause</source>
         <translation>Воспроизвести / Приостановить</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1717"/>
+        <location filename="../main/MainWindow.cpp" line="1756"/>
         <source>Space</source>
         <translation>Пробел</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>Запустить или остановить воспроизведение с текущей позиции</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>Перемотать вперёд</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>Перемотать до следующей отметки времени в текущем слое</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1740"/>
+        <location filename="../main/MainWindow.cpp" line="1779"/>
         <source>Fast Forward to End</source>
         <translation>Перемотать до конца</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1741"/>
+        <location filename="../main/MainWindow.cpp" line="1780"/>
         <source>End</source>
         <translation>Конец</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>Перемотать до конца</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1746"/>
+        <location filename="../main/MainWindow.cpp" line="1785"/>
         <source>Play Mode Toolbar</source>
         <translation>Панель режима воспроизведения</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1749"/>
+        <location filename="../main/MainWindow.cpp" line="1788"/>
         <source>Constrain Playback to Selection</source>
         <translation>Ограничить воспроизведение выделением</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1752"/>
+        <location filename="../main/MainWindow.cpp" line="1791"/>
         <source>s</source>
         <translation>с</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1760"/>
+        <location filename="../main/MainWindow.cpp" line="1799"/>
         <source>Loop Playback</source>
         <translation>Воспроизведение в цикле</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1763"/>
+        <location filename="../main/MainWindow.cpp" line="1802"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1764"/>
+        <location filename="../main/MainWindow.cpp" line="1803"/>
         <source>Loop playback</source>
         <translation>Воспроизведение в цикле</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1862"/>
+        <location filename="../main/MainWindow.cpp" line="1901"/>
         <source>Edit Toolbar</source>
         <translation>Панель правки</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1867"/>
+        <location filename="../main/MainWindow.cpp" line="1906"/>
         <source>Tools Toolbar</source>
         <translation>Панель инструментов</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>Перемещение</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1874"/>
+        <location filename="../main/MainWindow.cpp" line="1913"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1882"/>
+        <location filename="../main/MainWindow.cpp" line="1921"/>
         <source>Select</source>
         <translation>Выделение</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1884"/>
+        <location filename="../main/MainWindow.cpp" line="1923"/>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1892"/>
+        <location filename="../main/MainWindow.cpp" line="1931"/>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1894"/>
+        <location filename="../main/MainWindow.cpp" line="1933"/>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1903"/>
+        <location filename="../main/MainWindow.cpp" line="1942"/>
         <source>Draw</source>
         <translation>Рисование</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1905"/>
+        <location filename="../main/MainWindow.cpp" line="1944"/>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2028"/>
+        <location filename="../main/MainWindow.cpp" line="2067"/>
         <source>No audio file loaded.</source>
         <translation>Ни один звуковой файл не загружен.</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2039"/>
+        <location filename="../main/MainWindow.cpp" line="2078"/>
         <source>%1Hz (resampling to %2Hz)</source>
         <translation>%1 Гц (ресэмплирование до %2 Гц)</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>Не удалось открыть файл</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>Экспортировать только выделенную область</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>Экспортировать весь звуковой файл</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>Выделите область для экспорта</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>Какую область исходного звукового файла вы хотите экспортировать?</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>Экспортировать выделенные области в один звуковой файл</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>Экспортировать выделенные области в разные звуковые файлы</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>Выбрано несколько областей исходного звукового файла.
 Какую из них вы хотите экспортировать?</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>Файл фрагмента %1 уже существует, прерывание</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>Не удалось записать файл</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>Не удалось открыть файл %1 для записи</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2962"/>
+        <location filename="../main/MainWindow.cpp" line="3001"/>
         <source>Sonic Visualiser: %1</source>
         <translation>Sonic Visualiser: %1</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2874"/>
+        <location filename="../main/MainWindow.cpp" line="2913"/>
         <source>Session modified</source>
         <translation>Сеанс изменен</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>Не удалось сохранить файл</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3296"/>
+        <location filename="../main/MainWindow.cpp" line="3360"/>
         <source>Rename Layer</source>
         <translation>Переименовать слой</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>Новое имя этого слоя:</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3510"/>
+        <location filename="../main/MainWindow.cpp" line="3601"/>
         <source>Sample rate mismatch</source>
         <translation>Несоответствие частоты дискретизации</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>Не удалось повторно создать слой</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3861"/>
+        <location filename="../main/MainWindow.cpp" line="3952"/>
         <source>http://www.sonicvisualiser.org/</source>
         <translation>http://www.sonicvisualiser.org/</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3881"/>
+        <location filename="../main/MainWindow.cpp" line="3972"/>
         <source>Release %1 : Revision %2</source>
         <translation>Версия %1 : Редакция %2</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3883"/>
+        <location filename="../main/MainWindow.cpp" line="3974"/>
         <source>Release %1</source>
         <translation>Версия %1</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3887"/>
+        <location filename="../main/MainWindow.cpp" line="3978"/>
         <source>Unreleased : Revision %1</source>
         <translation>Не выпущено : редакция %1</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>&lt;h3&gt;О программе Sonic Visualiser&lt;/h3&gt;</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3897"/>
+        <location filename="../main/MainWindow.cpp" line="3988"/>
         <source>Debug</source>
         <translation>Отладка</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3897"/>
+        <location filename="../main/MainWindow.cpp" line="3988"/>
         <source>Release</source>
         <translation>Версия</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>&lt;br&gt;С декодером Ogg (oggz v%1, fishsound v%2) &amp;copy; CSIRO Australia</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>&lt;br&gt;С поддержкой расширений LADSPA (API v%1) &amp;copy; Richard Furse, Paul Davis, Stefan Westerfeld</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>&lt;br&gt;С поддержкой расширений DSSI (API v%1) &amp;copy; Chris Cannam, Steve Harris, Sean Bolton</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4014"/>
+        <location filename="../main/MainWindow.cpp" line="4105"/>
         <source>About Sonic Visualiser</source>
         <translation>О программе Sonic Visualiser</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>Не удалось создать слой</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="487"/>
+        <location filename="../main/MainWindow.cpp" line="494"/>
         <source>Adjust the application preferences</source>
         <translation>Изменить параметры работы приложения</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="479"/>
+        <location filename="../main/MainWindow.cpp" line="486"/>
         <source>&amp;Recent Files</source>
         <translation>Н&amp;едавние файлы</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="486"/>
+        <location filename="../main/MainWindow.cpp" line="493"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Параметры...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="615"/>
+        <location filename="../main/MainWindow.cpp" line="631"/>
         <source>;</source>
         <translation>;</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="838"/>
+        <location filename="../main/MainWindow.cpp" line="863"/>
         <source>Show &amp;Zoom Wheels</source>
         <translation>Показывать &amp;колёса масштабирования</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="839"/>
+        <location filename="../main/MainWindow.cpp" line="864"/>
         <source>Z</source>
         <translation>Z</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>Показывать колёса для масштабирования по горизонтали и вертикали</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1321"/>
+        <location filename="../main/MainWindow.cpp" line="1360"/>
         <source>%1 by Category</source>
         <translation>%1 по категории</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>Неклассифицированные</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1375"/>
+        <location filename="../main/MainWindow.cpp" line="1414"/>
         <source>%1 by Maker</source>
         <translation>%1 по имени создателя</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>Неизвестен</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1367"/>
+        <location filename="../main/MainWindow.cpp" line="1406"/>
         <source>%1 by Plugin Name</source>
         <translation>%1 по названию расширения</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>%1...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1042"/>
+        <location filename="../main/MainWindow.cpp" line="1079"/>
         <source>Add Spectr&amp;um</source>
         <translation>Добавить &amp;график спектральной функции</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>Добавить новое окно с частотой спектра</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1047"/>
+        <location filename="../main/MainWindow.cpp" line="1085"/>
         <source>Add a new layer showing a frequency spectrum</source>
         <translation>Добавить новый слой с частотой спектра</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="234"/>
+        <location filename="../main/MainWindow.cpp" line="236"/>
         <source>Playback Speedup</source>
         <translation>Ускорение воспроизведения</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>Пр&amp;еобразования</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1138"/>
+        <location filename="../main/MainWindow.cpp" line="1164"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1304"/>
+        <location filename="../main/MainWindow.cpp" line="1343"/>
         <source>&amp;Recent Transforms</source>
         <translation>&amp;Недавние преобразования</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> [\(&lt;].*$</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>Перегрузка в обработке звука</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>Показывать панели с&amp;войств</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="848"/>
+        <location filename="../main/MainWindow.cpp" line="873"/>
         <source>X</source>
         <translation>X</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>Показывать панели свойств слоёв сбоку от основного окна</translation>
     </message>
@@ -2592,1294 +2645,1347 @@
         <translation>Добавить окно %1</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>Отказаться от текущего сеанса Sonic Visualiser и начать новый</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="470"/>
+        <location filename="../main/MainWindow.cpp" line="477"/>
         <source>Open Lo&amp;cation...</source>
         <translation>Открыть &amp;местоположение...</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="471"/>
+        <location filename="../main/MainWindow.cpp" line="478"/>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</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>Открыть или импортировать файл с удалённого узла</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="495"/>
+        <location filename="../main/MainWindow.cpp" line="502"/>
         <source>Exit Sonic Visualiser</source>
         <translation>Завершить работу с Sonic Visualiser</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>Вырезать выделение из активного слоя в буфер обмена</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>Скопировать выделение из активного слоя в буфер обмена</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>Вставить содержимое буфера обмена в активный слой</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>Выбрать данные по всей длительности активнонр сеанса</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>Сделать временной диапазон равным активной ширине окна</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>Выделить от начала сеанса до текущей точки воспроизведения</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>Выделить от текущей точки воспроизведения до конца сеанса</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="595"/>
+        <location filename="../main/MainWindow.cpp" line="611"/>
         <source>Clear the selection</source>
         <translation>Очистить выделение</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>Вставить новую отметку времени в точку воспроизведения, при необходимости — в новый слой</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>Вставить отметки времени по &amp;краям выделения</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="621"/>
+        <location filename="../main/MainWindow.cpp" line="637"/>
         <source>Shift+Enter</source>
         <translation>Shift+Enter</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="721"/>
+        <location filename="../main/MainWindow.cpp" line="737"/>
         <source>&amp;Jump Left</source>
         <translation>Перескочить в&amp;лево</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="729"/>
+        <location filename="../main/MainWindow.cpp" line="745"/>
         <source>J&amp;ump Right</source>
         <translation>П&amp;ерескочить вправо</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>Восстановить обычный масштаб отображения</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="796"/>
+        <location filename="../main/MainWindow.cpp" line="812"/>
         <source>Show &amp;No Overlays</source>
         <translation>Не по&amp;казывать перекрытия совсем</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>Спрятать индикацию центра, времён выделения, имена слоёв и масштаб</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="806"/>
+        <location filename="../main/MainWindow.cpp" line="822"/>
         <source>Show &amp;Minimal Overlays</source>
         <translation>Показывать &amp;минимум перекрытий</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="808"/>
+        <location filename="../main/MainWindow.cpp" line="824"/>
         <source>Show centre indicator only</source>
         <translation>Показывать только индикатор центра</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="816"/>
+        <location filename="../main/MainWindow.cpp" line="832"/>
         <source>Show &amp;Standard Overlays</source>
         <translation>Показывать о&amp;бычные перекрытия</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>Показывать индикатор центра, времена выделений, имена слоёв и масштаб</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="826"/>
+        <location filename="../main/MainWindow.cpp" line="842"/>
         <source>Show &amp;All Overlays</source>
         <translation>Показывать в&amp;се перекрытия</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="827"/>
+        <location filename="../main/MainWindow.cpp" line="843"/>
         <source>7</source>
         <translation>7</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>Показывать весь текст и масштаб</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="856"/>
+        <location filename="../main/MainWindow.cpp" line="881"/>
         <source>Show Status &amp;Bar</source>
         <translation>Показывать статусную &amp;строку</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>Показывать контекстную справку в статусной строке, находящейся внизу окна программы</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>Добавить новое окно с отображением спектрограммы</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1014"/>
+        <location filename="../main/MainWindow.cpp" line="1049"/>
         <source>Add a new layer showing a spectrogram</source>
         <translation>Добавить новый слой с отображением спектрограммы</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>Добавить новое окно, отображающее спектрограмму для обзора высоты тона нот</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1025"/>
+        <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>Добавить новый слой, отображающий спектрограмму для обзора высоты тона нот</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>Удалить активное окно</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>Добавить &amp;фрагмент слоя</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1885"/>
+        <location filename="../main/MainWindow.cpp" line="1924"/>
         <source>Select ranges</source>
         <translation>Выбрать диапазон</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1895"/>
+        <location filename="../main/MainWindow.cpp" line="1934"/>
         <source>Edit items in layer</source>
         <translation>Изменить объекты слоя</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>Нарисовать новые объекты в слое</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2652"/>
+        <location filename="../main/MainWindow.cpp" line="2691"/>
         <source>Open Location</source>
         <translation>Открыть местоположение</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>Введите URL открываемого местоположения:</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>Не удалось открыть местоположение</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>Видимая область: от %1 до %2 (длительность %3)</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>Изменить общую громкость воспроизведения</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>Изменить общую скорость воспроизведения</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>&lt;br&gt;С декодером Ogg &amp;copy; CSIRO Australia</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>&lt;br&gt;С декодером MAD mp3 &amp;copy; Underbit Technologies Inc</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>&lt;br&gt;С libsamplerate &amp;copy; Erik de Castro Lopo</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>&lt;br&gt;С libsndfile &amp;copy; Erik de Castro Lopo</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>&lt;br&gt;С FFTW3 &amp;copy; Matteo Frigo и MIT</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>&lt;br&gt;С поддержкой расширений Vamp (API v%1, host SDK v%2) &amp;copy; Chris Cannam</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>&lt;br&gt;С liblo Lite OSC library &amp;copy; Steve Harris</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="462"/>
+        <location filename="../main/MainWindow.cpp" line="469"/>
         <source>Export Image File...</source>
         <translation>Экспортировать в файл изображения...</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>Экспортировать всё окно в файл изображения</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>Экспортировать всё окно (%1x%2 пикселов)</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>Экспортировать только видимую часть (%1x%2 пикселов)</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>Экспортировать выделение (%1x%2 пикселов)</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2463"/>
+        <location filename="../main/MainWindow.cpp" line="2502"/>
         <source>Export the selection extent</source>
         <translation>Экспортировать выделение</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>Какую область текущего окна вы хотите экспортировать как изображение?</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>Примечание: всё окно слишком широко, чтобы сохранить его как изображение.</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>Не удалось сохранить файл изображения</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>Не удалось сохранить файл изображения %1</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>Выделение: %1 до %2 (длительность %3)</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="170"/>
+        <location filename="../main/MainWindow.cpp" line="172"/>
         <source>Black</source>
         <translation>Чёрный</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="171"/>
+        <location filename="../main/MainWindow.cpp" line="173"/>
         <source>Red</source>
         <translation>Красный</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="172"/>
+        <location filename="../main/MainWindow.cpp" line="174"/>
         <source>Blue</source>
         <translation>Синий</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>Зелёный</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="174"/>
+        <location filename="../main/MainWindow.cpp" line="176"/>
         <source>Purple</source>
         <translation>Пурпурный</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="175"/>
+        <location filename="../main/MainWindow.cpp" line="177"/>
         <source>Orange</source>
         <translation>Оранжевый</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="176"/>
+        <location filename="../main/MainWindow.cpp" line="178"/>
         <source>White</source>
         <translation>Белый</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="177"/>
+        <location filename="../main/MainWindow.cpp" line="179"/>
         <source>Bright Red</source>
         <translation>Ярко-красный</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="178"/>
+        <location filename="../main/MainWindow.cpp" line="180"/>
         <source>Bright Blue</source>
         <translation>Ярко-синий</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>Ярко-зелёный</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="180"/>
+        <location filename="../main/MainWindow.cpp" line="182"/>
         <source>Bright Purple</source>
         <translation>Ярко-пурпурный</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="181"/>
+        <location filename="../main/MainWindow.cpp" line="183"/>
         <source>Bright Orange</source>
         <translation>Ярко-оранжевый</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="370"/>
+        <location filename="../main/MainWindow.cpp" line="377"/>
         <source>File and Session Management</source>
         <translation>Файлы и управление сеансами</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="510"/>
+        <location filename="../main/MainWindow.cpp" line="517"/>
         <source>Editing</source>
         <translation>Редактирование</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="548"/>
-        <location filename="../main/MainWindow.cpp" line="2001"/>
+        <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="564"/>
+        <location filename="../main/MainWindow.cpp" line="2040"/>
         <source>Delete items in current selection from the current layer</source>
         <translation>Удалить объекты в активном выделении текущего слоя</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="558"/>
+        <location filename="../main/MainWindow.cpp" line="574"/>
         <source>Selection</source>
         <translation>Выделение</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="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="638"/>
+        <location filename="../main/MainWindow.cpp" line="654"/>
         <source>Number New Instants with</source>
         <translation>Способ нумерации новых отметок</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="658"/>
+        <location filename="../main/MainWindow.cpp" line="674"/>
         <source>Cycle size</source>
         <translation>Размер цикла</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="679"/>
+        <location filename="../main/MainWindow.cpp" line="695"/>
         <source>Set Numbering Counters...</source>
         <translation>Установить счетчики нумерации...</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>Устанолвить счетчики для меток на основе подсчета</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="684"/>
+        <location filename="../main/MainWindow.cpp" line="700"/>
         <source>Renumber Selected Instants</source>
         <translation>Перенумеровать выбранные отметки</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>Прокрутка и перемещение</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="755"/>
+        <location filename="../main/MainWindow.cpp" line="771"/>
         <source>Zoom</source>
         <translation>Масштаб просмотра</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="783"/>
+        <location filename="../main/MainWindow.cpp" line="799"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="792"/>
+        <location filename="../main/MainWindow.cpp" line="808"/>
         <source>Display Features</source>
         <translation>Отображение элементов</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="874"/>
+        <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="899"/>
         <source>Show La&amp;yer Summary</source>
         <translation>&amp;Показать сводку по слою</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="875"/>
+        <location filename="../main/MainWindow.cpp" line="900"/>
         <source>Y</source>
         <translation>Y</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>Открыть окно, в котором отобразится иерархия окон и слоев активного сеанса</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="910"/>
+        <location filename="../main/MainWindow.cpp" line="943"/>
         <source>Managing Panes and Layers</source>
         <translation>Управление окнами и слоями</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="913"/>
+        <location filename="../main/MainWindow.cpp" line="946"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="947"/>
+        <location filename="../main/MainWindow.cpp" line="980"/>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="999"/>
+        <location filename="../main/MainWindow.cpp" line="1032"/>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1009"/>
+        <location filename="../main/MainWindow.cpp" line="1035"/>
+        <source>Shift+W</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="1043"/>
         <source>Add Spectro&amp;gram</source>
         <translation>Добавить &amp;спектограмму</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1011"/>
+        <location filename="../main/MainWindow.cpp" line="1045"/>
         <source>G</source>
         <translation>G</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1022"/>
+        <location filename="../main/MainWindow.cpp" line="1048"/>
+        <source>Shift+G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="1057"/>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1031"/>
+        <location filename="../main/MainWindow.cpp" line="1060"/>
+        <source>Shift+M</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="1067"/>
         <source>Add Pea&amp;k Frequency Spectrogram</source>
         <translation>Добавить спектограмму &amp;пиковой частоты</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1033"/>
+        <location filename="../main/MainWindow.cpp" line="1069"/>
         <source>K</source>
         <translation>K</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1044"/>
+        <location filename="../main/MainWindow.cpp" line="1072"/>
+        <source>Shift+K</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="1081"/>
         <source>U</source>
         <translation>U</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1180"/>
+        <location filename="../main/MainWindow.cpp" line="1084"/>
+        <source>Shift+U</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="1219"/>
         <source>Switch to Previous Pane</source>
         <translation>Перейти к предыдущему окну</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1181"/>
+        <location filename="../main/MainWindow.cpp" line="1220"/>
         <source>[</source>
         <translation>[</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>Перейти к следующему окну</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1189"/>
+        <location filename="../main/MainWindow.cpp" line="1228"/>
         <source>]</source>
         <translation>]</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="1199"/>
+        <location filename="../main/MainWindow.cpp" line="1238"/>
         <source>Ctrl+Shift+D</source>
         <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1250"/>
+        <location filename="../main/MainWindow.cpp" line="1289"/>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1257"/>
+        <location filename="../main/MainWindow.cpp" line="1296"/>
         <source>Edit Layer Data</source>
         <translation>Изменить данные слоя</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1258"/>
+        <location filename="../main/MainWindow.cpp" line="1297"/>
         <source>E</source>
         <translation>E</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>Изменить активный слой как сетку данных</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1266"/>
+        <location filename="../main/MainWindow.cpp" line="1305"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1526"/>
+        <location filename="../main/MainWindow.cpp" line="1565"/>
         <source>Help</source>
         <translation>Справка</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1532"/>
+        <location filename="../main/MainWindow.cpp" line="1571"/>
         <source>F1</source>
         <translation>F1</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>&amp;Использование клавиатуры и мыши</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1539"/>
+        <location filename="../main/MainWindow.cpp" line="1578"/>
         <source>F2</source>
         <translation>F2</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>Открыть окно, в котором перечисляются клавиатурные комбинации Sonic Visualiser</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1565"/>
+        <location filename="../main/MainWindow.cpp" line="1604"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1567"/>
+        <location filename="../main/MainWindow.cpp" line="1606"/>
         <source>Re-open</source>
         <translation>Повторно открыть</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>Повторно открыть активный или недавно открывавшийся файл</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1590"/>
+        <location filename="../main/MainWindow.cpp" line="1629"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1592"/>
+        <location filename="../main/MainWindow.cpp" line="1631"/>
         <source>Repeat Transform</source>
         <translation>Повторить преобразование</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>Повторно запустить самое последнее выполнявшееся преобразование</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1684"/>
+        <location filename="../main/MainWindow.cpp" line="1723"/>
         <source>Playback and Transport Controls</source>
         <translation>Управление воспроизведением и перемоткой</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1688"/>
+        <location filename="../main/MainWindow.cpp" line="1727"/>
         <source>Play&amp;back</source>
         <translation>Воспро&amp;изведение</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1691"/>
+        <location filename="../main/MainWindow.cpp" line="1730"/>
         <source>Playback</source>
         <translation>Воспроизведение</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1693"/>
+        <location filename="../main/MainWindow.cpp" line="1732"/>
         <source>Playback Toolbar</source>
         <translation>Панель воспроизведения</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1703"/>
+        <location filename="../main/MainWindow.cpp" line="1742"/>
         <source>PgUp</source>
         <translation>PgUp</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="1728"/>
+        <location filename="../main/MainWindow.cpp" line="1767"/>
         <source>PgDown</source>
         <translation>PgDown</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="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="1771"/>
+        <location filename="../main/MainWindow.cpp" line="1810"/>
         <source>Solo Current Pane</source>
         <translation>Соло активного окна</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1775"/>
+        <location filename="../main/MainWindow.cpp" line="1814"/>
         <source>o</source>
         <translation>o</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>При воспроизведении звучит лишь активное окно</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1785"/>
+        <location filename="../main/MainWindow.cpp" line="1824"/>
         <source>Align File Timelines</source>
         <translation>Выровнять линейки времени</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>Ускорить</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1837"/>
+        <location filename="../main/MainWindow.cpp" line="1876"/>
         <source>Ctrl+PgUp</source>
         <translation>Ctrl+PgUp</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>Сжать время воспроизведения, не меняя высоту тона</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1842"/>
+        <location filename="../main/MainWindow.cpp" line="1881"/>
         <source>Slow Down</source>
         <translation>Замедлить</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1843"/>
+        <location filename="../main/MainWindow.cpp" line="1882"/>
         <source>Ctrl+PgDown</source>
         <translation>Ctrl+PgDown</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>Расширить время воспроизведения, не меняя высоту тона</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1848"/>
+        <location filename="../main/MainWindow.cpp" line="1887"/>
         <source>Restore Normal Speed</source>
         <translation>Восстановить обычную скорость</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1849"/>
+        <location filename="../main/MainWindow.cpp" line="1888"/>
         <source>Ctrl+Home</source>
         <translation>Ctrl+Home</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>Восстановить естественную скорость воспроизведения</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1865"/>
+        <location filename="../main/MainWindow.cpp" line="1904"/>
         <source>Tool Selection</source>
         <translation>Выбор инструмента</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1914"/>
+        <location filename="../main/MainWindow.cpp" line="1953"/>
         <source>Erase</source>
         <translation>Стерка</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1916"/>
+        <location filename="../main/MainWindow.cpp" line="1955"/>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1917"/>
+        <location filename="../main/MainWindow.cpp" line="1956"/>
         <source>Erase items from layer</source>
         <translation>Стирать объекты слоя</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1924"/>
+        <location filename="../main/MainWindow.cpp" line="1963"/>
         <source>Measure</source>
         <translation>Измеритель</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1926"/>
+        <location filename="../main/MainWindow.cpp" line="1965"/>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1927"/>
+        <location filename="../main/MainWindow.cpp" line="1966"/>
         <source>Make measurements in layer</source>
         <translation>Выполнять измерения в слое</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1996"/>
+        <location filename="../main/MainWindow.cpp" line="2035"/>
         <source>&amp;Delete Current Measurement</source>
         <translation>&amp;Удалить активный замер</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>Удалить замер, находящийся под курсором мыши</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="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="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>Быстрый вперед</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>&lt;b&gt;Не удалось открыть файл&lt;/b&gt;&lt;p&gt;Не удалось открыть звуковой файл &quot;%1&quot;</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>&lt;b&gt;Не удалось открыть файл&lt;/b&gt;&lt;p&gt;Не удалось открыть файл слоя &quot;%1&quot;</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>Невозможно экспортировать ненотные слои в MIDI</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>&lt;b&gt;Не удалось открыть файл&lt;/b&gt;&lt;p&gt;Не удалось открыть файл сеанса &quot;%1&quot;</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>&lt;b&gt;Не удалось открыть файл&lt;/b&gt;&lt;p&gt;Не удалось открыть файл &quot;%1&quot;</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>&lt;b&gt;Не удалось открыть ссылку&lt;/b&gt;&lt;p&gt;Не удалось открыть URL &quot;%1&quot;</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>&lt;b&gt;Не удалось открыть ссылку&lt;/b&gt;&lt;p&gt;Не удалось открыть файл или URL &quot;%1&quot;</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>Не удалось открыть URL, перемещенный мышью в окно программы</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>&lt;b&gt;Не удалось открыть ссылку&lt;/b&gt;&lt;p&gt;Не удалось открыть файл URL &quot;%1&quot;, перетащенный в окно программы мышью</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>&lt;b&gt;Сеанс изменился&lt;/b&gt;&lt;p&gt;Активный сеанс изменился&lt;br&gt;Вы хотите сохранить его?</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>&lt;b&gt;Не удалось сохранить файл&lt;/b&gt;&lt;p&gt;Не удалось сохранить файл сеанса &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3388"/>
+        <location filename="../main/MainWindow.cpp" line="3452"/>
         <source>Playback speed: Normal</source>
         <translation>Скорость воспроизведения: обычная</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3390"/>
+        <location filename="../main/MainWindow.cpp" line="3454"/>
         <source>Playback speed: %1%2%</source>
         <translation>Скорость воспроизведения: %1%2%</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="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="3704"/>
+        <location filename="../main/MainWindow.cpp" line="3795"/>
         <source>Reset Counters</source>
         <translation>Обнуление счетчиков</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>Предупреждение</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>Не удалось рассчитать выравнивание</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="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>&lt;br&gt;С библиотекой JACK &amp;copy; Paul Davis и Jack O&apos;Quin</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>&lt;br&gt;С библиотекой PortAudio &amp;copy; Ross Bencina и Phil Burk</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>&lt;br&gt;С библиотекой PulseAudio &amp;copy; Lennart Poettering и Pierre Ossman</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="3959"/>
+        <location filename="../main/MainWindow.cpp" line="4050"/>
         <source>&lt;br&gt;With Rubber Band &amp;copy; Chris Cannam</source>
         <translation>&lt;br&gt;С Rubber Band &amp;copy; Chris Cannam</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1508"/>
+        <location filename="../main/MainWindow.cpp" line="1547"/>
         <source>Find a Transform...</source>
         <translation>Найти эффект трансформации...</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>Найти эффект трансформации среди установленных расширений по названию или описанию</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1510"/>
+        <location filename="../main/MainWindow.cpp" line="1549"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</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>&lt;p&gt;Sonic Visualiser — программа для просмотра и исследования звукозаписей с целью семантического анализа и аннотации музыки.&lt;br&gt;&lt;a href=&quot;http://www.sonicvisualiser.org/&quot;&gt;http://www.sonicvisualiser.org/&lt;/a&gt;&lt;/p&gt;</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="3901"/>
+        <location filename="../main/MainWindow.cpp" line="3992"/>
         <source>With Qt v%1 &amp;copy; Nokia Corporation</source>
         <translation>С использованием Qt v%1 &amp;copy; Nokia Corporation</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>&lt;br&gt;С библиотекой JACK v%1 &amp;copy; Paul Davis и Jack O&apos;Quin</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>&lt;br&gt;С библиотекой PulseAudio v%1 &amp;copy; Lennart Poettering и Pierre Ossman</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>&lt;br&gt;С декодером mp3 MAD v%1 &amp;copy; Underbit Technologies Inc</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>&lt;br&gt;С libsamplerate v%1 &amp;copy; Erik de Castro Lopo</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>&lt;br&gt;С libsndfile v%1 &amp;copy; Erik de Castro Lopo</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>&lt;br&gt;С FFTW3 v%1 &amp;copy; Matteo Frigo и MIT</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>&lt;br&gt;С Rubber Band v%1 &amp;copy; Chris Cannam</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>&lt;br&gt;С парсером RDF Raptor v%1 &amp;copy; Dave Beckett и Бристольский университет</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>&lt;br&gt;С парсером RDF Raptor &amp;copy; Dave Beckett и Бристольский университет</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>&lt;br&gt;С движком запросов RDF  Rasqal v%1 &amp;copy; Dave Beckett и Бристольский университет</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>&lt;br&gt;С движком запросов RDF  Rasqal &amp;copy; Dave Beckett и Бристольский университет</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>&lt;br&gt;C хранилищем данных RDF Redland v%1 &amp;copy; Dave Beckett и Бристольский университет</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>&lt;br&gt;C хранилищем данных RDF Redland &amp;copy; Dave Beckett и Бристольский университет</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>&lt;br&gt;С библиотекой OSC liblo v%1 &amp;copy; Steve Harris</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>С</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4002"/>
+        <location filename="../main/MainWindow.cpp" line="4093"/>
         <source>Using </source>
         <translation>Используя</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="737"/>
+        <location filename="../main/MainWindow.cpp" line="753"/>
         <source>Peek Left</source>
         <translation>Глянуть влево</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="738"/>
+        <location filename="../main/MainWindow.cpp" line="754"/>
         <source>Alt+Left</source>
         <translation>Alt+влево</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>Глянуть вправо</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="746"/>
+        <location filename="../main/MainWindow.cpp" line="762"/>
         <source>Alt+Right</source>
         <translation>Alt+вправо</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="881"/>
+        <location filename="../main/MainWindow.cpp" line="906"/>
         <source>Show Acti&amp;vity Log</source>
         <translation>Показать &amp;журнал действий</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>Открыть окно со списком всех действий в сеансе</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2288"/>
+        <location filename="../main/MainWindow.cpp" line="2327"/>
         <source>Export multiple audio files</source>
         <translation>Экспортировать несколько звуковых файлов </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>Экспорт звука в &quot;%1&quot;</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="2420"/>
+        <location filename="../main/MainWindow.cpp" line="2459"/>
         <source>Export layer to &quot;%1&quot;</source>
         <translation>Экспорт слоя в &quot;%1&quot;</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>Экспорт изображения в &quot;%1&quot;</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>Добавить эти данные в активный сеанс</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="2913"/>
+        <location filename="../main/MainWindow.cpp" line="2952"/>
         <source>Select target for import</source>
         <translation>Выбрать цель для импорта</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>&lt;b&gt;Выберите цель импорта&lt;/b&gt;&lt;p&gt;Этот документ RDF ссылается на один или более звуковых файлов.&lt;br&gt;У вас уже есть один загруженный звуковой файл.&lt;br&gt;Что вы хотите сделать с новыми данными?</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>Сохранение сеанса как &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="3603"/>
+        <location filename="../main/MainWindow.cpp" line="3694"/>
         <source>Add Point</source>
         <translation>Добавить точку</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>http://www.sonicvisualiser.org/doc/reference/%1/en/</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>&lt;br&gt;С RtMidi &amp;copy; Gary P. Scavone</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="414"/>
+        <location filename="../main/MainWindow.cpp" line="421"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="628"/>
+        <location filename="../main/MainWindow.cpp" line="644"/>
         <source>Insert Item at Selection</source>
         <translation>Вставить объект в выделение</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="629"/>
+        <location filename="../main/MainWindow.cpp" line="645"/>
         <source>Ctrl+Shift+Enter</source>
         <translation>Ctrl+Shift+Enter</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="1708"/>
+        <location filename="../main/MainWindow.cpp" line="1747"/>
         <source>Rewind to Similar Point</source>
         <translation>Назад к первой схожей точке</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1709"/>
+        <location filename="../main/MainWindow.cpp" line="1748"/>
         <source>Shift+PgUp</source>
         <translation>Shift+PgUp</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="1733"/>
+        <location filename="../main/MainWindow.cpp" line="1772"/>
         <source>Fast Forward to Similar Point</source>
         <translation>Вперед к первой схожей точке</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="1734"/>
+        <location filename="../main/MainWindow.cpp" line="1773"/>
         <source>Shift+PgDown</source>
         <translation>Shift+PgDown</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="2161"/>
         <source>1. %2</source>
-        <translation>1. %2</translation>
-    </message>
-    <message>
-        <location filename="../main/MainWindow.cpp" line="2168"/>
+        <translation type="obsolete">1. %2</translation>
+    </message>
+    <message>
         <source>%1. %2</source>
-        <translation>%1. %2</translation>
-    </message>
-    <message>
-        <location filename="../main/MainWindow.cpp" line="2181"/>
+        <translation type="obsolete">%1. %2</translation>
+    </message>
+    <message>
+        <location filename="../main/MainWindow.cpp" line="2220"/>
         <source>Select audio file to export</source>
         <translation>Укажите экспортируемый звуковой файл</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>Какой звуковой файл вы хотите экспортировать?</translation>
     </message>
     <message>
-        <location filename="../main/MainWindow.cpp" line="4030"/>
+        <location filename="../main/MainWindow.cpp" line="4121"/>
         <source>Newer version available</source>
         <translation>Доступна более новая версия</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>&lt;h3&gt;Доступна более новая версия&lt;/h3&gt;&lt;p&gt;Вы используетее Sonic Visualiser версии %1, но уже доступна версия %3.&lt;/p&gt;&lt;p&gt;Загляните на &lt;a href=&quot;http://sonicvisualiser.org/&quot;&gt;сайт Sonic Visualiser&lt;/a&gt; за подробностями.&lt;/p&gt;</translation>
     </message>
@@ -3887,184 +3993,194 @@
 <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>%1 (изменен)</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="447"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="447"/>
         <source> (modified)</source>
         <translation> (изменен)</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="639"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="645"/>
         <source>Cut</source>
         <translation>Вырезать</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="686"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="716"/>
         <source>Paste</source>
         <translation>Вставить</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>Добавить точку</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>Добавить точку по отметке %1 с</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>Открывается файл или URL...</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>Заменить существующую основную волновую форму</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>Загрузить этот файл в новое окно волновой формы</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>Выбрать цель для импорта</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>%1: %2</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1150"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1191"/>
         <source>%1: %2 [%3]</source>
         <translation>%1: %2 [%3]</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>Импортировать &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1260"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1301"/>
         <source>Opening playlist...</source>
         <translation>Открывается список воспроизведения...</translation>
     </message>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="1464"/>
+        <location filename="../../svapp/framework/MainWindowBase.cpp" line="1506"/>
         <source>Opening session...</source>
         <translation>Открывается сеанс...</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>Ошибка чтения XML-файла SV:
 %1</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="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>Не удалось открыть звуковое устройство</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>Не удалось записать файл</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>&lt;b&gt;Не удалось сохранить&lt;/b&gt;&lt;p&gt;Не удалось записать файл &quot;%1&quot;: %2</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>Удалить окно</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>Воспроизводится: %1 из %2 (осталось %3)</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>&lt;b&gt;Беззвучный режим&lt;/b&gt;&lt;p&gt;Не удалось открыть звуковое устройство для воспроизведения.&lt;p&gt;Не удалось автоматически определить звуковое устройство. На этот раз придется обойтись без воспроизведения звука.&lt;/p&gt;</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>&lt;b&gt;Беззвучный режим&lt;/b&gt;&lt;p&gt;Не удалось открыть предпочитаемое звуковое устройство («%1»).&lt;p&gt;На этот раз придется обойтись без воспроизведения звука.&lt;/p&gt;</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>Выполняется импорт из RDF...</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>&lt;b&gt;Выберите цель импорта&lt;/b&gt;&lt;p&gt;У вас уже есть один загруженный звуковой файл.&lt;br&gt;Что вы хотите сделать с новыми звуковыми данными?</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>Импорт звукового файла &quot;%1&quot;</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>Импорт XML-файла слоя &quot;%1&quot;</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>Импорт файла MIDI &quot;%1&quot;</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>Импорт файла сеанса &quot;%1&quot;</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>Не удалось импортировать RDF</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>&lt;b&gt;Не удалось импортировать RDF&lt;/b&gt;&lt;p&gt;Не удалось импортировать данные из документа RDF &quot;%1&quot;: %2&lt;/p&gt;</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>Импорт документа RDF &quot;%1&quot;</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>Добавить объект в позицию %1с</translation>
     </message>
@@ -4072,106 +4188,114 @@
 <context>
     <name>MainWindowBase::AddPaneCommand</name>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="2371"/>
         <source>Add Pane</source>
-        <translation>Добавить окно</translation>
+        <translation type="obsolete">Добавить окно</translation>
     </message>
 </context>
 <context>
     <name>MainWindowBase::RemovePaneCommand</name>
     <message>
-        <location filename="../../framework/MainWindowBase.cpp" line="2416"/>
         <source>Remove Pane</source>
-        <translation>Удалить окно</translation>
+        <translation type="obsolete">Удалить окно</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>Редактор данных</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="47"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="49"/>
         <source>Playback Toolbar</source>
         <translation>Панель воспроизведения</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="49"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="51"/>
         <source>Play Mode Toolbar</source>
         <translation>Панель режима воспроизведения</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="53"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="55"/>
         <source>Track Playback</source>
         <translation>Переключить воспроизведение</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>Переключить отслеживание позиции воспроизведения</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="60"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="62"/>
         <source>Edit Toolbar</source>
         <translation>Панель правки</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="62"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="64"/>
         <source>Insert New Item</source>
         <translation>Вставить новый объект</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="63"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="65"/>
         <source>Insert</source>
         <translation>Вставить</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>Вставить новый объект</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="68"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="70"/>
         <source>Delete Selected Items</source>
         <translation>Удалить выбранные объекты</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="69"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="71"/>
         <source>Delete</source>
         <translation>Удалить</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>Удалить выбранные объекты</translation>
     </message>
     <message>
-        <location filename="../../widgets/ModelDataTableDialog.cpp" line="94"/>
+        <location filename="../../svgui/widgets/ModelDataTableDialog.cpp" line="96"/>
         <source>Data in Layer</source>
         <translation>Данные в слое</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>Тип</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="228"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="228"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="229"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="229"/>
         <source>Maker</source>
         <translation>Создатель</translation>
     </message>
     <message>
-        <location filename="../../widgets/LayerTree.cpp" line="230"/>
+        <location filename="../../svgui/widgets/LayerTree.cpp" line="230"/>
         <source>Source</source>
         <translation>Источник</translation>
     </message>
@@ -4179,12 +4303,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>%1 &lt;%2&gt;</translation>
     </message>
     <message>
-        <location filename="../../transform/ModelTransformerFactory.cpp" line="370"/>
+        <location filename="../../svcore/transform/ModelTransformerFactory.cpp" line="217"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
@@ -4192,35 +4316,35 @@
 <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>Новая точка</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="83"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="83"/>
         <source>Vertical Scale</source>
         <translation>Верт. масштаб</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="142"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="142"/>
         <source>Auto-Align</source>
         <translation>Автовыравнивание</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="447"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="447"/>
         <source>In progress</source>
         <translation>В процессе</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>Нет локальных точек</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
@@ -4231,7 +4355,7 @@
 Без метки</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
@@ -4242,108 +4366,108 @@
 Метка:	%4</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="812"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="812"/>
         <source>Draw Point</source>
         <translation>Нарисовать точку</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="940"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="940"/>
         <source>Drag Point</source>
         <translation>Перетащить точку</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>Изменить точку</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="963"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="963"/>
         <source>Relocate Point</source>
         <translation>Переместить точку</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="966"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="966"/>
         <source>Change Point Value</source>
         <translation>Изменить значение точки</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1025"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1025"/>
         <source>Drag Selection</source>
         <translation>Перетащить выделение</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1050"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1050"/>
         <source>Resize Selection</source>
         <translation>Изменить размер выделения</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1089"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1089"/>
         <source>Delete Selected Points</source>
         <translation>Удалить выбранные точки</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="1150"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1150"/>
         <source>Paste</source>
         <translation>Вставить</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>Масштаб</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="143"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="143"/>
         <source>Linear</source>
         <translation>Линейный</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="144"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="144"/>
         <source>Log</source>
         <translation>Логарифмический</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="145"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="145"/>
         <source>MIDI Notes</source>
         <translation>Ноты MIDI</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="499"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="499"/>
         <source>%1 %2</source>
         <translation>%1 %2</translation>
     </message>
     <message>
-        <location filename="../../layer/NoteLayer.cpp" line="888"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="888"/>
         <source>Erase Point</source>
         <translation>Стереть точку</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>Заново выровнять вставленные объекты?</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="1221"/>
+        <location filename="../../svgui/layer/NoteLayer.cpp" line="1221"/>
         <source>Record Note</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>%1 (%2, %3Гц)</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>%1Гц (%2, %3)</translation>
     </message>
@@ -4351,47 +4475,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>Нота</translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="165"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="166"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="166"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="167"/>
         <source>Frame</source>
         <translation>Выборка</translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="167"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="168"/>
         <source>Pitch</source>
         <translation>Высота тона</translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="168"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="169"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="169"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="170"/>
         <source>Level</source>
         <translation>Уровень</translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="170"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="171"/>
         <source>Label</source>
         <translation>Метка</translation>
     </message>
     <message>
-        <location filename="../../data/model/NoteModel.h" line="171"/>
+        <location filename="../../svcore/data/model/NoteModel.h" line="172"/>
         <source>Unknown</source>
         <translation>Неизвестно</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>Изменить данные</translation>
     </message>
@@ -4399,7 +4523,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>Декодируется %1...</translation>
     </message>
@@ -4407,12 +4531,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>Обзор</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>Щёлкните и потащите для перемещения по окну; щёлкните дважды для скачка</translation>
     </message>
@@ -4420,490 +4544,523 @@
 <context>
     <name>Pane</name>
     <message>
-        <location filename="../../view/Pane.cpp" line="653"/>
+        <location filename="../../svgui/view/Pane.cpp" line="653"/>
         <source>Some lengthy prefix:</source>
         <translation>Некий длинный префикс:</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="974"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1012"/>
         <source>(R)</source>
         <translation>(R)</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="977"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1015"/>
         <source>(X)</source>
         <translation>(X)</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="981"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1019"/>
         <source>%1 / %2Hz%3</source>
         <translation>%1 / %2 Гц%3</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2306"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2344"/>
         <source>Drag Selection</source>
         <translation>Перетащить выделение</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2313"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2351"/>
         <source>Resize Selection</source>
         <translation>Изменить выделение</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="128"/>
+        <location filename="../../svgui/view/Pane.cpp" line="128"/>
         <source>Horizontal Zoom</source>
         <translation>Горизонтальное масштабирование</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="154"/>
+        <location filename="../../svgui/view/Pane.cpp" line="154"/>
         <source>Vertical Zoom</source>
         <translation>Вертикальное масштабирование</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="2186"/>
+        <location filename="../../svgui/view/Pane.cpp" line="2224"/>
         <source>Enter new range</source>
         <translation>Введите новый диапазон</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>Новый диапазон отображения по вертикали, от %1 до %2 %4:</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>Щёлкните и потащите для перемещения по окну</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>Щёлкните и потащите для выделения области; + Shift — для отключения прилипания к объектам; + Ctrl — для выделения нескольких объектов, + средняя клавиша мыши — для перемещения по окну</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>Щёлкните и потащите для выделения диапазона; + Ctrl — для выделения нескольких объектов, + средняя клавиша мыши — для перемещения по окну</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>Щёлкните и потащите для перемещения границ выделения</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>Щёлкните и потащите для выделения области; + Shift — для отключения прилипания к объектам; + средняя клавиша мыши — для перемещения по окну</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>Щёлкните и потащите для выделения области; + средняя клавиша мыши — для перемещения по окну</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>Щёлкните для добавления нового объекта на активный слой</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>Щёлкните и потащите все объекты в выделенной области</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>Щёлкните и потащите для смены видимого диапазона масштабирования по вертикали</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>Щёлкните и потащите для смены уровня масштабирования по вертикали</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>Щёлкните и потащите для смены уровня масштабирования по горизонтали</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>Сбросить уровни масштабирования по горизонтали и вертикали до исходных значений</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>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1165"/>
-        <location filename="../../view/Pane.cpp" line="1171"/>
+        <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="1203"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1209"/>
         <source>Zoom</source>
         <translation>Масштабирование отображения</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1166"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1204"/>
         <source>Zoom In</source>
         <translation>Приблизить</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1166"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1204"/>
         <source>Wheel Up</source>
         <translation>Колесом вверх</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1167"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1205"/>
         <source>Zoom Out</source>
         <translation>Отдалить</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1167"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1205"/>
         <source>Wheel Down</source>
         <translation>Колесом вниз</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>Использование мыши в окнах</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1171"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1209"/>
         <source>Wheel</source>
         <translation>Колесо</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>Приближение и отдаление по временной шкале</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1173"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1211"/>
         <source>Ctrl+Wheel</source>
         <translation>Ctrl+прокрутка</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1173"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1211"/>
         <source>Scroll</source>
         <translation>Прокручивать окно сеанса</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>Быстро перемещаться вправо и влево по временной шкале</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1175"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1213"/>
         <source>Zoom Vertically</source>
         <translation>Вертикальный масштаб</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1175"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1213"/>
         <source>Shift+Wheel</source>
         <translation>Shift+прокрутка</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>Масштабировать отображение по вертикальной оси</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1177"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1215"/>
         <source>Scroll Vertically</source>
         <translation>Прокрутка по вертикали</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1177"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1215"/>
         <source>Alt+Wheel</source>
         <translation>Alt+Колесо</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>Прокручивать отображение по вертикальной оси</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>Перемещение</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>Перемещение скачком</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1181"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1219"/>
         <source>Double-Click Middle</source>
         <translation>Двойной щелчок средней клавишей</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>Перескочить вправо или влево в зависимости от положения курсора</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1183"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1221"/>
         <source>Menu</source>
         <translation>Меню</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1183"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1221"/>
         <source>Right</source>
         <translation>Правая клавиша</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>Показать контекстное меню окна</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>Использование мыши с инструментом навигации</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>Левая клавиша</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>Масштабировать в выделение</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>Shift+Left</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>Двойной щелчок левой клавишей</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>Изменить</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>Использование мыши с инструментом выделения</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1198"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1236"/>
         <source>Select</source>
         <translation>Выделить</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>Множественное выделение</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1200"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1238"/>
         <source>Ctrl+Left</source>
         <translation>Ctrl+Влево</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>Выделить точно</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>Использование мыши с инструментом редактирования</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1206"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1244"/>
         <source>Move</source>
         <translation>Переместить</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>Использование мыши с инструментом рисования</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1212"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1250"/>
         <source>Draw</source>
         <translation>Рисовать</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>Щелкните левой клавишей мыши и перетащите курсор для создания нового объекта</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>Использование мыши с инструментом измерения</translation>
     </message>
     <message>
-        <location filename="../../view/Pane.cpp" line="1216"/>
+        <location filename="../../svgui/view/Pane.cpp" line="1254"/>
         <source>Measure Area</source>
         <translation>Измерить область</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>Измерить объект</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="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="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="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>
 </context>
 <context>
+    <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="../../svcore/base/PlayParameterRepository.cpp" line="211"/>
+        <source>Change Playback Mute State</source>
+        <translation type="unfinished">Смена состояния приглушенности воспроизведения</translation>
+    </message>
+    <message>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="216"/>
+        <source>Change Playback Gain</source>
+        <translation type="unfinished">Смена громкости воспроизведения</translation>
+    </message>
+    <message>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="221"/>
+        <source>Change Playback Pan</source>
+        <translation type="unfinished">Смена панорамы при воспроизведении</translation>
+    </message>
+    <message>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="226"/>
+        <source>Change Playback Plugin</source>
+        <translation type="unfinished">Смена расширения воспроизведения</translation>
+    </message>
+    <message>
+        <location filename="../../svcore/base/PlayParameterRepository.cpp" line="231"/>
+        <source>Configure Playback Plugin</source>
+        <translation type="unfinished">Смена параметров расширения воспроизведения</translation>
+    </message>
+</context>
+<context>
     <name>PlayParameterRepository::EditCommand</name>
     <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="206"/>
         <source>Adjust Playback Parameters</source>
-        <translation>Коррекция параметров воспроизведения</translation>
-    </message>
-    <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="211"/>
+        <translation type="obsolete">Коррекция параметров воспроизведения</translation>
+    </message>
+    <message>
         <source>Change Playback Mute State</source>
-        <translation>Смена состояния приглушенности воспроизведения</translation>
-    </message>
-    <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="216"/>
+        <translation type="obsolete">Смена состояния приглушенности воспроизведения</translation>
+    </message>
+    <message>
         <source>Change Playback Gain</source>
-        <translation>Смена громкости воспроизведения</translation>
-    </message>
-    <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="221"/>
+        <translation type="obsolete">Смена громкости воспроизведения</translation>
+    </message>
+    <message>
         <source>Change Playback Pan</source>
-        <translation>Смена панорамы при воспроизведении</translation>
-    </message>
-    <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="226"/>
+        <translation type="obsolete">Смена панорамы при воспроизведении</translation>
+    </message>
+    <message>
         <source>Change Playback Plugin</source>
-        <translation>Смена расширения воспроизведения</translation>
-    </message>
-    <message>
-        <location filename="../../base/PlayParameterRepository.cpp" line="231"/>
+        <translation type="obsolete">Смена расширения воспроизведения</translation>
+    </message>
+    <message>
         <source>Configure Playback Plugin</source>
-        <translation>Смена параметров расширения воспроизведения</translation>
+        <translation type="obsolete">Смена параметров расширения воспроизведения</translation>
     </message>
 </context>
 <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>У этого расширения нет изменяемых параметров.</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterBox.cpp" line="82"/>
+        <location filename="../../svgui/widgets/PluginParameterBox.cpp" line="82"/>
         <source>Program</source>
         <translation>Программа</translation>
     </message>
@@ -4911,58 +5068,58 @@
 <context>
     <name>PluginParameterDialog</name>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="102"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="102"/>
         <source>Name:</source>
         <translation>Название:</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="138"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="138"/>
         <source>Maker:</source>
         <translation>Автор:</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="144"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="144"/>
         <source>Copyright:  </source>
         <translation>Авторские права:  </translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="125"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="125"/>
         <source>Version:</source>
         <translation>Версия:</translation>
     </message>
     <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>Параметры расширения</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="322"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="322"/>
         <source>Channel mismatch</source>
         <translation>Несовпадение каналов</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>Этому расширению нужно хотя бы %1 вхдных каналовs, но лишь %2 %3 доступны.  Вероятно, расширение не сработает как должно.</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="323"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="323"/>
         <source>are</source>
         <translation>являются</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="323"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="323"/>
         <source>is</source>
         <translation>является</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="217"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="217"/>
         <source>Channels</source>
         <translation>Каналы</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>
@@ -4971,70 +5128,70 @@
 </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>Это расширение может обрабатывать только один канал,
 но у источника %1 каналов.</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>Использовать среднее значение каналов источника</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>Использовать только канал %1</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="156"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="156"/>
         <source>Output:</source>
         <translation>Выход:</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="223"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="223"/>
         <source>Processing</source>
         <translation>Обработка</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="404"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="404"/>
         <source>Window size:</source>
         <translation>Размер оконной функции:</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>Выборок звука на блок:</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="431"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="431"/>
         <source>Window increment:</source>
         <translation>Шаг:</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="455"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="455"/>
         <source>Window shape:</source>
         <translation>Форма:</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>Больше &gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../../widgets/PluginParameterDialog.cpp" line="599"/>
+        <location filename="../../svgui/widgets/PluginParameterDialog.cpp" line="599"/>
         <source>Advanced &lt;&lt;</source>
         <translation>Меньше &lt;&lt;</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>Только выделение</translation>
     </message>
@@ -5042,214 +5199,214 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../../base/Preferences.cpp" line="112"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="112"/>
         <source>Frequency of concert A</source>
         <translation>Частота условной ноты Ля (A)</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="115"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="115"/>
         <source>Property box layout</source>
         <translation>Внешний вид панели свойств</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>Форма оконной функции при спектральном анализе</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>Показывать панели для всех окон</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>Показывать панель только для активного окна</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="275"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="275"/>
         <source>Rectangular</source>
         <translation>Прямоугольная</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="276"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="276"/>
         <source>Triangular</source>
         <translation>Треугольная</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="277"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="277"/>
         <source>Hamming</source>
         <translation>Хамминга</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="279"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="279"/>
         <source>Blackman</source>
         <translation>Блэкмена</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="280"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="280"/>
         <source>Gaussian</source>
         <translation>Гауссова</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="281"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="281"/>
         <source>Parzen</source>
         <translation>Парзена</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="282"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="282"/>
         <source>Nuttall</source>
         <translation>Нутталла</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="283"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="283"/>
         <source>Blackman-Harris</source>
         <translation>Блэкмена-Харриса</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="332"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="332"/>
         <source>Preferences</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="121"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="121"/>
         <source>Playback resampler type</source>
         <translation>Тип ресэмплирования при воспроизведении</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="288"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="288"/>
         <source>Fastest</source>
         <translation>Самый быстрый</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="289"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="289"/>
         <source>Standard</source>
         <translation>Обычный</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="290"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="290"/>
         <source>Highest quality</source>
         <translation>Наивысшего качества</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="106"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="106"/>
         <source>Spectrogram y-axis interpolation:</source>
         <translation>Интерполяция оси Y спектрограммы:</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>Пропускать временные файлы в меню недавно открывавшихся</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>Ресэмплировать файлы при импорте</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>Расположение каталога с кэшем</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="133"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="133"/>
         <source>Background colour preference</source>
         <translation>Предпочитаемый цвет фона</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>Кегль шрифта для текстовых перекрытий</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>Показывать заставку при старте программы</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="278"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="278"/>
         <source>Hann</source>
         <translation>Хэнна</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="309"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="309"/>
         <source>Follow desktop theme</source>
         <translation>Использовать параметры окружения</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="310"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="310"/>
         <source>Dark background</source>
         <translation>Темный фон</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="311"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="311"/>
         <source>Light background</source>
         <translation>Светлый фон</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>Интерполяция спектрограммы по оси X:</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>Нет</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>Линейная интерполяция</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="297"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="297"/>
         <source>4 x Oversampling</source>
         <translation>4 × пересэмплированная</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>4 × пересэмплированная с интерполяцией</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="136"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="136"/>
         <source>Time display format</source>
         <translation>Формат отображения времени</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="316"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="316"/>
         <source>Standard (to millisecond)</source>
         <translation>Обычный (до мс)</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>Высокое разрешение (до мкс)</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="318"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="318"/>
         <source>24 FPS</source>
         <translation>24 кадра/с</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="319"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="319"/>
         <source>25 FPS</source>
         <translation>25 кадров/с</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="320"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="320"/>
         <source>30 FPS</source>
         <translation>30 кадров/с</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="321"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="321"/>
         <source>50 FPS</source>
         <translation>50 кадров/с</translation>
     </message>
     <message>
-        <location filename="../../base/Preferences.cpp" line="322"/>
+        <location filename="../../svcore/base/Preferences.cpp" line="322"/>
         <source>60 FPS</source>
         <translation>60 кадров/с</translation>
     </message>
@@ -5347,7 +5504,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>Отменить</translation>
     </message>
@@ -5355,78 +5512,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>Показать</translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="172"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="172"/>
         <source>Play</source>
         <translation>Воспроизвести</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>Панорама/баланс при воспроизведении</translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="210"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="210"/>
         <source>Playback Gain</source>
         <translation>Усиление воспроизведения</translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="212"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="212"/>
         <source>dB</source>
         <translation>Дб</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> (текущее значение: %1%2)</translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="832"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="832"/>
         <source> (current value: %1)</source>
         <translation> (текущее значение: %1)</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>Переключить видимость %1</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>Переключить воспроизведение %1</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>Переключить %1 свойство %2</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>Скорректировать %1 свойство %2%3</translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="468"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="468"/>
         <source>Add New Colour...</source>
         <translation>Добавить новый цвет...</translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyBox.cpp" line="655"/>
+        <location filename="../../svgui/widgets/PropertyBox.cpp" line="655"/>
         <source>Name New Colour</source>
         <translation>Дайте цвету название</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>Введите название нового цвета:</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>Предпочитать черный фон для этого цвета</translation>
     </message>
@@ -5434,53 +5591,57 @@
 <context>
     <name>PropertyContainer</name>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="151"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="151"/>
         <source>yes</source>
         <translation>да</translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="152"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="152"/>
         <source>on</source>
         <translation>вкл</translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="153"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="153"/>
         <source>true</source>
         <translation>правда</translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="155"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="155"/>
         <source>no</source>
         <translation>нет</translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="156"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="156"/>
         <source>off</source>
         <translation>выкл</translation>
     </message>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="157"/>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="157"/>
         <source>false</source>
         <translation>ложь</translation>
     </message>
+    <message>
+        <location filename="../../svcore/base/PropertyContainer.cpp" line="244"/>
+        <source>Set %1 Property</source>
+        <translation type="unfinished">Установить свойство %1</translation>
+    </message>
 </context>
 <context>
     <name>PropertyContainer::SetPropertyCommand</name>
     <message>
-        <location filename="../../base/PropertyContainer.cpp" line="244"/>
         <source>Set %1 Property</source>
-        <translation>Установить свойство %1</translation>
+        <translation type="obsolete">Установить свойство %1</translation>
     </message>
 </context>
 <context>
     <name>PropertyStack</name>
     <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>Щёлкните для смены активного слоя</translation>
     </message>
     <message>
-        <location filename="../../widgets/PropertyStack.cpp" line="235"/>
+        <location filename="../../svgui/widgets/PropertyStack.cpp" line="242"/>
         <source>Change Layer Visibility</source>
         <translation>Переключить видимость слоя</translation>
     </message>
@@ -5488,7 +5649,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.
@@ -5515,7 +5676,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../main/main.cpp" line="246"/>
+        <location filename="../main/main.cpp" line="257"/>
         <source>Sonic Visualiser</source>
         <translation>Sonic Visualiser</translation>
     </message>
@@ -5523,22 +5684,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>Файл &quot;%1&quot; не существует</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>Не удалось открыть файл &quot;%1&quot;</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>Файл или URL &quot;%1&quot; не мог быть получен</translation>
     </message>
@@ -5546,18 +5707,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>Не удалось открыть файл</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>Файл или URL &quot;%1&quot; не мог быть открыт</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">&lt;b&gt;Нужны звуковые данные&lt;/b&gt;&lt;p&gt;Загрузите хотя бы один звуковой файл перед импортом аннотаций</translation>
     </message>
@@ -5565,7 +5726,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>Декодируется %1...</translation>
     </message>
@@ -5573,17 +5734,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>
@@ -5591,7 +5752,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> до </translation>
     </message>
@@ -5599,7 +5760,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>
@@ -5607,73 +5768,73 @@
 <context>
     <name>RegionLayer</name>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="82"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="82"/>
         <source>Vertical Scale</source>
         <translation>Верт. масштаб</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="83"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="83"/>
         <source>Scale Units</source>
         <translation>Единицы шкалы</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="84"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="84"/>
         <source>Plot Type</source>
         <translation>Тип графика</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="102"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="102"/>
         <source>Scale</source>
         <translation>Масштаб</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="163"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="163"/>
         <source>Bars</source>
         <translation>Такты</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="164"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="164"/>
         <source>Segmentation</source>
         <translation>Сегментация</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="170"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="170"/>
         <source>Auto-Align</source>
         <translation>Автовыравнивание</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="171"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="171"/>
         <source>Equal Spaced</source>
         <translation>Равные промежутки</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="172"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="172"/>
         <source>Linear</source>
         <translation>Линейный</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="173"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="173"/>
         <source>Log</source>
         <translation>Логарифмический</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="366"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="378"/>
         <source>In progress</source>
         <translation>В процессе</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>Нет локальных точек</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="403"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="415"/>
         <source>%1 %2</source>
         <translation>%1 %2</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
@@ -5684,7 +5845,7 @@
 Без метки</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
@@ -5695,69 +5856,69 @@
 Метка:	%4</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1090"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1204"/>
         <source>Change Point Value</source>
         <translation>Изменить значение точки</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1155"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1263"/>
         <source>Drag Selection</source>
         <translation>Перетащить выделение</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1181"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1289"/>
         <source>Resize Selection</source>
         <translation>Изменить размер выделения</translation>
     </message>
     <message>
-        <location filename="../../layer/RegionLayer.cpp" line="1221"/>
+        <location filename="../../svgui/layer/RegionLayer.cpp" line="1329"/>
         <source>Delete Selected Points</source>
         <translation>Удалить выбранные точки</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>Заново выровнять вставленные объекты?</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>Вставить</translation>
     </message>
     <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="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>
@@ -5765,42 +5926,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>Область</translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="151"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="153"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="152"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="154"/>
         <source>Frame</source>
         <translation>Выборка</translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="153"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="155"/>
         <source>Value</source>
         <translation>Значение</translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="154"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="156"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="155"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="157"/>
         <source>Label</source>
         <translation>Метка</translation>
     </message>
     <message>
-        <location filename="../../data/model/RegionModel.h" line="156"/>
+        <location filename="../../svcore/data/model/RegionModel.h" line="158"/>
         <source>Unknown</source>
         <translation>Неизвестно</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>Изменить данные</translation>
     </message>
@@ -5808,7 +5969,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>Удалить слой %1 </translation>
     </message>
@@ -5816,7 +5977,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>Ресэмплирование %1...</translation>
     </message>
@@ -5824,13 +5985,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>(модель извлечена в SV-XML)</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>Открывается файл или URL...</translation>
     </message>
@@ -5838,12 +5999,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>Цвет</translation>
     </message>
     <message>
-        <location filename="../../layer/SingleColourLayer.cpp" line="114"/>
+        <location filename="../../svgui/layer/SingleColourLayer.cpp" line="114"/>
         <source>&lt;unknown&gt;</source>
         <translation>&lt;неизвестно&gt;</translation>
     </message>
@@ -5851,113 +6012,113 @@
 <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>%1 - %2</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>Пик</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="507"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="507"/>
         <source>0dB</source>
         <translation>0 Дб</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="508"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="508"/>
         <source>-Inf</source>
         <translation>-Inf</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="539"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="539"/>
         <source>x10</source>
         <translation>x10</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="564"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="564"/>
         <source>Plot Type</source>
         <translation>Тип графика</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>Масштаб</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="566"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="566"/>
         <source>Normalize</source>
         <translation>Нормализовать</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="568"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="568"/>
         <source>Gain</source>
         <translation>Усиление</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="569"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="569"/>
         <source>Sampling Mode</source>
         <translation>Режим сэмплирования</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>Линейный</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="708"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="708"/>
         <source>Meter</source>
         <translation>Счетчик</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>Дб</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="716"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="716"/>
         <source>Any</source>
         <translation>Любые</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="724"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="724"/>
         <source>Lines</source>
         <translation>Линии</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="725"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="725"/>
         <source>Steps</source>
         <translation>Шаги</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="726"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="726"/>
         <source>Blocks</source>
         <translation>Блоки</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="727"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="727"/>
         <source>Colours</source>
         <translation>Цвета</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
@@ -5968,40 +6129,40 @@
 %6 значение:	%7</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>Время:	%1 - %2
 Диапазон:	%3 сэмплов (%4)</translation>
     </message>
     <message>
-        <location filename="../../layer/SliceLayer.cpp" line="567"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="567"/>
         <source>Threshold</source>
         <translation>Порог</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="735"/>
+        <location filename="../../svgui/layer/SliceLayer.cpp" line="735"/>
         <source>Rev Log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6009,70 +6170,91 @@
 <context>
     <name>SparseModel</name>
     <message>
-        <location filename="../../data/model/SparseModel.h" line="172"/>
         <source>Add Point</source>
-        <translation>Добавить точку</translation>
-    </message>
-    <message>
-        <location filename="../../data/model/SparseModel.h" line="197"/>
+        <translation type="obsolete">Добавить точку</translation>
+    </message>
+    <message>
         <source>Delete Point</source>
-        <translation>Удалить точку</translation>
-    </message>
-    <message>
-        <location filename="../../data/model/SparseModel.h" line="254"/>
+        <translation type="obsolete">Удалить точку</translation>
+    </message>
+    <message>
         <source>Re-Label Point</source>
-        <translation>Переразметить точку</translation>
-    </message>
-    <message>
-        <location filename="../../data/model/SparseModel.h" line="143"/>
+        <translation type="obsolete">Переразметить точку</translation>
+    </message>
+    <message>
+        <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="328"/>
+        <location filename="../../svcore/data/model/SparseModel.h" line="328"/>
         <source>Edit Data</source>
         <translation type="unfinished">Изменить данные</translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseModel.h" line="344"/>
+        <location filename="../../svcore/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"/>
+        <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>
+</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>
+</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>
+</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>Время</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>Метка</translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseOneDimensionalModel.h" line="130"/>
+        <location filename="../../svcore/data/model/SparseOneDimensionalModel.h" line="130"/>
         <source>Unknown</source>
         <translation>Неизвестно</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>Изменить данные</translation>
     </message>
@@ -6080,37 +6262,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>Время</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>Значение</translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseTimeValueModel.h" line="119"/>
+        <location filename="../../svcore/data/model/SparseTimeValueModel.h" line="119"/>
         <source>Label</source>
         <translation>Метка</translation>
     </message>
     <message>
-        <location filename="../../data/model/SparseTimeValueModel.h" line="120"/>
+        <location filename="../../svcore/data/model/SparseTimeValueModel.h" line="120"/>
         <source>Unknown</source>
         <translation>Неизвестно</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>Изменить данные</translation>
     </message>
@@ -6118,7 +6300,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>
@@ -6126,250 +6308,250 @@
 <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>Цвет</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>Размер окна</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="175"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="175"/>
         <source>Normalize Columns</source>
         <translation>Нормализовать столбцы</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>Порог</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="179"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="179"/>
         <source>Gain</source>
         <translation>Усиление</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="180"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="180"/>
         <source>Colour Rotation</source>
         <translation>Вращение цвета</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="181"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="181"/>
         <source>Min Frequency</source>
         <translation>Мин. частота</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="182"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="182"/>
         <source>Max Frequency</source>
         <translation>Макс. частота</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="215"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="215"/>
         <source>Window</source>
         <translation>Окно</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="222"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="222"/>
         <source>Scale</source>
         <translation>Масштаб</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>Линейный</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="393"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="393"/>
         <source>Meter</source>
         <translation>Счетчик</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>Дб</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="396"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="396"/>
         <source>Phase</source>
         <translation>Фаза</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="420"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="420"/>
         <source>No min</source>
         <translation>Без минимума</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="421"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="421"/>
         <source>10 Hz</source>
         <translation>10 Гц</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="422"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="422"/>
         <source>20 Hz</source>
         <translation>20 Гц</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="423"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="423"/>
         <source>40 Hz</source>
         <translation>40 Гц</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="424"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="424"/>
         <source>100 Hz</source>
         <translation>100 Гц</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="425"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="425"/>
         <source>250 Hz</source>
         <translation>250 Гц</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>500 Гц</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>1 КГц</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>4 КГц</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="429"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="429"/>
         <source>10 KHz</source>
         <translation>10 КГц</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="437"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="437"/>
         <source>1.5 KHz</source>
         <translation>1,5 КГц</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="438"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="438"/>
         <source>2 KHz</source>
         <translation>2 КГц</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="440"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="440"/>
         <source>6 KHz</source>
         <translation>6 КГц</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="441"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="441"/>
         <source>8 KHz</source>
         <translation>8 КГц</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="442"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="442"/>
         <source>12 KHz</source>
         <translation>12 КГц</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="443"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="443"/>
         <source>16 KHz</source>
         <translation>16 КГц</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="444"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="444"/>
         <source>No max</source>
         <translation>Без максимума</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="451"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="451"/>
         <source>Log</source>
         <translation>Логарифм.</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="457"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="457"/>
         <source>All Bins</source>
         <translation>Все бины</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="458"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="458"/>
         <source>Peak Bins</source>
         <translation>Пиковые бины</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="459"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="459"/>
         <source>Frequencies</source>
         <translation>Частоты</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="462"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="462"/>
         <source>&lt;unknown&gt;</source>
         <translation>&lt;неизвестно&gt;</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>Пиковая частота:	%1 - %2 Гц
 </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>Пиковая частота:	%1 Гц
 </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>Пиковая высота тона:	%3 - %4
 </translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3179"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3180"/>
         <source>Peak Pitch:	%2
 </source>
         <translation>Пиковая высота тона:	%2
 </translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3190"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3191"/>
         <source>Time:	%1 - %2
 </source>
         <translation>Время:	%1 - %2
 </translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3194"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3195"/>
         <source>Time:	%1
 </source>
         <translation>Время:	%1
 </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>
@@ -6378,7 +6560,7 @@
 </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>
@@ -6387,115 +6569,115 @@
 </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>-Inf</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3230"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3231"/>
         <source>dB:	%1 - %2</source>
         <translation>Дб:	%1 - %2</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3232"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3233"/>
         <source>dB:	%1</source>
         <translation>Дб:	%1</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3235"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3236"/>
         <source>
 Phase:	%1 - %2</source>
         <translation>
 Фаза:	%1 - %2</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3237"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3238"/>
         <source>
 Phase:	%1</source>
         <translation>
 Фаза:	%1</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="174"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="174"/>
         <source>Window Overlap</source>
         <translation>Перекрытие окон</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="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>Нет</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="406"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="406"/>
         <source>25 %</source>
         <translation>25 %</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="407"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="407"/>
         <source>50 %</source>
         <translation>50 %</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="408"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="408"/>
         <source>75 %</source>
         <translation>75 %</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="409"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="409"/>
         <source>87.5 %</source>
         <translation>87,5 %</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="410"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="410"/>
         <source>93.75 %</source>
         <translation>93,75 %</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="176"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="176"/>
         <source>Normalize Visible Area</source>
         <translation>Нормализовать видимую область</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="212"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="212"/>
         <source>Bins</source>
         <translation>Бины</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="1666"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="1666"/>
         <source>FFT cache failed</source>
         <translation>Не удалось кэшировать FFT</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>Не удалось создать FFT-модель этой спектрограммы.
 Вероятно, не хватает памяти или дискового порстранства для продолжения.</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="394"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="394"/>
         <source>dBV^2</source>
         <translation>ДбВ^2</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="395"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="395"/>
         <source>dBV</source>
         <translation>ДбВ</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3266"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3267"/>
         <source>43Hz</source>
         <translation>43 Гц</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrogramLayer.cpp" line="3411"/>
+        <location filename="../../svgui/layer/SpectrogramLayer.cpp" line="3412"/>
         <source>%1Hz</source>
         <translation>%1 Гц</translation>
     </message>
@@ -6503,85 +6685,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>Размер окна</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="147"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="147"/>
         <source>Window Overlap</source>
         <translation>Перекрытие окон</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="172"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="172"/>
         <source>Window</source>
         <translation>Окно</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="228"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="228"/>
         <source>None</source>
         <translation>Ничего</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="229"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="173"/>
+        <source>Bins</source>
+        <translation type="unfinished">Бины</translation>
+    </message>
+    <message>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="229"/>
         <source>25 %</source>
         <translation>25 %</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="230"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="230"/>
         <source>50 %</source>
         <translation>50 %</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="231"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="231"/>
         <source>75 %</source>
         <translation>75 %</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="232"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="232"/>
         <source>87.5 %</source>
         <translation>87,5 %</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="233"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="233"/>
         <source>93.75 %</source>
         <translation>93,75 %</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>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="596"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="596"/>
         <source>%1 - %2 Hz</source>
         <translation>%1 - %2 Гц</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="598"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="598"/>
         <source>%1 Hz</source>
         <translation>%1 Гц</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>-Inf</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="626"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="626"/>
         <source>%1</source>
         <translation>%1</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
@@ -6592,17 +6779,17 @@
 Дб:	%6</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>Peak</source>
         <translation>Пик</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
@@ -6613,20 +6800,19 @@
 Дб:	%5</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="148"/>
+        <location filename="../../svgui/layer/SpectrumLayer.cpp" line="148"/>
         <source>Show Peak Frequencies</source>
         <translation>Показывать пиковые частоты</translation>
     </message>
     <message>
-        <location filename="../../layer/SpectrumLayer.cpp" line="173"/>
         <source>Plot Type</source>
-        <translation>Тип графика</translation>
+        <translation type="obsolete">Тип графика</translation>
     </message>
 </context>
 <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>%1 - %2</translation>
     </message>
@@ -6647,24 +6833,24 @@
 <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>Очистить метку</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>&lt;без текста&gt;</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="167"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="195"/>
         <source>In progress</source>
         <translation>В процессе</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>
@@ -6673,74 +6859,74 @@
 Метка:	%3</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>Введите метку</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>Введите текст новой метки:</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="536"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="563"/>
         <source>Drag Label</source>
         <translation>Перетащите метку</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="557"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="584"/>
         <source>Move Label</source>
         <translation>Переместите метку</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="559"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="586"/>
         <source>Move Label Horizontally</source>
         <translation>Переместите по горизонтали</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="562"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="589"/>
         <source>Move Label Vertically</source>
         <translation>Переместите по вертикали</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="602"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="629"/>
         <source>Drag Selection</source>
         <translation>Перетащите выделение</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="627"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="654"/>
         <source>Resize Selection</source>
         <translation>Смените размер выделения</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="661"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="688"/>
         <source>Delete Selection</source>
         <translation>Удалите выделение</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="719"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="746"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="764"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="791"/>
         <source>New Point</source>
         <translation>Новая точка</translation>
     </message>
     <message>
-        <location filename="../../layer/TextLayer.cpp" line="487"/>
+        <location filename="../../svgui/layer/TextLayer.cpp" line="514"/>
         <source>Erase Point</source>
         <translation>Удалить точку</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>Заново выровнять вставленные объекты?</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>
@@ -6748,37 +6934,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>Текст</translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="117"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="117"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="118"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="118"/>
         <source>Frame</source>
         <translation>Выборка</translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="119"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="119"/>
         <source>Height</source>
         <translation>Высота</translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="120"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="120"/>
         <source>Label</source>
         <translation>Метка</translation>
     </message>
     <message>
-        <location filename="../../data/model/TextModel.h" line="121"/>
+        <location filename="../../svcore/data/model/TextModel.h" line="121"/>
         <source>Unknown</source>
         <translation>Неизвестно</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>Изменить данные</translation>
     </message>
@@ -6786,39 +6972,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>%1: %2%3</translation>
     </message>
     <message>
-        <location filename="../../widgets/Thumbwheel.cpp" line="234"/>
+        <location filename="../../svgui/widgets/Thumbwheel.cpp" line="234"/>
         <source>%2%3</source>
         <translation>%2%3</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>Новое значение для %1, от %2 до %3 %4:</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>Новое значение для %1, от %2 до %3:</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>Введите новое значение от %1 до %2 %3:</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>Введите новое значение от %1 до %2:</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>Введите новое значение</translation>
     </message>
@@ -6826,107 +7012,107 @@
 <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>Новая точка</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="84"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="84"/>
         <source>Plot Type</source>
         <translation>Тип графика</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>Сегментация</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="214"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="226"/>
         <source>In progress</source>
         <translation>В процессе</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="216"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="228"/>
         <source>No local points</source>
         <translation>Нет локальных точек</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>Время:	%1
 Без метки</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>Время:	%1
 Метка:	%2</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="471"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="485"/>
         <source>Draw Point</source>
         <translation>Нарисовать точку</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>Добавить точку в %1 с</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="592"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="606"/>
         <source>Drag Point</source>
         <translation>Перетащить точку</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>Перетащить точку к %1 с</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="644"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="658"/>
         <source>Edit Point</source>
         <translation>Изменить точку</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="661"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="675"/>
         <source>Drag Selection</source>
         <translation>Перетащить выделение</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="687"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="701"/>
         <source>Resize Selection</source>
         <translation>Изменить размер выделения</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="722"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="736"/>
         <source>Delete Selection</source>
         <translation>Удалить выделение</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="780"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="794"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeInstantLayer.cpp" line="546"/>
+        <location filename="../../svgui/layer/TimeInstantLayer.cpp" line="560"/>
         <source>Erase Point</source>
         <translation>Удалить точку</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>Заново выровнять вставленные объекты?</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>
@@ -6934,75 +7120,80 @@
 <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>Новая точка</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>Тип графика</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="104"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="106"/>
         <source>Vertical Scale</source>
         <translation>Верт. масштаб</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="105"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="107"/>
         <source>Scale Units</source>
         <translation>Единицы шкалы</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="202"/>
+        <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="215"/>
         <source>Points</source>
         <translation>Точки</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="203"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="216"/>
         <source>Stems</source>
         <translation>Ножки</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="204"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="217"/>
         <source>Connected Points</source>
         <translation>Соединённые точки</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="205"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="218"/>
         <source>Lines</source>
         <translation>Линии</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="206"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="219"/>
         <source>Curve</source>
         <translation>Кривая</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="207"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="220"/>
         <source>Segmentation</source>
         <translation>Сегментация</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="212"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="225"/>
         <source>Auto-Align</source>
         <translation>Автовыравнивание</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="518"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="556"/>
         <source>In progress</source>
         <translation>В процессе</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="520"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="558"/>
         <source>No local points</source>
         <translation>Нет локальных точек</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>
@@ -7011,7 +7202,7 @@
 Без метки</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>
@@ -7020,121 +7211,121 @@
 Метка:	%4</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1231"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1292"/>
         <source>Draw Point</source>
         <translation>Нарисовать точку</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1398"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1459"/>
         <source>Drag Point</source>
         <translation>Перетащить точку</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>Изменить точку</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1423"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1484"/>
         <source>Relocate Point</source>
         <translation>Переместить точку</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1426"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1487"/>
         <source>Change Point Value</source>
         <translation>Изменить значение точки</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1483"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1544"/>
         <source>Drag Selection</source>
         <translation>Перетащить выделение</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1509"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1570"/>
         <source>Resize Selection</source>
         <translation>Изменить размер выделения</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1544"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1605"/>
         <source>Delete Selected Points</source>
         <translation>Удалить выбранные точки</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1606"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1667"/>
         <source>Paste</source>
         <translation>Вставить</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>У вставляемых объектов нет значений.
 Какие значения вы хотите для них использовать?</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>У некоторых вставляемых объектов нет значений.Какие значения вы хотите для них использовать?</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>Ноль для всех объектов</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1683"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1744"/>
         <source>Choose value calculation</source>
         <translation>Выбрать вычисление значения</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="132"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="137"/>
         <source>Scale</source>
         <translation>Масштаб</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="213"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="226"/>
         <source>Linear</source>
         <translation>Линейный</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="214"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="227"/>
         <source>Log</source>
         <translation>Логарифмический</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="215"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="228"/>
         <source>+/-1</source>
         <translation>+/-1</translation>
     </message>
     <message>
-        <location filename="../../layer/TimeValueLayer.cpp" line="1349"/>
+        <location filename="../../svgui/layer/TimeValueLayer.cpp" line="1410"/>
         <source>Erase Point</source>
         <translation>Стереть точку</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="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>
     <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>
@@ -7142,27 +7333,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>Совет дня</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>Показывать советы при запуске</translation>
     </message>
     <message>
-        <location filename="../../widgets/TipDialog.cpp" line="71"/>
+        <location filename="../../svgui/widgets/TipDialog.cpp" line="71"/>
         <source>&lt;&lt; Previous</source>
         <translation>&lt;&lt; Предыдущий</translation>
     </message>
     <message>
-        <location filename="../../widgets/TipDialog.cpp" line="75"/>
+        <location filename="../../svgui/widgets/TipDialog.cpp" line="75"/>
         <source>Next &gt;&gt;</source>
         <translation>Следующий &gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../../widgets/TipDialog.cpp" line="79"/>
+        <location filename="../../svgui/widgets/TipDialog.cpp" line="79"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -7170,136 +7361,136 @@
 <context>
     <name>TransformFactory</name>
     <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>%1: %2</translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="565"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="565"/>
         <source>%1: Output %2</source>
         <translation>%1: Выход %2</translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="320"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="320"/>
         <source>Analysis</source>
         <translation>Анализ</translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="322"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="322"/>
         <source>Effects Data</source>
         <translation>Данные эффектов</translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="321"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="321"/>
         <source>Effects</source>
         <translation>Эффекты</translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="386"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="386"/>
         <source> [\(&lt;].*$</source>
         <translation> [\(&lt;].*$</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>&lt;неизвестный производитель&gt;</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>Извлечь данные при помощи &quot;%1&quot; (из %2)</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>Извлечь данные при помощи &quot;%1&quot; вывода из расширения &quot;%2&quot; (из %3)</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>%1 используя расширение &quot;%2&quot; (из %3)</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>%1 используя вывод &quot;%2&quot; расширения &quot;%3&quot; (из %4)</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>Извлечь &quot;%1&quot; данные вывода из расширения эффектов &quot;%2&quot; (из %3)</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>Извлечь данные вывода %1 из расширения эффектов &quot;%2&quot; (из %3)</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>Трансформировать звуковой сигнал расширением эффектов &quot;%1&quot; (из %2)</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>Создать звуковой сигнал при помощи расширения &quot;%1&quot; (из %2)</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>Тип расширения</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>Категория</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>Системный идентификатор</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>Название</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>Описание</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>Создатель</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>Единица измерения</translation>
     </message>
     <message>
-        <location filename="../../transform/TransformFactory.cpp" line="323"/>
+        <location filename="../../svcore/transform/TransformFactory.cpp" line="323"/>
         <source>Generator</source>
         <translation>Генератор</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>Прочее</translation>
     </message>
@@ -7307,34 +7498,34 @@
 <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>Поиск расширений для трансформации</translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="44"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="44"/>
         <source>Find:</source>
         <translation>Искать:</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>&lt;br&gt;&amp;nbsp;&amp;nbsp;Ничего не найдено</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>Вверх</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>Вниз</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></numerusform>
@@ -7343,7 +7534,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></numerusform>
@@ -7352,84 +7543,84 @@
         </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>&lt;i&gt; (не установлено)&lt;/i&gt;</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>%1%2&lt;br&gt;&lt;small&gt;</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>&lt;/small&gt;</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>&lt;b&gt;%1&lt;/b&gt;%2&lt;br&gt;</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>&lt;small&gt;%1&lt;/small&gt;</translation>
     </message>
     <message>
-        <location filename="../../widgets/TransformFinder.cpp" line="288"/>
+        <location filename="../../svgui/widgets/TransformFinder.cpp" line="288"/>
         <source>&lt;small&gt;</source>
         <translation>&lt;small&gt;</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>&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;mdash; Тип расширения: %1</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>&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;mdash; Категория: %1</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>&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;mdash; Системный идентификатор: %1</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>&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;mdash; Подробная информация: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;</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>&lt;p&gt;Введите текст для поиска по описаниям среди:&lt;ul&gt;&lt;li&gt;всех установленных расширений &lt;a href=&quot;http://www.vamp-plugins.org/&quot;&gt;Vamp&lt;/a&gt; для извлечения анализируемых данных;&lt;/li&gt;&lt;li&gt;всех установленных эффектов&lt;a href=&quot;http://www.ladspa.org/&quot;&gt;LADSPA&lt;/a&gt;;&lt;/li&gt;&lt;li&gt;еще не установленных расширений Vamp, чье описание опубликовано в семантической сети.&lt;/li&gt;&lt;/ul&gt;</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>&lt;b&gt;Не удалось получить опубликованные в сети описания!&lt;/b&gt;</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>&lt;b&gt;Ни одно расширение не установлено!&lt;/b&gt;</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>&lt;p&gt;%1&lt;br&gt;Вероятно, не работает сетевое соединение, либо службы отзываются слишком медленно, либо произошла неполадка при обработке.&lt;br&gt;Будет выполнен поиск только по описаниям уже установленных расширений.</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>&lt;p&gt;%1&lt;br&gt;Выдет выполнен поиск только по описаниям расширений Vamp, предназначенных для извлечения анализируемых данных.</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>&lt;p&gt;%1&lt;br&gt;%2&lt;br&gt;Вероятно, не работает сетевое соединение, либо службы отзываются слишком медленно.&lt;br&gt;Результаты поиска будут недоступны.</translation>
     </message>
@@ -7437,58 +7628,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>Глобальная прокрутка</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="91"/>
+        <location filename="../../svgui/view/View.cpp" line="91"/>
         <source>Global Zoom</source>
         <translation>Глобальный масштаб</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="92"/>
+        <location filename="../../svgui/view/View.cpp" line="92"/>
         <source>Follow Playback</source>
         <translation>Следовать за воспроизведением</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="131"/>
+        <location filename="../../svgui/view/View.cpp" line="131"/>
         <source>Scroll</source>
         <translation>Прокручивать</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="132"/>
+        <location filename="../../svgui/view/View.cpp" line="132"/>
         <source>Page</source>
         <translation>Постранично</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="133"/>
+        <location filename="../../svgui/view/View.cpp" line="133"/>
         <source>Off</source>
         <translation>Выключить</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="136"/>
+        <location filename="../../svgui/view/View.cpp" line="136"/>
         <source>&lt;unknown&gt;</source>
         <translation>&lt;неизвестно&gt;</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>Ожидание готовности слоёв...</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>Отменить</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="2211"/>
+        <location filename="../../svgui/view/View.cpp" line="2262"/>
         <source>Rendering image...</source>
         <translation>Отрисовывается изображение...</translation>
     </message>
     <message>
-        <location filename="../../view/View.cpp" line="1434"/>
+        <location filename="../../svgui/view/View.cpp" line="1457"/>
         <source>Alignment</source>
         <translation>Выравнивание</translation>
     </message>
@@ -7496,82 +7687,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>
@@ -7580,7 +7786,7 @@
         </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>
@@ -7588,25 +7794,22 @@
 <context>
     <name>ViewManager::SetSelectionCommand</name>
     <message>
-        <location filename="../../view/ViewManager.cpp" line="328"/>
         <source>Clear Selection</source>
-        <translation>Снять выделение</translation>
-    </message>
-    <message>
-        <location filename="../../view/ViewManager.cpp" line="329"/>
+        <translation type="obsolete">Снять выделение</translation>
+    </message>
+    <message>
         <source>Select Multiple Regions</source>
-        <translation>Выделить несколько областей</translation>
-    </message>
-    <message>
-        <location filename="../../view/ViewManager.cpp" line="330"/>
+        <translation type="obsolete">Выделить несколько областей</translation>
+    </message>
+    <message>
         <source>Select Region</source>
-        <translation>Выделить область</translation>
+        <translation type="obsolete">Выделить область</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>Звуковой файл</translation>
     </message>
@@ -7614,112 +7817,112 @@
 <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>Масштаб по Y</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="105"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="105"/>
         <source>Gain</source>
         <translation>Усиление</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="106"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="106"/>
         <source>Normalize Visible Area</source>
         <translation>Нормализовать видимую область</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="107"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="107"/>
         <source>Channels</source>
         <translation>Каналы</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="194"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="194"/>
         <source>Linear</source>
         <translation>Линейный</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="195"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="195"/>
         <source>Meter</source>
         <translation>Счетчик</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>Дб</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="202"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="202"/>
         <source>Separate</source>
         <translation>Отдельно</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="203"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="203"/>
         <source>Mean</source>
         <translation>Усреднённо</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="204"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="204"/>
         <source>Butterfly</source>
         <translation>V-образно</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="940"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="940"/>
         <source>Time:	%1 - %2</source>
         <translation>Время:	%1 - %2</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="944"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="944"/>
         <source>Time:	%1</source>
         <translation>Время:	%1</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="965"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="965"/>
         <source>Level:</source>
         <translation>Уровень:</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="967"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="967"/>
         <source>Left:</source>
         <translation>Левый:</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="968"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="968"/>
         <source>Right:</source>
         <translation>Правый:</translation>
     </message>
     <message>
-        <location filename="../../layer/WaveformLayer.cpp" line="969"/>
+        <location filename="../../svgui/layer/WaveformLayer.cpp" line="969"/>
         <source>Channel %1</source>
         <translation>Канал %1</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>
 %1	%2 - %3 (пик в %4 Дб)</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>
 %1	%2 (пик в %3 Дб)</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>0 Дб</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>-Inf</translation>
     </message>
@@ -7727,12 +7930,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>V / время</translation>
     </message>
     <message>
-        <location filename="../../widgets/WindowShapePreview.cpp" line="202"/>
+        <location filename="../../svgui/widgets/WindowShapePreview.cpp" line="202"/>
         <source>dB / freq</source>
         <translation>Дб / частота</translation>
     </message>
@@ -7740,7 +7943,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>Записываемый звуковой файл</translation>
     </message>
--- a/misc/update-i18n.sh	Mon Feb 07 11:56:04 2011 +0000
+++ b/misc/update-i18n.sh	Mon Feb 07 20:19:33 2011 +0000
@@ -16,7 +16,6 @@
 	../svcore/*/*/*.h ../svcore/*/*/*.cpp \
 	../svgui/*/*.h ../svgui/*/*.cpp \
 	../svapp/*/*.h ../svapp/*/*.cpp \
-	../svapp/*/*/*.h ../svapp/*/*/*.cpp \
 	*/*.h */*.cpp \
 	-ts i18n/sonic-visualiser_$LANG.ts
 done