LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:musescore/MuseScore

Browse source
This commit is contained in:
Werner Schweer 2012-07-31 09:48:45 +02:00
commit 0488c2bed9
14 changed files with 49 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
awl/colorlabel.cpp
View file

@ -95,7 +95,7 @@ void ColorLabel::mousePressEvent(QMouseEvent*)
if (_pixmap)
return;
QColor c = QColorDialog::getColor(_color, this,
tr("MuseScore: select color"),
tr("MuseScore: Select Color"),
QColorDialog::ShowAlphaChannel
);
if (c.isValid()) {

3
libmscore/chordrest.cpp
View file

@ -408,6 +408,7 @@ void ChordRest::layoutArticulations()
&& (st2 == Articulation_Marcato)) {
QPointF pt = static_cast<Chord*>(this)->layoutArticulation(a1);
pt.ry() += a1->up() ? -_spatium * .5 : _spatium * .5;
a2->layout();
a2->setUp(a1->up());
a2->setPos(pt);
a2->adjustReadPos();
@ -425,6 +426,7 @@ void ChordRest::layoutArticulations()
&& (st2 == Articulation_Sforzatoaccent)) {
QPointF pt = static_cast<Chord*>(this)->layoutArticulation(a1);
pt.ry() += a1->up() ? -_spatium * .7 : _spatium * .7;
a2->layout();
a2->setUp(a1->up());
a2->setPos(pt);
a2->adjustReadPos();
@ -761,6 +763,7 @@ Element* ChordRest::drop(const DropData& data)
return e;
case DYNAMIC:
case FRET_DIAGRAM:
e->setTrack(track());
e->setParent(segment());
score()->undoAddElement(e);

3
libmscore/note.cpp
View file

@ -956,7 +956,8 @@ bool Note::acceptDrop(MuseScoreView*, const QPointF&, Element* e) const
|| (type == SLUR)
|| (type == STAFF_TEXT)
|| (type == TEMPO_TEXT)
|| (type == BEND && (staff()->useTablature())));
|| (type == BEND && (staff()->useTablature()))
|| (type == FRET_DIAGRAM));
}
//---------------------------------------------------------

1
libmscore/page.cpp
View file

@ -689,6 +689,7 @@ void Page::doRebuildBspTree()
bspTree.initialize(abbox(), n);
for (int i = 0; i < n; ++i)
bspTree.insert(el.at(i));
bspTreeValid = true;
}
#endif

2
libmscore/rendermidi.cpp
View file

@ -460,7 +460,7 @@ void Score::updateRepeatList(bool expandRepeats)
void Score::toEList(EventMap* events)
{
updateRepeatList(_playRepeats);
updateRepeatList(MScore::playRepeats);
_foundPlayPosAfterRepeats = false;
updateChannel();
updateVelo();

1
libmscore/score.cpp
View file

@ -331,7 +331,6 @@ void Score::init()
_showOmr = false;
_sigmap = 0; // new TimeSigMap();
_tempomap = 0; // new TempoMap;
_playRepeats = true;
_layoutMode = LayoutPage;
}

3
libmscore/score.h
View file

@ -323,7 +323,6 @@ class Score : public QObject {
Audio* _audio;
bool _showOmr;
PlayMode _playMode;
bool _playRepeats;
SyntiState _syntiState;
@ -859,8 +858,6 @@ class Score : public QObject {
void setExcerptsChanged(bool val) { _excerptsChanged = val; }
bool instrumentsChanged() const { return _instrumentsChanged; }
void setInstrumentsChanged(bool val) { _instrumentsChanged = val; }
bool playRepeats() const { return _playRepeats; }
void setPlayRepeats(bool val) { _playRepeats = val; }
bool selectionChanged() const { return _selectionChanged; }
void setSelectionChanged(bool val) { _selectionChanged = val; }

3
mscore/element.ui
View file

@ -240,6 +240,9 @@
<property name="toolTip">
<string notr="true"/>
</property>
<property name="frameShape">
<set>QFrame::Box</set>
</property>
</widget>
</item>
<item row="0" column="5">

6
mscore/inspector_element.ui
View file

@ -139,7 +139,11 @@
</widget>
</item>
<item row="0" column="1">
<widget class="Awl::ColorLabel" name="color"/>
<widget class="Awl::ColorLabel" name="color">
<property name="frameShape">
<set>QFrame::Box</set>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="visible">

6
mscore/inspector_group_element.ui
View file

@ -53,7 +53,11 @@
</widget>
</item>
<item row="0" column="0">
<widget class="Awl::ColorLabel" name="color"/>
<widget class="Awl::ColorLabel" name="color">
<property name="frameShape">
<set>QFrame::Box</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="setVisible">

3
mscore/lineproperties.ui
View file

@ -112,6 +112,9 @@
<height>0</height>
</size>
</property>
<property name="frameShape">
<set>QFrame::Box</set>
</property>
</widget>
</item>
<item>

10
mscore/navigator.cpp
View file

@ -329,10 +329,12 @@ static void createPixmap(PageCache* pc)
m->scanElements(&p, paintElement, false);
}
pc->page->scanElements(&p, paintElement, false);
p.setFont(QFont("FreeSans", 400)); // !!
p.setPen(QColor(0, 0, 255, 50));
p.drawText(pc->page->bbox(), Qt::AlignCenter, QString("%1").arg(pc->page->no()+1));
if (pc->page->score()->layoutMode() == LayoutPage) {
p.setFont(QFont("FreeSans", 400)); // !!
p.setPen(QColor(0, 0, 255, 50));
p.drawText(pc->page->bbox(), Qt::AlignCenter, QString("%1").arg(pc->page->no()+1));
}
pc->navigator->update(pageRect);
pc->valid = true;
}

12
mscore/prefsdialog.ui
View file

@ -683,7 +683,11 @@
<number>0</number>
</property>
<item>
<widget class="Awl::ColorLabel" name="bgColorLabel"/>
<widget class="Awl::ColorLabel" name="bgColorLabel">
<property name="frameShape">
<set>QFrame::Box</set>
</property>
</widget>
</item>
</layout>
</item>
@ -734,7 +738,11 @@
<number>0</number>
</property>
<item>
<widget class="Awl::ColorLabel" name="fgColorLabel"/>
<widget class="Awl::ColorLabel" name="fgColorLabel">
<property name="frameShape">
<set>QFrame::Box</set>
</property>
</widget>
</item>
</layout>
</item>

9
mscore/textproperties.ui
View file

@ -500,6 +500,9 @@
<property name="toolTip">
<string>text color</string>
</property>
<property name="frameShape">
<set>QFrame::Box</set>
</property>
</widget>
</item>
<item>
@ -912,6 +915,9 @@
<property name="toolTip">
<string>frame color</string>
</property>
<property name="frameShape">
<set>QFrame::Box</set>
</property>
</widget>
</item>
<item row="2" column="1">
@ -919,6 +925,9 @@
<property name="toolTip">
<string>frame color</string>
</property>
<property name="frameShape">
<set>QFrame::Box</set>
</property>
</widget>
</item>
<item row="2" column="2">