changeset 241:9aace07f6082

* Allow entry of numbers smaller than 1 in the Set Counters dialog * Renumber Selected Instants now starts its count at the next counter value -- previously it always started at 1:1 and the values that you had set were only used when tapping * pull Reset Counters up a menu level to make it easier to get to
author Chris Cannam
date Tue, 12 Feb 2008 15:41:01 +0000
parents 91426a5e4b53
children cf8748822f4d
files main/MainWindow.cpp
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/main/MainWindow.cpp	Fri Feb 08 17:51:15 2008 +0000
+++ b/main/MainWindow.cpp	Tue Feb 12 15:41:01 2008 +0000
@@ -612,10 +612,6 @@
                 cycleGroup->addAction(action);
                 cycleMenu->addAction(action);
             }
-            
-            action = new QAction(tr("Reset Counters..."), this);
-            connect(action, SIGNAL(triggered()), this, SLOT(resetInstantsCounters()));
-            numberingMenu->addAction(action);
         }
 
         if (i->first == Labeller::ValueNone ||
@@ -625,8 +621,13 @@
         }
     }
 
-    action = new QAction(tr("Re-Number Selected Instants"), this);
-    action->setStatusTip(tr("Re-number the selected instants using the current labelling scheme"));
+    action = new QAction(tr("Set Numbering Counters..."), this);
+    action->setStatusTip(tr("Set the counters used for counter-based labelling"));
+    connect(action, SIGNAL(triggered()), this, SLOT(resetInstantsCounters()));
+    menu->addAction(action);
+            
+    action = new QAction(tr("Renumber Selected Instants"), this);
+    action->setStatusTip(tr("Renumber the selected instants using the current labelling scheme"));
     connect(action, SIGNAL(triggered()), this, SLOT(renumberInstants()));
     connect(this, SIGNAL(canRenumberInstants(bool)), action, SLOT(setEnabled(bool)));
 //    m_keyReference->registerShortcut(action);
@@ -3288,6 +3289,7 @@
 MainWindow::resetInstantsCounters()
 {
     LabelCounterInputDialog dialog(m_labeller, this);
+    dialog.setWindowTitle(tr("Reset Counters"));
     dialog.exec();
 }