# HG changeset patch
# User Chris Cannam
# Date 1374663771 -3600
# Node ID 5a240c668b5e0ad4f241c1a30b4cc502e8544331
# Parent  e180e8b6f84b337aa78cf3bcb8aa786ecc9727d0# Parent  110eecb5d9f6dfcb6dafb86c6e3162f5597f899d
Merge from default branch

diff -r e180e8b6f84b -r 5a240c668b5e .hgsubstate
--- a/.hgsubstate	Wed Jul 24 11:15:53 2013 +0100
+++ b/.hgsubstate	Wed Jul 24 12:02:51 2013 +0100
@@ -1,5 +1,5 @@
 7096c7de2d4c327de5e028c33036f146a1884706 dataquay
 619f715526df43e23b2b9b50715e825941572352 sv-dependency-builds
 2925a4bbca5e86036d564aaac1bcf7fd11226ca9 svapp
-420ade1cb6da314a5717637d902238b713ebc4b0 svcore
+2f85f0fbf7ab6d67b7c8f79456c76106a0db4785 svcore
 0aea4b9e4c3dca9c42f9181748bdfde924a8574f svgui
diff -r e180e8b6f84b -r 5a240c668b5e main/MainWindow.cpp
--- a/main/MainWindow.cpp	Wed Jul 24 11:15:53 2013 +0100
+++ b/main/MainWindow.cpp	Wed Jul 24 12:02:51 2013 +0100
@@ -775,9 +775,15 @@
         }
     }
 
+    action = new QAction(tr("Reset Numbering Counters"), this);
+    action->setStatusTip(tr("Reset to 1 all the counters used for counter-based labelling"));
+    connect(action, SIGNAL(triggered()), this, SLOT(resetInstantsCounters()));
+    connect(this, SIGNAL(replacedDocument()), action, SLOT(trigger()));
+    menu->addAction(action);
+
     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()));
+    connect(action, SIGNAL(triggered()), this, SLOT(setInstantsCounters()));
     menu->addAction(action);
             
     action = new QAction(tr("Renumber Selected Instants"), this);
@@ -2061,6 +2067,7 @@
     action->setShortcut(tr("1"));
     action->setStatusTip(tr("Navigate"));
     connect(action, SIGNAL(triggered()), this, SLOT(toolNavigateSelected()));
+    connect(this, SIGNAL(replacedDocument()), action, SLOT(trigger()));
     group->addAction(action);
     m_keyReference->registerShortcut(action);
     m_toolActions[ViewManager::NavigateMode] = action;
@@ -4048,7 +4055,7 @@
 }
 
 void
-MainWindow::resetInstantsCounters()
+MainWindow::setInstantsCounters()
 {
     LabelCounterInputDialog dialog(m_labeller, this);
     dialog.setWindowTitle(tr("Reset Counters"));
@@ -4056,6 +4063,12 @@
 }
 
 void
+MainWindow::resetInstantsCounters()
+{
+    if (m_labeller) m_labeller->resetCounters();
+}
+
+void
 MainWindow::modelGenerationFailed(QString transformName, QString message)
 {
     emit hideSplash();
diff -r e180e8b6f84b -r 5a240c668b5e main/MainWindow.h
--- a/main/MainWindow.h	Wed Jul 24 11:15:53 2013 +0100
+++ b/main/MainWindow.h	Wed Jul 24 12:02:51 2013 +0100
@@ -121,6 +121,7 @@
 
     virtual void setInstantsNumbering();
     virtual void setInstantsCounterCycle();
+    virtual void setInstantsCounters();
     virtual void resetInstantsCounters();
 
     virtual void modelGenerationFailed(QString, QString);