Mercurial > hg > sonic-visualiser

changeset 1800:ec77ade1ab50 horizontal-scale

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Wed, 02 May 2018 14:33:41 +0100
parents 8d44bfd19f49 (current diff) bea6e7bced25 (diff)
children 15bb44af8f0d
files vext-lock.json
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/main/MainWindow.cpp	Wed May 02 14:28:44 2018 +0100
+++ b/main/MainWindow.cpp	Wed May 02 14:33:41 2018 +0100
@@ -1611,6 +1611,7 @@
     set<LayerFactory::LayerType> seen;
     
     for (auto &a : m_paneActions) {
+        if (!a.second.sourceModel) continue; // empty pane/layer shortcut
         auto type = a.second.layer;
         if (a.second.sourceModel == model && seen.find(type) == seen.end()) {
             a.first->setShortcut(shortcutFor(type, true));
@@ -1623,6 +1624,7 @@
     seen.clear();
     
     for (auto &a : m_layerActions) {
+        if (!a.second.sourceModel) continue; // empty pane/layer shortcut
         auto type = a.second.layer;
         if (a.second.sourceModel == model && seen.find(type) == seen.end()) {
             a.first->setShortcut(shortcutFor(type, false));
--- a/sonic-visualiser.qrc	Wed May 02 14:28:44 2018 +0100
+++ b/sonic-visualiser.qrc	Wed May 02 14:33:41 2018 +0100
@@ -42,6 +42,7 @@
     <file>icons/scalable/rewind-start.svg</file>
     <file>icons/scalable/rewind.svg</file>
     <file>icons/scalable/select.svg</file>
+    <file>icons/scalable/show-peaks.svg</file>
     <file>icons/scalable/solo.svg</file>
     <file>icons/scalable/speaker.svg</file>
     <file>icons/scalable/spectrogram.svg</file>
@@ -77,7 +78,6 @@
     <file>icons/sharpen.png</file>
     <file>icons/emptypage.png</file>
     <file>icons/invert-vertical.png</file>
-    <file>icons/show-peaks.png</file>
     <file>icons/opaque.png</file>
     <file>icons/smooth.png</file>
     <file>icons/lines.png</file>
--- a/vext-lock.json	Wed May 02 14:28:44 2018 +0100
+++ b/vext-lock.json	Wed May 02 14:33:41 2018 +0100
@@ -40,7 +40,7 @@
       "pin": "a69c1527268d"
     },
     "icons/scalable": {
-      "pin": "4b0d76640524"
+      "pin": "a0a78163e88e"
     }
   }
 }