# HG changeset patch
# User Chris Cannam
# Date 1287998147 -7200
# Node ID 5c4943eae1663212e3b08378980ffc46412043ae
# Parent  487d208fadb32514c25ab76e7631ab6443b108bc# Parent  b19bef1bc3f1d3986465b2c0845fc44b38ca0676
Merge

diff -r b19bef1bc3f1 -r 5c4943eae166 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Mon Oct 18 13:58:27 2010 +0100
+++ b/main/MainWindow.cpp	Mon Oct 25 11:15:47 2010 +0200
@@ -839,7 +839,16 @@
     overlayGroup->addAction(action);
     m_keyReference->registerShortcut(action);
     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);
@@ -850,7 +859,7 @@
     action->setChecked(m_viewManager->getZoomWheelsEnabled());
     m_keyReference->registerShortcut(action);
     menu->addAction(action);
-        
+
     action = new QAction(tr("Show Property Bo&xes"), this);
     action->setShortcut(tr("X"));
     action->setStatusTip(tr("Show the layer property boxes at the side of the main window"));