Merge pull request #3230 from JoshuaBonn1/6-timeline-class

Timeline Basic Functionality

mscore/CMakeLists.txt

@@ -241,6 +241,7 @@ add_executable ( ${ExecutableName}
       instrdialog.cpp instrwidget.cpp
       debugger/debugger.cpp menus.cpp
       musescore.cpp navigator.cpp pagesettings.cpp palette.cpp
+      timeline.cpp
       mixer.cpp playpanel.cpp selectionwindow.cpp preferences.cpp measureproperties.cpp
       seq.cpp textpalette.cpp
       timedialog.cpp symboldialog.cpp shortcutcapturedialog.cpp

mscore/data/shortcuts.xml

@@ -527,7 +527,7 @@
     <seq>F11</seq>
     </SC>
   <SC>
-    <key>toggle-navigator</key>
+    <key>toggle-timeline</key>
     <seq>F12</seq>
     </SC>
   <SC>

mscore/musescore.cpp

@@ -55,6 +55,7 @@
 #include "keyedit.h"
 #include "harmonyedit.h"
 #include "navigator.h"
+#include "timeline.h"
 #include "importmidi/importmidi_panel.h"
 #include "libmscore/chord.h"
 #include "mstyle/mstyle.h"
@@ -648,6 +649,12 @@ MuseScore::MuseScore()
       scorePageLayoutChanged();
       showNavigator(preferences.showNavigator);
 
+      _timeline = new TDockWidget;
+      _timeline->setFocusPolicy(Qt::NoFocus);
+      addDockWidget(Qt::BottomDockWidgetArea, _timeline);
+      scorePageLayoutChanged();
+      showTimeline(false);
+
       mainWindow->setStretchFactor(0, 1);
       mainWindow->setStretchFactor(1, 0);
       mainWindow->setSizes(QList<int>({500, 50}));
@@ -928,6 +935,10 @@ MuseScore::MuseScore()
       a->setChecked(preferences.showNavigator);
       menuView->addAction(a);
 
+      a = getAction("toggle-timeline");
+      a->setCheckable(true);
+      menuView->addAction(a);
+
       a = getAction("toggle-mixer");
       a->setCheckable(true);
       menuView->addAction(a);
@@ -1555,6 +1566,8 @@ void MuseScore::selectionChanged(SelState selectionState)
             pianorollEditor->changeSelection(selectionState);
       if (drumrollEditor)
             drumrollEditor->changeSelection(selectionState);
+      if (timeline())
+            timeline()->changeSelection(selectionState);
       updateInspector();
       }
 
@@ -1774,6 +1787,10 @@ void MuseScore::setCurrentScoreView(ScoreView* view)
                   navigator()->setScoreView(cv);
                   navigator()->setScore(0);
                   }
+            if (_timeline && _timeline->widget()) {
+                  timeline()->setScoreView(cv);
+                  timeline()->setScore(0);
+                  }
             if (_inspector)
                   _inspector->update(0);
             viewModeCombo->setEnabled(false);
@@ -1832,6 +1849,14 @@ void MuseScore::setCurrentScoreView(ScoreView* view)
             navigator()->setScore(cs);
             navigator()->setScoreView(view);
             }
+      if (_timeline && _timeline->widget()) {
+            QSplitter* s = static_cast<QSplitter*>(_timeline->widget());
+            if (s && s->count() > 0) {
+                  Timeline* t = static_cast<Timeline*>(s->widget(1));
+                  t->setScore(cs);
+                  t->setScoreView(view);
+                  }
+            }
       ScoreAccessibility::instance()->updateAccessibilityInfo();
       }
 
