Mercurial > hg > sonic-visualiser

changeset 497:e583f57f1311

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Give a dedicated key to toggling the centre line, and move it out of the overlay level setting -- reducing number of overlay levels to 3. Introduce two distinct vertical scale types (so that we can hide the spectrogram colour scale part easily)
author Chris Cannam
date Mon, 30 Jan 2012 16:01:21 +0000
parents abbd15ead43d
children d2a58dfc3ae5
files main/MainWindow.cpp main/OSCHandler.cpp
diffstat 2 files changed, 23 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/main/MainWindow.cpp	Thu Jan 26 14:58:18 2012 +0000
+++ b/main/MainWindow.cpp	Mon Jan 30 16:01:21 2012 +0000
@@ -843,11 +843,29 @@
 
     m_keyReference->setCategory(tr("Display Features"));
 
+    action = new QAction(tr("Show &Centre Line"), this);
+    action->setShortcut(tr("'"));
+    action->setStatusTip(tr("Show or hide the centre line"));
+    connect(action, SIGNAL(triggered()), this, SLOT(toggleCentreLine()));
+    action->setCheckable(true);
+    action->setChecked(true);
+    m_keyReference->registerShortcut(action);
+    menu->addAction(action);
+
+    action = new QAction(tr("Toggle All Time Rulers"), this);
+    action->setShortcut(tr("#"));
+    action->setStatusTip(tr("Show or hide all time rulers"));
+    connect(action, SIGNAL(triggered()), this, SLOT(toggleTimeRulers()));
+    m_keyReference->registerShortcut(action);
+    menu->addAction(action);
+
+    menu->addSeparator();
+
     QActionGroup *overlayGroup = new QActionGroup(this);
         
     action = new QAction(tr("Show &No Overlays"), this);
     action->setShortcut(tr("0"));
-    action->setStatusTip(tr("Hide centre indicator, frame times, layer names and scale"));
+    action->setStatusTip(tr("Hide times, layer names, and scale"));
     connect(action, SIGNAL(triggered()), this, SLOT(showNoOverlays()));
     action->setCheckable(true);
     action->setChecked(false);
@@ -857,27 +875,17 @@
         
     action = new QAction(tr("Show &Minimal Overlays"), this);
     action->setShortcut(tr("9"));
-    action->setStatusTip(tr("Show centre indicator only"));
+    action->setStatusTip(tr("Show times and basic scale"));
     connect(action, SIGNAL(triggered()), this, SLOT(showMinimalOverlays()));
     action->setCheckable(true);
-    action->setChecked(false);
-    overlayGroup->addAction(action);
-    m_keyReference->registerShortcut(action);
-    menu->addAction(action);
-        
-    action = new QAction(tr("Show &Standard Overlays"), this);
-    action->setShortcut(tr("8"));
-    action->setStatusTip(tr("Show centre indicator, frame times and scale"));
-    connect(action, SIGNAL(triggered()), this, SLOT(showStandardOverlays()));
-    action->setCheckable(true);
     action->setChecked(true);
     overlayGroup->addAction(action);
     m_keyReference->registerShortcut(action);
     menu->addAction(action);
         
     action = new QAction(tr("Show &All Overlays"), this);
-    action->setShortcut(tr("7"));
-    action->setStatusTip(tr("Show all texts and scale"));
+    action->setShortcut(tr("8"));
+    action->setStatusTip(tr("Show times, layer names, and scale"));
     connect(action, SIGNAL(triggered()), this, SLOT(showAllOverlays()));
     action->setCheckable(true);
     action->setChecked(false);
@@ -886,16 +894,7 @@
     menu->addAction(action);
 
     menu->addSeparator();
-
-    action = new QAction(tr("Show All Time Rulers"), this);
-    action->setShortcut(tr("#"));
-    action->setStatusTip(tr("Show or hide all time rulers"));
-    connect(action, SIGNAL(triggered()), this, SLOT(toggleTimeRulers()));
-    m_keyReference->registerShortcut(action);
-    menu->addAction(action);
-
-    menu->addSeparator();
-
+        
     action = new QAction(tr("Show &Zoom Wheels"), this);
     action->setShortcut(tr("Z"));
     action->setStatusTip(tr("Show thumbwheels for zooming horizontally and vertically"));
--- a/main/OSCHandler.cpp	Thu Jan 26 14:58:18 2012 +0000
+++ b/main/OSCHandler.cpp	Mon Jan 30 16:01:21 2012 +0000
@@ -350,8 +350,6 @@
                     m_viewManager->setOverlayMode(ViewManager::NoOverlays);
                 } else if (value < 1.5) {
                     m_viewManager->setOverlayMode(ViewManager::MinimalOverlays);
-                } else if (value < 2.5) {
-                    m_viewManager->setOverlayMode(ViewManager::StandardOverlays);
                 } else {
                     m_viewManager->setOverlayMode(ViewManager::AllOverlays);
                 }