Mercurial > hg > svapp

changeset 127:7ee6da3f2b3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* a bit of progress on retaining current row when sorting changes &c
author Chris Cannam
date Tue, 17 Jun 2008 16:07:56 +0000
parents d615d0220828
children 09e6016c5436
files framework/MainWindowBase.cpp
diffstat 1 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp	Fri Jun 13 21:09:43 2008 +0000
+++ b/framework/MainWindowBase.cpp	Tue Jun 17 16:07:56 2008 +0000
@@ -1977,13 +1977,13 @@
     connect(m_viewManager,
             SIGNAL(globalCentreFrameChanged(unsigned long)),
             dialog,
-            SLOT(scrollToFrameRequested(unsigned long)));
-/*
-  connect(m_viewManager,
-  SIGNAL(playbackFrameChanged(unsigned long)),
-  dialog,
-  SLOT(scrollToFrameRequested(unsigned long)));
-*/
+            SLOT(userScrolledToFrame(unsigned long)));
+
+    connect(m_viewManager,
+            SIGNAL(playbackFrameChanged(unsigned long)),
+            dialog,
+            SLOT(playbackScrolledToFrame(unsigned long)));
+
     connect(dialog,
             SIGNAL(scrollToFrame(unsigned long)),
             m_viewManager,
@@ -2131,8 +2131,7 @@
     if (m_viewDataDialogMap.find(v) != m_viewDataDialogMap.end()) {
         for (DataDialogSet::iterator i = m_viewDataDialogMap[v].begin();
              i != m_viewDataDialogMap[v].end(); ++i) {
-            std::cerr << "found dialog" << std::endl;
-            (*i)->scrollToFrameRequested(frame);
+            (*i)->userScrolledToFrame(frame);
         }
     }
     if ((m_playSource && m_playSource->isPlaying()) || !getMainModel()) return;