@@ -4597,6 +4622,8 @@ void MuseScore::cmd(QAction* a)
 
 void MuseScore::endCmd()
       {
+      if (timeline())
+            timeline()->updateGrid();
       if (MScore::_error != MS_NO_ERROR)
             showError();
       if (cs) {
@@ -4812,6 +4839,8 @@ void MuseScore::cmd(QAction* a, const QString& cmd)
             showPlayPanel(a->isChecked());
       else if (cmd == "toggle-navigator")
             showNavigator(a->isChecked());
+      else if (cmd == "toggle-timeline")
+            showTimeline(a->isChecked());
       else if (cmd == "toggle-midiimportpanel")
             importmidiPanel->setVisible(a->isChecked());
       else if (cmd == "toggle-mixer")
@@ -5058,6 +5087,21 @@ Navigator* MuseScore::navigator() const
       return _navigator ? static_cast<Navigator*>(_navigator->widget()) : 0;
       }
 
+//---------------------------------------------------------
+//   timeline
+//---------------------------------------------------------
+
+Timeline* MuseScore::timeline() const
+      {
+      if (_timeline) {
+            QSplitter* s = static_cast<QSplitter *>(_timeline->widget());
+            if (s && s->count() > 0)
+                  return _timeline ? static_cast<Timeline*>(s->widget(1)) : 0;
+            return 0;
+            }
+      return 0;
+      }
+
 //---------------------------------------------------------
 //   getSearchDialog
 //---------------------------------------------------------

mscore/musescore.h

@@ -75,6 +75,7 @@ class ScriptEngine;
 class KeyEditor;
 class ChordStyleEditor;
 class Navigator;
+class Timeline;
 class PianoTools;
 class MediaDialog;
 class Workspace;
@@ -85,6 +86,7 @@ class Capella;
 class Inspector;
 class OmrPanel;
 class NScrollArea;
+class TDockWidget;
 class Sym;
 class MasterPalette;
 class PluginCreator;
@@ -232,6 +234,7 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
       ScoreTab* tab1;
       ScoreTab* tab2;
       NScrollArea* _navigator;
+      TDockWidget* _timeline;
       ImportMidiPanel* importmidiPanel     { 0 };
       QFrame* importmidiShowPanel;
       QSplitter* mainWindow;
@@ -428,6 +431,7 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
       void showInspector(bool);
       void showOmrPanel(bool);
       void showNavigator(bool);
+      void showTimeline(bool);
       void showSelectionWindow(bool);
       void showSearchDialog();
       void showToolbarEditor();
@@ -669,6 +673,8 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
       Q_INVOKABLE QString getLocaleISOCode() const;
       Navigator* navigator() const;
       NScrollArea* navigatorScrollArea() const { return _navigator; }
+      Timeline* timeline() const;
+      TDockWidget* timelineScrollArea() const { return _timeline; }
       QWidget*   searchDialog() const;
       SelectionWindow* getSelectionWindow() const { return selectionWindow; }
       void updateLayer();

mscore/scoreview.cpp

@@ -2717,7 +2717,7 @@ void ScoreView::pageEnd()
 //   adjustCanvasPosition
 //---------------------------------------------------------
 
-void ScoreView::adjustCanvasPosition(const Element* el, bool playBack)
+void ScoreView::adjustCanvasPosition(const Element* el, bool playBack, int staff )
       {
       if (this != mscore->currentScoreView())
             return;
@@ -2831,8 +2831,19 @@ void ScoreView::adjustCanvasPosition(const Element* el, bool playBack)
 
       double _spatium    = score()->spatium();
       const qreal border = _spatium * 3;
-      QRectF showRect = QRectF(mRect.x(), sysRect.y(), mRect.width(), sysRect.height())
+      QRectF showRect;
+      if (staff == -1) {
+            showRect = QRectF(mRect.x(), sysRect.y(), mRect.width(), sysRect.height())
                         .adjusted(-border, -border, border, border);
+            }
+      else {
+            //find a box for the individual stave in a system
+            QRectF stave = QRectF(sys->canvasBoundingRect().left(),
+                                  sys->staffCanvasYpage(staff),
+                                  sys->width(),
+                                  sys->staff(staff)->bbox().height());
+            showRect = mRect.intersected(stave).adjusted(-border, -border, border, border);
+            }
 
 /*      printf("%f %f %f %f   %f %f %f %f  %d\n",
             showRect.x(), showRect.y(), showRect.width(), showRect.height(),

mscore/scoreview.h

@@ -396,7 +396,7 @@ class ScoreView : public QWidget, public MuseScoreView {
       virtual void layoutChanged();
       virtual void dataChanged(const QRectF&);
       virtual void updateAll()    { update(); }
-      virtual void adjustCanvasPosition(const Element* el, bool playBack);
+      virtual void adjustCanvasPosition(const Element* el, bool playBack, int staff = -1);
       virtual void setCursor(const QCursor& c) { QWidget::setCursor(c); }
       virtual QCursor cursor() const { return QWidget::cursor(); }
       void loopUpdate(bool val)   {  loopToggled(val); }

mscore/shortcut.cpp

@@ -1763,6 +1763,16 @@ Shortcut Shortcut::_sc[] = {
          Icons::Invalid_ICON,
          Qt::ApplicationShortcut
          },
+      {
+         MsWidget::MAIN_WINDOW,
+         STATE_NORMAL | STATE_NOTE_ENTRY | STATE_EDIT  | STATE_PLAY,
+         "toggle-timeline",
+         QT_TRANSLATE_NOOP("action","Timeline"),
+         0,
+         0,
+         Icons::Invalid_ICON,
+         Qt::ApplicationShortcut
+         },
       {
          MsWidget::MAIN_WINDOW,
          STATE_NORMAL | STATE_NOTE_ENTRY | STATE_EDIT | STATE_PLAY,