fix #39006

musescore · Nov 20, 2014 · 6c03319 · 6c03319
1 parent 0a913fd
commit 6c03319
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 22 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -1494,10 +1494,8 @@ void Score::doLayout()
 
       rebuildBspTree();
 
-      for (MuseScoreView* v : viewer) {
+      for (MuseScoreView* v : viewer)
             v->layoutChanged();
-            v->updateLoopCursors();
-            }
 
       _layoutAll = false;
 

diff --git a/libmscore/mscoreview.h b/libmscore/mscoreview.h
@@ -41,7 +41,6 @@ class MuseScoreView {
       virtual void updateAll() = 0;
 
       virtual void moveCursor()          {}
-      virtual void updateLoopCursors()   {}
       virtual void showLoopCursors(bool) {}
 
       virtual void adjustCanvasPosition(const Element* el, bool playBack) = 0;
@@ -60,7 +59,7 @@ class MuseScoreView {
       virtual void startEdit(Element*, int startGrip) = 0;
       virtual void drawBackground(QPainter*, const QRectF&) const = 0;
       virtual void setDropTarget(const Element*) {}
-      
+
       virtual void lyricsTab(bool /*back*/, bool /*end*/, bool /*moveOnly*/) {}
       virtual void lyricsReturn() {}
       virtual void lyricsEndEdit() {}

diff --git a/mscore/musescore.qrc b/mscore/musescore.qrc
@@ -18,7 +18,7 @@
         <file alias="fonts/fonts_figuredbass.xml">../fonts/fonts_figuredbass.xml</file>
         <file alias="data/instruments.xml">../share/instruments/instruments.xml</file>
         <file>data/splash.jpg</file>
-        <file>data/My_First_Score.mscz</file>
+        <file alias="data/My_First_Score.mscz">../share/templates/01-General/01-My_First_Score.mscz</file>
         <file>data/tab_sample.mscx</file>
         <file>data/style.qss</file>
         <file>data/mscore.png</file>

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -944,10 +944,6 @@ void ScoreView::setScore(Score* s)
 
             connect(s, SIGNAL(posChanged(POS,unsigned)), SLOT(posChanged(POS,unsigned)));
             connect(this, SIGNAL(viewRectChanged()), this, SLOT(updateContinuousPanel()));
-
-//            s->setLayoutMode(LayoutMode::PAGE);
-//            s->setLayoutAll(true);
-//            s->update();
             }
       }
 
@@ -1288,15 +1284,6 @@ void ScoreView::dataChanged(const QRectF& r)
       update(_matrix.mapRect(r).toRect());  // generate paint event
       }
 
-//---------------------------------------------------------
-//   updateAll
-//---------------------------------------------------------
-
-void ScoreView::updateAll()
-      {
-      update();
-      }
-
 //---------------------------------------------------------
 //   moveCursor
 //    move cursor during playback
@@ -5366,6 +5353,8 @@ void ScoreView::layoutChanged()
       {
       if (mscore->navigator())
             mscore->navigator()->layoutChanged();
+      _curLoopIn->move(_score->pos(POS::LEFT));
+      _curLoopOut->move(_score->pos(POS::RIGHT));
       }
 
 //---------------------------------------------------------

diff --git a/mscore/scoreview.h b/mscore/scoreview.h
@@ -419,7 +419,7 @@ class ScoreView : public QWidget, public MuseScoreView {
 
       virtual void layoutChanged();
       virtual void dataChanged(const QRectF&);
-      virtual void updateAll();
+      virtual void updateAll()    { update(); }
       virtual void adjustCanvasPosition(const Element* el, bool playBack);
       virtual void setCursor(const QCursor& c) { QWidget::setCursor(c); }
       virtual QCursor cursor() const { return QWidget::cursor(); }

diff --git a/mscore/data/My_First_Score.mscz → ...mplates/01-General/01-My_First_Score.mscz b/mscore/data/My_First_Score.mscz → ...mplates/01-General/01-My_First_Score.mscz
diff --git a/.../templates/01-General/01-Treble_Clef.mscz → .../templates/01-General/02-Treble_Clef.mscz b/.../templates/01-General/01-Treble_Clef.mscz → .../templates/01-General/02-Treble_Clef.mscz
diff --git a/share/templates/01-General/01-Bass_Clef.mscz → share/templates/01-General/03-Bass_Clef.mscz b/share/templates/01-General/01-Bass_Clef.mscz → share/templates/01-General/03-Bass_Clef.mscz
diff --git a/share/templates/CMakeLists.txt b/share/templates/CMakeLists.txt
@@ -23,8 +23,9 @@ install(FILES
       DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}templates
       )
 install(FILES
-      01-General/01-Bass_Clef.mscz
-      01-General/01-Treble_Clef.mscz
+      01-General/01-My_First_Score.mscz
+      01-General/02-Treble_Clef.mscz
+      01-General/03-Bass_Clef.mscz
       DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}templates/01-General
       )