diff view/ViewManager.cpp @ 222:cd81066ac7ad

* More useful status bar text -- show the current play time and the extents of the visible area * Add update-i18n.sh to update the i18n/ts and qm files -- I can't get qmake to do the right thing now that the project file has been split up into several project files * Fix missing Q_OBJECTs, etc, reported by lupdate * Update Russian translation from AlexandrE
author Chris Cannam
date Wed, 07 Mar 2007 17:07:02 +0000
parents e2baee498ec8
children 9465b5375235
line wrap: on
line diff
--- a/view/ViewManager.cpp	Mon Mar 05 15:32:55 2007 +0000
+++ b/view/ViewManager.cpp	Wed Mar 07 17:07:02 2007 +0000
@@ -47,10 +47,11 @@
     m_zoomWheelsEnabled =
         settings.value("zoom-wheels-enabled", m_zoomWheelsEnabled).toBool();
     settings.endGroup();
-
+/*!!!
     connect(this, 
 	    SIGNAL(zoomLevelChanged(void *, unsigned long, bool)),
 	    SLOT(considerZoomChange(void *, unsigned long, bool)));
+*/
 }
 
 ViewManager::~ViewManager()
@@ -379,17 +380,26 @@
 }
 
 void
-ViewManager::considerZoomChange(void *p, unsigned long z, bool locked)
+ViewManager::viewZoomLevelChanged(unsigned long z, bool locked)
 {
-    emit zoomLevelChanged();
+    View *v = dynamic_cast<View *>(sender());
+
+    if (!v) {
+        std::cerr << "ViewManager::viewZoomLevelChanged: WARNING: sender is not a view" << std::endl;
+        return;
+    }
+
+//!!!    emit zoomLevelChanged();
     
     if (locked) {
 	m_globalZoom = z;
     }
 
 #ifdef DEBUG_VIEW_MANAGER 
-    std::cout << "ViewManager::considerZoomChange(" << p << ", " << z << ", " << locked << ")" << std::endl;
+    std::cout << "ViewManager::viewZoomLevelChanged(" << v << ", " << z << ", " << locked << ")" << std::endl;
 #endif
+
+    emit viewZoomLevelChanged(v, z, locked);
 }
 
 void