diff options
Diffstat (limited to 'common/Util')
| -rw-r--r-- | common/Util/InstrumentDB.py | 2 | ||||
| -rw-r--r-- | common/Util/Instruments.py | 20 |
2 files changed, 7 insertions, 15 deletions
diff --git a/common/Util/InstrumentDB.py b/common/Util/InstrumentDB.py index ac72a19..e7cbce0 100644 --- a/common/Util/InstrumentDB.py +++ b/common/Util/InstrumentDB.py @@ -24,7 +24,7 @@ class Instrument: self.wav = wav self.img = img self.category = category - self.nameTooltip = nameTooltip + self.nameTooltip = nameTooltip or name # build an Instrument instance by parsing a file def loadFromPath(self, path ): diff --git a/common/Util/Instruments.py b/common/Util/Instruments.py index 315e451..8462e0d 100644 --- a/common/Util/Instruments.py +++ b/common/Util/Instruments.py @@ -291,19 +291,11 @@ DRUM6KIT = { 24 : "drum6madal00", 46 : "drum6madal11", 48 : "drum6madal12" } -_addInstrument( "drum1kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM1KIT ) -_addInstrument( "drum2kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM2KIT ) -_addInstrument( "drum3kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM3KIT ) -_addInstrument( "drum4kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM4KIT ) -_addInstrument( "drum5kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM5KIT ) -_addInstrument( "drum6kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM6KIT ) - -DRUMTIPS = [ - _('Jazz / Rock Kit'), - _('African Kit'), - _('Arabic Kit'), - _('South American Kit'), - _('Electronic Kit'), - _('Nepali') ] +_addInstrument( "drum1kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM1KIT, nameTooltip=_('Jazz / Rock Kit') ) +_addInstrument( "drum2kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM2KIT, nameTooltip=_('African Kit') ) +_addInstrument( "drum3kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM3KIT, nameTooltip=_('Arabic Kit') ) +_addInstrument( "drum4kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM4KIT, nameTooltip=_('South American Kit') ) +_addInstrument( "drum5kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM5KIT, nameTooltip=_('Electronic Kit') ) +_addInstrument( "drum6kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM6KIT, nameTooltip=_('Nepali') ) DRUMCOUNT = 6 |