# HG changeset patch
# User Chris Cannam
# Date 1304000939 -3600
# Node ID 07fbfba541b0e5b8a64d957ac1508d760a680a55
# Parent a0d162a3f3a7c0dc8f1f25b6c1a44e3d93fb15d1# Parent 5fdd59f8bff2c0478c264b38efa9092135e83058
Merge from branch "feature_150_menu_arrangement"
diff -r 5fdd59f8bff2 -r 07fbfba541b0 main/MainWindow.cpp
--- a/main/MainWindow.cpp Thu Apr 28 15:28:08 2011 +0100
+++ b/main/MainWindow.cpp Thu Apr 28 15:28:59 2011 +0100
@@ -2155,7 +2155,7 @@
QString path = getOpenFileName(FileFinder::AudioFile);
if (path != "") {
- if (openAudio(path, ReplaceMainModel) == FileOpenFailed) {
+ if (openAudio(path, ReplaceSession) == FileOpenFailed) {
emit hideSplash();
QMessageBox::critical(this, tr("Failed to open file"),
tr("File open failedAudio file \"%1\" could not be opened").arg(path));
diff -r 5fdd59f8bff2 -r 07fbfba541b0 main/main.cpp
--- a/main/main.cpp Thu Apr 28 15:28:08 2011 +0100
+++ b/main/main.cpp Thu Apr 28 15:28:59 2011 +0100
@@ -468,7 +468,7 @@
}
if (status != MainWindow::FileOpenSucceeded) {
if (!haveMainModel) {
- status = m_mainWindow->open(path, MainWindow::ReplaceMainModel);
+ status = m_mainWindow->open(path, MainWindow::ReplaceSession);
if (status == MainWindow::FileOpenSucceeded) {
haveMainModel = true;
}
diff -r 5fdd59f8bff2 -r 07fbfba541b0 sonic-visualiser.qrc
--- a/sonic-visualiser.qrc Thu Apr 28 15:28:08 2011 +0100
+++ b/sonic-visualiser.qrc Thu Apr 28 15:28:59 2011 +0100
@@ -104,6 +104,7 @@
samples/stick.wav
samples/strike.wav
samples/tap.wav
+ templates/testtemplate.xml
i18n/sonic-visualiser_ru.qm
i18n/sonic-visualiser_en_GB.qm
i18n/sonic-visualiser_en_US.qm
diff -r 5fdd59f8bff2 -r 07fbfba541b0 templates/testtemplate.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/testtemplate.xml Thu Apr 28 15:28:59 2011 +0100
@@ -0,0 +1,329 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+