# HG changeset patch
# User Chris Cannam
# Date 1433939882 -3600
# Node ID 0359493998b8102d97762de2ec07619996b3b4c6
# Parent  9fbd599b4e3a959c555f4bd10b1f805e887533e6# Parent  0c78336aa4f3696f86befa3b4f8a71f7d03e468e
Merge from default branch

diff -r 9fbd599b4e3a -r 0359493998b8 .hgsubstate
--- a/.hgsubstate	Thu Jun 04 12:32:23 2015 +0100
+++ b/.hgsubstate	Wed Jun 10 13:38:02 2015 +0100
@@ -1,6 +1,6 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 845471c833a182376747b44a3ca28181bbdb3c93 icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-1ab4ac6b2fcb8c8fd85716c8f1033b0ab780d53c svapp
-b792ea8243be7865170c39e9d958c1dc4d245518 svcore
-0aac065f09f989c1a7eddec2576a900569e29a8f svgui
+8125b8cb8128b71ba9eb0759a8774c8038cd16e8 svapp
+e4d40c185c72e262d7d5336ebaa856888bf2fe1d svcore
+1011ffb1b6d5f67588f997d7a68fefed002886ae svgui
diff -r 9fbd599b4e3a -r 0359493998b8 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Thu Jun 04 12:32:23 2015 +0100
+++ b/main/MainWindow.cpp	Wed Jun 10 13:38:02 2015 +0100
@@ -565,10 +565,12 @@
     m_keyReference->registerShortcut(action);
     menu->addAction(action);
 
-    action = new QAction(tr("Export Annotation Layer..."), this);
+    action = new QAction(tr("Export Annotation La&yer..."), this);
+    action->setShortcut(tr("Ctrl+Y"));
     action->setStatusTip(tr("Export layer data to a file"));
     connect(action, SIGNAL(triggered()), this, SLOT(exportLayer()));
     connect(this, SIGNAL(canExportLayer(bool)), action, SLOT(setEnabled(bool)));
+    m_keyReference->registerShortcut(action);
     menu->addAction(action);
 
     menu->addSeparator();
@@ -4290,20 +4292,25 @@
 {
     emit hideSplash();
 
+    QString quoted;
+    if (transformName != "") {
+        quoted = QString("\"%1\" ").arg(transformName);
+    }
+    
     if (message != "") {
 
         QMessageBox::warning
             (this,
              tr("Failed to generate layer"),
-             tr("<b>Layer generation failed</b><p>Failed to generate derived layer.<p>The layer transform \"%1\" failed:<p>%2")
-             .arg(transformName).arg(message),
+             tr("<b>Layer generation failed</b><p>Failed to generate derived layer.<p>The layer transform %1failed:<p>%2")
+             .arg(quoted).arg(message),
              QMessageBox::Ok);
     } else {
         QMessageBox::warning
             (this,
              tr("Failed to generate layer"),
-             tr("<b>Layer generation failed</b><p>Failed to generate a derived layer.<p>The layer transform \"%1\" failed.<p>No error information is available.")
-             .arg(transformName),
+             tr("<b>Layer generation failed</b><p>Failed to generate a derived layer.<p>The layer transform %1failed.<p>No error information is available.")
+             .arg(quoted),
              QMessageBox::Ok);
     }
 }