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

new wizard: don't create instrument names if only one part

Browse source
This commit is contained in:
Werner Schweer 2012-08-22 09:32:58 +02:00
parent f5bed11a87
commit 0cd8973b68
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libmscore/event.h
View file

@ -140,7 +140,6 @@ class Event {
Event& operator=(const Event&);
bool operator==(const Event&) const;
// void write(MidiFile*) const;
void write(Xml&) const;
void dump() const;

24
mscore/newwizard.cpp
View file

@ -122,7 +122,7 @@ void InstrumentWizard::on_partiturList_itemSelectionChanged()
}
QTreeWidgetItem* item = wi.front();
bool flag = item != 0;
int count = 0; // item can be hidden
QTreeWidgetItem* it = 0;
QList<QTreeWidgetItem*> witems;
@ -142,12 +142,12 @@ void InstrumentWizard::on_partiturList_itemSelectionChanged()
}
}
}
bool onlyOne = (count == 1);
bool onlyOne = (count == 1);
bool onlyOneStaff = ((item->type() == STAFF_LIST_ITEM) && onlyOne);
bool first = (witems.first() == item);
bool last = (witems.last() == item);
removeButton->setEnabled(flag && !onlyOneStaff);
upButton->setEnabled(flag && !onlyOne && !first);
downButton->setEnabled(flag && !onlyOne && !last);
@ -434,7 +434,7 @@ void InstrumentWizard::createInstruments(Score* cs)
dst.push_back(sli->staff);
}
}
#if 1
//
// check for bar lines
//
@ -453,7 +453,19 @@ void InstrumentWizard::createInstruments(Score* cs)
staffIdx = nstaffIdx;
}
#endif
//
// remove instrument names if only one part
//
if (cs->parts().size() == 1) {
Part* part = cs->parts().front();
if (part->instrList()->size() == 1) {
Instrument& instrument = part->instrList()->instrument(0);
instrument.setShortName(QTextDocumentFragment());
instrument.setLongName(QTextDocumentFragment());
}
}
cs->setLayoutAll(true);
}

1
mscore/palette.cpp
View file

@ -1177,7 +1177,6 @@ void Palette::read(QDomElement e)
element->read(ee);
if (element->type() == ICON) {
Icon* icon = static_cast<Icon*>(element);
// Shortcut* s = getShortcut(icon->action());
QIcon qicon(getAction(icon->action())->icon());
icon->setAction(icon->action(), qicon);
}