# HG changeset patch
# User Chris Cannam
# Date 1327939607 0
# Node ID d2a58dfc3ae5a6af4dd98ca09c209a80e8fe9c46
# Parent  e583f57f131167461844ea08eb1c138ef250e89c# Parent  80eae4eb6cc8524971031cb0c91a471c88019902
Merge from branch "fullscreen"

diff -r 80eae4eb6cc8 -r d2a58dfc3ae5 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Thu Jan 26 14:57:05 2012 +0000
+++ b/main/MainWindow.cpp	Mon Jan 30 16:06:47 2012 +0000
@@ -883,11 +883,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);
@@ -897,27 +915,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);
@@ -926,16 +934,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"));
diff -r 80eae4eb6cc8 -r d2a58dfc3ae5 main/OSCHandler.cpp
--- a/main/OSCHandler.cpp	Thu Jan 26 14:57:05 2012 +0000
+++ b/main/OSCHandler.cpp	Mon Jan 30 16:06:47 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);
                 }