comparison main/MainWindow.cpp @ 340:3211f8cef51a sv-v1.7.1

* Layer data editor window: fix sorting for columns in region model,
  add Find feature
* RDF import: assign names to layers based on event types, if no suitable
  labels are found in the RDF
* Add label to status bar showing the last text that was passed in current
  layer (so e.g. counting 1, 2, 3, 4 if that's what beats are labelled)
* Better layout of text labels for region layers in segmentation mode when
  they are close together
* Give text layer the same method for finding "nearest point" as region and
  note layers, should improve its editability

 #include "layer/NoteLayer.h"
 #include "layer/Colour3DPlotLayer.h"
 #include "layer/SliceLayer.h"
 #include "layer/SliceableLayer.h"
 #include "layer/ImageLayer.h"
+#include "layer/RegionLayer.h"
 #include "widgets/Fader.h"
 #include "view/Overview.h"
 #include "widgets/PropertyBox.h"
 #include "widgets/PropertyStack.h"
 #include "widgets/AudioDial.h"

     setupMenus();
     setupToolbars();
     setupHelpMenu();
 
     statusBar();
+    m_currentLabel = new QLabel;
+    statusBar()->addPermanentWidget(m_currentLabel);
 
     connect(m_viewManager, SIGNAL(activity(QString)),
             m_activityLog, SLOT(activityHappened(QString)));
     connect(m_playSource, SIGNAL(activity(QString)),
             m_activityLog, SLOT(activityHappened(QString)));

         m_myStatusMessage = tr("Visible: %1 to %2 (duration %3)")
             .arg(startStr).arg(endStr).arg(durationStr);
     }
 
     statusBar()->showMessage(m_myStatusMessage);
+
+    updatePositionStatusDisplays();
+}
+
+void
+MainWindow::updatePositionStatusDisplays() const
+{
+    if (!statusBar()->isVisible()) return;
+
+    Pane *pane = 0;
+    size_t frame = m_viewManager->getPlaybackFrame();
+
+    if (m_paneStack) pane = m_paneStack->getCurrentPane();
+    if (!pane) return;
+
+    int layers = pane->getLayerCount();
+    if (layers == 0) m_currentLabel->setText("");
+
+    for (int i = layers-1; i >= 0; --i) {
+        Layer *layer = pane->getLayer(i);
+        if (!layer) continue;
+        if (!layer->isLayerEditable()) continue;
+        QString label = layer->getLabelPreceding
+            (pane->alignFromReference(frame));
+        m_currentLabel->setText(label);
+        break;
+    }
 }
 
 void
 MainWindow::outputLevelsChanged(float left, float right)
 {