comparison view/Pane.cpp @ 283:86a112b5b319

* Make it possible to "measure" a feature on the spectrogram by double-
  clicking in measure mode
* Make shift-click-drag (for zoom to region) work in measure mode as well
  as navigate mode.  It would be nice to be able to shift-doubleclick to
  zoom on a feature directly using a combination of these last two features,
  but that isn't possible yet.
* Make Del delete the measurement under the mouse pointer.

         m_manager->shouldShowLayerNames()) {
         drawLayerNames(r, paint);
     }
 
     if (m_shiftPressed && m_clickedInRange &&
-        toolMode == ViewManager::NavigateMode) {
+        (toolMode == ViewManager::NavigateMode || m_navigating)) {
 
         //!!! be nice if this looked a bit more in keeping with the
         //selection block
         
         paint.setPen(Qt::blue);

     kr.setCategory(tr("Select Tool Mouse Actions"));
     kr.registerShortcut(tr("Select"), tr("Left"), 
                         tr("Click left button and drag to select region; drag region edge to resize"));
     kr.registerShortcut(tr("Multi Select"), tr("Ctrl+Left"), 
                         tr("Ctrl-click left button and drag to select an additional region"));
+    kr.registerShortcut(tr("Fine Select"), tr("Shift+Left"), 
+                        tr("Shift-click left button and drag to select without snapping to items or grid"));
     
     kr.setCategory(tr("Edit Tool Mouse Actions"));
     kr.registerShortcut(tr("Move"), tr("Left"), 
                         tr("Click left button on an item or selected region and drag to move"));
     kr.registerShortcut(tr("Edit"), tr("Double-Click Left"), 

     kr.setCategory(tr("Measure Tool Mouse Actions"));
     kr.registerShortcut(tr("Measure Area"), tr("Left"), 
                         tr("Click left button and drag to measure a rectangular area"));
     kr.registerShortcut(tr("Measure Item"), tr("Double-Click Left"), 
                         tr("Click left button and drag to measure extents of an item or shape"));
+    kr.registerShortcut(tr("Zoom to Area"), tr("Shift+Left"), 
+                        tr("Shift-click left button and drag to zoom to a rectangular area"));
 }
 
 void
 Pane::mousePressEvent(QMouseEvent *e)
 {

     ViewManager::ToolMode mode = ViewManager::NavigateMode;
     if (m_manager) mode = m_manager->getToolMode();
 
     m_navigating = false;
 
-    if (mode == ViewManager::NavigateMode || (e->buttons() & Qt::MidButton)) {
+    if (mode == ViewManager::NavigateMode ||
+        (e->buttons() & Qt::MidButton) ||
+        (mode == ViewManager::MeasureMode &&
+         (e->buttons() & Qt::LeftButton) && m_shiftPressed)) {
 
 	if (mode != ViewManager::NavigateMode) {
 	    setCursor(Qt::PointingHandCursor);
 	}