diff options
501 files changed, 488 insertions, 268 deletions
diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py index 996f517..e2b41e4 100644 --- a/Edit/EditToolbars.py +++ b/Edit/EditToolbars.py @@ -525,13 +525,13 @@ class generationPalette(Palette): self.predrawIdleAbort = False self.predrawBuffer = False # self.predrawBuffer is initialized in handlePreviewAlloc - pix = gtk.gdk.pixbuf_new_from_file( Config.IMAGE_ROOT+"sampleBG.png" ) + pix = gtk.gdk.pixbuf_new_from_file(imagefile('sampleBG.png')) self.sampleBg = gtk.gdk.Pixmap( win, pix.get_width(), pix.get_height() ) self.sampleBg.draw_pixbuf( self.gc, pix, 0, 0, 0, 0, pix.get_width(), pix.get_height(), gtk.gdk.RGB_DITHER_NONE ) self.sampleBg.endOffset = pix.get_width()-5 self.sampleNoteHeight = 7 if True: # load clipmask - pix = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT+'sampleNoteMask.png') + pix = gtk.gdk.pixbuf_new_from_file(imagefile('sampleNoteMask.png')) pixels = pix.get_pixels() stride = pix.get_rowstride() channels = pix.get_n_channels() @@ -830,7 +830,10 @@ class propertiesPalette(Palette): self.pageColorLabel = gtk.Label(_('Page color: ')) self.pageColorComboBox = BigComboBox() for color in (0,1,2,3): - self.pageColorComboBox.append_item(color, text = None, icon_name = Config.IMAGE_ROOT + 'pageThumbnailBG' + str(color) + '.png', size = (30,40)) + self.pageColorComboBox.append_item(color, text=None, + icon_name=imagefile( + 'pageThumbnailBG' + str(color) + '.png'), + size=(30,40)) self.pageColorComboBox.set_active(0) self.pageColorComboBox.connect('changed', self.handleColor) self.pageColorBox.pack_start(self.pageColorLabel, False, False, padding = 5) diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py index 4351985..8cb015f 100644 --- a/Edit/MainWindow.py +++ b/Edit/MainWindow.py @@ -44,9 +44,14 @@ from Edit.TuneInterface import TuneInterface, TuneInterfaceParasite from common.Generation.Generator import generator1, GenerationParameters + Tooltips = Config.Tooltips() KEY_MAP_PIANO = Config.KEY_MAP_PIANO +TRACK_SIZE = Config.scale(132) +DRUM_TRACK_SIZE = Config.scale(165) + + #----------------------------------- # The main TamTam window #----------------------------------- @@ -133,9 +138,11 @@ class MainWindow(gtk.EventBox): self.GUI["2instrumentIcons"] = {} for i in instruments: try: - self.GUI["2instrumentIcons"][i.name] = gtk.gdk.pixbuf_new_from_file(i.img) + pixbuf = gtk.gdk.pixbuf_new_from_file(i.img) except: - self.GUI["2instrumentIcons"][i.name] = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT + 'generic.png') + pixbuf = gtk.gdk.pixbuf_new_from_file( + imagefile('generic.png')) + self.GUI['2instrumentIcons'][i.name] = pixbuf TP.ProfileBegin("init_GUI::instrument icons") draw_inst_icons() TP.ProfileEnd("init_GUI::instrument icons") @@ -154,7 +161,7 @@ class MainWindow(gtk.EventBox): self.GUI["2page"].pack_start( self.GUI["2instrumentPanel"], True ) # + + instrument 1 box self.GUI["2instrument1Box"] = formatRoundBox( RoundHBox(), Config.BG_COLOR ) - self.GUI["2instrument1Box"].set_size_request( -1, 132 ) + self.GUI["2instrument1Box"].set_size_request(-1, TRACK_SIZE) self.GUI["2instrument1volBox"] = gtk.VBox() #self.GUI["2instrument1volumeAdjustment"] = gtk.Adjustment( self._data["track_volume"][1], 0, 100, 1, 1, 0 ) #self.GUI["2instrument1volumeAdjustment"].connect( "value_changed", self.onTrackVolumeChanged, 0 ) @@ -163,7 +170,8 @@ class MainWindow(gtk.EventBox): #self.GUI["2instrument1volumeSlider"].set_inverted(True) #self.GUI["2instrument1volumeSlider"].set_size_request( 30, -1 ) #self.GUI["2instrument1volumeAdjustment"].connect( "value-changed", self.handleTrackVolume, 0 ) - self.GUI["2instrument1muteButton"] = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg") + self.GUI["2instrument1muteButton"] = ImageToggleButton( + 'checkOff.png', 'checkOn.png') self.GUI["2instrument1muteButton"].connect("toggled",self.handlemuteButton,0) self.GUI["2instrument1muteButton"].connect("button-press-event",self.handlemuteButtonRightClick,0) self.GUI["2instrument1muteButton"].set_active(True) @@ -177,7 +185,7 @@ class MainWindow(gtk.EventBox): self.GUI["2instrumentPanel"].pack_start( self.GUI["2instrument1Box"] ) # + + instrument 2 box self.GUI["2instrument2Box"] = formatRoundBox( RoundHBox(), Config.BG_COLOR ) - self.GUI["2instrument2Box"].set_size_request( -1, 132 ) + self.GUI["2instrument2Box"].set_size_request(-1, TRACK_SIZE) self.GUI["2instrument2volBox"] = gtk.VBox() #self.GUI["2instrument2volumeAdjustment"] = gtk.Adjustment( self._data["track_volume"][1], 0, 100, 1, 1, 0 ) #self.GUI["2instrument2volumeAdjustment"].connect( "value_changed", self.onTrackVolumeChanged, 1 ) @@ -186,7 +194,8 @@ class MainWindow(gtk.EventBox): #self.GUI["2instrument2volumeSlider"].set_inverted(True) #self.GUI["2instrument2volumeSlider"].set_size_request( 30, -1 ) #self.GUI["2instrument2volumeAdjustment"].connect( "value-changed", self.handleTrackVolume, 1 ) - self.GUI["2instrument2muteButton"] = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg") + self.GUI["2instrument2muteButton"] = ImageToggleButton( + 'checkOff.png', 'checkOn.png') self.GUI["2instrument2muteButton"].connect("toggled",self.handlemuteButton,1) self.GUI["2instrument2muteButton"].connect("button-press-event",self.handlemuteButtonRightClick,1) self.GUI["2instrument2muteButton"].set_active(True) @@ -200,7 +209,7 @@ class MainWindow(gtk.EventBox): self.GUI["2instrumentPanel"].pack_start( self.GUI["2instrument2Box"] ) # + + instrument 3 box self.GUI["2instrument3Box"] = formatRoundBox( RoundHBox(), Config.BG_COLOR ) - self.GUI["2instrument3Box"].set_size_request( -1, 132 ) + self.GUI["2instrument3Box"].set_size_request(-1, TRACK_SIZE) self.GUI["2instrument3volBox"] = gtk.VBox() #self.GUI["2instrument3volumeAdjustment"] = gtk.Adjustment( self._data["track_volume"][2], 0, 100, 1, 1, 0 ) #self.GUI["2instrument3volumeAdjustment"].connect( "value_changed", self.onTrackVolumeChanged, 2 ) @@ -209,7 +218,8 @@ class MainWindow(gtk.EventBox): #self.GUI["2instrument3volumeSlider"].set_inverted(True) #elf.GUI["2instrument3volumeSlider"].set_size_request( 30, -1 ) #self.GUI["2instrument3volumeAdjustment"].connect( "value-changed", self.handleTrackVolume, 2 ) - self.GUI["2instrument3muteButton"] = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg") + self.GUI["2instrument3muteButton"] = ImageToggleButton( + 'checkOff.png', 'checkOn.png') self.GUI["2instrument3muteButton"].connect("toggled",self.handlemuteButton,2) self.GUI["2instrument3muteButton"].connect("button-press-event",self.handlemuteButtonRightClick,2) self.GUI["2instrument3muteButton"].set_active(True) @@ -223,7 +233,7 @@ class MainWindow(gtk.EventBox): self.GUI["2instrumentPanel"].pack_start( self.GUI["2instrument3Box"] ) # + + instrument 4 box self.GUI["2instrument4Box"] = formatRoundBox( RoundHBox(), Config.BG_COLOR ) - self.GUI["2instrument4Box"].set_size_request( -1, 132 ) + self.GUI["2instrument4Box"].set_size_request(-1, TRACK_SIZE) self.GUI["2instrument4volBox"] = gtk.VBox() #self.GUI["2instrument4volumeAdjustment"] = gtk.Adjustment( self._data["track_volume"][3], 0, 100, 1, 1, 0 ) #self.GUI["2instrument4volumeAdjustment"].connect( "value_changed", self.onTrackVolumeChanged, 3 ) @@ -232,7 +242,8 @@ class MainWindow(gtk.EventBox): #self.GUI["2instrument4volumeSlider"].set_inverted(True) #self.GUI["2instrument4volumeSlider"].set_size_request( 30, -1 ) #self.GUI["2instrument4volumeAdjustment"].connect( "value-changed", self.handleTrackVolume, 3 ) - self.GUI["2instrument4muteButton"] = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg") + self.GUI["2instrument4muteButton"] = ImageToggleButton( + 'checkOff.png', 'checkOn.png') self.GUI["2instrument4muteButton"].connect("toggled",self.handlemuteButton,3) self.GUI["2instrument4muteButton"].connect("button-press-event",self.handlemuteButtonRightClick,3) self.GUI["2instrument4muteButton"].set_active(True) @@ -246,7 +257,7 @@ class MainWindow(gtk.EventBox): self.GUI["2instrumentPanel"].pack_start( self.GUI["2instrument4Box"] ) # + + drum box self.GUI["2drumBox"] = formatRoundBox( RoundHBox(), Config.BG_COLOR ) - self.GUI["2drumBox"].set_size_request( -1, 165 ) + self.GUI["2drumBox"].set_size_request(-1, DRUM_TRACK_SIZE) self.GUI["2drumVolBox"] = gtk.VBox() self.GUI["2drumvolumeAdjustment"] = gtk.Adjustment( self._data["track_volume"][4], 0, 100, 1, 1, 0 ) self.GUI["2drumvolumeAdjustment"].connect( "value_changed", self.onTrackVolumeChanged, 4 ) @@ -255,14 +266,17 @@ class MainWindow(gtk.EventBox): #self.GUI["2drumvolumeSlider"].set_inverted(True) #self.GUI["2drumvolumeSlider"].set_size_request( 30, -1 ) self.GUI["2drumvolumeAdjustment"].connect( "value-changed", self.handleTrackVolume, 4 ) - self.GUI["2drumMuteButton"] = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg") + self.GUI["2drumMuteButton"] = ImageToggleButton( + 'checkOff.png', 'checkOn.png') self.GUI["2drumMuteButton"].connect("toggled",self.handlemuteButton,4) self.GUI["2drumMuteButton"].connect("button-press-event",self.handlemuteButtonRightClick,4) self.GUI["2drumMuteButton"].set_active(True) #self.GUI["2drumVolBox"].pack_start( self.GUI["2drumvolumeSlider"], True, True, 0 ) #self.GUI["2drumVolBox"].pack_start( self.GUI["2drumMuteButton"], False, False, 5 ) self.GUI["2drumBox"].pack_start( self.GUI["2drumVolBox"], False, False, 0 ) - self.GUI["2drumButton"] = ImageToggleButton(Config.IMAGE_ROOT + self.trackInstrument[4].name + '.png', Config.IMAGE_ROOT + self.trackInstrument[4].name + '.png') + self.GUI["2drumButton"] = ImageToggleButton( + self.trackInstrument[4].name + '.png', + self.trackInstrument[4].name + '.png') self.GUI["2drumPalette"] = drumPalette(_('Track 5 Properties'), self, 4) self.GUI["2drumButton"].connect("toggled", self.pickDrum) self.GUI["2drumButton"].connect('button-release-event',self.GUI["2drumPalette"].setBlock) @@ -270,10 +284,11 @@ class MainWindow(gtk.EventBox): self.GUI["2instrumentPanel"].pack_start( self.GUI["2drumBox"] ) self.GUI["2page"].pack_start( self.GUI["2instrumentPanel"], True ) # + track interface - tracks_width = gtk.gdk.screen_width() - 140 - self.trackInterface = TrackInterface( self.noteDB, self, self.getScale, tracks_width ) + tracks_width = gtk.gdk.screen_width() - TRACK_SIZE * 1.25 + self.trackInterface = TrackInterface( self.noteDB, self, + self.getScale, tracks_width) self.noteDB.addListener( self.trackInterface, TrackInterfaceParasite, True ) - self.trackInterface.set_size_request( tracks_width, -1 ) + self.trackInterface.set_size_request(tracks_width, -1) self.GUI["2page"].pack_start( self.trackInterface, False ) #------------------------------------------------------------------------ @@ -284,7 +299,8 @@ class MainWindow(gtk.EventBox): self.noteDB.addListener( self.tuneInterface, TuneInterfaceParasite, True ) self.GUI["2tuneScrolledWindow"].set_viewport( self.tuneInterface ) self.tuneInterface.get_parent().set_shadow_type( gtk.SHADOW_NONE ) - self.GUI["2tuneScrolledWindow"].set_size_request(-1, 100) + self.GUI["2tuneScrolledWindow"].set_size_request(-1, + Config.PAGE_THUMBNAIL_HEIGHT + style.DEFAULT_PADDING * 2) self.GUI["2tuneScrolledWindow"].modify_bg(gtk.STATE_NORMAL, style.Color(Config.TOOLBAR_BCK_COLOR).get_gdk_color()) self.GUI["2main"].pack_start( self.GUI["2tuneScrolledWindow"], False, True ) @@ -907,7 +923,7 @@ class MainWindow(gtk.EventBox): self._data["volume"] = round(widget.get_value()) self.csnd.setMasterVolume(self._data["volume"]) img = min(3,int(4*self._data["volume"]/100)) # volume 0-3 - #self.GUI["2volumeImage"].set_from_file( Config.IMAGE_ROOT+"volume"+str(img)+".png" ) + #self.GUI["2volumeImage"].set_from_file(imagefile('volume' + str(img) + '.png')) def initTrackVolume(self): for i in range(Config.NUMBER_OF_TRACKS): @@ -926,7 +942,7 @@ class MainWindow(gtk.EventBox): def handleTempo(self, widget): self._data['tempo'] = round(widget.get_value()) img = min(7,int(8*(self._data["tempo"]-widget.lower)/(widget.upper-widget.lower)))+1 # tempo 1-8 - #self.GUI["2tempoImage"].set_from_file( Config.IMAGE_ROOT+"tempo"+str(img)+".png" ) + #self.GUI["2tempoImage"].set_from_file(imagefile('tempo' + str(img) + '.png')) if self.playing: self.csnd.setTempo(self._data['tempo']) @@ -2202,9 +2218,9 @@ class instrumentPalette(Popup): self.categories = Config.CATEGORIES self.categoryBox = BigComboBox() for category in self.categories: - image = Config.IMAGE_ROOT + category.lower() + '.png' + image = imagefile(category.lower() + '.png') if not os.path.isfile(image): - image = Config.IMAGE_ROOT + 'generic.png' + image = imagefile('generic.png') self.categoryBox.append_item(category, category.capitalize(), icon_name = image, size = instrumentPalette.ICON_SIZE) self.categoryBox.connect('changed', self.handleCategoryChange) @@ -2355,9 +2371,9 @@ class drumPalette(Popup): def loadDrumMenu(self, instruments): self.drumBox.remove_all() for instrument in instruments: - image = Config.IMAGE_ROOT + instrument + '.png' + image = imagefile(instrument + '.png') if not os.path.isfile(image): - image = Config.IMAGE_ROOT + 'generic.png' + image = imagefile('generic.png') self.drumBox.append_item(instrument, text = None, icon_name = image, size = instrumentPalette.ICON_SIZE) def getDrums(self): diff --git a/Edit/Properties.py b/Edit/Properties.py index 2dc6d84..b6baf9d 100644 --- a/Edit/Properties.py +++ b/Edit/Properties.py @@ -60,30 +60,39 @@ class Properties( gtk.VBox ): self.pageBox.set_radius(10) beatBox = gtk.VBox() self.beatAdjust = gtk.Adjustment( 4, 2, 12, 1, 1, 0) - self.GUI['beatSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.beatAdjust, 7 ) + self.GUI['beatSlider'] = ImageVScale('sliderEditVolume.png', + self.beatAdjust, 7) self.GUI['beatSlider'].connect("button-release-event", self.handleBeat) self.GUI['beatSlider'].set_snap( 1 ) self.GUI['beatSlider'].set_inverted(True) self.GUI['beatSlider'].set_size_request(50, 200) beatBox.pack_start( self.GUI['beatSlider'] ) self.beatLabel = gtk.Image() - self.beatLabel.set_from_file(Config.IMAGE_ROOT + 'volume3.png') + self.beatLabel.set_from_file(imagefile('volume3.png')) self.beatAdjust.connect("value-changed", self.updateBeatLabel) self.updateBeatLabel( self.beatAdjust ) beatBox.pack_start( self.beatLabel ) self.pageBox.pack_start( beatBox ) colorBox = gtk.VBox() - self.GUI["color0Button"] = ImageRadioButton( None, Config.IMAGE_ROOT+"pageThumbnailBut0.png", Config.IMAGE_ROOT+"pageThumbnailBut0Down.png", backgroundFill = Config.PANEL_COLOR ) + self.GUI["color0Button"] = ImageRadioButton(None, + 'pageThumbnailBut0.png', 'pageThumbnailBut0Down.png', + backgroundFill=Config.PANEL_COLOR) self.GUI["color0Button"].set_size_request( 80, -1 ) self.GUI["color0Button"].connect( "clicked", self.handleColor, 0 ) colorBox.pack_start( self.GUI["color0Button"] ) - self.GUI["color1Button"] = ImageRadioButton( self.GUI["color0Button"], Config.IMAGE_ROOT+"pageThumbnailBut1.png", Config.IMAGE_ROOT+"pageThumbnailBut1Down.png", backgroundFill = Config.PANEL_COLOR ) + self.GUI["color1Button"] = ImageRadioButton(self.GUI['color0Button'], + 'pageThumbnailBut1.png', 'pageThumbnailBut1Down.png', + backgroundFill=Config.PANEL_COLOR) self.GUI["color1Button"].connect( "clicked", self.handleColor, 1 ) colorBox.pack_start( self.GUI["color1Button"] ) - self.GUI["color2Button"] = ImageRadioButton( self.GUI["color0Button"], Config.IMAGE_ROOT+"pageThumbnailBut2.png", Config.IMAGE_ROOT+"pageThumbnailBut2Down.png", backgroundFill = Config.PANEL_COLOR ) + self.GUI["color2Button"] = ImageRadioButton(self.GUI['color0Button'], + 'pageThumbnailBut2.png', 'pageThumbnailBut2Down.png', + backgroundFill=Config.PANEL_COLOR) self.GUI["color2Button"].connect( "clicked", self.handleColor, 2 ) colorBox.pack_start( self.GUI["color2Button"] ) - self.GUI["color3Button"] = ImageRadioButton( self.GUI["color0Button"], Config.IMAGE_ROOT+"pageThumbnailBut3.png", Config.IMAGE_ROOT+"pageThumbnailBut3Down.png", backgroundFill = Config.PANEL_COLOR ) + self.GUI["color3Button"] = ImageRadioButton(self.GUI['color0Button'], + 'pageThumbnailBut3.png', 'pageThumbnailBut3Down.png', + backgroundFill=Config.PANEL_COLOR) self.GUI["color3Button"].connect( "clicked", self.handleColor, 3 ) colorBox.pack_start( self.GUI["color3Button"] ) self.pageBox.pack_start( colorBox ) @@ -94,16 +103,22 @@ class Properties( gtk.VBox ): pitchBox = RoundVBox(fillcolor=Config.PANEL_COLOR, bordercolor=Config.INST_BCK_COLOR) pitchBox.set_border_width(3) pitchBox.set_radius(10) - self.GUI['pitchUp'] = ImageButton( Config.IMAGE_ROOT+"arrowEditUp.png", Config.IMAGE_ROOT+"arrowEditUpDown.png", Config.IMAGE_ROOT+"arrowEditUpOver.png", backgroundFill = Config.PANEL_COLOR ) + self.GUI['pitchUp'] = ImageButton('arrowEditUp.png', + 'arrowEditUpDown.png', 'arrowEditUpOver.png', + backgroundFill=Config.PANEL_COLOR) self.GUI['pitchUp'].connect( "clicked", lambda w:self.stepPitch( 1 ) ) - self.GUI['pitchGen'] = ImageToggleButton( Config.IMAGE_ROOT+"diceProp.png", Config.IMAGE_ROOT+"dicePropSel.png", Config.IMAGE_ROOT+"dicePropSel.png", backgroundFill = Config.PANEL_COLOR ) + self.GUI['pitchGen'] = ImageToggleButton('diceProp.png', + 'dicePropSel.png', 'dicePropSel.png', + backgroundFill=Config.PANEL_COLOR) self.GUI['pitchGen'].connect( "clicked", self.openAlgoBox, 'pitch' ) pitchBox.pack_start( self.GUI['pitchGen'], False, False, 5 ) pitchBox.pack_start( self.GUI['pitchUp'] ) self.pitchIcon = gtk.Image() - self.pitchIcon.set_from_file(Config.IMAGE_ROOT + 'propPitch2.png') + self.pitchIcon.set_from_file(imagefile('propPitch2.png')) pitchBox.pack_start(self.pitchIcon) - self.GUI['pitchDown'] = ImageButton( Config.IMAGE_ROOT+"arrowEditDown.png", Config.IMAGE_ROOT+"arrowEditDownDown.png", Config.IMAGE_ROOT+"arrowEditDownOver.png", backgroundFill = Config.PANEL_COLOR ) + self.GUI['pitchDown'] = ImageButton('arrowEditDown.png', + 'arrowEditDownDown.png', 'arrowEditDownOver.png', + backgroundFill=Config.PANEL_COLOR) self.GUI['pitchDown'].connect( "clicked", lambda w:self.stepPitch( -1 ) ) pitchBox.pack_start( self.GUI['pitchDown'] ) self.controlsBox.pack_start(pitchBox) @@ -111,16 +126,22 @@ class Properties( gtk.VBox ): volumeBox = RoundVBox(fillcolor=Config.PANEL_COLOR, bordercolor=Config.INST_BCK_COLOR) volumeBox.set_border_width(3) volumeBox.set_radius(10) - self.GUI['volumeUp'] = ImageButton( Config.IMAGE_ROOT+"arrowEditUp.png", Config.IMAGE_ROOT+"arrowEditUpDown.png", Config.IMAGE_ROOT+"arrowEditUpOver.png", backgroundFill = Config.PANEL_COLOR ) + self.GUI['volumeUp'] = ImageButton('arrowEditUp.png', + 'arrowEditUpDown.png', 'arrowEditUpOver.png', + backgroundFill=Config.PANEL_COLOR) self.GUI['volumeUp'].connect( "clicked", lambda w:self.stepVolume( 0.1 ) ) - self.GUI['volumeGen'] = ImageToggleButton( Config.IMAGE_ROOT+"diceProp.png", Config.IMAGE_ROOT+"dicePropSel.png", Config.IMAGE_ROOT+"dicePropSel.png", backgroundFill = Config.PANEL_COLOR ) + self.GUI['volumeGen'] = ImageToggleButton('diceProp.png', + 'dicePropSel.png', 'dicePropSel.png', + backgroundFill=Config.PANEL_COLOR) self.GUI['volumeGen'].connect( "clicked", self.openAlgoBox, 'volume' ) volumeBox.pack_start( self.GUI['volumeGen'], False, False, 5 ) volumeBox.pack_start( self.GUI['volumeUp'] ) self.volumeIcon = gtk.Image() - self.volumeIcon.set_from_file(Config.IMAGE_ROOT + 'volume3.png') + self.volumeIcon.set_from_file(imagefile('volume3.png')) volumeBox.pack_start(self.volumeIcon) - self.GUI['volumeDown'] = ImageButton( Config.IMAGE_ROOT+"arrowEditDown.png", Config.IMAGE_ROOT+"arrowEditDownDown.png", Config.IMAGE_ROOT+"arrowEditDownOver.png", backgroundFill = Config.PANEL_COLOR ) + self.GUI['volumeDown'] = ImageButton('arrowEditDown.png', + 'arrowEditDownDown.png', 'arrowEditDownOver.png', + backgroundFill=Config.PANEL_COLOR) self.GUI['volumeDown'].connect( "clicked", lambda w:self.stepVolume( -0.1 ) ) volumeBox.pack_start( self.GUI['volumeDown'] ) self.controlsBox.pack_start(volumeBox) @@ -129,14 +150,17 @@ class Properties( gtk.VBox ): panBox.set_border_width(3) panBox.set_radius(10) self.panAdjust = gtk.Adjustment( 0.5, 0, 1, .1, .1, 0) - self.GUI['panSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.panAdjust, 7 ) + self.GUI['panSlider'] = ImageVScale('sliderEditVolume.png', + self.panAdjust, 7) self.panAdjust.connect("value-changed", self.handlePan) self.GUI['panSlider'].set_snap( 0.1 ) self.GUI['panSlider'].set_inverted(True) self.GUI['panSlider'].set_size_request(50, 200) self.panLabel = gtk.Image() self.handlePan( self.panAdjust ) - self.GUI['panGen'] = ImageToggleButton( Config.IMAGE_ROOT+"diceProp.png", Config.IMAGE_ROOT+"dicePropSel.png", Config.IMAGE_ROOT+"dicePropSel.png", backgroundFill = Config.PANEL_COLOR ) + self.GUI['panGen'] = ImageToggleButton('diceProp.png', + 'dicePropSel.png', 'dicePropSel.png', + backgroundFill=Config.PANEL_COLOR) self.GUI['panGen'].connect( "clicked", self.openAlgoBox, 'pan' ) panBox.pack_start(self.GUI['panGen'], True, True, 5) panBox.pack_start(self.GUI['panSlider'], True, True, 5) @@ -147,14 +171,17 @@ class Properties( gtk.VBox ): reverbBox.set_border_width(3) reverbBox.set_radius(10) self.reverbAdjust = gtk.Adjustment(0.1, 0, 1, 0.1, 0.1, 0) - self.GUI['reverbSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.reverbAdjust, 7 ) + self.GUI['reverbSlider'] = ImageVScale('sliderEditVolume.png', + self.reverbAdjust, 7) self.reverbAdjust.connect("value-changed", self.handleReverb) self.GUI['reverbSlider'].set_snap( 0.1 ) self.GUI['reverbSlider'].set_inverted(True) self.GUI['reverbSlider'].set_size_request(50, 200) self.reverbLabel = gtk.Image() self.handleReverb( self.reverbAdjust ) - self.GUI['reverbGen'] = ImageToggleButton( Config.IMAGE_ROOT+"diceProp.png", Config.IMAGE_ROOT+"dicePropSel.png", Config.IMAGE_ROOT+"dicePropSel.png", backgroundFill = Config.PANEL_COLOR ) + self.GUI['reverbGen'] = ImageToggleButton('diceProp.png', + 'dicePropSel.png', 'dicePropSel.png', + backgroundFill=Config.PANEL_COLOR) self.GUI['reverbGen'].connect( "clicked", self.openAlgoBox, 'reverb' ) reverbBox.pack_start(self.GUI['reverbGen'], True, True, 5) reverbBox.pack_start(self.GUI['reverbSlider'], True, True, 5) @@ -165,14 +192,17 @@ class Properties( gtk.VBox ): attackBox.set_border_width(3) attackBox.set_radius(10) self.attackAdjust = gtk.Adjustment(0.04, 0.03, 1, .01, .01, 0) - self.GUI['attackSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.attackAdjust, 7 ) + self.GUI['attackSlider'] = ImageVScale('sliderEditVolume.png', + self.attackAdjust, 7) self.attackAdjust.connect("value-changed", self.handleAttack) self.GUI['attackSlider'].set_snap( 0.01 ) self.GUI['attackSlider'].set_inverted(True) self.GUI['attackSlider'].set_size_request(50, 200) self.attackLabel = gtk.Image() self.handleAttack( self.attackAdjust ) - self.GUI['attackGen'] = ImageToggleButton( Config.IMAGE_ROOT+"diceProp.png", Config.IMAGE_ROOT+"dicePropSel.png", Config.IMAGE_ROOT+"dicePropSel.png", backgroundFill = Config.PANEL_COLOR ) + self.GUI['attackGen'] = ImageToggleButton('diceProp.png', + 'dicePropSel.png', 'dicePropSel.png', + backgroundFill=Config.PANEL_COLOR) self.GUI['attackGen'].connect( "clicked", self.openAlgoBox, 'attack' ) attackBox.pack_start(self.GUI['attackGen'], True, True, 5) attackBox.pack_start(self.GUI['attackSlider'], True, True, 5) @@ -183,14 +213,17 @@ class Properties( gtk.VBox ): decayBox.set_border_width(3) decayBox.set_radius(10) self.decayAdjust = gtk.Adjustment(0.31, 0.03, 1, .01, .01, 0) - self.GUI['decaySlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.decayAdjust, 7 ) + self.GUI['decaySlider'] = ImageVScale('sliderEditVolume.png', + self.decayAdjust, 7) self.decayAdjust.connect("value-changed", self.handleDecay) self.GUI['decaySlider'].set_snap( 0.01 ) self.GUI['decaySlider'].set_inverted(True) self.GUI['decaySlider'].set_size_request(50, 200) self.decayLabel = gtk.Image() self.handleDecay( self.decayAdjust ) - self.GUI['decayGen'] = ImageToggleButton( Config.IMAGE_ROOT+"diceProp.png", Config.IMAGE_ROOT+"dicePropSel.png", Config.IMAGE_ROOT+"dicePropSel.png", backgroundFill = Config.PANEL_COLOR ) + self.GUI['decayGen'] = ImageToggleButton('diceProp.png', + 'dicePropSel.png', 'dicePropSel.png', + backgroundFill=Config.PANEL_COLOR) self.GUI['decayGen'].connect( "clicked", self.openAlgoBox, 'decay' ) decayBox.pack_start(self.GUI['decayGen'], True, True, 5) decayBox.pack_start(self.GUI['decaySlider'], True, True, 5) @@ -202,14 +235,17 @@ class Properties( gtk.VBox ): filterBox.set_radius(10) filterTypeBox = gtk.VBox() - self.GUI['filterTypeLowButton'] = ImageToggleButton(Config.IMAGE_ROOT + 'propLow3.png', Config.IMAGE_ROOT + 'propLow3Sel.png', Config.IMAGE_ROOT + 'propLow3Over.png') + self.GUI['filterTypeLowButton'] = ImageToggleButton('propLow3.png', + 'propLow3Sel.png', 'propLow3Over.png') self.GUI['filterTypeLowButton'].connect( "toggled", self.handleFilterType, 1 ) filterTypeBox.pack_start( self.GUI['filterTypeLowButton'] ) - self.GUI['filterTypeHighButton'] = ImageToggleButton(Config.IMAGE_ROOT + 'propHi3.png', Config.IMAGE_ROOT + 'propHi3Sel.png', Config.IMAGE_ROOT + 'propHi3Over.png') + self.GUI['filterTypeHighButton'] = ImageToggleButton('propHi3.png', + 'propHi3Sel.png', 'propHi3Over.png') self.GUI['filterTypeHighButton'].connect( "toggled", self.handleFilterType, 2 ) filterTypeBox.pack_start( self.GUI['filterTypeHighButton'] ) self.GUI['filterTypeBandButton'] = gtk.ToggleButton( "B" ) - self.GUI['filterTypeBandButton'] = ImageToggleButton(Config.IMAGE_ROOT + 'propBand3.png', Config.IMAGE_ROOT + 'propBand3Sel.png', Config.IMAGE_ROOT + 'propBand3Over.png') + self.GUI['filterTypeBandButton'] = ImageToggleButton('propBand3.png', + 'propBand3Sel.png', 'propBand3Over.png') self.GUI['filterTypeBandButton'].connect( "toggled", self.handleFilterType, 3 ) filterTypeBox.pack_start( self.GUI['filterTypeBandButton'] ) filterBox.pack_start( filterTypeBox ) @@ -217,55 +253,66 @@ class Properties( gtk.VBox ): self.filterSliderBox = gtk.VBox() self.filterSliderBox.set_size_request(50, -1) self.cutoffAdjust = gtk.Adjustment(1000, 100, 7000, 100, 100, 0) - self.GUI['cutoffSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.cutoffAdjust, 7 ) + self.GUI['cutoffSlider'] = ImageVScale('sliderEditVolume.png', + self.cutoffAdjust, 7) self.GUI['cutoffSlider'].set_snap(100) self.cutoffAdjust.connect("value-changed", self.handleFilter) self.GUI['cutoffSlider'].set_inverted(True) self.GUI['cutoffSlider'].set_size_request(50, 200) - self.GUI['cutoffGen'] = ImageToggleButton( Config.IMAGE_ROOT+"diceProp.png", Config.IMAGE_ROOT+"dicePropSel.png", Config.IMAGE_ROOT+"dicePropSel.png", backgroundFill = Config.PANEL_COLOR ) + self.GUI['cutoffGen'] = ImageToggleButton('diceProp.png', + 'dicePropSel.png', 'dicePropSel.png', + backgroundFill=Config.PANEL_COLOR) self.GUI['cutoffGen'].connect( "clicked", self.openAlgoBox, 'cutoff' ) self.filterSliderBox.pack_start(self.GUI['cutoffGen'], True, True, 5) self.filterSliderBox.pack_start(self.GUI['cutoffSlider'], True, True, 5) self.filterLabel = gtk.Image() - self.filterLabel.set_from_file(Config.IMAGE_ROOT + 'propFilter1.png') + self.filterLabel.set_from_file(imagefile('propFilter1.png')) self.filterSliderBox.pack_start(self.filterLabel, False, padding=10) filterBox.pack_start(self.filterSliderBox) self.controlsBox.pack_start(filterBox) - + self.algoBox = RoundVBox(fillcolor=Config.PANEL_COLOR, bordercolor=Config.INST_BCK_COLOR) self.algoBox.set_size_request( -1, 378 ) self.algoBox.set_border_width(3) self.algoBox.set_radius(10) #self.algoBox = gtk.VBox() - + algoUpperBox = gtk.HBox() - + algoRadioButtonBox = gtk.VBox() algoRadioButtonBox.set_size_request(100, 150) #algoRadioButtonBox = RoundHBox(fillcolor=Config.PANEL_COLOR, bordercolor=Config.INST_BCK_COLOR) #algoRadioButtonBox.set_border_width(3) #algoRadioButtonBox.set_radius(10) - self.GUI['line'] = ImageRadioButton( None, Config.IMAGE_ROOT + 'propLine.png', Config.IMAGE_ROOT + 'propLineDown.png', Config.IMAGE_ROOT + 'propLineOver.png' ) + self.GUI['line'] = ImageRadioButton(None, 'propLine.png', + 'propLineDown.png', 'propLineOver.png') self.GUI['line'].connect( "toggled", self.handleAlgo, 0 ) algoRadioButtonBox.pack_start( self.GUI['line'], False, False, 1 ) - self.GUI['drunk'] = ImageRadioButton( self.GUI['line'], Config.IMAGE_ROOT + 'propDrunk.png', Config.IMAGE_ROOT + 'propDrunkDown.png', Config.IMAGE_ROOT + 'propDrunkOver.png' ) + self.GUI['drunk'] = ImageRadioButton(self.GUI['line'], 'propDrunk.png', + 'propDrunkDown.png', 'propDrunkOver.png') self.GUI['drunk'].connect( "toggled", self.handleAlgo, 1 ) algoRadioButtonBox.pack_start( self.GUI['drunk'], False, False, 1 ) - self.GUI['droneJump'] = ImageRadioButton( self.GUI['line'], Config.IMAGE_ROOT + 'propDroneJump.png', Config.IMAGE_ROOT + 'propDroneJumpDown.png', Config.IMAGE_ROOT + 'propDroneJumpOver.png' ) + self.GUI['droneJump'] = ImageRadioButton(self.GUI['line'], + 'propDroneJump.png', 'propDroneJumpDown.png', + 'propDroneJumpOver.png') self.GUI['droneJump'].connect( "toggled", self.handleAlgo, 2 ) algoRadioButtonBox.pack_start( self.GUI['droneJump'], False, False, 1 ) - self.GUI['repeater'] = ImageRadioButton( self.GUI['line'], Config.IMAGE_ROOT + 'propRepeater.png', Config.IMAGE_ROOT + 'propRepeaterDown.png', Config.IMAGE_ROOT + 'propRepeaterOver.png' ) + self.GUI['repeater'] = ImageRadioButton(self.GUI['line'], + 'propRepeater.png', 'propRepeaterDown.png', + 'propRepeaterOver.png') self.GUI['repeater'].connect( "toggled", self.handleAlgo, 3 ) algoRadioButtonBox.pack_start( self.GUI['repeater'], False, False, 1 ) - self.GUI['loopseg'] = ImageRadioButton( self.GUI['line'], Config.IMAGE_ROOT + 'propLoopseg.png', Config.IMAGE_ROOT + 'propLoopsegDown.png', Config.IMAGE_ROOT + 'propLoopsegOver.png' ) + self.GUI['loopseg'] = ImageRadioButton(self.GUI['line'], + 'propLoopseg.png', 'propLoopsegDown.png', + 'propLoopsegOver.png') self.GUI['loopseg'].connect( "toggled", self.handleAlgo, 4 ) algoRadioButtonBox.pack_start( self.GUI['loopseg'], False, False, 1 ) - + algoUpperBox.pack_start(algoRadioButtonBox) - + algoSlidersBox = gtk.HBox() algoSlidersBox.set_size_request(150, 320) #algoSlidersBox = RoundHBox(fillcolor=Config.PANEL_COLOR, bordercolor=Config.INST_BCK_COLOR) @@ -273,38 +320,41 @@ class Properties( gtk.VBox ): #algoSlidersBox.set_radius(10) minBox = gtk.VBox() self.minAdjust = gtk.Adjustment(0, 0, 100, 1, 1, 0) - self.GUI['minSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.minAdjust, 7 ) + self.GUI['minSlider'] = ImageVScale('sliderEditVolume.png', + self.minAdjust, 7) self.GUI['minSlider'].set_snap(1) self.minAdjust.connect("value-changed", self.handleMin) self.GUI['minSlider'].set_inverted(True) self.GUI['minSlider'].set_size_request(50, 200) - minBox.pack_start(self.GUI['minSlider'], True, True, 5) + minBox.pack_start(self.GUI['minSlider'], True, True, 5) algoSlidersBox.pack_start(minBox) - + maxBox = gtk.VBox() self.maxAdjust = gtk.Adjustment(100, 0, 100, 1, 1, 0) - self.GUI['maxSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.maxAdjust, 7 ) + self.GUI['maxSlider'] = ImageVScale('sliderEditVolume.png', + self.maxAdjust, 7) self.GUI['maxSlider'].set_snap(1) self.maxAdjust.connect("value-changed", self.handleMax) self.GUI['maxSlider'].set_inverted(True) self.GUI['maxSlider'].set_size_request(50, 200) - maxBox.pack_start(self.GUI['maxSlider'], True, True, 5) + maxBox.pack_start(self.GUI['maxSlider'], True, True, 5) algoSlidersBox.pack_start(maxBox) - + paraBox = gtk.VBox() self.paraAdjust = gtk.Adjustment(20, 0, 100, 1, 1, 0) - self.GUI['paraSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.paraAdjust, 7 ) + self.GUI['paraSlider'] = ImageVScale('sliderEditVolume.png', + self.paraAdjust, 7) self.GUI['paraSlider'].set_snap(1) self.paraAdjust.connect("value-changed", self.handlePara) self.GUI['paraSlider'].set_inverted(True) self.GUI['paraSlider'].set_size_request(50, 200) - paraBox.pack_start(self.GUI['paraSlider'], True, True, 5) - algoSlidersBox.pack_start(paraBox) - + paraBox.pack_start(self.GUI['paraSlider'], True, True, 5) + algoSlidersBox.pack_start(paraBox) + algoUpperBox.pack_start(algoSlidersBox) - + self.algoBox.pack_start(algoUpperBox) - + #transButtonBox = RoundHBox(fillcolor=Config.PANEL_COLOR, bordercolor=Config.INST_BCK_COLOR) #transButtonBox.set_border_width(3) #transButtonBox.set_radius(10) @@ -312,10 +362,12 @@ class Properties( gtk.VBox ): transButtonBox.set_size_request(150, 50) # create cancel/check button - self.GUI["checkButton"] = ImageButton(Config.IMAGE_ROOT + 'check.png', backgroundFill=Config.PANEL_COLOR ) + self.GUI["checkButton"] = ImageButton('check.png', + backgroundFill=Config.PANEL_COLOR) self.GUI["checkButton"].connect("clicked", self.apply) - self.GUI["cancelButton"] = ImageButton(Config.IMAGE_ROOT + 'closeA.png', backgroundFill=Config.PANEL_COLOR ) + self.GUI["cancelButton"] = ImageButton('closeA.png', + backgroundFill=Config.PANEL_COLOR) self.GUI["cancelButton"].connect("clicked", self.cancel) transButtonBox.pack_end(self.GUI["checkButton"], False, False, 10) @@ -443,7 +495,8 @@ class Properties( gtk.VBox ): def updateBeatLabel( self, adjust ): beats = int(adjust.value) - self.beatLabel.set_from_file(Config.IMAGE_ROOT + 'propBeats' + str(beats) + '.png') + self.beatLabel.set_from_file( + imagefile('propBeats' + str(beats) + '.png')) def handleBeat( self, widget, signal_id ): beats = int(widget.get_adjustment().value) @@ -549,7 +602,7 @@ class Properties( gtk.VBox ): def handlePan( self, adjust ): img = min( 4, int(adjust.value * 5) ) - self.panLabel.set_from_file(Config.IMAGE_ROOT + 'propPan' + str(img) + '.png') + self.panLabel.set_from_file(imagefile('propPan' + str(img) + '.png')) if not self.setup: stream = [] for p in self.notes: @@ -581,7 +634,8 @@ class Properties( gtk.VBox ): def handleReverb( self, adjust ): img = min( 5, int(adjust.value * 6) ) - self.reverbLabel.set_from_file(Config.IMAGE_ROOT + 'propReverb' + str(img) + '.png') + self.reverbLabel.set_from_file( + imagefile('propReverb' + str(img) + '.png')) if not self.setup: stream = [] for p in self.notes: @@ -614,7 +668,8 @@ class Properties( gtk.VBox ): def handleAttack( self, adjust ): val = adjust.value #*adjust.value img = min( 4, int(val * 4) ) - self.attackLabel.set_from_file(Config.IMAGE_ROOT + 'propAtt' + str(img) + '.png') + self.attackLabel.set_from_file( + imagefile('propAtt' + str(img) + '.png')) if not self.setup: stream = [] for p in self.notes: @@ -647,7 +702,7 @@ class Properties( gtk.VBox ): def handleDecay( self, adjust ): val = adjust.value #*adjust.value img = min( 4, int(val * 4) ) - self.decayLabel.set_from_file(Config.IMAGE_ROOT + 'propDec' + str(img) + '.png') + self.decayLabel.set_from_file(imagefile('propDec' + str(img) + '.png')) if not self.setup: stream = [] for p in self.notes: @@ -799,10 +854,5 @@ class Properties( gtk.VBox ): def updateFilterLabel( self ): val = (self.cutoffAdjust.value-self.cutoffAdjust.lower)/(self.cutoffAdjust.upper-self.cutoffAdjust.lower) img = min( 5, int(val * 6) ) - self.filterLabel.set_from_file(Config.IMAGE_ROOT + 'propFilter%d.%d' % (self.filterType, img) + '.png') - - - - - - + self.filterLabel.set_from_file( + imagefile('propFilter%d.%d' % (self.filterType, img) + '.png')) diff --git a/Edit/TrackInterface.py b/Edit/TrackInterface.py index ad740ee..73f70df 100644 --- a/Edit/TrackInterface.py +++ b/Edit/TrackInterface.py @@ -8,6 +8,7 @@ from math import floor import time import common.Config as Config +from common.Config import imagefile from Edit.NoteInterface import NoteInterface from Edit.HitInterface import HitInterface from Edit.MainWindow import CONTEXT @@ -128,13 +129,13 @@ class TrackInterface( gtk.EventBox ): self.gc = gtk.gdk.GC( win ) def prepareDrawable( name, width = -1 ): - pix = gtk.gdk.pixbuf_new_from_file( Config.IMAGE_ROOT+name+".png" ) + pix = gtk.gdk.pixbuf_new_from_file(imagefile(name + '.png')) if width != -1: pix = pix.scale_simple(width, pix.get_height(), gtk.gdk.INTERP_BILINEAR) self.image[name] = gtk.gdk.Pixmap( win, pix.get_width(), pix.get_height() ) self.image[name].draw_pixbuf( self.gc, pix, 0, 0, 0, 0, pix.get_width(), pix.get_height(), gtk.gdk.RGB_DITHER_NONE ) def preparePixbuf( name ): - self.image[name] = gtk.gdk.pixbuf_new_from_file( Config.IMAGE_ROOT+name+".png" ) + self.image[name] = gtk.gdk.pixbuf_new_from_file(imagefile(name + '.png')) prepareDrawable( "trackBG", width ) prepareDrawable( "trackBGSelected", width ) diff --git a/Edit/TuneInterface.py b/Edit/TuneInterface.py index f8bc4e7..2090855 100644 --- a/Edit/TuneInterface.py +++ b/Edit/TuneInterface.py @@ -3,7 +3,7 @@ pygtk.require( '2.0' ) import gtk import common.Config as Config - +from common.Config import imagefile from common.Util.Profiler import TP from Edit.MainWindow import CONTEXT @@ -117,13 +117,14 @@ class TuneInterface( gtk.EventBox ): self.thumbnailBG = [] self.gc.foreground = self.bgColor for i in range(4): - pix = gtk.gdk.pixbuf_new_from_file( Config.IMAGE_ROOT+"pageThumbnailBG%d.png"%i ) + pix = gtk.gdk.pixbuf_new_from_file( + imagefile('pageThumbnailBG%d.png' % i)) self.thumbnailBG.append( gtk.gdk.Pixmap( self.defaultwin, Config.PAGE_THUMBNAIL_WIDTH, Config.PAGE_THUMBNAIL_HEIGHT ) ) self.thumbnailBG[i].draw_rectangle( self.gc, True, 0, 0, Config.PAGE_THUMBNAIL_WIDTH, Config.PAGE_THUMBNAIL_HEIGHT ) self.thumbnailBG[i].draw_pixbuf( self.gc, pix, 0, 0, 0, 0, Config.PAGE_THUMBNAIL_WIDTH, Config.PAGE_THUMBNAIL_HEIGHT, gtk.gdk.RGB_DITHER_NONE ) # load clipmask - pix = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT+'pageThumbnailMask.png') + pix = gtk.gdk.pixbuf_new_from_file(imagefile('pageThumbnailMask.png')) pixels = pix.get_pixels() stride = pix.get_rowstride() channels = pix.get_n_channels() @@ -155,6 +156,9 @@ class TuneInterface( gtk.EventBox ): self.pixelsPerPitchDrum = float(self.trackRect[self.drumIndex][3]-1)/(Config.MAXIMUM_PITCH_DRUM - Config.MINIMUM_PITCH_DRUM ) self.pixelsPerTick = [0] + [ float(self.trackRect[0][2]-4)/(i*Config.TICKS_PER_BEAT) for i in range(1,Config.MAXIMUM_BEATS+1) ] + import logging + logging.error('> %r %r %r', self.pixelsPerPitch, self.pixelsPerPitchDrum, self.pixelsPerTick) + self.alloced = False self.width = self.baseWidth = self.height = -1 self.waitingForAlloc = True diff --git a/Jam/Block.py b/Jam/Block.py index e6a7bf4..14cd8c0 100644 --- a/Jam/Block.py +++ b/Jam/Block.py @@ -7,6 +7,7 @@ import random import common.Util.InstrumentDB as InstrumentDB import common.Config as Config +from common.Config import scale from common.Util.NoteDB import PARAMETER @@ -16,15 +17,15 @@ from common.Util.NoteDB import PARAMETER class Block: - WIDTH = 100 - HEIGHT = 100 + WIDTH = scale(100) + HEIGHT = scale(100) - SNAP = 15 + SNAP = scale(15) - PAD = 4 + PAD = scale(4) - KEYSIZE = 26 - KEYMASK_START = 309 + KEYSIZE = scale(26) + KEYMASK_START = scale(309) def __init__( self, owner, data ): self.owner = owner @@ -359,7 +360,7 @@ class Instrument(Block): class Drum(Block): - MASK_START = 100 + MASK_START = scale(100) KEYRECT = [ Block.PAD - 1, Block.HEIGHT + 1 - Block.PAD - Block.KEYSIZE, Block.KEYSIZE, Block.KEYSIZE ] KEYRECT += [ KEYRECT[0]+KEYRECT[2], KEYRECT[1]+KEYRECT[3] ] @@ -525,15 +526,15 @@ class Drum(Block): class Loop(Block): - HEAD = 13 - BEAT = 23 + HEAD = scale(13) + BEAT = scale(23) TAIL = BEAT + Block.PAD WIDTH = [ HEAD + BEAT*(n-1) + TAIL for n in range(Config.MAXIMUM_BEATS+1) ] BEAT_MUL3 = BEAT*3 - MASK_START = 200 + MASK_START = scale(200) MASK_BEAT = MASK_START + HEAD MASK_TAIL = MASK_START + HEAD + BEAT*3 diff --git a/Jam/JamMain.py b/Jam/JamMain.py index dcdc776..beee980 100644 --- a/Jam/JamMain.py +++ b/Jam/JamMain.py @@ -11,6 +11,8 @@ import random import common.Util.Instruments import common.Config as Config +from common.Config import scale +from common.Config import imagefile from gettext import gettext as _ import sugar.graphics.style as style @@ -149,8 +151,7 @@ class JamMain(gtk.EventBox): self.colors["Note_Border_Inactive"] = self.colors["Border_Inactive"] if True: # load block clipmask - pix = gtk.gdk.pixbuf_new_from_file( - Config.IMAGE_ROOT + 'jam-blockMask.png') + pix = gtk.gdk.pixbuf_new_from_file(imagefile('jam-blockMask.png')) pixels = pix.get_pixels() stride = pix.get_rowstride() channels = pix.get_n_channels() @@ -175,15 +176,14 @@ class JamMain(gtk.EventBox): self.blockMask = gtk.gdk.bitmap_create_from_data( None, bitmap, pix.get_width(), pix.get_height()) - pix = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT + "sampleBG.png") + pix = gtk.gdk.pixbuf_new_from_file(imagefile('sampleBG.png')) self.sampleBg = gtk.gdk.Pixmap(win, pix.get_width(), pix.get_height()) self.sampleBg.draw_pixbuf(self.gc, pix, 0, 0, 0, 0, pix.get_width(), pix.get_height(), gtk.gdk.RGB_DITHER_NONE) self.sampleBg.endOffset = pix.get_width() - 5 self.sampleNoteHeight = 7 if True: # load sample note clipmask - pix = gtk.gdk.pixbuf_new_from_file( - Config.IMAGE_ROOT + 'sampleNoteMask.png') + pix = gtk.gdk.pixbuf_new_from_file(imagefile('sampleNoteMask.png')) pixels = pix.get_pixels() stride = pix.get_rowstride() channels = pix.get_n_channels() @@ -333,7 +333,7 @@ class JamMain(gtk.EventBox): self.colors["Picker_Bg_Inactive"]) self.GUI["notebook"].props.tab_vborder = style.TOOLBOX_TAB_VBORDER self.GUI["notebook"].props.tab_hborder = style.TOOLBOX_TAB_HBORDER - self.GUI["notebook"].set_size_request(-1, 160) + self.GUI["notebook"].set_size_request(-1, scale(160)) self.GUI["notebook"].connect("switch-page", self.setPicker) self.GUI["mainVBox"].pack_start(self.GUI["notebook"], False, False) self.pickers = {} @@ -998,8 +998,7 @@ class JamMain(gtk.EventBox): except: if Config.DEBUG >= 5: print "JamMain:: file does not exist: " + img_path - pix = gtk.gdk.pixbuf_new_from_file( - Config.IMAGE_ROOT + "generic.png") + pix = gtk.gdk.pixbuf_new_from_file(imagefile('generic.png')) x = (Block.Block.WIDTH - pix.get_width()) // 2 y = (Block.Block.HEIGHT - pix.get_height()) // 2 img = gtk.gdk.Pixmap(win, Block.Block.WIDTH, Block.Block.HEIGHT) diff --git a/Jam/Toolbars.py b/Jam/Toolbars.py index c2a9044..23da473 100644 --- a/Jam/Toolbars.py +++ b/Jam/Toolbars.py @@ -422,8 +422,7 @@ class LoopSettingsPalette(Palette): loopedBox = gtk.HBox() loopedLabel = gtk.Label("Looped sound: ") - loopedToggle = ImageToggleButton(Config.IMAGE_ROOT + "checkOff.svg", - Config.IMAGE_ROOT + "checkOn.svg") + loopedToggle = ImageToggleButton('checkOff.png', 'checkOn.png') loopedToggle.connect('button-press-event', self.handleLooped) loopedBox.pack_start(loopedLabel, False, False, padding=10) loopedBox.pack_end(loopedToggle, False, False, padding=10) @@ -478,8 +477,7 @@ class LoopSettingsPalette(Palette): self.mainBox.pack_start(self.controlsBox, False, False, 10) previewBox = gtk.VBox() - self.playStopButton = ImageToggleButton( - Config.IMAGE_ROOT + 'miniplay.png', Config.IMAGE_ROOT + 'stop.png') + self.playStopButton = ImageToggleButton('miniplay.png', 'stop.png') self.playStopButton.connect('button-press-event', self.handlePlayButton) previewBox.pack_start(self.playStopButton) @@ -563,7 +561,7 @@ class LoopSettingsPalette(Palette): ofile.write(dur + '\n') ofile.write(vol + '\n') ofile.write(self.sndname + '\n') - ofile.write(Config.IMAGE_ROOT + "/" + self.sndname + ".png\n") + ofile.write(imagefile(self.sndname + '.png') + '\n') ofile.write(category) ofile.close() if copy: diff --git a/Mini/InstrumentPanel.py b/Mini/InstrumentPanel.py index fc0af18..a9e8d4f 100644 --- a/Mini/InstrumentPanel.py +++ b/Mini/InstrumentPanel.py @@ -11,9 +11,12 @@ from common.port.scrolledbox import HScrolledBox import sugar.graphics.style as style import logging -InstrumentSize = 116 + +INSTRUMENT_SIZE = Config.scale(114) + Tooltips = Config.Tooltips + class InstrumentPanel( gtk.EventBox ): def __init__(self,setInstrument=None): gtk.EventBox.__init__(self) @@ -40,7 +43,7 @@ class InstrumentPanel( gtk.EventBox ): self.micRec = micRec if width != -1: - rowLen = width / InstrumentSize + rowLen = width / INSTRUMENT_SIZE if self.rowLen == rowLen: return @@ -172,7 +175,9 @@ class InstrumentPanel( gtk.EventBox ): if timeout >= 0 and time.time() > timeout: return False if loadStage[2] == 1: - self.loadData["btn"] = ImageRadioButton(self.firstTbBtn,Config.IMAGE_ROOT + category + '.png', Config.IMAGE_ROOT + category + 'sel.png', Config.IMAGE_ROOT + category + 'sel.png') + self.loadData["btn"] = ImageRadioButton(self.firstTbBtn, + category + '.png', category + 'sel.png', + category + 'sel.png') loadStage[2] = 2 if timeout >= 0 and time.time() > timeout: return False @@ -211,9 +216,13 @@ class InstrumentPanel( gtk.EventBox ): if loadStage[2] == 1: try: - self.loadData["instButton"] = ImageRadioButton(self.firstInstButton, Config.IMAGE_ROOT + instrument + '.png' , Config.IMAGE_ROOT + instrument + 'sel.png', Config.IMAGE_ROOT + instrument + 'sel.png') + self.loadData['instButton'] = ImageRadioButton( + self.firstInstButton, instrument + '.png', + instrument + 'sel.png', instrument + 'sel.png') except: - self.loadData["instButton"] = ImageRadioButton(self.firstInstButton, Config.IMAGE_ROOT + 'generic.png' , Config.IMAGE_ROOT + 'genericsel.png', Config.IMAGE_ROOT + 'genericsel.png') + self.loadData["instButton"] = ImageRadioButton( + self.firstInstButton, 'generic.png', + 'genericsel.png', 'genericsel.png') loadStage[2] = 2 if timeout >= 0 and time.time() > timeout: return False @@ -241,21 +250,19 @@ class InstrumentPanel( gtk.EventBox ): return True def loadInstrumentViewport( self ): - self.instrumentBox= RoundHBox(fillcolor= Config.INSTRUMENT_GRID_COLOR, bordercolor= Config.PANEL_BCK_COLOR, radius= Config.PANEL_RADIUS) + self.instBox = gtk.Alignment(0.5, 0, 0, 1) - self.tableEventBox= gtk.EventBox() - color= gtk.gdk.color_parse(Config.INSTRUMENT_GRID_COLOR) - self.tableEventBox.modify_bg(gtk.STATE_NORMAL, color) + box = gtk.EventBox() + color = gtk.gdk.color_parse(Config.INSTRUMENT_GRID_COLOR) + box.modify_bg(gtk.STATE_NORMAL, color) + box.add(self.instBox) - scrollwin= gtk.ScrolledWindow() + scrollwin = gtk.ScrolledWindow() scrollwin.set_policy(gtk.POLICY_NEVER,gtk.POLICY_AUTOMATIC) - scrollwin.add_with_viewport(self.tableEventBox) - alignment= gtk.Alignment(1, 0, 0, 1) - alignment.add(scrollwin) + scrollwin.add_with_viewport(box) + box.get_parent().set_shadow_type(gtk.SHADOW_NONE) + self.mainVBox.pack_end(scrollwin) - self.tableEventBox.get_parent().set_shadow_type( gtk.SHADOW_NONE ) - self.instrumentBox.pack_start(alignment, True, True, 0) - self.mainVBox.pack_end(self.instrumentBox) self.show_all() def prepareInstrumentTable(self,category = 'all'): @@ -268,13 +275,13 @@ class InstrumentPanel( gtk.EventBox ): if self.instTable != None: for child in self.instTable.get_children()[:]: self.instTable.remove(child) - self.tableEventBox.remove(self.instTable) + self.instBox.remove(self.instTable) self.instTable.destroy() instrumentNum = len(self.instrumentList[category]) instruments = self.instrumentList[category] - cols = 8 + cols = self.rowLen if instrumentNum < cols: cols = instrumentNum rows = (instrumentNum // cols) @@ -294,7 +301,7 @@ class InstrumentPanel( gtk.EventBox ): if self.instDic.has_key(inst): self.instTable.attach(self.instDic[inst], col, col+1, row, row+1, gtk.SHRINK, gtk.SHRINK, 0, 0) - self.tableEventBox.add(self.instTable) + self.instBox.add(self.instTable) self.instTable.show_all() def selectFirstCat(self): @@ -360,7 +367,8 @@ class DrumPanel( gtk.EventBox ): for drumkit in self.instrumentList: instBox = RoundVBox(fillcolor = Config.INST_BCK_COLOR, bordercolor = Config.PANEL_COLOR, radius = Config.PANEL_RADIUS) instBox.set_border_width(Config.PANEL_SPACING) - self.drums[drumkit] = ImageRadioButton(firstBtn, Config.IMAGE_ROOT + drumkit + '.png' , Config.IMAGE_ROOT + drumkit + 'sel.png', Config.IMAGE_ROOT + drumkit + 'sel.png') + self.drums[drumkit] = ImageRadioButton(firstBtn, drumkit + '.png', + drumkit + 'sel.png', drumkit + 'sel.png') self.drums[drumkit].clickedHandler = self.drums[drumkit].connect('clicked',self.setDrums,drumkit) if firstBtn == None: firstBtn = self.drums[drumkit] diff --git a/Mini/miniTamTamMain.py b/Mini/miniTamTamMain.py index 9cb1aca..1a2211b 100644 --- a/Mini/miniTamTamMain.py +++ b/Mini/miniTamTamMain.py @@ -91,18 +91,12 @@ class miniTamTamMain(gtk.EventBox): self.loop.beat = self.beat self.tooltips = gtk.Tooltips() - self.masterVBox = gtk.VBox() self.mainWindowBox = gtk.HBox() self.leftBox = gtk.VBox() self.rightBox = gtk.VBox() self.mainWindowBox.pack_start(self.rightBox, False, True) self.mainWindowBox.pack_start(self.leftBox, True, True) - self.masterVBox.pack_start(self.mainWindowBox) - - scroll= gtk.ScrolledWindow() - scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - scroll.add_with_viewport (self.masterVBox) - self.add(scroll) + self.add(self.mainWindowBox) self.enableKeyboard() self.setInstrument(self.instrument) @@ -206,11 +200,11 @@ class miniTamTamMain(gtk.EventBox): geneSliderBox = gtk.VBox() self.geneSliderBoxImgTop = gtk.Image() - self.geneSliderBoxImgTop.set_from_file(Config.IMAGE_ROOT + 'complex6.png') + self.geneSliderBoxImgTop.set_from_file(imagefile('complex6.png')) self.geneAdjustment = gtk.Adjustment(value=self.regularity, lower=0, upper=1, step_incr=0.01, page_incr=0, page_size=0) - self.geneSlider = ImageVScale( Config.IMAGE_ROOT + "sliderbutbleu.png", self.geneAdjustment, 5 ) + self.geneSlider = ImageVScale('sliderbutbleu.png', + self.geneAdjustment, 5) self.geneSlider.set_inverted(False) - self.geneSlider.set_size_request(15,-1) self.geneAdjustment.connect("value_changed" , self.handleGenerationSlider) self.geneSlider.connect("button-release-event", self.handleGenerationSliderRelease) geneSliderBox.pack_start(self.geneSliderBoxImgTop, False, padding=10) @@ -219,11 +213,12 @@ class miniTamTamMain(gtk.EventBox): beatSliderBox = gtk.VBox() self.beatSliderBoxImgTop = gtk.Image() - self.beatSliderBoxImgTop.set_from_file(Config.IMAGE_ROOT + 'beat3.png') - self.beatAdjustment = gtk.Adjustment(value=self.beat, lower=2, upper=12, step_incr=1, page_incr=0, page_size=0) - self.beatSlider = ImageVScale( Config.IMAGE_ROOT + "sliderbutjaune.png", self.beatAdjustment, 5, snap = 1 ) + self.beatSliderBoxImgTop.set_from_file(imagefile('beat3.png')) + self.beatAdjustment = gtk.Adjustment(value=self.beat, lower=2, + upper=12, step_incr=1, page_incr=0, page_size=0) + self.beatSlider = ImageVScale('sliderbutjaune.png', + self.beatAdjustment, 5, snap=1) self.beatSlider.set_inverted(True) - self.beatSlider.set_size_request(15,-1) self.beatAdjustment.connect("value_changed" , self.handleBeatSlider) self.beatSlider.connect("button-release-event", self.handleBeatSliderRelease) beatSliderBox.pack_start(self.beatSliderBoxImgTop, False, padding=10) @@ -235,11 +230,10 @@ class miniTamTamMain(gtk.EventBox): tempoSliderBox = gtk.VBox() self.tempoSliderBoxImgTop = gtk.Image() - self.tempoSliderBoxImgTop.set_from_file(Config.IMAGE_ROOT + 'tempo5.png') + self.tempoSliderBoxImgTop.set_from_file(imagefile('tempo5.png')) self.tempoAdjustment = gtk.Adjustment(value=self.tempo, lower=Config.PLAYER_TEMPO_LOWER, upper=Config.PLAYER_TEMPO_UPPER, step_incr=1, page_incr=1, page_size=1) - tempoSlider = ImageVScale( Config.IMAGE_ROOT + "sliderbutvert.png", self.tempoAdjustment, 5) + tempoSlider = ImageVScale('sliderbutvert.png', self.tempoAdjustment, 5) tempoSlider.set_inverted(True) - tempoSlider.set_size_request(15,-1) self.tempoAdjustmentHandler = self.tempoAdjustment.connect("value_changed" , self.handleTempoSliderChange) tempoSlider.connect("button-press-event", self.handleTempoSliderPress) tempoSlider.connect("button-release-event", self.handleTempoSliderRelease) @@ -249,11 +243,11 @@ class miniTamTamMain(gtk.EventBox): volumeSliderBox = gtk.VBox() self.volumeSliderBoxImgTop = gtk.Image() - self.volumeSliderBoxImgTop.set_from_file(Config.IMAGE_ROOT + 'volume2.png') + self.volumeSliderBoxImgTop.set_from_file(imagefile('volume2.png')) self.volumeAdjustment = gtk.Adjustment(value=self.volume, lower=0, upper=200, step_incr=1, page_incr=1, page_size=1) - volumeSlider = ImageVScale( Config.IMAGE_ROOT + "sliderbutbleu.png", self.volumeAdjustment, 5) + volumeSlider = ImageVScale('sliderbutbleu.png', + self.volumeAdjustment, 5) volumeSlider.set_inverted(True) - volumeSlider.set_size_request(15,-1) self.volumeAdjustment.connect("value_changed" , self.handleVolumeSlider) #volumeSlider.connect("button-release-event", self.handleVolumeSliderRelease) volumeSliderBox.pack_start(self.volumeSliderBoxImgTop, False, padding=10) @@ -276,14 +270,14 @@ class miniTamTamMain(gtk.EventBox): #playImg = gtk.Image() #playImg.set_from_icon_name('media-playback-start', gtk.ICON_SIZE_LARGE_TOOLBAR) - self.playButton = ImageToggleButton(Config.IMAGE_ROOT + 'miniplay.png', Config.IMAGE_ROOT + 'stop.png') + self.playButton = ImageToggleButton('miniplay.png', 'stop.png') #self.playButton.set_relief(gtk.RELIEF_NONE) #self.playButton.set_image(playImg) self.playButton.connect('clicked',self.handlePlayButton) generateBtnSub.pack_start(self.playButton) #self.playButton.set_tooltip(_('Play / Stop')) - generateBtn = ImageButton(Config.IMAGE_ROOT + 'dice.png', clickImg_path = Config.IMAGE_ROOT + 'diceblur.png') + generateBtn = ImageButton('dice.png', clickImg_path='diceblur.png') generateBtn.connect('button-press-event', self.handleGenerateBtn) generateBtnSub.pack_start(generateBtn) self.tooltips.set_tip(generateBtn,Tooltips.GEN) @@ -294,7 +288,6 @@ class miniTamTamMain(gtk.EventBox): fillcolor=Config.PANEL_COLOR, bordercolor=Config.PANEL_BCK_COLOR, radius=Config.PANEL_RADIUS) - drum_box.set_border_width(Config.PANEL_SPACING) drum_scroll = VScrolledBox(scroll_policy=gtk.POLICY_NEVER) drum_scroll.set_viewport(drum_box) @@ -313,15 +306,14 @@ class miniTamTamMain(gtk.EventBox): drum = ImageRadioButton( group=drum_group, - mainImg_path=Config.IMAGE_ROOT + \ - ('drum%dkit.png' % (drum_i+1)), - altImg_path=Config.IMAGE_ROOT + \ - ('drum%dkitselgen.png' % (drum_i+1))) + mainImg_path='drum%dkit.png' % (drum_i + 1), + altImg_path='drum%dkitselgen.png' % (drum_i +1)) drum.connect('clicked', self.handleGenerationDrumBtn, 'drum%dkit' % (drum_i+1)) row_box.pack_start(drum) - hint = self.instrumentDB.instNamed['drum%dkit' % (drum_i + 1)].nameTooltip + drum_name = 'drum%dkit' % (drum_i + 1) + hint = self.instrumentDB.instNamed[drum_name].nameTooltip self.tooltips.set_tip(drum, hint) if not drum_group: @@ -333,8 +325,8 @@ class miniTamTamMain(gtk.EventBox): self.rightBox.pack_start(drum_scroll) drum_size = drum_group.get_size_request() - slidersBox.set_size_request(-1, drum_size[1]*2) - self.rightBox.set_size_request(drum_size[0]*2, -1) + slidersBox.set_size_request(-1, drum_size[1] * 2.3) + self.rightBox.set_size_request(drum_size[0] * 2.05, -1) def loopSettingsChannel(self, channel, value): self.csnd.setChannel(channel, value) @@ -425,7 +417,8 @@ class miniTamTamMain(gtk.EventBox): def handleGenerationSlider(self, adj): img = int(adj.value * 7)+1 - self.geneSliderBoxImgTop.set_from_file(Config.IMAGE_ROOT + 'complex' + str(img) + '.png') + self.geneSliderBoxImgTop.set_from_file( + imagefile('complex' + str(img) + '.png')) def handleGenerationSliderRelease(self, widget, event): self.regularity = widget.get_adjustment().value @@ -436,12 +429,14 @@ class miniTamTamMain(gtk.EventBox): def pickupNewBeat(self): self.beat = random.randint(2, 12) img = self.scale(self.beat,2,12,1,11) - self.beatSliderBoxImgTop.set_from_file(Config.IMAGE_ROOT + 'beat' + str(img) + '.png') + self.beatSliderBoxImgTop.set_from_file( + imagefile('beat' + str(img) + '.png')) self.beatAdjustment.set_value(self.beat) self.regularity = random.randint(50, 100) * 0.01 img = int(self.regularity * 7)+1 - self.geneSliderBoxImgTop.set_from_file(Config.IMAGE_ROOT + 'complex' + str(img) + '.png') + self.geneSliderBoxImgTop.set_from_file( + imagefile('complex' + str(img) + '.png')) self.geneAdjustment.set_value(self.regularity) self.sequencer.beat = self.beat @@ -450,7 +445,8 @@ class miniTamTamMain(gtk.EventBox): def handleBeatSlider(self, adj): img = self.scale(int(adj.value),2,12,1,11) - self.beatSliderBoxImgTop.set_from_file(Config.IMAGE_ROOT + 'beat' + str(img) + '.png') + self.beatSliderBoxImgTop.set_from_file( + imagefile('beat' + str(img) + '.png')) self.sequencer.beat = self.beat self.loop.beat = self.beat self.drumFillin.setBeats( self.beat ) @@ -505,7 +501,8 @@ class miniTamTamMain(gtk.EventBox): img = int(self.scale( self.tempo, Config.PLAYER_TEMPO_LOWER,Config.PLAYER_TEMPO_UPPER, 1,9)) - self.tempoSliderBoxImgTop.set_from_file(Config.IMAGE_ROOT + 'tempo' + str(img) + '.png') + self.tempoSliderBoxImgTop.set_from_file( + imagefile('tempo' + str(img) + '.png')) def handleBalanceSlider(self, adj): self.instVolume = int(adj.value) @@ -516,22 +513,26 @@ class miniTamTamMain(gtk.EventBox): self.loop.adjustLoopVolume(instrumentVolume) self.sequencer.adjustSequencerVolume(instrumentVolume) img = int(self.scale(self.instVolume,100,0,0,4.9)) - self._playToolbar.balanceSliderImgLeft.set_from_file(Config.IMAGE_ROOT + 'dru' + str(img) + '.png') + self._playToolbar.balanceSliderImgLeft.set_from_file( + imagefile('dru' + str(img) + '.png')) img2 = int(self.scale(self.instVolume,0,100,0,4.9)) - self._playToolbar.balanceSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'instr' + str(img2) + '.png') + self._playToolbar.balanceSliderImgRight.set_from_file( + imagefile('instr' + str(img2) + '.png')) def handleReverbSlider(self, adj): self.reverb = adj.value self.drumFillin.setReverb( self.reverb ) img = int(self.scale(self.reverb,0,1,0,4)) - self._playToolbar.reverbSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'reverb' + str(img) + '.png') + self._playToolbar.reverbSliderImgRight.set_from_file( + imagefile('reverb' + str(img) + '.png')) self.keyboardStandAlone.setReverb(self.reverb) def handleVolumeSlider(self, adj): self.volume = adj.value self.csnd.setMasterVolume(self.volume) img = int(self.scale(self.volume,0,200,0,3.9)) - self.volumeSliderBoxImgTop.set_from_file(Config.IMAGE_ROOT + 'volume' + str(img) + '.png') + self.volumeSliderBoxImgTop.set_from_file( + imagefile('volume' + str(img) + '.png')) def handlePlayButton(self, widget, data = None): # use widget.get_active() == False when calling this on 'clicked' diff --git a/Mini/miniToolbars.py b/Mini/miniToolbars.py index 3a78af1..16c4a4d 100644 --- a/Mini/miniToolbars.py +++ b/Mini/miniToolbars.py @@ -27,8 +27,8 @@ class playToolbar(gtk.Toolbar): self.balanceSliderImgLeft = gtk.Image() self.balanceSliderImgRight = gtk.Image() - self.balanceSliderImgLeft.set_from_file(Config.IMAGE_ROOT + 'dru2.png') - self.balanceSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'instr2.png') + self.balanceSliderImgLeft.set_from_file(imagefile('dru2.png')) + self.balanceSliderImgRight.set_from_file(imagefile('instr2.png')) self.balanceSliderImgLeftTool = gtk.ToolItem() self.balanceSliderImgLeftTool.add(self.balanceSliderImgLeft) self.balanceSliderImgRightTool = gtk.ToolItem() @@ -55,7 +55,7 @@ class playToolbar(gtk.Toolbar): _insertSeparator(1) self.reverbSliderImgRight = gtk.Image() - self.reverbSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'reverb0.png') + self.reverbSliderImgRight.set_from_file(imagefile('reverb0.png')) self.reverbSliderImgRightTool = gtk.ToolItem() self.reverbSliderImgRightTool.add(self.reverbSliderImgRight) @@ -201,7 +201,7 @@ class LoopSettingsPalette( Palette ): loopedBox = gtk.HBox() loopedLabel = gtk.Label("Looped sound: ") - loopedToggle = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg") + loopedToggle = ImageToggleButton('checkOff.png', 'checkOn.png') loopedToggle.connect('button-press-event', self.handleLooped ) loopedBox.pack_start(loopedLabel, False, False, padding=10) loopedBox.pack_end(loopedToggle, False, False, padding=10) @@ -254,7 +254,7 @@ class LoopSettingsPalette( Palette ): self.mainBox.pack_start(self.controlsBox, False, False, 10) previewBox = gtk.VBox() - self.playStopButton = ImageToggleButton(Config.IMAGE_ROOT + 'miniplay.png', Config.IMAGE_ROOT + 'stop.png') + self.playStopButton = ImageToggleButton('miniplay.png', 'stop.png') self.playStopButton.connect('button-press-event' , self.handlePlayButton) previewBox.pack_start(self.playStopButton) self.mainBox.pack_start(previewBox, False, False, 10) @@ -326,7 +326,7 @@ class LoopSettingsPalette( Palette ): ofile.write(dur + '\n') ofile.write(vol + '\n') ofile.write(self.sndname + '\n') - ofile.write(Config.IMAGE_ROOT+"/"+self.sndname+".png\n") + ofile.write(imagefile(self.sndname + '.png') + '\n') ofile.write(category) ofile.close() if copy: diff --git a/SynthLab/SynthLabConstants.py b/SynthLab/SynthLabConstants.py index db988bb..6f1e32e 100644 --- a/SynthLab/SynthLabConstants.py +++ b/SynthLab/SynthLabConstants.py @@ -1,5 +1,6 @@ from gettext import gettext as _ import common.Config as Config +from common.Config import scale Tooltips = Config.Tooltips() @@ -7,28 +8,78 @@ Tooltips = Config.Tooltips() class SynthLabConstants: - PIC_SIZE = 80 + PIC_SIZE = scale(80) HALF_SIZE = PIC_SIZE // 2 PIC_SIZE_HIGHLIGHT = PIC_SIZE + 4 + HALF_SIZE_HIGHLIGHT = PIC_SIZE + 2 GT_CONTROL_OUTPUT = 0 GT_CONTROL_INPUT = 1 GT_SOUND_OUTPUT = 2 GT_SOUND_INPUT = 3 + # GATE_POINT[objecttype][gatetype][gatenum] = (x,y) # relative to object center - GATE_POINT = [ [ [ (-1,33) ] ], - [ [], [ (-24,-34),(-9,-34),(8,-34),(24,-34) ], [ (-1,33) ] ], - [ [], [ (31,-20),(31,-6),(31,6),(31,19) ], [ (-3,33) ], [ (-3,-34) ] ], - [ [], [], [], [ (2,-35) ] ] ] - # GATE_MAP[objecttype][gatetype][gatenum] = [ sx, sy, ex, ey, (wireX,wireY) ] + GATE_POINT = [ + [ + [(scale(-1), scale(33))], + ], + [ + [], + [(scale(-24), scale(-34)), (scale(-9), scale(-34)), + (scale(8), scale(-34)), (scale(24), scale(-34))], + [(scale(-1), scale(33))], + ], + [ + [], + [(scale(31), scale(-20)), (scale(31), scale(-6)), + (scale(31), scale(6)), (scale(31), scale(19))], + [(scale(-3), scale(33))], + [(scale(-3), scale(-34))], + ], + [ + [], + [], + [], + [(scale(2), scale(-35))], + ], + ] + + # GATE_MAP[objecttype][gatetype][gatenum] = [sx, sy, ex, ey, (wireX,wireY)] # gate locations relative to object center - GATE_MAP = [ [ [ [-7,26,4,39] ] ], - [ [], [[-30,-40,-19,-28], [-15,-40,-3,-28], [3,-40,14,-28], [19,-40,28,-28]], [[-6,28,5,40]] ], - [ [], [[25,-25,37,-14], [25,-12,37,-1], [25,1,37,12], [25,13,37,25]], [[-8,27,3,40]], [[-8,-40,3,-27]] ], - [ [], [], [], [[-4,-40,7,-29]] ] ] + GATE_MAP = [ + [ + [[scale(-7), scale(26), scale(4), scale(39)]], + ], + [ + [], + [[scale(-30), scale(-40), scale(-19), scale(-28)], + [scale(-15), scale(-40), scale(-3), scale(-28)], + [scale(3), scale(-40), scale(14), scale(-28)], + [scale(19), scale(-40), scale(28), scale(-28)], + ], + [[scale(-6), scale(28), scale(5), scale(40)]], + ], + [ + [], + [[scale(25), scale(-25), scale(37), scale(-14)], + [scale(25), scale(-12), scale(37), scale(-1)], + [scale(25), scale(1), scale(37), scale(12)], + [scale(25), scale(13), scale(37), scale(25)], + ], + [[scale(-8), scale(27), scale(3), scale(40)]], + [[scale(-8), scale(-40), scale(3), scale(-27)]], + ], + [ + [], + [], + [], + [[scale(-4), scale(-40), scale(7), scale(-29)]], + ], + ] + # insert wire locations into map - GATE_OFFSET = 15 + GATE_OFFSET = scale(15) for oT in GATE_MAP: for gT in oT: for m in gT: @@ -41,12 +92,16 @@ class SynthLabConstants: elif y > HALF_SIZE-GATE_OFFSET: y = m[3] m.append( ( x, y ) ) - OBJ_Y_LOC = 710 - INIT_LOCATIONS = [ [450,OBJ_Y_LOC], [450,OBJ_Y_LOC], [450,OBJ_Y_LOC], - [450, OBJ_Y_LOC], [225,OBJ_Y_LOC], [225,OBJ_Y_LOC], - [225,OBJ_Y_LOC], [225, OBJ_Y_LOC], [675,OBJ_Y_LOC], - [675,OBJ_Y_LOC], [675,OBJ_Y_LOC], [675, OBJ_Y_LOC], - [450, 625]] + OBJ_Y_LOC = scale(710) + INIT_LOCATIONS = [ + [scale(450), OBJ_Y_LOC], [scale(450), OBJ_Y_LOC], + [scale(450), OBJ_Y_LOC], [scale(450), OBJ_Y_LOC], + [scale(225), OBJ_Y_LOC], [scale(225), OBJ_Y_LOC], + [scale(225), OBJ_Y_LOC], [scale(225), OBJ_Y_LOC], + [scale(675), OBJ_Y_LOC], [scale(675) ,OBJ_Y_LOC], + [scale(675), OBJ_Y_LOC], [scale(675), OBJ_Y_LOC], + [scale(450), scale(625)], + ] FLOAT1 = [.1, 1] FLOAT = [.01, 2] diff --git a/SynthLab/SynthLabMain.py b/SynthLab/SynthLabMain.py index 3e3ca55..5d4d419 100644 --- a/SynthLab/SynthLabMain.py +++ b/SynthLab/SynthLabMain.py @@ -17,6 +17,7 @@ from common.Util.ThemeWidgets import BigComboBox import common.Util.Instruments import common.Util.InstrumentDB as InstrumentDB import common.Config as Config +from common.Config import imagefile from common.Util.ThemeWidgets import * from common.Util.CSoundClient import new_csound_client from SynthLab.SynthObjectsParameters import SynthObjectsParameters @@ -32,6 +33,8 @@ from common.Util import OS as_window = False SPEAKER = 12 # and last instrument +SLIDER_HEIGHT = Config.scale(240) + class SynthLabMain(gtk.EventBox): def __init__( self, activity ): @@ -164,7 +167,8 @@ class SynthLabMain(gtk.EventBox): menuBox = gtk.HBox() self.objComboBox = BigComboBox() - self.objComboBox.append_item(0, 'Envelope', Config.TAM_TAM_ROOT + '/icons/sl-adsr-menu.svg') + self.objComboBox.append_item(0, 'Envelope', + imagefile('sl-adsr-menu.png')) self.objComboBox.set_active(0) self.objComboBox.connect('changed', self.changeObject) comboMenu = ToolComboBox(self.objComboBox) @@ -206,7 +210,6 @@ class SynthLabMain(gtk.EventBox): slider4Init = parametersTable[tablePos+3] sliderTextColor = gtk.gdk.color_parse(Config.WHITE_COLOR) - sliderHeight = 240 self.p1Adjust = gtk.Adjustment(slider1Init, slider1Min, slider1Max, slider1Step, slider1Step, 0) self.p1Adjust.connect("value-changed", self.sendTables, 1) @@ -216,7 +219,7 @@ class SynthLabMain(gtk.EventBox): self.slider1.connect("enter-notify-event", self.handleSliderEnter, 1) self.slider1.set_digits(slider1Snap) self.slider1.set_inverted(True) - self.slider1.set_size_request(-1, sliderHeight) + self.slider1.set_size_request(-1, SLIDER_HEIGHT) self.slider1.modify_fg(gtk.STATE_NORMAL, sliderTextColor) slidersBox.pack_start(self.slider1, True, True) @@ -228,7 +231,7 @@ class SynthLabMain(gtk.EventBox): self.slider2.connect("enter-notify-event", self.handleSliderEnter, 2) self.slider2.set_digits(slider2Snap) self.slider2.set_inverted(True) - self.slider2.set_size_request(-1, sliderHeight) + self.slider2.set_size_request(-1, SLIDER_HEIGHT) self.slider2.modify_fg(gtk.STATE_NORMAL, sliderTextColor) slidersBox.pack_start(self.slider2, True, True) @@ -240,7 +243,7 @@ class SynthLabMain(gtk.EventBox): self.slider3.connect("enter-notify-event", self.handleSliderEnter, 3) self.slider3.set_digits(slider3Snap) self.slider3.set_inverted(True) - self.slider3.set_size_request(-1, sliderHeight) + self.slider3.set_size_request(-1, SLIDER_HEIGHT) self.slider3.modify_fg(gtk.STATE_NORMAL, sliderTextColor) slidersBox.pack_start(self.slider3, True, True) @@ -252,7 +255,7 @@ class SynthLabMain(gtk.EventBox): self.slider4.connect("enter-notify-event", self.handleSliderEnter, 4) self.slider4.set_digits(2) self.slider4.set_inverted(True) - self.slider4.set_size_request(-1, sliderHeight) + self.slider4.set_size_request(-1, SLIDER_HEIGHT) self.slider4.modify_fg(gtk.STATE_NORMAL, sliderTextColor) slidersBox.pack_start(self.slider4, True, True) @@ -356,12 +359,17 @@ class SynthLabMain(gtk.EventBox): def select(self, i): self.sliderGate = False - self.invalidate_rect( self.bounds[i][0], self.bounds[i][1]-2, SynthLabConstants.PIC_SIZE, SynthLabConstants.PIC_SIZE_HIGHLIGHT ) + self.invalidate_rect(self.bounds[i][0], self.bounds[i][1]-2, + SynthLabConstants.PIC_SIZE, + SynthLabConstants.PIC_SIZE_HIGHLIGHT) if i == self.instanceID: return self.new = False - self.invalidate_rect( self.bounds[self.instanceID][0], self.bounds[self.instanceID][1]-2, SynthLabConstants.PIC_SIZE, SynthLabConstants.PIC_SIZE_HIGHLIGHT ) + self.invalidate_rect(self.bounds[self.instanceID][0], + self.bounds[self.instanceID][1] - 2, + SynthLabConstants.PIC_SIZE, + SynthLabConstants.PIC_SIZE_HIGHLIGHT) self.instanceID = i self.objComboBox.set_active(-1) @@ -369,7 +377,10 @@ class SynthLabMain(gtk.EventBox): self.objectType = self.instanceID / 4 self.objComboBox.remove_all() for i in range(len(SynthLabConstants.CHOOSE_TYPE[self.objectType])): - self.objComboBox.append_item(i, SynthLabConstants.SYNTHTYPES[self.objectType][i], Config.TAM_TAM_ROOT + '/icons/sl-' + SynthLabConstants.CHOOSE_TYPE[self.objectType][i] + '-menu.svg') + name = SynthLabConstants.SYNTHTYPES[self.objectType][i] + image_name = SynthLabConstants.CHOOSE_TYPE[self.objectType][i] + self.objComboBox.append_item(i, name, + imagefile('sl-%s-menu.png' % image_name)) if self.instanceID != SPEAKER: self.choosenType = self.synthObjectsParameters.types[self.instanceID] @@ -1095,7 +1106,9 @@ class SynthLabMain(gtk.EventBox): self.gc.set_clip_origin( self.bounds[i][0]-SynthLabConstants.PIC_SIZE*type, self.bounds[i][1] ) buf.draw_drawable( self.gc, self.pixmap[type][types[i]], 0, 0, self.bounds[i][0], self.bounds[i][1], SynthLabConstants.PIC_SIZE, SynthLabConstants.PIC_SIZE ) # draw selectionHighlight - self.gc.set_clip_origin( self.bounds[i][0]-SynthLabConstants.PIC_SIZE*type, self.bounds[i][1]-82 ) + self.gc.set_clip_origin( + self.bounds[i][0] - SynthLabConstants.PIC_SIZE * type, + self.bounds[i][1] - SynthLabConstants.HALF_SIZE_HIGHLIGHT) self.gc.foreground = self.highlightColor buf.draw_rectangle( self.gc, True, self.bounds[i][0], self.bounds[i][1]-2, SynthLabConstants.PIC_SIZE, SynthLabConstants.PIC_SIZE_HIGHLIGHT ) self.gc.foreground = self.lineColor @@ -1136,7 +1149,11 @@ class SynthLabMain(gtk.EventBox): if self.instanceID == self.dragObject: # draw selectionHighlight - self.gc.set_clip_origin( self.bounds[self.dragObject][0]-SynthLabConstants.PIC_SIZE*type, self.bounds[self.dragObject][1]-82 ) + self.gc.set_clip_origin( + self.bounds[self.dragObject][0] - \ + SynthLabConstants.PIC_SIZE * type, + self.bounds[self.dragObject][1] - \ + SynthLabConstants.HALF_SIZE_HIGHLIGHT) self.gc.foreground = self.highlightColor widget.window.draw_rectangle( self.gc, True, self.bounds[self.dragObject][0], self.bounds[self.dragObject][1]-2, SynthLabConstants.PIC_SIZE, SynthLabConstants.PIC_SIZE_HIGHLIGHT ) @@ -1384,8 +1401,8 @@ class SynthLabMain(gtk.EventBox): gc.foreground = self.bgColor self.pixmap = [ [], [], [], [] ] - def loadImg( type, img ): - pix = gtk.gdk.pixbuf_new_from_file(Config.TAM_TAM_ROOT + '/icons/sl-' + img + '.svg') + def loadImg(type, img): + pix = gtk.gdk.pixbuf_new_from_file(imagefile('sl-%s.png' % img)) map = gtk.gdk.Pixmap( win, pix.get_width(), pix.get_height() ) map.draw_rectangle( gc, True, 0, 0, pix.get_width(), pix.get_height() ) map.draw_pixbuf( gc, pix, 0, 0, 0, 0, pix.get_width(), pix.get_height(), gtk.gdk.RGB_DITHER_NONE ) @@ -1399,7 +1416,7 @@ class SynthLabMain(gtk.EventBox): loadImg( 2, SynthLabConstants.FX_TYPES_PLUS[i] ) loadImg( 3, "speaker" ) - pix = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT+'synthlabMask.png') + pix = gtk.gdk.pixbuf_new_from_file(imagefile('synthlabMask.png')) pixels = pix.get_pixels() stride = pix.get_rowstride() channels = pix.get_n_channels() diff --git a/common/Config.py b/common/Config.py index 85fa2bf..4e32e89 100644 --- a/common/Config.py +++ b/common/Config.py @@ -6,6 +6,8 @@ import gettext import logging from os.path import join +import gtk + from sugar.activity.activity import get_bundle_path, get_activity_root from sugar import env @@ -102,21 +104,29 @@ CSOUND_STOP_RECORD_PERF = 'i5401 4 1 "%s"' ## GUI CONSTANTS ################# +if max(gtk.gdk.screen_width(), gtk.gdk.screen_height()) <= 800: + # Images created using `convert $i -resize 73%` command + IMAGE_ROOT_SCALED = join(IMAGE_ROOT, '73', '') + scale = lambda x: int(x * .73) +else: + IMAGE_ROOT_SCALED = IMAGE_ROOT + scale = lambda x: x + LANGUAGE = 'En' MAIN_WINDOW_PADDING = 5 BG_COLOR = '#404040' FG_COLOR = '#818286' -NOTE_HEIGHT = 9 # pixels -NOTE_IMAGE_PADDING = 6 +NOTE_HEIGHT = scale(9) # pixels +NOTE_IMAGE_PADDING = scale(6) NOTE_IMAGE_PADDING_MUL2 = NOTE_IMAGE_PADDING * 2 -NOTE_IMAGE_TAIL = 1059 -NOTE_IMAGE_ENDLENGTH = 12 -HIT_HEIGHT = 13 # pixels -HIT_IMAGE_PADDING = 6 +NOTE_IMAGE_TAIL = scale(1059) +NOTE_IMAGE_ENDLENGTH = scale(12) +HIT_HEIGHT = scale(13) # pixels +HIT_IMAGE_PADDING = scale(6) HIT_IMAGE_PADDING_MUL2 = HIT_IMAGE_PADDING * 2 -TRACK_SPACING = 4 +TRACK_SPACING = scale(4) TRACK_SPACING_DIV2 = TRACK_SPACING//2 TRACK_COLORS = [("#00290B", "#00E847"), \ ("#3F0200", "#E72500"), \ @@ -138,18 +148,20 @@ MARQUEE_SIZE = 2 PAGE_BORDER_SIZE = 2 PAGE_SELECTED_BORDER_SIZE = 5 -PAGE_WIDTH = 100 -PAGE_HEIGHT = 25 +PAGE_WIDTH = scale(100) +PAGE_HEIGHT = scale(25) -PAGE_THUMBNAIL_WIDTH = 92 +PAGE_THUMBNAIL_WIDTH = scale(92) PAGE_THUMBNAIL_WIDTH_DIV2 = PAGE_THUMBNAIL_WIDTH / 2 -PAGE_THUMBNAIL_HEIGHT = 65 - -THUMBNAIL_TRACK_RECT = [(2, 4, 83, 10), \ - (2, 14, 83, 10), \ - (2, 24, 83, 10), \ - (2, 34, 83, 10), \ - (2, 44, 83, 13)] +PAGE_THUMBNAIL_HEIGHT = scale(65) + +THUMBNAIL_TRACK_RECT = [ + (scale(2), scale(4), scale(83), scale(10)), + (scale(2), scale(14), scale(83), scale(10)), + (scale(2), scale(24), scale(83), scale(10)), + (scale(2), scale(34), scale(83), scale(10)), + (scale(2), scale(44), scale(83), scale(13)), + ] THUMBNAIL_DRAG_COLOR = "#000000" THUMBNAIL_TRACK_COLOR = "#FF0000" THUMBNAIL_SELECTED_COLOR = "#2266FF" @@ -322,3 +334,9 @@ KEY_MAP_NOTPIANO = {24: 24, # Q 57: 48} # N KEY_MAP = KEY_MAP_PIANO + + +def imagefile(filename): + if filename and not filename.startswith(os.sep): + filename = IMAGE_ROOT_SCALED + filename + return filename diff --git a/common/Generation/GenerationParametersWindow.py b/common/Generation/GenerationParametersWindow.py index 5a3ea31..a549417 100644 --- a/common/Generation/GenerationParametersWindow.py +++ b/common/Generation/GenerationParametersWindow.py @@ -57,7 +57,8 @@ class GenerationParametersWindow( gtk.VBox ): self.slider1Label.connect("expose-event", self.draw ) XYSliderBox1 = self.formatRoundBox( RoundFixed(), Config.PANEL_COLOR ) XYSliderBox1.set_size_request( 250, 250 ) - self.GUI["XYButton1"] = ImageToggleButton( Config.IMAGE_ROOT+"XYbut.png", Config.IMAGE_ROOT+"XYbutDown.png", backgroundFill=Config.PANEL_COLOR ) + self.GUI["XYButton1"] = ImageToggleButton('XYbut.png', + 'XYbutDown.png', backgroundFill=Config.PANEL_COLOR) self.XAdjustment1 = gtk.Adjustment( self.rythmDensity*100, 0, 100, 1, 1, 1 ) self.XAdjustment1.connect("value-changed", self.handleXAdjustment1) self.YAdjustment1 = gtk.Adjustment( self.rythmRegularity*100, 0, 100, 1, 1, 1 ) @@ -85,7 +86,8 @@ class GenerationParametersWindow( gtk.VBox ): self.slider2Label.connect("expose-event", self.draw2 ) XYSliderBox2 = self.formatRoundBox( RoundFixed(), Config.PANEL_COLOR ) XYSliderBox2.set_size_request( 250, 250 ) - self.GUI["XYButton2"] = ImageToggleButton( Config.IMAGE_ROOT+"XYbut.png", Config.IMAGE_ROOT+"XYbutDown.png", backgroundFill=Config.PANEL_COLOR ) + self.GUI["XYButton2"] = ImageToggleButton('XYbut.png', + 'XYbutDown.png', backgroundFill=Config.PANEL_COLOR) self.XAdjustment2 = gtk.Adjustment( self.pitchRegularity*100, 0, 100, 1, 1, 1 ) self.XAdjustment2.connect("value-changed", self.handleXAdjustment2) self.YAdjustment2 = gtk.Adjustment( self.pitchStep*100, 0, 100, 1, 1, 1 ) @@ -113,7 +115,8 @@ class GenerationParametersWindow( gtk.VBox ): self.slider3Label.connect("expose-event", self.draw3 ) XYSliderBox3 = self.formatRoundBox( RoundFixed(), Config.PANEL_COLOR ) XYSliderBox3.set_size_request( 250, 250 ) - self.GUI["XYButton3"] = ImageToggleButton( Config.IMAGE_ROOT+"XYbut.png", Config.IMAGE_ROOT+"XYbutDown.png", backgroundFill=Config.PANEL_COLOR ) + self.GUI["XYButton3"] = ImageToggleButton('XYbut.png', + 'XYbutDown.png', backgroundFill=Config.PANEL_COLOR) self.XAdjustment3 = gtk.Adjustment( self.duration*100, 0, 100, 1, 1, 1 ) self.XAdjustment3.connect("value-changed", self.handleXAdjustment3) self.YAdjustment3 = gtk.Adjustment( self.silence*100, 0, 100, 1, 1, 1 ) @@ -135,11 +138,13 @@ class GenerationParametersWindow( gtk.VBox ): metaAlgoBox.set_border_width(1) metaAlgoBox.set_radius(10) - methodBox = gtk.HBox() + methodBox = gtk.HBox() self.firstButton = None methodNames = ['drunk', 'droneJump', 'repeat', 'loopSeg'] for meth in methodNames: - self.GUI[meth] = ImageRadioButton(self.firstButton, Config.IMAGE_ROOT + meth + '.png', Config.IMAGE_ROOT + meth + 'Down.png', Config.IMAGE_ROOT + meth + 'Over.png', backgroundFill=Config.INST_BCK_COLOR ) + self.GUI[meth] = ImageRadioButton(self.firstButton, meth + '.png', + meth + 'Down.png', meth + 'Over.png', + backgroundFill=Config.INST_BCK_COLOR) if self.firstButton == None: self.firstButton = self.GUI[meth] self.GUI[meth].connect('clicked' , self.handleMethod , methodNames.index(meth)) @@ -148,11 +153,13 @@ class GenerationParametersWindow( gtk.VBox ): methodBox.pack_start(self.GUI[meth], False, False) metaAlgoBox.pack_start(methodBox, False, False, 5) - scaleBox = gtk.HBox() + scaleBox = gtk.HBox() self.firstButton = None scaleNames = ['majorKey', 'minorHarmKey', 'minorKey', 'phrygienKey', 'dorienKey', 'lydienKey', 'myxoKey'] for scale in scaleNames: - self.GUI[scale] = ImageRadioButton(self.firstButton, Config.IMAGE_ROOT + scale + '.png', Config.IMAGE_ROOT + scale + 'Down.png', Config.IMAGE_ROOT + scale + 'Over.png', backgroundFill=Config.INST_BCK_COLOR ) + self.GUI[scale] = ImageRadioButton(self.firstButton, + scale + '.png', scale + 'Down.png', scale + 'Over.png', + backgroundFill=Config.INST_BCK_COLOR) if self.firstButton == None: self.firstButton = self.GUI[scale] self.GUI[scale].connect('clicked' , self.handleScale , scaleNames.index(scale)) @@ -168,33 +175,39 @@ class GenerationParametersWindow( gtk.VBox ): transportBox.set_border_width(1) transportBox.set_radius(10) - # Create save/load presets + # Create save/load presets transButtonBox = RoundHBox(fillcolor=Config.INST_BCK_COLOR, bordercolor=Config.PANEL_BCK_COLOR) transButtonBox.set_radius(10) - self.GUI["saveButton"] = ImageButton(Config.IMAGE_ROOT + '/save.png', backgroundFill=Config.INST_BCK_COLOR ) + self.GUI["saveButton"] = ImageButton('save.png', + backgroundFill=Config.INST_BCK_COLOR) self.GUI["saveButton"].connect("clicked", self.handleSave, None) #transButtonBox.pack_start(self.GUI["saveButton"], False, False, 2) - self.GUI["loadButton"] = ImageButton(Config.IMAGE_ROOT + '/load.png', backgroundFill=Config.INST_BCK_COLOR ) + self.GUI["loadButton"] = ImageButton('load.png', + backgroundFill=Config.INST_BCK_COLOR) self.GUI["loadButton"].connect("clicked", self.handleLoad, None) #transButtonBox.pack_start(self.GUI["loadButton"], False, False, 2) # create cancel/check button - self.GUI["checkButton"] = ImageButton(Config.IMAGE_ROOT + 'check.png', backgroundFill=Config.INST_BCK_COLOR ) + self.GUI["checkButton"] = ImageButton('check.png', + backgroundFill=Config.INST_BCK_COLOR) self.GUI["checkButton"].connect("clicked", self.generate) - - self.GUI["cancelButton"] = ImageButton(Config.IMAGE_ROOT + 'closeA.png', backgroundFill=Config.INST_BCK_COLOR ) + + self.GUI["cancelButton"] = ImageButton('closeA.png', + backgroundFill=Config.INST_BCK_COLOR) self.GUI["cancelButton"].connect("clicked", self.cancel) # create play/stop buttons - playButton = ImageToggleButton(Config.IMAGE_ROOT + 'playTogOff.png', Config.IMAGE_ROOT + 'playTogOn.png', backgroundFill=Config.INST_BCK_COLOR ) - selButton = ImageToggleButton(Config.IMAGE_ROOT + 'playAll.png', Config.IMAGE_ROOT + 'playSel.png', backgroundFill=Config.INST_BCK_COLOR ) + playButton = ImageToggleButton('playTogOff.png', 'playTogOn.png', + backgroundFill=Config.INST_BCK_COLOR) + selButton = ImageToggleButton('playAll.png', 'playSel.png', + backgroundFill=Config.INST_BCK_COLOR) transButtonBox.pack_end(self.GUI["checkButton"], False, False, 10) transButtonBox.pack_end(self.GUI["cancelButton"], False, False) #transButtonBox.pack_end(selButton, False, False) #transButtonBox.pack_end(playButton, False, False) - transportBox.pack_start(transButtonBox) + transportBox.pack_start(transButtonBox) self.pack_start(transportBox) self.loadPixmaps() @@ -209,8 +222,9 @@ class GenerationParametersWindow( gtk.VBox ): self.gc.foreground = self.bgColor self.arrowPixmap = [] - for i in range(2): - pix = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT + ['arrowSide.png', 'arrowUp.png'][i]) + for i in range(2): + pix = gtk.gdk.pixbuf_new_from_file( + imagefile(['arrowSide.png', 'arrowUp.png'][i])) map = gtk.gdk.Pixmap( win, pix.get_width(), pix.get_height() ) map.draw_rectangle( self.gc, True, 0, 0, pix.get_width(), pix.get_height() ) map.draw_pixbuf( self.gc, pix, 0, 0, 0, 0, pix.get_width(), pix.get_height(), gtk.gdk.RGB_DITHER_NONE ) @@ -228,8 +242,9 @@ class GenerationParametersWindow( gtk.VBox ): for inc in range(6): imgName = pixmapNames[inc] pixmap = pixmaps[inc] - for i in range(6): - pix = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT + imgName + str(i+1) + '.png') + for i in range(6): + pix = gtk.gdk.pixbuf_new_from_file( + imagefile(imgName + str(i+1) + '.png')) map = gtk.gdk.Pixmap( win, pix.get_width(), pix.get_height() ) map.draw_rectangle( self.gc, True, 0, 0, pix.get_width(), pix.get_height() ) map.draw_pixbuf( self.gc, pix, 0, 0, 0, 0, pix.get_width(), pix.get_height(), gtk.gdk.RGB_DITHER_NONE ) diff --git a/common/Resources/Images/73/TamTam.png b/common/Resources/Images/73/TamTam.png Binary files differnew file mode 100644 index 0000000..66f68a0 --- /dev/null +++ b/common/Resources/Images/73/TamTam.png diff --git a/common/Resources/Images/73/acguit.png b/common/Resources/Images/73/acguit.png Binary files differnew file mode 100644 index 0000000..3f2ac4b --- /dev/null +++ b/common/Resources/Images/73/acguit.png diff --git a/common/Resources/Images/73/acguitsel.png b/common/Resources/Images/73/acguitsel.png Binary files differnew file mode 100644 index 0000000..2bd4d24 --- /dev/null +++ b/common/Resources/Images/73/acguitsel.png diff --git a/common/Resources/Images/73/alarm.png b/common/Resources/Images/73/alarm.png Binary files differnew file mode 100644 index 0000000..a653162 --- /dev/null +++ b/common/Resources/Images/73/alarm.png diff --git a/common/Resources/Images/73/alarmsel.png b/common/Resources/Images/73/alarmsel.png Binary files differnew file mode 100644 index 0000000..2fb9782 --- /dev/null +++ b/common/Resources/Images/73/alarmsel.png diff --git a/common/Resources/Images/73/all.png b/common/Resources/Images/73/all.png Binary files differnew file mode 100644 index 0000000..5cb0ee3 --- /dev/null +++ b/common/Resources/Images/73/all.png diff --git a/common/Resources/Images/73/allsel.png b/common/Resources/Images/73/allsel.png Binary files differnew file mode 100644 index 0000000..ca6fe95 --- /dev/null +++ b/common/Resources/Images/73/allsel.png diff --git a/common/Resources/Images/73/animals.png b/common/Resources/Images/73/animals.png Binary files differnew file mode 100644 index 0000000..f8cfdbd --- /dev/null +++ b/common/Resources/Images/73/animals.png diff --git a/common/Resources/Images/73/animalssel.png b/common/Resources/Images/73/animalssel.png Binary files differnew file mode 100644 index 0000000..25248f0 --- /dev/null +++ b/common/Resources/Images/73/animalssel.png diff --git a/common/Resources/Images/73/armbone.png b/common/Resources/Images/73/armbone.png Binary files differnew file mode 100644 index 0000000..01bf5ae --- /dev/null +++ b/common/Resources/Images/73/armbone.png diff --git a/common/Resources/Images/73/armbonesel.png b/common/Resources/Images/73/armbonesel.png Binary files differnew file mode 100644 index 0000000..f2fd146 --- /dev/null +++ b/common/Resources/Images/73/armbonesel.png diff --git a/common/Resources/Images/73/arrowEditDown.png b/common/Resources/Images/73/arrowEditDown.png Binary files differnew file mode 100644 index 0000000..cd90751 --- /dev/null +++ b/common/Resources/Images/73/arrowEditDown.png diff --git a/common/Resources/Images/73/arrowEditDownDown.png b/common/Resources/Images/73/arrowEditDownDown.png Binary files differnew file mode 100644 index 0000000..9deb9d5 --- /dev/null +++ b/common/Resources/Images/73/arrowEditDownDown.png diff --git a/common/Resources/Images/73/arrowEditDownOver.png b/common/Resources/Images/73/arrowEditDownOver.png Binary files differnew file mode 100644 index 0000000..fdb06a3 --- /dev/null +++ b/common/Resources/Images/73/arrowEditDownOver.png diff --git a/common/Resources/Images/73/arrowEditLeft.png b/common/Resources/Images/73/arrowEditLeft.png Binary files differnew file mode 100644 index 0000000..969942f --- /dev/null +++ b/common/Resources/Images/73/arrowEditLeft.png diff --git a/common/Resources/Images/73/arrowEditLeftDown.png b/common/Resources/Images/73/arrowEditLeftDown.png Binary files differnew file mode 100644 index 0000000..c654e85 --- /dev/null +++ b/common/Resources/Images/73/arrowEditLeftDown.png diff --git a/common/Resources/Images/73/arrowEditLeftOver.png b/common/Resources/Images/73/arrowEditLeftOver.png Binary files differnew file mode 100644 index 0000000..3e99d60 --- /dev/null +++ b/common/Resources/Images/73/arrowEditLeftOver.png diff --git a/common/Resources/Images/73/arrowEditRight.png b/common/Resources/Images/73/arrowEditRight.png Binary files differnew file mode 100644 index 0000000..03555bb --- /dev/null +++ b/common/Resources/Images/73/arrowEditRight.png diff --git a/common/Resources/Images/73/arrowEditRightDown.png b/common/Resources/Images/73/arrowEditRightDown.png Binary files differnew file mode 100644 index 0000000..6336d6d --- /dev/null +++ b/common/Resources/Images/73/arrowEditRightDown.png diff --git a/common/Resources/Images/73/arrowEditRightOver.png b/common/Resources/Images/73/arrowEditRightOver.png Binary files differnew file mode 100644 index 0000000..f359486 --- /dev/null +++ b/common/Resources/Images/73/arrowEditRightOver.png diff --git a/common/Resources/Images/73/arrowEditUp.png b/common/Resources/Images/73/arrowEditUp.png Binary files differnew file mode 100644 index 0000000..544f6a1 --- /dev/null +++ b/common/Resources/Images/73/arrowEditUp.png diff --git a/common/Resources/Images/73/arrowEditUpDown.png b/common/Resources/Images/73/arrowEditUpDown.png Binary files differnew file mode 100644 index 0000000..7fc9944 --- /dev/null +++ b/common/Resources/Images/73/arrowEditUpDown.png diff --git a/common/Resources/Images/73/arrowEditUpOver.png b/common/Resources/Images/73/arrowEditUpOver.png Binary files differnew file mode 100644 index 0000000..182c81e --- /dev/null +++ b/common/Resources/Images/73/arrowEditUpOver.png diff --git a/common/Resources/Images/73/au_pipes.png b/common/Resources/Images/73/au_pipes.png Binary files differnew file mode 100644 index 0000000..754d65d --- /dev/null +++ b/common/Resources/Images/73/au_pipes.png diff --git a/common/Resources/Images/73/au_pipessel.png b/common/Resources/Images/73/au_pipessel.png Binary files differnew file mode 100644 index 0000000..ad82438 --- /dev/null +++ b/common/Resources/Images/73/au_pipessel.png diff --git a/common/Resources/Images/73/babylaugh.png b/common/Resources/Images/73/babylaugh.png Binary files differnew file mode 100644 index 0000000..63418d2 --- /dev/null +++ b/common/Resources/Images/73/babylaugh.png diff --git a/common/Resources/Images/73/babylaughsel.png b/common/Resources/Images/73/babylaughsel.png Binary files differnew file mode 100644 index 0000000..f9fa48a --- /dev/null +++ b/common/Resources/Images/73/babylaughsel.png diff --git a/common/Resources/Images/73/babyuhoh.png b/common/Resources/Images/73/babyuhoh.png Binary files differnew file mode 100644 index 0000000..555c1fb --- /dev/null +++ b/common/Resources/Images/73/babyuhoh.png diff --git a/common/Resources/Images/73/babyuhohsel.png b/common/Resources/Images/73/babyuhohsel.png Binary files differnew file mode 100644 index 0000000..0b3e76b --- /dev/null +++ b/common/Resources/Images/73/babyuhohsel.png diff --git a/common/Resources/Images/73/banjo.png b/common/Resources/Images/73/banjo.png Binary files differnew file mode 100644 index 0000000..3341a0c --- /dev/null +++ b/common/Resources/Images/73/banjo.png diff --git a/common/Resources/Images/73/banjosel.png b/common/Resources/Images/73/banjosel.png Binary files differnew file mode 100644 index 0000000..b6724d5 --- /dev/null +++ b/common/Resources/Images/73/banjosel.png diff --git a/common/Resources/Images/73/basse.png b/common/Resources/Images/73/basse.png Binary files differnew file mode 100644 index 0000000..f087268 --- /dev/null +++ b/common/Resources/Images/73/basse.png diff --git a/common/Resources/Images/73/basse2.png b/common/Resources/Images/73/basse2.png Binary files differnew file mode 100644 index 0000000..00846ee --- /dev/null +++ b/common/Resources/Images/73/basse2.png diff --git a/common/Resources/Images/73/basse2sel.png b/common/Resources/Images/73/basse2sel.png Binary files differnew file mode 100644 index 0000000..4c6a62d --- /dev/null +++ b/common/Resources/Images/73/basse2sel.png diff --git a/common/Resources/Images/73/bassesel.png b/common/Resources/Images/73/bassesel.png Binary files differnew file mode 100644 index 0000000..885e04d --- /dev/null +++ b/common/Resources/Images/73/bassesel.png diff --git a/common/Resources/Images/73/beat1.png b/common/Resources/Images/73/beat1.png Binary files differnew file mode 100644 index 0000000..ff67801 --- /dev/null +++ b/common/Resources/Images/73/beat1.png diff --git a/common/Resources/Images/73/beat10.png b/common/Resources/Images/73/beat10.png Binary files differnew file mode 100644 index 0000000..b5007fe --- /dev/null +++ b/common/Resources/Images/73/beat10.png diff --git a/common/Resources/Images/73/beat11.png b/common/Resources/Images/73/beat11.png Binary files differnew file mode 100644 index 0000000..e418347 --- /dev/null +++ b/common/Resources/Images/73/beat11.png diff --git a/common/Resources/Images/73/beat2.png b/common/Resources/Images/73/beat2.png Binary files differnew file mode 100644 index 0000000..9c05c9a --- /dev/null +++ b/common/Resources/Images/73/beat2.png diff --git a/common/Resources/Images/73/beat3.png b/common/Resources/Images/73/beat3.png Binary files differnew file mode 100644 index 0000000..e9e7f7a --- /dev/null +++ b/common/Resources/Images/73/beat3.png diff --git a/common/Resources/Images/73/beat4.png b/common/Resources/Images/73/beat4.png Binary files differnew file mode 100644 index 0000000..4d7a7ec --- /dev/null +++ b/common/Resources/Images/73/beat4.png diff --git a/common/Resources/Images/73/beat5.png b/common/Resources/Images/73/beat5.png Binary files differnew file mode 100644 index 0000000..bb01b5b --- /dev/null +++ b/common/Resources/Images/73/beat5.png diff --git a/common/Resources/Images/73/beat6.png b/common/Resources/Images/73/beat6.png Binary files differnew file mode 100644 index 0000000..391de87 --- /dev/null +++ b/common/Resources/Images/73/beat6.png diff --git a/common/Resources/Images/73/beat7.png b/common/Resources/Images/73/beat7.png Binary files differnew file mode 100644 index 0000000..18bb233 --- /dev/null +++ b/common/Resources/Images/73/beat7.png diff --git a/common/Resources/Images/73/beat8.png b/common/Resources/Images/73/beat8.png Binary files differnew file mode 100644 index 0000000..c1aec1d --- /dev/null +++ b/common/Resources/Images/73/beat8.png diff --git a/common/Resources/Images/73/beat9.png b/common/Resources/Images/73/beat9.png Binary files differnew file mode 100644 index 0000000..6ba987d --- /dev/null +++ b/common/Resources/Images/73/beat9.png diff --git a/common/Resources/Images/73/bird.png b/common/Resources/Images/73/bird.png Binary files differnew file mode 100644 index 0000000..eabdf9c --- /dev/null +++ b/common/Resources/Images/73/bird.png diff --git a/common/Resources/Images/73/birdsel.png b/common/Resources/Images/73/birdsel.png Binary files differnew file mode 100644 index 0000000..9b13b4b --- /dev/null +++ b/common/Resources/Images/73/birdsel.png diff --git a/common/Resources/Images/73/bottle.png b/common/Resources/Images/73/bottle.png Binary files differnew file mode 100644 index 0000000..dd87fc4 --- /dev/null +++ b/common/Resources/Images/73/bottle.png diff --git a/common/Resources/Images/73/bottlesel.png b/common/Resources/Images/73/bottlesel.png Binary files differnew file mode 100644 index 0000000..42dd127 --- /dev/null +++ b/common/Resources/Images/73/bottlesel.png diff --git a/common/Resources/Images/73/bubbles.png b/common/Resources/Images/73/bubbles.png Binary files differnew file mode 100644 index 0000000..0e4781a --- /dev/null +++ b/common/Resources/Images/73/bubbles.png diff --git a/common/Resources/Images/73/bubblessel.png b/common/Resources/Images/73/bubblessel.png Binary files differnew file mode 100644 index 0000000..7186dc2 --- /dev/null +++ b/common/Resources/Images/73/bubblessel.png diff --git a/common/Resources/Images/73/byke.png b/common/Resources/Images/73/byke.png Binary files differnew file mode 100644 index 0000000..d503883 --- /dev/null +++ b/common/Resources/Images/73/byke.png diff --git a/common/Resources/Images/73/bykesel.png b/common/Resources/Images/73/bykesel.png Binary files differnew file mode 100644 index 0000000..cb11901 --- /dev/null +++ b/common/Resources/Images/73/bykesel.png diff --git a/common/Resources/Images/73/camera.png b/common/Resources/Images/73/camera.png Binary files differnew file mode 100644 index 0000000..4931ab4 --- /dev/null +++ b/common/Resources/Images/73/camera.png diff --git a/common/Resources/Images/73/camerasel.png b/common/Resources/Images/73/camerasel.png Binary files differnew file mode 100644 index 0000000..2fdf12e --- /dev/null +++ b/common/Resources/Images/73/camerasel.png diff --git a/common/Resources/Images/73/car.png b/common/Resources/Images/73/car.png Binary files differnew file mode 100644 index 0000000..8071d2e --- /dev/null +++ b/common/Resources/Images/73/car.png diff --git a/common/Resources/Images/73/carhorn.png b/common/Resources/Images/73/carhorn.png Binary files differnew file mode 100644 index 0000000..2168bb7 --- /dev/null +++ b/common/Resources/Images/73/carhorn.png diff --git a/common/Resources/Images/73/carhornsel.png b/common/Resources/Images/73/carhornsel.png Binary files differnew file mode 100644 index 0000000..b92b477 --- /dev/null +++ b/common/Resources/Images/73/carhornsel.png diff --git a/common/Resources/Images/73/carsel.png b/common/Resources/Images/73/carsel.png Binary files differnew file mode 100644 index 0000000..9967bc0 --- /dev/null +++ b/common/Resources/Images/73/carsel.png diff --git a/common/Resources/Images/73/cat.png b/common/Resources/Images/73/cat.png Binary files differnew file mode 100644 index 0000000..81c182e --- /dev/null +++ b/common/Resources/Images/73/cat.png diff --git a/common/Resources/Images/73/catsel.png b/common/Resources/Images/73/catsel.png Binary files differnew file mode 100644 index 0000000..4d6589a --- /dev/null +++ b/common/Resources/Images/73/catsel.png diff --git a/common/Resources/Images/73/cello.png b/common/Resources/Images/73/cello.png Binary files differnew file mode 100644 index 0000000..97625a8 --- /dev/null +++ b/common/Resources/Images/73/cello.png diff --git a/common/Resources/Images/73/cellosel.png b/common/Resources/Images/73/cellosel.png Binary files differnew file mode 100644 index 0000000..1409b53 --- /dev/null +++ b/common/Resources/Images/73/cellosel.png diff --git a/common/Resources/Images/73/check.png b/common/Resources/Images/73/check.png Binary files differnew file mode 100644 index 0000000..e6b22b9 --- /dev/null +++ b/common/Resources/Images/73/check.png diff --git a/common/Resources/Images/73/checkOff.png b/common/Resources/Images/73/checkOff.png Binary files differnew file mode 100644 index 0000000..7cabb62 --- /dev/null +++ b/common/Resources/Images/73/checkOff.png diff --git a/common/Resources/Images/73/checkOn.png b/common/Resources/Images/73/checkOn.png Binary files differnew file mode 100644 index 0000000..9ff426a --- /dev/null +++ b/common/Resources/Images/73/checkOn.png diff --git a/common/Resources/Images/73/chiken.png b/common/Resources/Images/73/chiken.png Binary files differnew file mode 100644 index 0000000..c90891b --- /dev/null +++ b/common/Resources/Images/73/chiken.png diff --git a/common/Resources/Images/73/chikensel.png b/common/Resources/Images/73/chikensel.png Binary files differnew file mode 100644 index 0000000..13925ce --- /dev/null +++ b/common/Resources/Images/73/chikensel.png diff --git a/common/Resources/Images/73/chimes.png b/common/Resources/Images/73/chimes.png Binary files differnew file mode 100644 index 0000000..f6714ad --- /dev/null +++ b/common/Resources/Images/73/chimes.png diff --git a/common/Resources/Images/73/chimessel.png b/common/Resources/Images/73/chimessel.png Binary files differnew file mode 100644 index 0000000..970d748 --- /dev/null +++ b/common/Resources/Images/73/chimessel.png diff --git a/common/Resources/Images/73/clang.png b/common/Resources/Images/73/clang.png Binary files differnew file mode 100644 index 0000000..c0aa23d --- /dev/null +++ b/common/Resources/Images/73/clang.png diff --git a/common/Resources/Images/73/clang2.png b/common/Resources/Images/73/clang2.png Binary files differnew file mode 100644 index 0000000..a5672d7 --- /dev/null +++ b/common/Resources/Images/73/clang2.png diff --git a/common/Resources/Images/73/clang2sel.png b/common/Resources/Images/73/clang2sel.png Binary files differnew file mode 100644 index 0000000..a0edfd1 --- /dev/null +++ b/common/Resources/Images/73/clang2sel.png diff --git a/common/Resources/Images/73/clangsel.png b/common/Resources/Images/73/clangsel.png Binary files differnew file mode 100644 index 0000000..d03983e --- /dev/null +++ b/common/Resources/Images/73/clangsel.png diff --git a/common/Resources/Images/73/clarinette.png b/common/Resources/Images/73/clarinette.png Binary files differnew file mode 100644 index 0000000..a58914c --- /dev/null +++ b/common/Resources/Images/73/clarinette.png diff --git a/common/Resources/Images/73/clarinettesel.png b/common/Resources/Images/73/clarinettesel.png Binary files differnew file mode 100644 index 0000000..b906fd9 --- /dev/null +++ b/common/Resources/Images/73/clarinettesel.png diff --git a/common/Resources/Images/73/clavinet.png b/common/Resources/Images/73/clavinet.png Binary files differnew file mode 100644 index 0000000..9c963e9 --- /dev/null +++ b/common/Resources/Images/73/clavinet.png diff --git a/common/Resources/Images/73/clavinetsel.png b/common/Resources/Images/73/clavinetsel.png Binary files differnew file mode 100644 index 0000000..073ebc6 --- /dev/null +++ b/common/Resources/Images/73/clavinetsel.png diff --git a/common/Resources/Images/73/cling.png b/common/Resources/Images/73/cling.png Binary files differnew file mode 100644 index 0000000..acf07a8 --- /dev/null +++ b/common/Resources/Images/73/cling.png diff --git a/common/Resources/Images/73/clingsel.png b/common/Resources/Images/73/clingsel.png Binary files differnew file mode 100644 index 0000000..05ec713 --- /dev/null +++ b/common/Resources/Images/73/clingsel.png diff --git a/common/Resources/Images/73/complex1.png b/common/Resources/Images/73/complex1.png Binary files differnew file mode 100644 index 0000000..86e278f --- /dev/null +++ b/common/Resources/Images/73/complex1.png diff --git a/common/Resources/Images/73/complex2.png b/common/Resources/Images/73/complex2.png Binary files differnew file mode 100644 index 0000000..3d75a21 --- /dev/null +++ b/common/Resources/Images/73/complex2.png diff --git a/common/Resources/Images/73/complex3.png b/common/Resources/Images/73/complex3.png Binary files differnew file mode 100644 index 0000000..53e1670 --- /dev/null +++ b/common/Resources/Images/73/complex3.png diff --git a/common/Resources/Images/73/complex4.png b/common/Resources/Images/73/complex4.png Binary files differnew file mode 100644 index 0000000..d77bf6f --- /dev/null +++ b/common/Resources/Images/73/complex4.png diff --git a/common/Resources/Images/73/complex5.png b/common/Resources/Images/73/complex5.png Binary files differnew file mode 100644 index 0000000..d299d09 --- /dev/null +++ b/common/Resources/Images/73/complex5.png diff --git a/common/Resources/Images/73/complex6.png b/common/Resources/Images/73/complex6.png Binary files differnew file mode 100644 index 0000000..9720649 --- /dev/null +++ b/common/Resources/Images/73/complex6.png diff --git a/common/Resources/Images/73/complex7.png b/common/Resources/Images/73/complex7.png Binary files differnew file mode 100644 index 0000000..911b0d2 --- /dev/null +++ b/common/Resources/Images/73/complex7.png diff --git a/common/Resources/Images/73/complex8.png b/common/Resources/Images/73/complex8.png Binary files differnew file mode 100644 index 0000000..b2cff7f --- /dev/null +++ b/common/Resources/Images/73/complex8.png diff --git a/common/Resources/Images/73/concret.png b/common/Resources/Images/73/concret.png Binary files differnew file mode 100644 index 0000000..ca6d0d9 --- /dev/null +++ b/common/Resources/Images/73/concret.png diff --git a/common/Resources/Images/73/concretsel.png b/common/Resources/Images/73/concretsel.png Binary files differnew file mode 100644 index 0000000..5f3d6d5 --- /dev/null +++ b/common/Resources/Images/73/concretsel.png diff --git a/common/Resources/Images/73/cow.png b/common/Resources/Images/73/cow.png Binary files differnew file mode 100644 index 0000000..3ad8422 --- /dev/null +++ b/common/Resources/Images/73/cow.png diff --git a/common/Resources/Images/73/cowsel.png b/common/Resources/Images/73/cowsel.png Binary files differnew file mode 100644 index 0000000..8bc7888 --- /dev/null +++ b/common/Resources/Images/73/cowsel.png diff --git a/common/Resources/Images/73/crash.png b/common/Resources/Images/73/crash.png Binary files differnew file mode 100644 index 0000000..1fcf526 --- /dev/null +++ b/common/Resources/Images/73/crash.png diff --git a/common/Resources/Images/73/crashsel.png b/common/Resources/Images/73/crashsel.png Binary files differnew file mode 100644 index 0000000..53a131f --- /dev/null +++ b/common/Resources/Images/73/crashsel.png diff --git a/common/Resources/Images/73/cricket.png b/common/Resources/Images/73/cricket.png Binary files differnew file mode 100644 index 0000000..fa6f10a --- /dev/null +++ b/common/Resources/Images/73/cricket.png diff --git a/common/Resources/Images/73/cricketsel.png b/common/Resources/Images/73/cricketsel.png Binary files differnew file mode 100644 index 0000000..fd9e20a --- /dev/null +++ b/common/Resources/Images/73/cricketsel.png diff --git a/common/Resources/Images/73/dice.png b/common/Resources/Images/73/dice.png Binary files differnew file mode 100644 index 0000000..aa28ad8 --- /dev/null +++ b/common/Resources/Images/73/dice.png diff --git a/common/Resources/Images/73/diceProp.png b/common/Resources/Images/73/diceProp.png Binary files differnew file mode 100644 index 0000000..594fb86 --- /dev/null +++ b/common/Resources/Images/73/diceProp.png diff --git a/common/Resources/Images/73/dicePropSel.png b/common/Resources/Images/73/dicePropSel.png Binary files differnew file mode 100644 index 0000000..9fc93c7 --- /dev/null +++ b/common/Resources/Images/73/dicePropSel.png diff --git a/common/Resources/Images/73/diceblur.png b/common/Resources/Images/73/diceblur.png Binary files differnew file mode 100644 index 0000000..6417ae5 --- /dev/null +++ b/common/Resources/Images/73/diceblur.png diff --git a/common/Resources/Images/73/diceinst.png b/common/Resources/Images/73/diceinst.png Binary files differnew file mode 100644 index 0000000..a97708d --- /dev/null +++ b/common/Resources/Images/73/diceinst.png diff --git a/common/Resources/Images/73/diceinstsel.png b/common/Resources/Images/73/diceinstsel.png Binary files differnew file mode 100644 index 0000000..94d06a8 --- /dev/null +++ b/common/Resources/Images/73/diceinstsel.png diff --git a/common/Resources/Images/73/didjeridu.png b/common/Resources/Images/73/didjeridu.png Binary files differnew file mode 100644 index 0000000..5a1b1ad --- /dev/null +++ b/common/Resources/Images/73/didjeridu.png diff --git a/common/Resources/Images/73/didjeridusel.png b/common/Resources/Images/73/didjeridusel.png Binary files differnew file mode 100644 index 0000000..f7d6061 --- /dev/null +++ b/common/Resources/Images/73/didjeridusel.png diff --git a/common/Resources/Images/73/dog.png b/common/Resources/Images/73/dog.png Binary files differnew file mode 100644 index 0000000..93f4481 --- /dev/null +++ b/common/Resources/Images/73/dog.png diff --git a/common/Resources/Images/73/dogsel.png b/common/Resources/Images/73/dogsel.png Binary files differnew file mode 100644 index 0000000..4d7d5dc --- /dev/null +++ b/common/Resources/Images/73/dogsel.png diff --git a/common/Resources/Images/73/door.png b/common/Resources/Images/73/door.png Binary files differnew file mode 100644 index 0000000..ff9eec8 --- /dev/null +++ b/common/Resources/Images/73/door.png diff --git a/common/Resources/Images/73/doorsel.png b/common/Resources/Images/73/doorsel.png Binary files differnew file mode 100644 index 0000000..9aae9fd --- /dev/null +++ b/common/Resources/Images/73/doorsel.png diff --git a/common/Resources/Images/73/dru0.png b/common/Resources/Images/73/dru0.png Binary files differnew file mode 100644 index 0000000..ee0d828 --- /dev/null +++ b/common/Resources/Images/73/dru0.png diff --git a/common/Resources/Images/73/dru1.png b/common/Resources/Images/73/dru1.png Binary files differnew file mode 100644 index 0000000..e223813 --- /dev/null +++ b/common/Resources/Images/73/dru1.png diff --git a/common/Resources/Images/73/dru2.png b/common/Resources/Images/73/dru2.png Binary files differnew file mode 100644 index 0000000..af17889 --- /dev/null +++ b/common/Resources/Images/73/dru2.png diff --git a/common/Resources/Images/73/dru3.png b/common/Resources/Images/73/dru3.png Binary files differnew file mode 100644 index 0000000..47e99e4 --- /dev/null +++ b/common/Resources/Images/73/dru3.png diff --git a/common/Resources/Images/73/dru4.png b/common/Resources/Images/73/dru4.png Binary files differnew file mode 100644 index 0000000..c7ca938 --- /dev/null +++ b/common/Resources/Images/73/dru4.png diff --git a/common/Resources/Images/73/drum1kit.png b/common/Resources/Images/73/drum1kit.png Binary files differnew file mode 100644 index 0000000..34426ed --- /dev/null +++ b/common/Resources/Images/73/drum1kit.png diff --git a/common/Resources/Images/73/drum1kitsel.png b/common/Resources/Images/73/drum1kitsel.png Binary files differnew file mode 100644 index 0000000..a4a0481 --- /dev/null +++ b/common/Resources/Images/73/drum1kitsel.png diff --git a/common/Resources/Images/73/drum1kitselgen.png b/common/Resources/Images/73/drum1kitselgen.png Binary files differnew file mode 100644 index 0000000..0050306 --- /dev/null +++ b/common/Resources/Images/73/drum1kitselgen.png diff --git a/common/Resources/Images/73/drum2kit.png b/common/Resources/Images/73/drum2kit.png Binary files differnew file mode 100644 index 0000000..e88fdef --- /dev/null +++ b/common/Resources/Images/73/drum2kit.png diff --git a/common/Resources/Images/73/drum2kitsel.png b/common/Resources/Images/73/drum2kitsel.png Binary files differnew file mode 100644 index 0000000..bd106df --- /dev/null +++ b/common/Resources/Images/73/drum2kitsel.png diff --git a/common/Resources/Images/73/drum2kitselgen.png b/common/Resources/Images/73/drum2kitselgen.png Binary files differnew file mode 100644 index 0000000..8949d1a --- /dev/null +++ b/common/Resources/Images/73/drum2kitselgen.png diff --git a/common/Resources/Images/73/drum3kit.png b/common/Resources/Images/73/drum3kit.png Binary files differnew file mode 100644 index 0000000..e38f166 --- /dev/null +++ b/common/Resources/Images/73/drum3kit.png diff --git a/common/Resources/Images/73/drum3kitsel.png b/common/Resources/Images/73/drum3kitsel.png Binary files differnew file mode 100644 index 0000000..d9fd1c6 --- /dev/null +++ b/common/Resources/Images/73/drum3kitsel.png diff --git a/common/Resources/Images/73/drum3kitselgen.png b/common/Resources/Images/73/drum3kitselgen.png Binary files differnew file mode 100644 index 0000000..46d5737 --- /dev/null +++ b/common/Resources/Images/73/drum3kitselgen.png diff --git a/common/Resources/Images/73/drum4kit.png b/common/Resources/Images/73/drum4kit.png Binary files differnew file mode 100644 index 0000000..e64d041 --- /dev/null +++ b/common/Resources/Images/73/drum4kit.png diff --git a/common/Resources/Images/73/drum4kitsel.png b/common/Resources/Images/73/drum4kitsel.png Binary files differnew file mode 100644 index 0000000..066d809 --- /dev/null +++ b/common/Resources/Images/73/drum4kitsel.png diff --git a/common/Resources/Images/73/drum4kitselgen.png b/common/Resources/Images/73/drum4kitselgen.png Binary files differnew file mode 100644 index 0000000..7654869 --- /dev/null +++ b/common/Resources/Images/73/drum4kitselgen.png diff --git a/common/Resources/Images/73/drum5kit.png b/common/Resources/Images/73/drum5kit.png Binary files differnew file mode 100644 index 0000000..d1832bc --- /dev/null +++ b/common/Resources/Images/73/drum5kit.png diff --git a/common/Resources/Images/73/drum5kitsel.png b/common/Resources/Images/73/drum5kitsel.png Binary files differnew file mode 100644 index 0000000..5027697 --- /dev/null +++ b/common/Resources/Images/73/drum5kitsel.png diff --git a/common/Resources/Images/73/drum5kitselgen.png b/common/Resources/Images/73/drum5kitselgen.png Binary files differnew file mode 100644 index 0000000..223b945 --- /dev/null +++ b/common/Resources/Images/73/drum5kitselgen.png diff --git a/common/Resources/Images/73/drum6kit.png b/common/Resources/Images/73/drum6kit.png Binary files differnew file mode 100644 index 0000000..f730310 --- /dev/null +++ b/common/Resources/Images/73/drum6kit.png diff --git a/common/Resources/Images/73/drum6kitsel.png b/common/Resources/Images/73/drum6kitsel.png Binary files differnew file mode 100644 index 0000000..53e88bc --- /dev/null +++ b/common/Resources/Images/73/drum6kitsel.png diff --git a/common/Resources/Images/73/drum6kitselgen.png b/common/Resources/Images/73/drum6kitselgen.png Binary files differnew file mode 100644 index 0000000..3387332 --- /dev/null +++ b/common/Resources/Images/73/drum6kitselgen.png diff --git a/common/Resources/Images/73/duck.png b/common/Resources/Images/73/duck.png Binary files differnew file mode 100644 index 0000000..b014033 --- /dev/null +++ b/common/Resources/Images/73/duck.png diff --git a/common/Resources/Images/73/duck2.png b/common/Resources/Images/73/duck2.png Binary files differnew file mode 100644 index 0000000..4a28a1c --- /dev/null +++ b/common/Resources/Images/73/duck2.png diff --git a/common/Resources/Images/73/duck2sel.png b/common/Resources/Images/73/duck2sel.png Binary files differnew file mode 100644 index 0000000..91c7470 --- /dev/null +++ b/common/Resources/Images/73/duck2sel.png diff --git a/common/Resources/Images/73/ducksel.png b/common/Resources/Images/73/ducksel.png Binary files differnew file mode 100644 index 0000000..861288f --- /dev/null +++ b/common/Resources/Images/73/ducksel.png diff --git a/common/Resources/Images/73/editTam.png b/common/Resources/Images/73/editTam.png Binary files differnew file mode 100644 index 0000000..a554391 --- /dev/null +++ b/common/Resources/Images/73/editTam.png diff --git a/common/Resources/Images/73/editTamDown.png b/common/Resources/Images/73/editTamDown.png Binary files differnew file mode 100644 index 0000000..06a114d --- /dev/null +++ b/common/Resources/Images/73/editTamDown.png diff --git a/common/Resources/Images/73/editTamOver.png b/common/Resources/Images/73/editTamOver.png Binary files differnew file mode 100644 index 0000000..5fe3958 --- /dev/null +++ b/common/Resources/Images/73/editTamOver.png diff --git a/common/Resources/Images/73/electronic.png b/common/Resources/Images/73/electronic.png Binary files differnew file mode 100644 index 0000000..49585ed --- /dev/null +++ b/common/Resources/Images/73/electronic.png diff --git a/common/Resources/Images/73/electronicsel.png b/common/Resources/Images/73/electronicsel.png Binary files differnew file mode 100644 index 0000000..aacb17c --- /dev/null +++ b/common/Resources/Images/73/electronicsel.png diff --git a/common/Resources/Images/73/fingercymbals.png b/common/Resources/Images/73/fingercymbals.png Binary files differnew file mode 100644 index 0000000..186bd40 --- /dev/null +++ b/common/Resources/Images/73/fingercymbals.png diff --git a/common/Resources/Images/73/fingercymbalssel.png b/common/Resources/Images/73/fingercymbalssel.png Binary files differnew file mode 100644 index 0000000..0126227 --- /dev/null +++ b/common/Resources/Images/73/fingercymbalssel.png diff --git a/common/Resources/Images/73/flugel.png b/common/Resources/Images/73/flugel.png Binary files differnew file mode 100644 index 0000000..c0e62ee --- /dev/null +++ b/common/Resources/Images/73/flugel.png diff --git a/common/Resources/Images/73/flugelsel.png b/common/Resources/Images/73/flugelsel.png Binary files differnew file mode 100644 index 0000000..bcd9381 --- /dev/null +++ b/common/Resources/Images/73/flugelsel.png diff --git a/common/Resources/Images/73/flute.png b/common/Resources/Images/73/flute.png Binary files differnew file mode 100644 index 0000000..87b05a8 --- /dev/null +++ b/common/Resources/Images/73/flute.png diff --git a/common/Resources/Images/73/flutesel.png b/common/Resources/Images/73/flutesel.png Binary files differnew file mode 100644 index 0000000..a78e97a --- /dev/null +++ b/common/Resources/Images/73/flutesel.png diff --git a/common/Resources/Images/73/foghorn.png b/common/Resources/Images/73/foghorn.png Binary files differnew file mode 100644 index 0000000..70c2b19 --- /dev/null +++ b/common/Resources/Images/73/foghorn.png diff --git a/common/Resources/Images/73/foghornsel.png b/common/Resources/Images/73/foghornsel.png Binary files differnew file mode 100644 index 0000000..1421921 --- /dev/null +++ b/common/Resources/Images/73/foghornsel.png diff --git a/common/Resources/Images/73/frogs.png b/common/Resources/Images/73/frogs.png Binary files differnew file mode 100644 index 0000000..7ebecea --- /dev/null +++ b/common/Resources/Images/73/frogs.png diff --git a/common/Resources/Images/73/frogssel.png b/common/Resources/Images/73/frogssel.png Binary files differnew file mode 100644 index 0000000..148d4d7 --- /dev/null +++ b/common/Resources/Images/73/frogssel.png diff --git a/common/Resources/Images/73/gam.png b/common/Resources/Images/73/gam.png Binary files differnew file mode 100644 index 0000000..f655e7c --- /dev/null +++ b/common/Resources/Images/73/gam.png diff --git a/common/Resources/Images/73/gamsel.png b/common/Resources/Images/73/gamsel.png Binary files differnew file mode 100644 index 0000000..af754fe --- /dev/null +++ b/common/Resources/Images/73/gamsel.png diff --git a/common/Resources/Images/73/generic.png b/common/Resources/Images/73/generic.png Binary files differnew file mode 100644 index 0000000..b4c823e --- /dev/null +++ b/common/Resources/Images/73/generic.png diff --git a/common/Resources/Images/73/genericsel.png b/common/Resources/Images/73/genericsel.png Binary files differnew file mode 100644 index 0000000..90e0776 --- /dev/null +++ b/common/Resources/Images/73/genericsel.png diff --git a/common/Resources/Images/73/guit.png b/common/Resources/Images/73/guit.png Binary files differnew file mode 100644 index 0000000..6c6e065 --- /dev/null +++ b/common/Resources/Images/73/guit.png diff --git a/common/Resources/Images/73/guit2.png b/common/Resources/Images/73/guit2.png Binary files differnew file mode 100644 index 0000000..a14a785 --- /dev/null +++ b/common/Resources/Images/73/guit2.png diff --git a/common/Resources/Images/73/guit2sel.png b/common/Resources/Images/73/guit2sel.png Binary files differnew file mode 100644 index 0000000..a430567 --- /dev/null +++ b/common/Resources/Images/73/guit2sel.png diff --git a/common/Resources/Images/73/guitmute.png b/common/Resources/Images/73/guitmute.png Binary files differnew file mode 100644 index 0000000..4f86b5b --- /dev/null +++ b/common/Resources/Images/73/guitmute.png diff --git a/common/Resources/Images/73/guitmutesel.png b/common/Resources/Images/73/guitmutesel.png Binary files differnew file mode 100644 index 0000000..ed134d4 --- /dev/null +++ b/common/Resources/Images/73/guitmutesel.png diff --git a/common/Resources/Images/73/guitsel.png b/common/Resources/Images/73/guitsel.png Binary files differnew file mode 100644 index 0000000..40e2770 --- /dev/null +++ b/common/Resources/Images/73/guitsel.png diff --git a/common/Resources/Images/73/guitshort.png b/common/Resources/Images/73/guitshort.png Binary files differnew file mode 100644 index 0000000..e10837f --- /dev/null +++ b/common/Resources/Images/73/guitshort.png diff --git a/common/Resources/Images/73/guitshortsel.png b/common/Resources/Images/73/guitshortsel.png Binary files differnew file mode 100644 index 0000000..c4428e2 --- /dev/null +++ b/common/Resources/Images/73/guitshortsel.png diff --git a/common/Resources/Images/73/harmonica.png b/common/Resources/Images/73/harmonica.png Binary files differnew file mode 100644 index 0000000..48c572b --- /dev/null +++ b/common/Resources/Images/73/harmonica.png diff --git a/common/Resources/Images/73/harmonicasel.png b/common/Resources/Images/73/harmonicasel.png Binary files differnew file mode 100644 index 0000000..b993928 --- /dev/null +++ b/common/Resources/Images/73/harmonicasel.png diff --git a/common/Resources/Images/73/harmonium.png b/common/Resources/Images/73/harmonium.png Binary files differnew file mode 100644 index 0000000..acd45b6 --- /dev/null +++ b/common/Resources/Images/73/harmonium.png diff --git a/common/Resources/Images/73/harmoniumsel.png b/common/Resources/Images/73/harmoniumsel.png Binary files differnew file mode 100644 index 0000000..857efba --- /dev/null +++ b/common/Resources/Images/73/harmoniumsel.png diff --git a/common/Resources/Images/73/harpsichord.png b/common/Resources/Images/73/harpsichord.png Binary files differnew file mode 100644 index 0000000..e0209c3 --- /dev/null +++ b/common/Resources/Images/73/harpsichord.png diff --git a/common/Resources/Images/73/harpsichordsel.png b/common/Resources/Images/73/harpsichordsel.png Binary files differnew file mode 100644 index 0000000..592d6c6 --- /dev/null +++ b/common/Resources/Images/73/harpsichordsel.png diff --git a/common/Resources/Images/73/helpTam.png b/common/Resources/Images/73/helpTam.png Binary files differnew file mode 100644 index 0000000..06a114d --- /dev/null +++ b/common/Resources/Images/73/helpTam.png diff --git a/common/Resources/Images/73/helpTamDown.png b/common/Resources/Images/73/helpTamDown.png Binary files differnew file mode 100644 index 0000000..a554391 --- /dev/null +++ b/common/Resources/Images/73/helpTamDown.png diff --git a/common/Resources/Images/73/helpTamOver.png b/common/Resources/Images/73/helpTamOver.png Binary files differnew file mode 100644 index 0000000..5fe3958 --- /dev/null +++ b/common/Resources/Images/73/helpTamOver.png diff --git a/common/Resources/Images/73/hey.png b/common/Resources/Images/73/hey.png Binary files differnew file mode 100644 index 0000000..afcca8b --- /dev/null +++ b/common/Resources/Images/73/hey.png diff --git a/common/Resources/Images/73/heysel.png b/common/Resources/Images/73/heysel.png Binary files differnew file mode 100644 index 0000000..bb93047 --- /dev/null +++ b/common/Resources/Images/73/heysel.png diff --git a/common/Resources/Images/73/hit.png b/common/Resources/Images/73/hit.png Binary files differnew file mode 100644 index 0000000..1ad957a --- /dev/null +++ b/common/Resources/Images/73/hit.png diff --git a/common/Resources/Images/73/hitSelected.png b/common/Resources/Images/73/hitSelected.png Binary files differnew file mode 100644 index 0000000..7c24683 --- /dev/null +++ b/common/Resources/Images/73/hitSelected.png diff --git a/common/Resources/Images/73/horse.png b/common/Resources/Images/73/horse.png Binary files differnew file mode 100644 index 0000000..806c1c4 --- /dev/null +++ b/common/Resources/Images/73/horse.png diff --git a/common/Resources/Images/73/horsesel.png b/common/Resources/Images/73/horsesel.png Binary files differnew file mode 100644 index 0000000..7652b2f --- /dev/null +++ b/common/Resources/Images/73/horsesel.png diff --git a/common/Resources/Images/73/instr0.png b/common/Resources/Images/73/instr0.png Binary files differnew file mode 100644 index 0000000..9c0566a --- /dev/null +++ b/common/Resources/Images/73/instr0.png diff --git a/common/Resources/Images/73/instr1.png b/common/Resources/Images/73/instr1.png Binary files differnew file mode 100644 index 0000000..f5cf07e --- /dev/null +++ b/common/Resources/Images/73/instr1.png diff --git a/common/Resources/Images/73/instr2.png b/common/Resources/Images/73/instr2.png Binary files differnew file mode 100644 index 0000000..31f09b5 --- /dev/null +++ b/common/Resources/Images/73/instr2.png diff --git a/common/Resources/Images/73/instr3.png b/common/Resources/Images/73/instr3.png Binary files differnew file mode 100644 index 0000000..c00f543 --- /dev/null +++ b/common/Resources/Images/73/instr3.png diff --git a/common/Resources/Images/73/instr4.png b/common/Resources/Images/73/instr4.png Binary files differnew file mode 100644 index 0000000..1fa4882 --- /dev/null +++ b/common/Resources/Images/73/instr4.png diff --git a/common/Resources/Images/73/jam-blockMask.png b/common/Resources/Images/73/jam-blockMask.png Binary files differnew file mode 100644 index 0000000..e67ac0b --- /dev/null +++ b/common/Resources/Images/73/jam-blockMask.png diff --git a/common/Resources/Images/73/kalimba.png b/common/Resources/Images/73/kalimba.png Binary files differnew file mode 100644 index 0000000..bfd1eb1 --- /dev/null +++ b/common/Resources/Images/73/kalimba.png diff --git a/common/Resources/Images/73/kalimbasel.png b/common/Resources/Images/73/kalimbasel.png Binary files differnew file mode 100644 index 0000000..696a4a7 --- /dev/null +++ b/common/Resources/Images/73/kalimbasel.png diff --git a/common/Resources/Images/73/keyboard.png b/common/Resources/Images/73/keyboard.png Binary files differnew file mode 100644 index 0000000..11398ea --- /dev/null +++ b/common/Resources/Images/73/keyboard.png diff --git a/common/Resources/Images/73/keyboardsel.png b/common/Resources/Images/73/keyboardsel.png Binary files differnew file mode 100644 index 0000000..9684341 --- /dev/null +++ b/common/Resources/Images/73/keyboardsel.png diff --git a/common/Resources/Images/73/koto.png b/common/Resources/Images/73/koto.png Binary files differnew file mode 100644 index 0000000..765a2f8 --- /dev/null +++ b/common/Resources/Images/73/koto.png diff --git a/common/Resources/Images/73/kotosel.png b/common/Resources/Images/73/kotosel.png Binary files differnew file mode 100644 index 0000000..d47b2da --- /dev/null +++ b/common/Resources/Images/73/kotosel.png diff --git a/common/Resources/Images/73/lab1.png b/common/Resources/Images/73/lab1.png Binary files differnew file mode 100644 index 0000000..382340f --- /dev/null +++ b/common/Resources/Images/73/lab1.png diff --git a/common/Resources/Images/73/lab1sel.png b/common/Resources/Images/73/lab1sel.png Binary files differnew file mode 100644 index 0000000..1a60c6b --- /dev/null +++ b/common/Resources/Images/73/lab1sel.png diff --git a/common/Resources/Images/73/lab2.png b/common/Resources/Images/73/lab2.png Binary files differnew file mode 100644 index 0000000..a74d56c --- /dev/null +++ b/common/Resources/Images/73/lab2.png diff --git a/common/Resources/Images/73/lab2sel.png b/common/Resources/Images/73/lab2sel.png Binary files differnew file mode 100644 index 0000000..7ae3985 --- /dev/null +++ b/common/Resources/Images/73/lab2sel.png diff --git a/common/Resources/Images/73/lab3.png b/common/Resources/Images/73/lab3.png Binary files differnew file mode 100644 index 0000000..6c9d56a --- /dev/null +++ b/common/Resources/Images/73/lab3.png diff --git a/common/Resources/Images/73/lab3sel.png b/common/Resources/Images/73/lab3sel.png Binary files differnew file mode 100644 index 0000000..754909a --- /dev/null +++ b/common/Resources/Images/73/lab3sel.png diff --git a/common/Resources/Images/73/lab4.png b/common/Resources/Images/73/lab4.png Binary files differnew file mode 100644 index 0000000..65c3d25 --- /dev/null +++ b/common/Resources/Images/73/lab4.png diff --git a/common/Resources/Images/73/lab4sel.png b/common/Resources/Images/73/lab4sel.png Binary files differnew file mode 100644 index 0000000..1c01314 --- /dev/null +++ b/common/Resources/Images/73/lab4sel.png diff --git a/common/Resources/Images/73/lab5.png b/common/Resources/Images/73/lab5.png Binary files differnew file mode 100644 index 0000000..78dacd8 --- /dev/null +++ b/common/Resources/Images/73/lab5.png diff --git a/common/Resources/Images/73/lab5sel.png b/common/Resources/Images/73/lab5sel.png Binary files differnew file mode 100644 index 0000000..3994f90 --- /dev/null +++ b/common/Resources/Images/73/lab5sel.png diff --git a/common/Resources/Images/73/lab6.png b/common/Resources/Images/73/lab6.png Binary files differnew file mode 100644 index 0000000..a591753 --- /dev/null +++ b/common/Resources/Images/73/lab6.png diff --git a/common/Resources/Images/73/lab6sel.png b/common/Resources/Images/73/lab6sel.png Binary files differnew file mode 100644 index 0000000..a1716d9 --- /dev/null +++ b/common/Resources/Images/73/lab6sel.png diff --git a/common/Resources/Images/73/laugh.png b/common/Resources/Images/73/laugh.png Binary files differnew file mode 100644 index 0000000..4502656 --- /dev/null +++ b/common/Resources/Images/73/laugh.png diff --git a/common/Resources/Images/73/laughsel.png b/common/Resources/Images/73/laughsel.png Binary files differnew file mode 100644 index 0000000..a32fb95 --- /dev/null +++ b/common/Resources/Images/73/laughsel.png diff --git a/common/Resources/Images/73/mando.png b/common/Resources/Images/73/mando.png Binary files differnew file mode 100644 index 0000000..bad1603 --- /dev/null +++ b/common/Resources/Images/73/mando.png diff --git a/common/Resources/Images/73/mandosel.png b/common/Resources/Images/73/mandosel.png Binary files differnew file mode 100644 index 0000000..7d816c7 --- /dev/null +++ b/common/Resources/Images/73/mandosel.png diff --git a/common/Resources/Images/73/marimba.png b/common/Resources/Images/73/marimba.png Binary files differnew file mode 100644 index 0000000..2a3e8d1 --- /dev/null +++ b/common/Resources/Images/73/marimba.png diff --git a/common/Resources/Images/73/marimbasel.png b/common/Resources/Images/73/marimbasel.png Binary files differnew file mode 100644 index 0000000..c022f0d --- /dev/null +++ b/common/Resources/Images/73/marimbasel.png diff --git a/common/Resources/Images/73/marquis.png b/common/Resources/Images/73/marquis.png Binary files differnew file mode 100644 index 0000000..d144bb6 --- /dev/null +++ b/common/Resources/Images/73/marquis.png diff --git a/common/Resources/Images/73/mic1.png b/common/Resources/Images/73/mic1.png Binary files differnew file mode 100644 index 0000000..e010751 --- /dev/null +++ b/common/Resources/Images/73/mic1.png diff --git a/common/Resources/Images/73/mic1sel.png b/common/Resources/Images/73/mic1sel.png Binary files differnew file mode 100644 index 0000000..09c851d --- /dev/null +++ b/common/Resources/Images/73/mic1sel.png diff --git a/common/Resources/Images/73/mic2.png b/common/Resources/Images/73/mic2.png Binary files differnew file mode 100644 index 0000000..1d38ae3 --- /dev/null +++ b/common/Resources/Images/73/mic2.png diff --git a/common/Resources/Images/73/mic2sel.png b/common/Resources/Images/73/mic2sel.png Binary files differnew file mode 100644 index 0000000..dd2783b --- /dev/null +++ b/common/Resources/Images/73/mic2sel.png diff --git a/common/Resources/Images/73/mic3.png b/common/Resources/Images/73/mic3.png Binary files differnew file mode 100644 index 0000000..64a2af8 --- /dev/null +++ b/common/Resources/Images/73/mic3.png diff --git a/common/Resources/Images/73/mic3sel.png b/common/Resources/Images/73/mic3sel.png Binary files differnew file mode 100644 index 0000000..89311a5 --- /dev/null +++ b/common/Resources/Images/73/mic3sel.png diff --git a/common/Resources/Images/73/mic4.png b/common/Resources/Images/73/mic4.png Binary files differnew file mode 100644 index 0000000..097bf90 --- /dev/null +++ b/common/Resources/Images/73/mic4.png diff --git a/common/Resources/Images/73/mic4sel.png b/common/Resources/Images/73/mic4sel.png Binary files differnew file mode 100644 index 0000000..08d7bdf --- /dev/null +++ b/common/Resources/Images/73/mic4sel.png diff --git a/common/Resources/Images/73/miniTam.png b/common/Resources/Images/73/miniTam.png Binary files differnew file mode 100644 index 0000000..baddfd6 --- /dev/null +++ b/common/Resources/Images/73/miniTam.png diff --git a/common/Resources/Images/73/miniTamDown.png b/common/Resources/Images/73/miniTamDown.png Binary files differnew file mode 100644 index 0000000..5e949bf --- /dev/null +++ b/common/Resources/Images/73/miniTamDown.png diff --git a/common/Resources/Images/73/miniTamOver.png b/common/Resources/Images/73/miniTamOver.png Binary files differnew file mode 100644 index 0000000..d04ad6c --- /dev/null +++ b/common/Resources/Images/73/miniTamOver.png diff --git a/common/Resources/Images/73/miniplay.png b/common/Resources/Images/73/miniplay.png Binary files differnew file mode 100644 index 0000000..5cc6cf4 --- /dev/null +++ b/common/Resources/Images/73/miniplay.png diff --git a/common/Resources/Images/73/mysounds.png b/common/Resources/Images/73/mysounds.png Binary files differnew file mode 100644 index 0000000..94ea33b --- /dev/null +++ b/common/Resources/Images/73/mysounds.png diff --git a/common/Resources/Images/73/mysoundssel.png b/common/Resources/Images/73/mysoundssel.png Binary files differnew file mode 100644 index 0000000..a045b47 --- /dev/null +++ b/common/Resources/Images/73/mysoundssel.png diff --git a/common/Resources/Images/73/note.png b/common/Resources/Images/73/note.png Binary files differnew file mode 100644 index 0000000..cb6d2f7 --- /dev/null +++ b/common/Resources/Images/73/note.png diff --git a/common/Resources/Images/73/noteSelected.png b/common/Resources/Images/73/noteSelected.png Binary files differnew file mode 100644 index 0000000..f2c396d --- /dev/null +++ b/common/Resources/Images/73/noteSelected.png diff --git a/common/Resources/Images/73/ocarina.png b/common/Resources/Images/73/ocarina.png Binary files differnew file mode 100644 index 0000000..64c08f7 --- /dev/null +++ b/common/Resources/Images/73/ocarina.png diff --git a/common/Resources/Images/73/ocarinasel.png b/common/Resources/Images/73/ocarinasel.png Binary files differnew file mode 100644 index 0000000..e4dfdf9 --- /dev/null +++ b/common/Resources/Images/73/ocarinasel.png diff --git a/common/Resources/Images/73/ounk.png b/common/Resources/Images/73/ounk.png Binary files differnew file mode 100644 index 0000000..7b76dcd --- /dev/null +++ b/common/Resources/Images/73/ounk.png diff --git a/common/Resources/Images/73/ounksel.png b/common/Resources/Images/73/ounksel.png Binary files differnew file mode 100644 index 0000000..1cd9e3a --- /dev/null +++ b/common/Resources/Images/73/ounksel.png diff --git a/common/Resources/Images/73/ow.png b/common/Resources/Images/73/ow.png Binary files differnew file mode 100644 index 0000000..0188688 --- /dev/null +++ b/common/Resources/Images/73/ow.png diff --git a/common/Resources/Images/73/owsel.png b/common/Resources/Images/73/owsel.png Binary files differnew file mode 100644 index 0000000..0d3f793 --- /dev/null +++ b/common/Resources/Images/73/owsel.png diff --git a/common/Resources/Images/73/pageThumbnailBG.png b/common/Resources/Images/73/pageThumbnailBG.png Binary files differnew file mode 100644 index 0000000..356fa03 --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBG.png diff --git a/common/Resources/Images/73/pageThumbnailBG0.png b/common/Resources/Images/73/pageThumbnailBG0.png Binary files differnew file mode 100644 index 0000000..2a7b12c --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBG0.png diff --git a/common/Resources/Images/73/pageThumbnailBG1.png b/common/Resources/Images/73/pageThumbnailBG1.png Binary files differnew file mode 100644 index 0000000..9c7556a --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBG1.png diff --git a/common/Resources/Images/73/pageThumbnailBG2.png b/common/Resources/Images/73/pageThumbnailBG2.png Binary files differnew file mode 100644 index 0000000..561d53d --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBG2.png diff --git a/common/Resources/Images/73/pageThumbnailBG3.png b/common/Resources/Images/73/pageThumbnailBG3.png Binary files differnew file mode 100644 index 0000000..3f67543 --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBG3.png diff --git a/common/Resources/Images/73/pageThumbnailBut0.png b/common/Resources/Images/73/pageThumbnailBut0.png Binary files differnew file mode 100644 index 0000000..4bc411a --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut0.png diff --git a/common/Resources/Images/73/pageThumbnailBut0Down.png b/common/Resources/Images/73/pageThumbnailBut0Down.png Binary files differnew file mode 100644 index 0000000..d891cb4 --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut0Down.png diff --git a/common/Resources/Images/73/pageThumbnailBut1.png b/common/Resources/Images/73/pageThumbnailBut1.png Binary files differnew file mode 100644 index 0000000..e74ec49 --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut1.png diff --git a/common/Resources/Images/73/pageThumbnailBut1Down.png b/common/Resources/Images/73/pageThumbnailBut1Down.png Binary files differnew file mode 100644 index 0000000..5439ffa --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut1Down.png diff --git a/common/Resources/Images/73/pageThumbnailBut2.png b/common/Resources/Images/73/pageThumbnailBut2.png Binary files differnew file mode 100644 index 0000000..1556580 --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut2.png diff --git a/common/Resources/Images/73/pageThumbnailBut2Down.png b/common/Resources/Images/73/pageThumbnailBut2Down.png Binary files differnew file mode 100644 index 0000000..e1d0ed2 --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut2Down.png diff --git a/common/Resources/Images/73/pageThumbnailBut3.png b/common/Resources/Images/73/pageThumbnailBut3.png Binary files differnew file mode 100644 index 0000000..312955b --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut3.png diff --git a/common/Resources/Images/73/pageThumbnailBut3Down.png b/common/Resources/Images/73/pageThumbnailBut3Down.png Binary files differnew file mode 100644 index 0000000..a2f45ad --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut3Down.png diff --git a/common/Resources/Images/73/pageThumbnailMask.png b/common/Resources/Images/73/pageThumbnailMask.png Binary files differnew file mode 100644 index 0000000..4ae99ee --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailMask.png diff --git a/common/Resources/Images/73/people.png b/common/Resources/Images/73/people.png Binary files differnew file mode 100644 index 0000000..eb66ce0 --- /dev/null +++ b/common/Resources/Images/73/people.png diff --git a/common/Resources/Images/73/peoplesel.png b/common/Resources/Images/73/peoplesel.png Binary files differnew file mode 100644 index 0000000..2c166b6 --- /dev/null +++ b/common/Resources/Images/73/peoplesel.png diff --git a/common/Resources/Images/73/percussions.png b/common/Resources/Images/73/percussions.png Binary files differnew file mode 100644 index 0000000..c1ed155 --- /dev/null +++ b/common/Resources/Images/73/percussions.png diff --git a/common/Resources/Images/73/percussionssel.png b/common/Resources/Images/73/percussionssel.png Binary files differnew file mode 100644 index 0000000..14c5456 --- /dev/null +++ b/common/Resources/Images/73/percussionssel.png diff --git a/common/Resources/Images/73/piano.png b/common/Resources/Images/73/piano.png Binary files differnew file mode 100644 index 0000000..891950d --- /dev/null +++ b/common/Resources/Images/73/piano.png diff --git a/common/Resources/Images/73/pianosel.png b/common/Resources/Images/73/pianosel.png Binary files differnew file mode 100644 index 0000000..adfccc7 --- /dev/null +++ b/common/Resources/Images/73/pianosel.png diff --git a/common/Resources/Images/73/plane.png b/common/Resources/Images/73/plane.png Binary files differnew file mode 100644 index 0000000..5513306 --- /dev/null +++ b/common/Resources/Images/73/plane.png diff --git a/common/Resources/Images/73/planesel.png b/common/Resources/Images/73/planesel.png Binary files differnew file mode 100644 index 0000000..7a1c85b --- /dev/null +++ b/common/Resources/Images/73/planesel.png diff --git a/common/Resources/Images/73/reverb0.png b/common/Resources/Images/73/reverb0.png Binary files differnew file mode 100644 index 0000000..096e35d --- /dev/null +++ b/common/Resources/Images/73/reverb0.png diff --git a/common/Resources/Images/73/reverb1.png b/common/Resources/Images/73/reverb1.png Binary files differnew file mode 100644 index 0000000..ce52859 --- /dev/null +++ b/common/Resources/Images/73/reverb1.png diff --git a/common/Resources/Images/73/reverb2.png b/common/Resources/Images/73/reverb2.png Binary files differnew file mode 100644 index 0000000..9cf89d7 --- /dev/null +++ b/common/Resources/Images/73/reverb2.png diff --git a/common/Resources/Images/73/reverb3.png b/common/Resources/Images/73/reverb3.png Binary files differnew file mode 100644 index 0000000..c235d81 --- /dev/null +++ b/common/Resources/Images/73/reverb3.png diff --git a/common/Resources/Images/73/reverb4.png b/common/Resources/Images/73/reverb4.png Binary files differnew file mode 100644 index 0000000..b1e1897 --- /dev/null +++ b/common/Resources/Images/73/reverb4.png diff --git a/common/Resources/Images/73/reverb5.png b/common/Resources/Images/73/reverb5.png Binary files differnew file mode 100644 index 0000000..1be0e33 --- /dev/null +++ b/common/Resources/Images/73/reverb5.png diff --git a/common/Resources/Images/73/rhodes.png b/common/Resources/Images/73/rhodes.png Binary files differnew file mode 100644 index 0000000..590d58b --- /dev/null +++ b/common/Resources/Images/73/rhodes.png diff --git a/common/Resources/Images/73/rhodessel.png b/common/Resources/Images/73/rhodessel.png Binary files differnew file mode 100644 index 0000000..3a906b7 --- /dev/null +++ b/common/Resources/Images/73/rhodessel.png diff --git a/common/Resources/Images/73/sampleBG.png b/common/Resources/Images/73/sampleBG.png Binary files differnew file mode 100644 index 0000000..ad83f14 --- /dev/null +++ b/common/Resources/Images/73/sampleBG.png diff --git a/common/Resources/Images/73/sampleNoteMask.png b/common/Resources/Images/73/sampleNoteMask.png Binary files differnew file mode 100644 index 0000000..8cfb635 --- /dev/null +++ b/common/Resources/Images/73/sampleNoteMask.png diff --git a/common/Resources/Images/73/sarangi.png b/common/Resources/Images/73/sarangi.png Binary files differnew file mode 100644 index 0000000..e81eb45 --- /dev/null +++ b/common/Resources/Images/73/sarangi.png diff --git a/common/Resources/Images/73/sarangisel.png b/common/Resources/Images/73/sarangisel.png Binary files differnew file mode 100644 index 0000000..6adc6b0 --- /dev/null +++ b/common/Resources/Images/73/sarangisel.png diff --git a/common/Resources/Images/73/saxo.png b/common/Resources/Images/73/saxo.png Binary files differnew file mode 100644 index 0000000..49a3ced --- /dev/null +++ b/common/Resources/Images/73/saxo.png diff --git a/common/Resources/Images/73/saxosel.png b/common/Resources/Images/73/saxosel.png Binary files differnew file mode 100644 index 0000000..1e7f83a --- /dev/null +++ b/common/Resources/Images/73/saxosel.png diff --git a/common/Resources/Images/73/saxsoprano.png b/common/Resources/Images/73/saxsoprano.png Binary files differnew file mode 100644 index 0000000..a5ef552 --- /dev/null +++ b/common/Resources/Images/73/saxsoprano.png diff --git a/common/Resources/Images/73/saxsopranosel.png b/common/Resources/Images/73/saxsopranosel.png Binary files differnew file mode 100644 index 0000000..482fb00 --- /dev/null +++ b/common/Resources/Images/73/saxsopranosel.png diff --git a/common/Resources/Images/73/scrollBar.png b/common/Resources/Images/73/scrollBar.png Binary files differnew file mode 100644 index 0000000..51a2c95 --- /dev/null +++ b/common/Resources/Images/73/scrollBar.png diff --git a/common/Resources/Images/73/sheep.png b/common/Resources/Images/73/sheep.png Binary files differnew file mode 100644 index 0000000..13ae4fc --- /dev/null +++ b/common/Resources/Images/73/sheep.png diff --git a/common/Resources/Images/73/sheepsel.png b/common/Resources/Images/73/sheepsel.png Binary files differnew file mode 100644 index 0000000..7e8ea35 --- /dev/null +++ b/common/Resources/Images/73/sheepsel.png diff --git a/common/Resources/Images/73/shenai.png b/common/Resources/Images/73/shenai.png Binary files differnew file mode 100644 index 0000000..32e9dba --- /dev/null +++ b/common/Resources/Images/73/shenai.png diff --git a/common/Resources/Images/73/shenaisel.png b/common/Resources/Images/73/shenaisel.png Binary files differnew file mode 100644 index 0000000..8a6b778 --- /dev/null +++ b/common/Resources/Images/73/shenaisel.png diff --git a/common/Resources/Images/73/sitar.png b/common/Resources/Images/73/sitar.png Binary files differnew file mode 100644 index 0000000..a9510ca --- /dev/null +++ b/common/Resources/Images/73/sitar.png diff --git a/common/Resources/Images/73/sitarsel.png b/common/Resources/Images/73/sitarsel.png Binary files differnew file mode 100644 index 0000000..775b8c8 --- /dev/null +++ b/common/Resources/Images/73/sitarsel.png diff --git a/common/Resources/Images/73/sl-addSynth+.png b/common/Resources/Images/73/sl-addSynth+.png Binary files differnew file mode 100644 index 0000000..94cd4a6 --- /dev/null +++ b/common/Resources/Images/73/sl-addSynth+.png diff --git a/common/Resources/Images/73/sl-addSynth-menu.png b/common/Resources/Images/73/sl-addSynth-menu.png Binary files differnew file mode 100644 index 0000000..56ccb1b --- /dev/null +++ b/common/Resources/Images/73/sl-addSynth-menu.png diff --git a/common/Resources/Images/73/sl-adsr+.png b/common/Resources/Images/73/sl-adsr+.png Binary files differnew file mode 100644 index 0000000..3d800e6 --- /dev/null +++ b/common/Resources/Images/73/sl-adsr+.png diff --git a/common/Resources/Images/73/sl-adsr-menu.png b/common/Resources/Images/73/sl-adsr-menu.png Binary files differnew file mode 100644 index 0000000..b7c2701 --- /dev/null +++ b/common/Resources/Images/73/sl-adsr-menu.png diff --git a/common/Resources/Images/73/sl-buzz+.png b/common/Resources/Images/73/sl-buzz+.png Binary files differnew file mode 100644 index 0000000..09188d2 --- /dev/null +++ b/common/Resources/Images/73/sl-buzz+.png diff --git a/common/Resources/Images/73/sl-buzz-menu.png b/common/Resources/Images/73/sl-buzz-menu.png Binary files differnew file mode 100644 index 0000000..1c70fbe --- /dev/null +++ b/common/Resources/Images/73/sl-buzz-menu.png diff --git a/common/Resources/Images/73/sl-chorus+.png b/common/Resources/Images/73/sl-chorus+.png Binary files differnew file mode 100644 index 0000000..c02899b --- /dev/null +++ b/common/Resources/Images/73/sl-chorus+.png diff --git a/common/Resources/Images/73/sl-chorus-menu.png b/common/Resources/Images/73/sl-chorus-menu.png Binary files differnew file mode 100644 index 0000000..fd51a2c --- /dev/null +++ b/common/Resources/Images/73/sl-chorus-menu.png diff --git a/common/Resources/Images/73/sl-distort+.png b/common/Resources/Images/73/sl-distort+.png Binary files differnew file mode 100644 index 0000000..621b0ff --- /dev/null +++ b/common/Resources/Images/73/sl-distort+.png diff --git a/common/Resources/Images/73/sl-distort-menu.png b/common/Resources/Images/73/sl-distort-menu.png Binary files differnew file mode 100644 index 0000000..55f2bf2 --- /dev/null +++ b/common/Resources/Images/73/sl-distort-menu.png diff --git a/common/Resources/Images/73/sl-eq4band+.png b/common/Resources/Images/73/sl-eq4band+.png Binary files differnew file mode 100644 index 0000000..5bf3a75 --- /dev/null +++ b/common/Resources/Images/73/sl-eq4band+.png diff --git a/common/Resources/Images/73/sl-eq4band-menu.png b/common/Resources/Images/73/sl-eq4band-menu.png Binary files differnew file mode 100644 index 0000000..bce0c4d --- /dev/null +++ b/common/Resources/Images/73/sl-eq4band-menu.png diff --git a/common/Resources/Images/73/sl-filter+.png b/common/Resources/Images/73/sl-filter+.png Binary files differnew file mode 100644 index 0000000..8c526e3 --- /dev/null +++ b/common/Resources/Images/73/sl-filter+.png diff --git a/common/Resources/Images/73/sl-filter-menu.png b/common/Resources/Images/73/sl-filter-menu.png Binary files differnew file mode 100644 index 0000000..71309f1 --- /dev/null +++ b/common/Resources/Images/73/sl-filter-menu.png diff --git a/common/Resources/Images/73/sl-fm+.png b/common/Resources/Images/73/sl-fm+.png Binary files differnew file mode 100644 index 0000000..c0ef3f4 --- /dev/null +++ b/common/Resources/Images/73/sl-fm+.png diff --git a/common/Resources/Images/73/sl-fm-menu.png b/common/Resources/Images/73/sl-fm-menu.png Binary files differnew file mode 100644 index 0000000..f35cfc7 --- /dev/null +++ b/common/Resources/Images/73/sl-fm-menu.png diff --git a/common/Resources/Images/73/sl-grain+.png b/common/Resources/Images/73/sl-grain+.png Binary files differnew file mode 100644 index 0000000..5c2e9f4 --- /dev/null +++ b/common/Resources/Images/73/sl-grain+.png diff --git a/common/Resources/Images/73/sl-grain-menu.png b/common/Resources/Images/73/sl-grain-menu.png Binary files differnew file mode 100644 index 0000000..e2d9190 --- /dev/null +++ b/common/Resources/Images/73/sl-grain-menu.png diff --git a/common/Resources/Images/73/sl-harmon+.png b/common/Resources/Images/73/sl-harmon+.png Binary files differnew file mode 100644 index 0000000..b935df0 --- /dev/null +++ b/common/Resources/Images/73/sl-harmon+.png diff --git a/common/Resources/Images/73/sl-harmon-menu.png b/common/Resources/Images/73/sl-harmon-menu.png Binary files differnew file mode 100644 index 0000000..59d696f --- /dev/null +++ b/common/Resources/Images/73/sl-harmon-menu.png diff --git a/common/Resources/Images/73/sl-lfo+.png b/common/Resources/Images/73/sl-lfo+.png Binary files differnew file mode 100644 index 0000000..6c1d0d6 --- /dev/null +++ b/common/Resources/Images/73/sl-lfo+.png diff --git a/common/Resources/Images/73/sl-lfo-menu.png b/common/Resources/Images/73/sl-lfo-menu.png Binary files differnew file mode 100644 index 0000000..b31fe95 --- /dev/null +++ b/common/Resources/Images/73/sl-lfo-menu.png diff --git a/common/Resources/Images/73/sl-mic+.png b/common/Resources/Images/73/sl-mic+.png Binary files differnew file mode 100644 index 0000000..c586dbe --- /dev/null +++ b/common/Resources/Images/73/sl-mic+.png diff --git a/common/Resources/Images/73/sl-mic-menu.png b/common/Resources/Images/73/sl-mic-menu.png Binary files differnew file mode 100644 index 0000000..f196956 --- /dev/null +++ b/common/Resources/Images/73/sl-mic-menu.png diff --git a/common/Resources/Images/73/sl-noise+.png b/common/Resources/Images/73/sl-noise+.png Binary files differnew file mode 100644 index 0000000..7ea63a7 --- /dev/null +++ b/common/Resources/Images/73/sl-noise+.png diff --git a/common/Resources/Images/73/sl-noise-menu.png b/common/Resources/Images/73/sl-noise-menu.png Binary files differnew file mode 100644 index 0000000..3d66d55 --- /dev/null +++ b/common/Resources/Images/73/sl-noise-menu.png diff --git a/common/Resources/Images/73/sl-pluck+.png b/common/Resources/Images/73/sl-pluck+.png Binary files differnew file mode 100644 index 0000000..99f9d22 --- /dev/null +++ b/common/Resources/Images/73/sl-pluck+.png diff --git a/common/Resources/Images/73/sl-pluck-menu.png b/common/Resources/Images/73/sl-pluck-menu.png Binary files differnew file mode 100644 index 0000000..b7c9132 --- /dev/null +++ b/common/Resources/Images/73/sl-pluck-menu.png diff --git a/common/Resources/Images/73/sl-rand+.png b/common/Resources/Images/73/sl-rand+.png Binary files differnew file mode 100644 index 0000000..2258bd7 --- /dev/null +++ b/common/Resources/Images/73/sl-rand+.png diff --git a/common/Resources/Images/73/sl-rand-menu.png b/common/Resources/Images/73/sl-rand-menu.png Binary files differnew file mode 100644 index 0000000..cc1d063 --- /dev/null +++ b/common/Resources/Images/73/sl-rand-menu.png diff --git a/common/Resources/Images/73/sl-reverb+.png b/common/Resources/Images/73/sl-reverb+.png Binary files differnew file mode 100644 index 0000000..3610db2 --- /dev/null +++ b/common/Resources/Images/73/sl-reverb+.png diff --git a/common/Resources/Images/73/sl-reverb-menu.png b/common/Resources/Images/73/sl-reverb-menu.png Binary files differnew file mode 100644 index 0000000..2fbaa5d --- /dev/null +++ b/common/Resources/Images/73/sl-reverb-menu.png diff --git a/common/Resources/Images/73/sl-ring+.png b/common/Resources/Images/73/sl-ring+.png Binary files differnew file mode 100644 index 0000000..209ef59 --- /dev/null +++ b/common/Resources/Images/73/sl-ring+.png diff --git a/common/Resources/Images/73/sl-ring-menu.png b/common/Resources/Images/73/sl-ring-menu.png Binary files differnew file mode 100644 index 0000000..054ea9d --- /dev/null +++ b/common/Resources/Images/73/sl-ring-menu.png diff --git a/common/Resources/Images/73/sl-sample+.png b/common/Resources/Images/73/sl-sample+.png Binary files differnew file mode 100644 index 0000000..621e093 --- /dev/null +++ b/common/Resources/Images/73/sl-sample+.png diff --git a/common/Resources/Images/73/sl-sample-menu.png b/common/Resources/Images/73/sl-sample-menu.png Binary files differnew file mode 100644 index 0000000..dfed585 --- /dev/null +++ b/common/Resources/Images/73/sl-sample-menu.png diff --git a/common/Resources/Images/73/sl-speaker.png b/common/Resources/Images/73/sl-speaker.png Binary files differnew file mode 100644 index 0000000..13e1642 --- /dev/null +++ b/common/Resources/Images/73/sl-speaker.png diff --git a/common/Resources/Images/73/sl-trackpadX+.png b/common/Resources/Images/73/sl-trackpadX+.png Binary files differnew file mode 100644 index 0000000..bc1e024 --- /dev/null +++ b/common/Resources/Images/73/sl-trackpadX+.png diff --git a/common/Resources/Images/73/sl-trackpadX-menu.png b/common/Resources/Images/73/sl-trackpadX-menu.png Binary files differnew file mode 100644 index 0000000..70c319d --- /dev/null +++ b/common/Resources/Images/73/sl-trackpadX-menu.png diff --git a/common/Resources/Images/73/sl-trackpadY+.png b/common/Resources/Images/73/sl-trackpadY+.png Binary files differnew file mode 100644 index 0000000..8eb887c --- /dev/null +++ b/common/Resources/Images/73/sl-trackpadY+.png diff --git a/common/Resources/Images/73/sl-trackpadY-menu.png b/common/Resources/Images/73/sl-trackpadY-menu.png Binary files differnew file mode 100644 index 0000000..4469025 --- /dev/null +++ b/common/Resources/Images/73/sl-trackpadY-menu.png diff --git a/common/Resources/Images/73/sl-vco+.png b/common/Resources/Images/73/sl-vco+.png Binary files differnew file mode 100644 index 0000000..26e26ce --- /dev/null +++ b/common/Resources/Images/73/sl-vco+.png diff --git a/common/Resources/Images/73/sl-vco-menu.png b/common/Resources/Images/73/sl-vco-menu.png Binary files differnew file mode 100644 index 0000000..f97b618 --- /dev/null +++ b/common/Resources/Images/73/sl-vco-menu.png diff --git a/common/Resources/Images/73/sl-voice+.png b/common/Resources/Images/73/sl-voice+.png Binary files differnew file mode 100644 index 0000000..3d4d418 --- /dev/null +++ b/common/Resources/Images/73/sl-voice+.png diff --git a/common/Resources/Images/73/sl-voice-menu.png b/common/Resources/Images/73/sl-voice-menu.png Binary files differnew file mode 100644 index 0000000..cc92b0c --- /dev/null +++ b/common/Resources/Images/73/sl-voice-menu.png diff --git a/common/Resources/Images/73/sl-wguide+.png b/common/Resources/Images/73/sl-wguide+.png Binary files differnew file mode 100644 index 0000000..2fc9dda --- /dev/null +++ b/common/Resources/Images/73/sl-wguide+.png diff --git a/common/Resources/Images/73/sl-wguide-menu.png b/common/Resources/Images/73/sl-wguide-menu.png Binary files differnew file mode 100644 index 0000000..ae69d4a --- /dev/null +++ b/common/Resources/Images/73/sl-wguide-menu.png diff --git a/common/Resources/Images/73/slap.png b/common/Resources/Images/73/slap.png Binary files differnew file mode 100644 index 0000000..cd71c22 --- /dev/null +++ b/common/Resources/Images/73/slap.png diff --git a/common/Resources/Images/73/slapsel.png b/common/Resources/Images/73/slapsel.png Binary files differnew file mode 100644 index 0000000..e891f38 --- /dev/null +++ b/common/Resources/Images/73/slapsel.png diff --git a/common/Resources/Images/73/sliderDrum.png b/common/Resources/Images/73/sliderDrum.png Binary files differnew file mode 100644 index 0000000..32936d6 --- /dev/null +++ b/common/Resources/Images/73/sliderDrum.png diff --git a/common/Resources/Images/73/sliderEditTempo.png b/common/Resources/Images/73/sliderEditTempo.png Binary files differnew file mode 100644 index 0000000..5c4d636 --- /dev/null +++ b/common/Resources/Images/73/sliderEditTempo.png diff --git a/common/Resources/Images/73/sliderEditVolume.png b/common/Resources/Images/73/sliderEditVolume.png Binary files differnew file mode 100644 index 0000000..c7be235 --- /dev/null +++ b/common/Resources/Images/73/sliderEditVolume.png diff --git a/common/Resources/Images/73/sliderInst1.png b/common/Resources/Images/73/sliderInst1.png Binary files differnew file mode 100644 index 0000000..44798ad --- /dev/null +++ b/common/Resources/Images/73/sliderInst1.png diff --git a/common/Resources/Images/73/sliderInst2.png b/common/Resources/Images/73/sliderInst2.png Binary files differnew file mode 100644 index 0000000..7fe04ad --- /dev/null +++ b/common/Resources/Images/73/sliderInst2.png diff --git a/common/Resources/Images/73/sliderInst3.png b/common/Resources/Images/73/sliderInst3.png Binary files differnew file mode 100644 index 0000000..9606a23 --- /dev/null +++ b/common/Resources/Images/73/sliderInst3.png diff --git a/common/Resources/Images/73/sliderInst4.png b/common/Resources/Images/73/sliderInst4.png Binary files differnew file mode 100644 index 0000000..0a2ce05 --- /dev/null +++ b/common/Resources/Images/73/sliderInst4.png diff --git a/common/Resources/Images/73/sliderbutbleu.png b/common/Resources/Images/73/sliderbutbleu.png Binary files differnew file mode 100644 index 0000000..0e56c07 --- /dev/null +++ b/common/Resources/Images/73/sliderbutbleu.png diff --git a/common/Resources/Images/73/sliderbutjaune.png b/common/Resources/Images/73/sliderbutjaune.png Binary files differnew file mode 100644 index 0000000..03a354d --- /dev/null +++ b/common/Resources/Images/73/sliderbutjaune.png diff --git a/common/Resources/Images/73/sliderbutred.png b/common/Resources/Images/73/sliderbutred.png Binary files differnew file mode 100644 index 0000000..3d1fd77 --- /dev/null +++ b/common/Resources/Images/73/sliderbutred.png diff --git a/common/Resources/Images/73/sliderbutvert.png b/common/Resources/Images/73/sliderbutvert.png Binary files differnew file mode 100644 index 0000000..795f69c --- /dev/null +++ b/common/Resources/Images/73/sliderbutvert.png diff --git a/common/Resources/Images/73/sliderbutviolet.png b/common/Resources/Images/73/sliderbutviolet.png Binary files differnew file mode 100644 index 0000000..32091db --- /dev/null +++ b/common/Resources/Images/73/sliderbutviolet.png diff --git a/common/Resources/Images/73/sliderlong.png b/common/Resources/Images/73/sliderlong.png Binary files differnew file mode 100644 index 0000000..3aa2094 --- /dev/null +++ b/common/Resources/Images/73/sliderlong.png diff --git a/common/Resources/Images/73/slidershort.png b/common/Resources/Images/73/slidershort.png Binary files differnew file mode 100644 index 0000000..5cf84c0 --- /dev/null +++ b/common/Resources/Images/73/slidershort.png diff --git a/common/Resources/Images/73/stop.png b/common/Resources/Images/73/stop.png Binary files differnew file mode 100644 index 0000000..6d7dce3 --- /dev/null +++ b/common/Resources/Images/73/stop.png diff --git a/common/Resources/Images/73/strings.png b/common/Resources/Images/73/strings.png Binary files differnew file mode 100644 index 0000000..ed1d3a1 --- /dev/null +++ b/common/Resources/Images/73/strings.png diff --git a/common/Resources/Images/73/stringssel.png b/common/Resources/Images/73/stringssel.png Binary files differnew file mode 100644 index 0000000..78bb18c --- /dev/null +++ b/common/Resources/Images/73/stringssel.png diff --git a/common/Resources/Images/73/synthTam.png b/common/Resources/Images/73/synthTam.png Binary files differnew file mode 100644 index 0000000..2167486 --- /dev/null +++ b/common/Resources/Images/73/synthTam.png diff --git a/common/Resources/Images/73/synthTamDown.png b/common/Resources/Images/73/synthTamDown.png Binary files differnew file mode 100644 index 0000000..f50c5e7 --- /dev/null +++ b/common/Resources/Images/73/synthTamDown.png diff --git a/common/Resources/Images/73/synthTamOver.png b/common/Resources/Images/73/synthTamOver.png Binary files differnew file mode 100644 index 0000000..73c1957 --- /dev/null +++ b/common/Resources/Images/73/synthTamOver.png diff --git a/common/Resources/Images/73/synthlabMask.png b/common/Resources/Images/73/synthlabMask.png Binary files differnew file mode 100644 index 0000000..f495889 --- /dev/null +++ b/common/Resources/Images/73/synthlabMask.png diff --git a/common/Resources/Images/73/tchiwo.png b/common/Resources/Images/73/tchiwo.png Binary files differnew file mode 100644 index 0000000..4139160 --- /dev/null +++ b/common/Resources/Images/73/tchiwo.png diff --git a/common/Resources/Images/73/tchiwosel.png b/common/Resources/Images/73/tchiwosel.png Binary files differnew file mode 100644 index 0000000..fdde92b --- /dev/null +++ b/common/Resources/Images/73/tchiwosel.png diff --git a/common/Resources/Images/73/templebell.png b/common/Resources/Images/73/templebell.png Binary files differnew file mode 100644 index 0000000..885b019 --- /dev/null +++ b/common/Resources/Images/73/templebell.png diff --git a/common/Resources/Images/73/templebellsel.png b/common/Resources/Images/73/templebellsel.png Binary files differnew file mode 100644 index 0000000..9a26957 --- /dev/null +++ b/common/Resources/Images/73/templebellsel.png diff --git a/common/Resources/Images/73/tempo1.png b/common/Resources/Images/73/tempo1.png Binary files differnew file mode 100644 index 0000000..92b6b3f --- /dev/null +++ b/common/Resources/Images/73/tempo1.png diff --git a/common/Resources/Images/73/tempo2.png b/common/Resources/Images/73/tempo2.png Binary files differnew file mode 100644 index 0000000..e8722e8 --- /dev/null +++ b/common/Resources/Images/73/tempo2.png diff --git a/common/Resources/Images/73/tempo3.png b/common/Resources/Images/73/tempo3.png Binary files differnew file mode 100644 index 0000000..8242628 --- /dev/null +++ b/common/Resources/Images/73/tempo3.png diff --git a/common/Resources/Images/73/tempo4.png b/common/Resources/Images/73/tempo4.png Binary files differnew file mode 100644 index 0000000..5ab6e45 --- /dev/null +++ b/common/Resources/Images/73/tempo4.png diff --git a/common/Resources/Images/73/tempo5.png b/common/Resources/Images/73/tempo5.png Binary files differnew file mode 100644 index 0000000..af71e32 --- /dev/null +++ b/common/Resources/Images/73/tempo5.png diff --git a/common/Resources/Images/73/tempo6.png b/common/Resources/Images/73/tempo6.png Binary files differnew file mode 100644 index 0000000..9d1a53e --- /dev/null +++ b/common/Resources/Images/73/tempo6.png diff --git a/common/Resources/Images/73/tempo7.png b/common/Resources/Images/73/tempo7.png Binary files differnew file mode 100644 index 0000000..ff93d2e --- /dev/null +++ b/common/Resources/Images/73/tempo7.png diff --git a/common/Resources/Images/73/tempo8.png b/common/Resources/Images/73/tempo8.png Binary files differnew file mode 100644 index 0000000..f1f2c31 --- /dev/null +++ b/common/Resources/Images/73/tempo8.png diff --git a/common/Resources/Images/73/trackBG.png b/common/Resources/Images/73/trackBG.png Binary files differnew file mode 100644 index 0000000..24d9ec1 --- /dev/null +++ b/common/Resources/Images/73/trackBG.png diff --git a/common/Resources/Images/73/trackBGDrum.png b/common/Resources/Images/73/trackBGDrum.png Binary files differnew file mode 100644 index 0000000..fd6b732 --- /dev/null +++ b/common/Resources/Images/73/trackBGDrum.png diff --git a/common/Resources/Images/73/trackBGDrumSelected.png b/common/Resources/Images/73/trackBGDrumSelected.png Binary files differnew file mode 100644 index 0000000..3b14e48 --- /dev/null +++ b/common/Resources/Images/73/trackBGDrumSelected.png diff --git a/common/Resources/Images/73/trackBGSelected.png b/common/Resources/Images/73/trackBGSelected.png Binary files differnew file mode 100644 index 0000000..e06c5e7 --- /dev/null +++ b/common/Resources/Images/73/trackBGSelected.png diff --git a/common/Resources/Images/73/triangle.png b/common/Resources/Images/73/triangle.png Binary files differnew file mode 100644 index 0000000..3ff1672 --- /dev/null +++ b/common/Resources/Images/73/triangle.png diff --git a/common/Resources/Images/73/trianglesel.png b/common/Resources/Images/73/trianglesel.png Binary files differnew file mode 100644 index 0000000..4dda783 --- /dev/null +++ b/common/Resources/Images/73/trianglesel.png diff --git a/common/Resources/Images/73/trumpet.png b/common/Resources/Images/73/trumpet.png Binary files differnew file mode 100644 index 0000000..90d0c23 --- /dev/null +++ b/common/Resources/Images/73/trumpet.png diff --git a/common/Resources/Images/73/trumpetsel.png b/common/Resources/Images/73/trumpetsel.png Binary files differnew file mode 100644 index 0000000..cc4c09e --- /dev/null +++ b/common/Resources/Images/73/trumpetsel.png diff --git a/common/Resources/Images/73/tuba.png b/common/Resources/Images/73/tuba.png Binary files differnew file mode 100644 index 0000000..82f93bf --- /dev/null +++ b/common/Resources/Images/73/tuba.png diff --git a/common/Resources/Images/73/tubasel.png b/common/Resources/Images/73/tubasel.png Binary files differnew file mode 100644 index 0000000..a306bcd --- /dev/null +++ b/common/Resources/Images/73/tubasel.png diff --git a/common/Resources/Images/73/ukulele.png b/common/Resources/Images/73/ukulele.png Binary files differnew file mode 100644 index 0000000..8e1e254 --- /dev/null +++ b/common/Resources/Images/73/ukulele.png diff --git a/common/Resources/Images/73/ukulelesel.png b/common/Resources/Images/73/ukulelesel.png Binary files differnew file mode 100644 index 0000000..0c2cc60 --- /dev/null +++ b/common/Resources/Images/73/ukulelesel.png diff --git a/common/Resources/Images/73/violin.png b/common/Resources/Images/73/violin.png Binary files differnew file mode 100644 index 0000000..d8aed18 --- /dev/null +++ b/common/Resources/Images/73/violin.png diff --git a/common/Resources/Images/73/violinsel.png b/common/Resources/Images/73/violinsel.png Binary files differnew file mode 100644 index 0000000..f4ba07d --- /dev/null +++ b/common/Resources/Images/73/violinsel.png diff --git a/common/Resources/Images/73/voix.png b/common/Resources/Images/73/voix.png Binary files differnew file mode 100644 index 0000000..8af17b5 --- /dev/null +++ b/common/Resources/Images/73/voix.png diff --git a/common/Resources/Images/73/voixsel.png b/common/Resources/Images/73/voixsel.png Binary files differnew file mode 100644 index 0000000..6335b3f --- /dev/null +++ b/common/Resources/Images/73/voixsel.png diff --git a/common/Resources/Images/73/volume0.png b/common/Resources/Images/73/volume0.png Binary files differnew file mode 100644 index 0000000..3b90fe4 --- /dev/null +++ b/common/Resources/Images/73/volume0.png diff --git a/common/Resources/Images/73/volume1.png b/common/Resources/Images/73/volume1.png Binary files differnew file mode 100644 index 0000000..1c5a1c7 --- /dev/null +++ b/common/Resources/Images/73/volume1.png diff --git a/common/Resources/Images/73/volume2.png b/common/Resources/Images/73/volume2.png Binary files differnew file mode 100644 index 0000000..d4ab295 --- /dev/null +++ b/common/Resources/Images/73/volume2.png diff --git a/common/Resources/Images/73/volume3.png b/common/Resources/Images/73/volume3.png Binary files differnew file mode 100644 index 0000000..6845a0e --- /dev/null +++ b/common/Resources/Images/73/volume3.png diff --git a/common/Resources/Images/73/water.png b/common/Resources/Images/73/water.png Binary files differnew file mode 100644 index 0000000..64d3808 --- /dev/null +++ b/common/Resources/Images/73/water.png diff --git a/common/Resources/Images/73/watersel.png b/common/Resources/Images/73/watersel.png Binary files differnew file mode 100644 index 0000000..bc56181 --- /dev/null +++ b/common/Resources/Images/73/watersel.png diff --git a/common/Resources/Images/73/winds.png b/common/Resources/Images/73/winds.png Binary files differnew file mode 100644 index 0000000..a38ddf3 --- /dev/null +++ b/common/Resources/Images/73/winds.png diff --git a/common/Resources/Images/73/windssel.png b/common/Resources/Images/73/windssel.png Binary files differnew file mode 100644 index 0000000..6258c0b --- /dev/null +++ b/common/Resources/Images/73/windssel.png diff --git a/common/Resources/Images/73/zap.png b/common/Resources/Images/73/zap.png Binary files differnew file mode 100644 index 0000000..3932e44 --- /dev/null +++ b/common/Resources/Images/73/zap.png diff --git a/common/Resources/Images/73/zapsel.png b/common/Resources/Images/73/zapsel.png Binary files differnew file mode 100644 index 0000000..8dbedda --- /dev/null +++ b/common/Resources/Images/73/zapsel.png diff --git a/common/Resources/Images/checkOff.png b/common/Resources/Images/checkOff.png Binary files differnew file mode 100644 index 0000000..8df162a --- /dev/null +++ b/common/Resources/Images/checkOff.png diff --git a/common/Resources/Images/checkOn.png b/common/Resources/Images/checkOn.png Binary files differnew file mode 100644 index 0000000..83c2913 --- /dev/null +++ b/common/Resources/Images/checkOn.png diff --git a/common/Resources/Images/sl-addSynth+.png b/common/Resources/Images/sl-addSynth+.png Binary files differnew file mode 100644 index 0000000..4d02645 --- /dev/null +++ b/common/Resources/Images/sl-addSynth+.png diff --git a/common/Resources/Images/sl-addSynth-menu.png b/common/Resources/Images/sl-addSynth-menu.png Binary files differnew file mode 100644 index 0000000..273590f --- /dev/null +++ b/common/Resources/Images/sl-addSynth-menu.png diff --git a/common/Resources/Images/sl-adsr+.png b/common/Resources/Images/sl-adsr+.png Binary files differnew file mode 100644 index 0000000..5f60c96 --- /dev/null +++ b/common/Resources/Images/sl-adsr+.png diff --git a/common/Resources/Images/sl-adsr-menu.png b/common/Resources/Images/sl-adsr-menu.png Binary files differnew file mode 100644 index 0000000..e193034 --- /dev/null +++ b/common/Resources/Images/sl-adsr-menu.png diff --git a/common/Resources/Images/sl-buzz+.png b/common/Resources/Images/sl-buzz+.png Binary files differnew file mode 100644 index 0000000..ea9df55 --- /dev/null +++ b/common/Resources/Images/sl-buzz+.png diff --git a/common/Resources/Images/sl-buzz-menu.png b/common/Resources/Images/sl-buzz-menu.png Binary files differnew file mode 100644 index 0000000..3b53921 --- /dev/null +++ b/common/Resources/Images/sl-buzz-menu.png diff --git a/common/Resources/Images/sl-chorus+.png b/common/Resources/Images/sl-chorus+.png Binary files differnew file mode 100644 index 0000000..dcb1d41 --- /dev/null +++ b/common/Resources/Images/sl-chorus+.png diff --git a/common/Resources/Images/sl-chorus-menu.png b/common/Resources/Images/sl-chorus-menu.png Binary files differnew file mode 100644 index 0000000..54e5fee --- /dev/null +++ b/common/Resources/Images/sl-chorus-menu.png diff --git a/common/Resources/Images/sl-distort+.png b/common/Resources/Images/sl-distort+.png Binary files differnew file mode 100644 index 0000000..f0dfa3f --- /dev/null +++ b/common/Resources/Images/sl-distort+.png diff --git a/common/Resources/Images/sl-distort-menu.png b/common/Resources/Images/sl-distort-menu.png Binary files differnew file mode 100644 index 0000000..bd0f5d9 --- /dev/null +++ b/common/Resources/Images/sl-distort-menu.png diff --git a/common/Resources/Images/sl-eq4band+.png b/common/Resources/Images/sl-eq4band+.png Binary files differnew file mode 100644 index 0000000..db8c572 --- /dev/null +++ b/common/Resources/Images/sl-eq4band+.png diff --git a/common/Resources/Images/sl-eq4band-menu.png b/common/Resources/Images/sl-eq4band-menu.png Binary files differnew file mode 100644 index 0000000..5a1f0a0 --- /dev/null +++ b/common/Resources/Images/sl-eq4band-menu.png diff --git a/common/Resources/Images/sl-filter+.png b/common/Resources/Images/sl-filter+.png Binary files differnew file mode 100644 index 0000000..b9f680c --- /dev/null +++ b/common/Resources/Images/sl-filter+.png diff --git a/common/Resources/Images/sl-filter-menu.png b/common/Resources/Images/sl-filter-menu.png Binary files differnew file mode 100644 index 0000000..2068ada --- /dev/null +++ b/common/Resources/Images/sl-filter-menu.png diff --git a/common/Resources/Images/sl-fm+.png b/common/Resources/Images/sl-fm+.png Binary files differnew file mode 100644 index 0000000..ef69aa9 --- /dev/null +++ b/common/Resources/Images/sl-fm+.png diff --git a/common/Resources/Images/sl-fm-menu.png b/common/Resources/Images/sl-fm-menu.png Binary files differnew file mode 100644 index 0000000..ec45b95 --- /dev/null +++ b/common/Resources/Images/sl-fm-menu.png diff --git a/common/Resources/Images/sl-grain+.png b/common/Resources/Images/sl-grain+.png Binary files differnew file mode 100644 index 0000000..9ae881b --- /dev/null +++ b/common/Resources/Images/sl-grain+.png diff --git a/common/Resources/Images/sl-grain-menu.png b/common/Resources/Images/sl-grain-menu.png Binary files differnew file mode 100644 index 0000000..792b22e --- /dev/null +++ b/common/Resources/Images/sl-grain-menu.png diff --git a/common/Resources/Images/sl-harmon+.png b/common/Resources/Images/sl-harmon+.png Binary files differnew file mode 100644 index 0000000..da9a63c --- /dev/null +++ b/common/Resources/Images/sl-harmon+.png diff --git a/common/Resources/Images/sl-harmon-menu.png b/common/Resources/Images/sl-harmon-menu.png Binary files differnew file mode 100644 index 0000000..136fcb9 --- /dev/null +++ b/common/Resources/Images/sl-harmon-menu.png diff --git a/common/Resources/Images/sl-lfo+.png b/common/Resources/Images/sl-lfo+.png Binary files differnew file mode 100644 index 0000000..1ab96a3 --- /dev/null +++ b/common/Resources/Images/sl-lfo+.png diff --git a/common/Resources/Images/sl-lfo-menu.png b/common/Resources/Images/sl-lfo-menu.png Binary files differnew file mode 100644 index 0000000..c0cd64a --- /dev/null +++ b/common/Resources/Images/sl-lfo-menu.png diff --git a/common/Resources/Images/sl-mic+.png b/common/Resources/Images/sl-mic+.png Binary files differnew file mode 100644 index 0000000..ab774d1 --- /dev/null +++ b/common/Resources/Images/sl-mic+.png diff --git a/common/Resources/Images/sl-mic-menu.png b/common/Resources/Images/sl-mic-menu.png Binary files differnew file mode 100644 index 0000000..af359c9 --- /dev/null +++ b/common/Resources/Images/sl-mic-menu.png diff --git a/common/Resources/Images/sl-noise+.png b/common/Resources/Images/sl-noise+.png Binary files differnew file mode 100644 index 0000000..b9b6931 --- /dev/null +++ b/common/Resources/Images/sl-noise+.png diff --git a/common/Resources/Images/sl-noise-menu.png b/common/Resources/Images/sl-noise-menu.png Binary files differnew file mode 100644 index 0000000..f7eff91 --- /dev/null +++ b/common/Resources/Images/sl-noise-menu.png diff --git a/common/Resources/Images/sl-pluck+.png b/common/Resources/Images/sl-pluck+.png Binary files differnew file mode 100644 index 0000000..9c32419 --- /dev/null +++ b/common/Resources/Images/sl-pluck+.png diff --git a/common/Resources/Images/sl-pluck-menu.png b/common/Resources/Images/sl-pluck-menu.png Binary files differnew file mode 100644 index 0000000..ba7b0aa --- /dev/null +++ b/common/Resources/Images/sl-pluck-menu.png diff --git a/common/Resources/Images/sl-rand+.png b/common/Resources/Images/sl-rand+.png Binary files differnew file mode 100644 index 0000000..f8f7bba --- /dev/null +++ b/common/Resources/Images/sl-rand+.png diff --git a/common/Resources/Images/sl-rand-menu.png b/common/Resources/Images/sl-rand-menu.png Binary files differnew file mode 100644 index 0000000..df079d6 --- /dev/null +++ b/common/Resources/Images/sl-rand-menu.png diff --git a/common/Resources/Images/sl-reverb+.png b/common/Resources/Images/sl-reverb+.png Binary files differnew file mode 100644 index 0000000..a5684e0 --- /dev/null +++ b/common/Resources/Images/sl-reverb+.png diff --git a/common/Resources/Images/sl-reverb-menu.png b/common/Resources/Images/sl-reverb-menu.png Binary files differnew file mode 100644 index 0000000..16239a7 --- /dev/null +++ b/common/Resources/Images/sl-reverb-menu.png diff --git a/common/Resources/Images/sl-ring+.png b/common/Resources/Images/sl-ring+.png Binary files differnew file mode 100644 index 0000000..8d7636e --- /dev/null +++ b/common/Resources/Images/sl-ring+.png diff --git a/common/Resources/Images/sl-ring-menu.png b/common/Resources/Images/sl-ring-menu.png Binary files differnew file mode 100644 index 0000000..8d53682 --- /dev/null +++ b/common/Resources/Images/sl-ring-menu.png diff --git a/common/Resources/Images/sl-sample+.png b/common/Resources/Images/sl-sample+.png Binary files differnew file mode 100644 index 0000000..859cd06 --- /dev/null +++ b/common/Resources/Images/sl-sample+.png diff --git a/common/Resources/Images/sl-sample-menu.png b/common/Resources/Images/sl-sample-menu.png Binary files differnew file mode 100644 index 0000000..4be025b --- /dev/null +++ b/common/Resources/Images/sl-sample-menu.png diff --git a/common/Resources/Images/sl-speaker.png b/common/Resources/Images/sl-speaker.png Binary files differnew file mode 100644 index 0000000..f4e5dc8 --- /dev/null +++ b/common/Resources/Images/sl-speaker.png diff --git a/common/Resources/Images/sl-trackpadX+.png b/common/Resources/Images/sl-trackpadX+.png Binary files differnew file mode 100644 index 0000000..d6910bc --- /dev/null +++ b/common/Resources/Images/sl-trackpadX+.png diff --git a/common/Resources/Images/sl-trackpadX-menu.png b/common/Resources/Images/sl-trackpadX-menu.png Binary files differnew file mode 100644 index 0000000..e67f314 --- /dev/null +++ b/common/Resources/Images/sl-trackpadX-menu.png diff --git a/common/Resources/Images/sl-trackpadY+.png b/common/Resources/Images/sl-trackpadY+.png Binary files differnew file mode 100644 index 0000000..d40765c --- /dev/null +++ b/common/Resources/Images/sl-trackpadY+.png diff --git a/common/Resources/Images/sl-trackpadY-menu.png b/common/Resources/Images/sl-trackpadY-menu.png Binary files differnew file mode 100644 index 0000000..d5a61d5 --- /dev/null +++ b/common/Resources/Images/sl-trackpadY-menu.png diff --git a/common/Resources/Images/sl-vco+.png b/common/Resources/Images/sl-vco+.png Binary files differnew file mode 100644 index 0000000..89e0379 --- /dev/null +++ b/common/Resources/Images/sl-vco+.png diff --git a/common/Resources/Images/sl-vco-menu.png b/common/Resources/Images/sl-vco-menu.png Binary files differnew file mode 100644 index 0000000..7a94ea9 --- /dev/null +++ b/common/Resources/Images/sl-vco-menu.png diff --git a/common/Resources/Images/sl-voice+.png b/common/Resources/Images/sl-voice+.png Binary files differnew file mode 100644 index 0000000..9607c47 --- /dev/null +++ b/common/Resources/Images/sl-voice+.png diff --git a/common/Resources/Images/sl-voice-menu.png b/common/Resources/Images/sl-voice-menu.png Binary files differnew file mode 100644 index 0000000..c3f8b9b --- /dev/null +++ b/common/Resources/Images/sl-voice-menu.png diff --git a/common/Resources/Images/sl-wguide+.png b/common/Resources/Images/sl-wguide+.png Binary files differnew file mode 100644 index 0000000..5bcb0aa --- /dev/null +++ b/common/Resources/Images/sl-wguide+.png diff --git a/common/Resources/Images/sl-wguide-menu.png b/common/Resources/Images/sl-wguide-menu.png Binary files differnew file mode 100644 index 0000000..08ca522 --- /dev/null +++ b/common/Resources/Images/sl-wguide-menu.png diff --git a/common/Util/InstrumentPanel.py b/common/Util/InstrumentPanel.py index 014d794..6620031 100644 --- a/common/Util/InstrumentPanel.py +++ b/common/Util/InstrumentPanel.py @@ -164,7 +164,9 @@ class InstrumentPanel( gtk.EventBox ): if timeout >= 0 and time.time() > timeout: return False if loadStage[2] == 1: - self.loadData["btn"] = ImageRadioButton(self.firstTbBtn,Config.IMAGE_ROOT + category + '.png', Config.IMAGE_ROOT + category + 'sel.png', Config.IMAGE_ROOT + category + 'sel.png') + self.loadData["btn"] = ImageRadioButton(self.firstTbBtn, + category + '.png', category + 'sel.png', + category + 'sel.png') loadStage[2] = 2 if timeout >= 0 and time.time() > timeout: return False @@ -205,9 +207,13 @@ class InstrumentPanel( gtk.EventBox ): if loadStage[2] == 1: try: - self.loadData["instButton"] = ImageRadioButton(self.firstInstButton, Config.IMAGE_ROOT + instrument + '.png' , Config.IMAGE_ROOT + instrument + 'sel.png', Config.IMAGE_ROOT + instrument + 'sel.png') + self.loadData["instButton"] = ImageRadioButton( + self.firstInstButton, instrument + '.png', + instrument + 'sel.png', instrument + 'sel.png') except: - self.loadData["instButton"] = ImageRadioButton(self.firstInstButton, Config.IMAGE_ROOT + 'generic.png' , Config.IMAGE_ROOT + 'genericsel.png', Config.IMAGE_ROOT + 'genericsel.png') + self.loadData["instButton"] = ImageRadioButton( + self.firstInstButton, 'generic.png', + 'genericsel.png', 'genericsel.png') loadStage[2] = 2 if timeout >= 0 and time.time() > timeout: return False @@ -348,7 +354,8 @@ class DrumPanel( gtk.EventBox ): for drumkit in self.instrumentList: instBox = RoundVBox(fillcolor = Config.INST_BCK_COLOR, bordercolor = Config.PANEL_COLOR, radius = Config.PANEL_RADIUS) instBox.set_border_width(Config.PANEL_SPACING) - self.drums[drumkit] = ImageRadioButton(firstBtn, Config.IMAGE_ROOT + drumkit + '.png' , Config.IMAGE_ROOT + drumkit + 'sel.png', Config.IMAGE_ROOT + drumkit + 'sel.png') + self.drums[drumkit] = ImageRadioButton(firstBtn, drumkit + '.png', + drumkit + 'sel.png', drumkit + 'sel.png') self.drums[drumkit].clickedHandler = self.drums[drumkit].connect('clicked',self.setDrums,drumkit) if firstBtn == None: firstBtn = self.drums[drumkit] diff --git a/common/Util/Instruments.py b/common/Util/Instruments.py index 5ba8937..1386b25 100644 --- a/common/Util/Instruments.py +++ b/common/Util/Instruments.py @@ -2,8 +2,8 @@ import os from gettext import gettext as _ import common.Config as Config +from common.Config import imagefile import common.Util.InstrumentDB as InstrumentDB -from sugar.activity.activity import get_bundle_name LOW = Config.LOW MID = Config.MID @@ -19,8 +19,13 @@ INST_PERC = Config.INST_PERC instrumentDB = InstrumentDB.getRef() -def _addInstrument(name, csoundInstrumentId, instrumentRegister, category, loopStart, loopEnd, crossDur, ampScale=1, kit=None, kitStage=False, volatile=False, nameTooltip=""): - instrumentDB.addInstrumentFromArgs(name, csoundInstrumentId, instrumentRegister, loopStart, loopEnd, crossDur, ampScale, kit, name, Config.IMAGE_ROOT + "/" + name + ".png", category, kitStage=kitStage, volatile=volatile, nameTooltip=nameTooltip) +def _addInstrument(name, csoundInstrumentId, instrumentRegister, category, + loopStart, loopEnd, crossDur, ampScale=1, kit=None, kitStage=False, + volatile=False, nameTooltip=""): + instrumentDB.addInstrumentFromArgs(name, csoundInstrumentId, + instrumentRegister, loopStart, loopEnd, crossDur, ampScale, kit, + name, imagefile(name + '.png'), category, kitStage=kitStage, + volatile=volatile, nameTooltip=nameTooltip) if Config.FEATURES_MIC: _addInstrument("mic1", INST_TIED, MID, 'mysounds', .01, 1.99, .01, 1, volatile=True) diff --git a/common/Util/LoopSettings.py b/common/Util/LoopSettings.py index d672050..a36dd94 100644 --- a/common/Util/LoopSettings.py +++ b/common/Util/LoopSettings.py @@ -45,7 +45,7 @@ class LoopSettings( gtk.VBox ): loopedBox = gtk.HBox() loopedLabel = gtk.Label("Looped sound: ") loopedBox.pack_start(loopedLabel) - loopedToggle = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg") + loopedToggle = ImageToggleButton('checkOff.png', 'checkOn.png') loopedToggle.connect('button-press-event', self.handleLooped ) loopedBox.pack_start(loopedToggle) self.mainBox.pack_start(loopedBox, False, False, 5) @@ -80,7 +80,8 @@ class LoopSettings( gtk.VBox ): startBox = gtk.VBox() self.startAdjust = gtk.Adjustment( 0.01, 0, 1., .001, .001, 0) - self.GUI['startSlider'] = ImageVScale( Config.IMAGE_ROOT + "sliderEditVolume.png", self.startAdjust, 7 ) + self.GUI['startSlider'] = ImageVScale('sliderEditVolume.png', + self.startAdjust, 7) self.startAdjust.connect("value-changed", self.handleStart) self.GUI['startSlider'].set_inverted(True) self.GUI['startSlider'].set_size_request(50, 200) @@ -93,7 +94,8 @@ class LoopSettings( gtk.VBox ): endBox = gtk.VBox() self.endAdjust = gtk.Adjustment( 0.9, 0, 1, .001, .001, 0) - self.GUI['endSlider'] = ImageVScale( Config.IMAGE_ROOT + "sliderEditVolume.png", self.endAdjust, 7 ) + self.GUI['endSlider'] = ImageVScale('sliderEditVolume.png', + self.endAdjust, 7) self.endAdjust.connect("value-changed", self.handleEnd) self.GUI['endSlider'].set_inverted(True) self.GUI['endSlider'].set_size_request(50, 200) @@ -106,7 +108,8 @@ class LoopSettings( gtk.VBox ): durBox = gtk.VBox() self.durAdjust = gtk.Adjustment( 0.01, 0, 0.2, .001, .001, 0) - self.GUI['durSlider'] = ImageVScale( Config.IMAGE_ROOT + "sliderEditVolume.png", self.durAdjust, 7 ) + self.GUI['durSlider'] = ImageVScale('sliderEditVolume.png', + self.durAdjust, 7) self.durAdjust.connect("value-changed", self.handleDur) self.GUI['durSlider'].set_inverted(True) self.GUI['durSlider'].set_size_request(50, 200) @@ -120,13 +123,13 @@ class LoopSettings( gtk.VBox ): self.mainBox.pack_start(self.controlsBox, False, False, 5) previewBox = gtk.VBox() - self.playStopButton = ImageToggleButton(Config.IMAGE_ROOT + 'miniplay.png', Config.IMAGE_ROOT + 'stop.png') + self.playStopButton = ImageToggleButton('miniplay.png', 'stop.png') self.playStopButton.connect('button-press-event' , self.handlePlayButton) previewBox.pack_start(self.playStopButton) self.mainBox.pack_start(previewBox, False, False, 5) checkBox = gtk.VBox() - checkButton = ImageButton(Config.IMAGE_ROOT + 'check.png') + checkButton = ImageButton('check.png') checkButton.connect('clicked' , self.handleCheck) checkBox.pack_start(checkButton) self.mainBox.pack_start(checkBox, False, False, 5) diff --git a/common/Util/ThemeWidgets.py b/common/Util/ThemeWidgets.py index 6512655..7503d57 100644 --- a/common/Util/ThemeWidgets.py +++ b/common/Util/ThemeWidgets.py @@ -3,6 +3,7 @@ pygtk.require( '2.0' ) import gtk import logging import common.Config as Config +from common.Config import imagefile from sugar.graphics.combobox import ComboBox from sugar.graphics.palette import Palette, WidgetInvoker @@ -106,7 +107,10 @@ widget "*%s*" style "scale_style" self.set_value( round(self.snap*self.get_value())/self.snap ) class ImageVScale( gtk.VScale ): - def __init__( self, image_name, adjustment = None, slider_border = 0, insensitive_name = None, trough_color = "#3D403A", snap = False ): + def __init__(self, image_name, adjustment=None, slider_border=0, + insensitive_name=None, trough_color="#3D403A", snap=False): + image_name = imagefile(image_name) + gtk.VScale.__init__( self, adjustment ) if snap: self.snap = 1/snap @@ -726,7 +730,12 @@ class RoundFixed( gtk.Fixed ): return False class ImageButton(gtk.Button): - def __init__( self, mainImg_path, clickImg_path = None, enterImg_path = None, backgroundFill = None ): + def __init__(self, mainImg_path, clickImg_path=None, enterImg_path=None, + backgroundFill=None ): + mainImg_path = imagefile(mainImg_path) + clickImg_path = imagefile(clickImg_path) + enterImg_path = imagefile(enterImg_path) + gtk.Button.__init__(self) self.alloc = None win = gtk.gdk.get_default_root_window() @@ -869,7 +878,12 @@ class ImageButton(gtk.Button): class ImageToggleButton(gtk.ToggleButton): - def __init__(self , mainImg_path, altImg_path, enterImg_path = None, backgroundFill = None ): + def __init__(self , mainImg_path, altImg_path, enterImg_path=None, + backgroundFill=None): + mainImg_path = imagefile(mainImg_path) + altImg_path = imagefile(altImg_path) + enterImg_path = imagefile(enterImg_path) + gtk.ToggleButton.__init__(self) self.alloc = None self.within = False @@ -1028,7 +1042,12 @@ class ImageToggleButton(gtk.ToggleButton): class ImageRadioButton(gtk.RadioButton): - def __init__( self, group, mainImg_path, altImg_path, enterImg_path = None, backgroundFill = None ): + def __init__(self, group, mainImg_path, altImg_path, enterImg_path=None, + backgroundFill=None): + mainImg_path = imagefile(mainImg_path) + altImg_path = imagefile(altImg_path) + enterImg_path = imagefile(enterImg_path) + gtk.RadioButton.__init__(self, group) self.alloc = None self.within = False diff --git a/common/Resources/Images/checkOff.svg b/orig/Images/checkOff.svg index 9357b87..9357b87 100644 --- a/common/Resources/Images/checkOff.svg +++ b/orig/Images/checkOff.svg diff --git a/common/Resources/Images/checkOn.svg b/orig/Images/checkOn.svg index 5b91ddf..5b91ddf 100644 --- a/common/Resources/Images/checkOn.svg +++ b/orig/Images/checkOn.svg diff --git a/icons/sl-addSynth+.svg b/orig/icons/sl-addSynth+.svg index 23d3fbc..23d3fbc 100644 --- a/icons/sl-addSynth+.svg +++ b/orig/icons/sl-addSynth+.svg diff --git a/icons/sl-addSynth-menu.svg b/orig/icons/sl-addSynth-menu.svg index b26b996..b26b996 100644 --- a/icons/sl-addSynth-menu.svg +++ b/orig/icons/sl-addSynth-menu.svg diff --git a/icons/sl-adsr+.svg b/orig/icons/sl-adsr+.svg index bbf18d5..bbf18d5 100644 --- a/icons/sl-adsr+.svg +++ b/orig/icons/sl-adsr+.svg diff --git a/icons/sl-adsr-menu.svg b/orig/icons/sl-adsr-menu.svg index 35960ab..35960ab 100644 --- a/icons/sl-adsr-menu.svg +++ b/orig/icons/sl-adsr-menu.svg diff --git a/icons/sl-buzz+.svg b/orig/icons/sl-buzz+.svg index 9ca65f0..9ca65f0 100644 --- a/icons/sl-buzz+.svg +++ b/orig/icons/sl-buzz+.svg diff --git a/icons/sl-buzz-menu.svg b/orig/icons/sl-buzz-menu.svg index 570a530..570a530 100644 --- a/icons/sl-buzz-menu.svg +++ b/orig/icons/sl-buzz-menu.svg diff --git a/icons/sl-chorus+.svg b/orig/icons/sl-chorus+.svg index e58b602..e58b602 100644 --- a/icons/sl-chorus+.svg +++ b/orig/icons/sl-chorus+.svg diff --git a/icons/sl-chorus-menu.svg b/orig/icons/sl-chorus-menu.svg index 7dcb3f4..7dcb3f4 100644 --- a/icons/sl-chorus-menu.svg +++ b/orig/icons/sl-chorus-menu.svg diff --git a/icons/sl-distort+.svg b/orig/icons/sl-distort+.svg index 12c99a1..12c99a1 100644 --- a/icons/sl-distort+.svg +++ b/orig/icons/sl-distort+.svg diff --git a/icons/sl-distort-menu.svg b/orig/icons/sl-distort-menu.svg index bc7bca9..bc7bca9 100644 --- a/icons/sl-distort-menu.svg +++ b/orig/icons/sl-distort-menu.svg diff --git a/icons/sl-eq4band+.svg b/orig/icons/sl-eq4band+.svg index 3684361..3684361 100644 --- a/icons/sl-eq4band+.svg +++ b/orig/icons/sl-eq4band+.svg diff --git a/icons/sl-eq4band-menu.svg b/orig/icons/sl-eq4band-menu.svg index 36928a5..36928a5 100644 --- a/icons/sl-eq4band-menu.svg +++ b/orig/icons/sl-eq4band-menu.svg diff --git a/icons/sl-filter+.svg b/orig/icons/sl-filter+.svg index c86b558..c86b558 100644 --- a/icons/sl-filter+.svg +++ b/orig/icons/sl-filter+.svg diff --git a/icons/sl-filter-menu.svg b/orig/icons/sl-filter-menu.svg index 1dca673..1dca673 100644 --- a/icons/sl-filter-menu.svg +++ b/orig/icons/sl-filter-menu.svg diff --git a/icons/sl-fm+.svg b/orig/icons/sl-fm+.svg index b517986..b517986 100644 --- a/icons/sl-fm+.svg +++ b/orig/icons/sl-fm+.svg diff --git a/icons/sl-fm-menu.svg b/orig/icons/sl-fm-menu.svg index 94cb8e3..94cb8e3 100644 --- a/icons/sl-fm-menu.svg +++ b/orig/icons/sl-fm-menu.svg diff --git a/icons/sl-grain+.svg b/orig/icons/sl-grain+.svg index 1a270cf..1a270cf 100644 --- a/icons/sl-grain+.svg +++ b/orig/icons/sl-grain+.svg diff --git a/icons/sl-grain-menu.svg b/orig/icons/sl-grain-menu.svg index fa772a1..fa772a1 100644 --- a/icons/sl-grain-menu.svg +++ b/orig/icons/sl-grain-menu.svg diff --git a/icons/sl-harmon+.svg b/orig/icons/sl-harmon+.svg index ef4f968..ef4f968 100644 --- a/icons/sl-harmon+.svg +++ b/orig/icons/sl-harmon+.svg diff --git a/icons/sl-harmon-menu.svg b/orig/icons/sl-harmon-menu.svg index de11295..de11295 100644 --- a/icons/sl-harmon-menu.svg +++ b/orig/icons/sl-harmon-menu.svg diff --git a/icons/sl-lfo+.svg b/orig/icons/sl-lfo+.svg index 4bdaa74..4bdaa74 100644 --- a/icons/sl-lfo+.svg +++ b/orig/icons/sl-lfo+.svg diff --git a/icons/sl-lfo-menu.svg b/orig/icons/sl-lfo-menu.svg index e340173..e340173 100644 --- a/icons/sl-lfo-menu.svg +++ b/orig/icons/sl-lfo-menu.svg diff --git a/icons/sl-mic+.svg b/orig/icons/sl-mic+.svg index fd55be3..fd55be3 100644 --- a/icons/sl-mic+.svg +++ b/orig/icons/sl-mic+.svg diff --git a/icons/sl-mic-menu.svg b/orig/icons/sl-mic-menu.svg index a892caa..a892caa 100644 --- a/icons/sl-mic-menu.svg +++ b/orig/icons/sl-mic-menu.svg diff --git a/icons/sl-noise+.svg b/orig/icons/sl-noise+.svg index abe48a5..abe48a5 100644 --- a/icons/sl-noise+.svg +++ b/orig/icons/sl-noise+.svg diff --git a/icons/sl-noise-menu.svg b/orig/icons/sl-noise-menu.svg index 3157316..3157316 100644 --- a/icons/sl-noise-menu.svg +++ b/orig/icons/sl-noise-menu.svg diff --git a/icons/sl-pluck+.svg b/orig/icons/sl-pluck+.svg index 01bbf3d..01bbf3d 100644 --- a/icons/sl-pluck+.svg +++ b/orig/icons/sl-pluck+.svg diff --git a/icons/sl-pluck-menu.svg b/orig/icons/sl-pluck-menu.svg index 3131019..3131019 100644 --- a/icons/sl-pluck-menu.svg +++ b/orig/icons/sl-pluck-menu.svg diff --git a/icons/sl-rand+.svg b/orig/icons/sl-rand+.svg index 62d89d1..62d89d1 100644 --- a/icons/sl-rand+.svg +++ b/orig/icons/sl-rand+.svg diff --git a/icons/sl-rand-menu.svg b/orig/icons/sl-rand-menu.svg index e02bc99..e02bc99 100644 --- a/icons/sl-rand-menu.svg +++ b/orig/icons/sl-rand-menu.svg diff --git a/icons/sl-reverb+.svg b/orig/icons/sl-reverb+.svg index 44faefc..44faefc 100644 --- a/icons/sl-reverb+.svg +++ b/orig/icons/sl-reverb+.svg diff --git a/icons/sl-reverb-menu.svg b/orig/icons/sl-reverb-menu.svg index c14a445..c14a445 100644 --- a/icons/sl-reverb-menu.svg +++ b/orig/icons/sl-reverb-menu.svg diff --git a/icons/sl-ring+.svg b/orig/icons/sl-ring+.svg index 7fd5495..7fd5495 100644 --- a/icons/sl-ring+.svg +++ b/orig/icons/sl-ring+.svg diff --git a/icons/sl-ring-menu.svg b/orig/icons/sl-ring-menu.svg index 731f2d2..731f2d2 100644 --- a/icons/sl-ring-menu.svg +++ b/orig/icons/sl-ring-menu.svg diff --git a/icons/sl-sample+.svg b/orig/icons/sl-sample+.svg index fdca11a..fdca11a 100644 --- a/icons/sl-sample+.svg +++ b/orig/icons/sl-sample+.svg diff --git a/icons/sl-sample-menu.svg b/orig/icons/sl-sample-menu.svg index d1fb3ed..d1fb3ed 100644 --- a/icons/sl-sample-menu.svg +++ b/orig/icons/sl-sample-menu.svg diff --git a/icons/sl-speaker.svg b/orig/icons/sl-speaker.svg index b0d38a5..b0d38a5 100644 --- a/icons/sl-speaker.svg +++ b/orig/icons/sl-speaker.svg diff --git a/icons/sl-trackpadX+.svg b/orig/icons/sl-trackpadX+.svg index 51bac2e..51bac2e 100644 --- a/icons/sl-trackpadX+.svg +++ b/orig/icons/sl-trackpadX+.svg diff --git a/icons/sl-trackpadX-menu.svg b/orig/icons/sl-trackpadX-menu.svg index 0d6598b..0d6598b 100644 --- a/icons/sl-trackpadX-menu.svg +++ b/orig/icons/sl-trackpadX-menu.svg diff --git a/icons/sl-trackpadY+.svg b/orig/icons/sl-trackpadY+.svg index 8122fed..8122fed 100644 --- a/icons/sl-trackpadY+.svg +++ b/orig/icons/sl-trackpadY+.svg diff --git a/icons/sl-trackpadY-menu.svg b/orig/icons/sl-trackpadY-menu.svg index 45e555c..45e555c 100644 --- a/icons/sl-trackpadY-menu.svg +++ b/orig/icons/sl-trackpadY-menu.svg diff --git a/icons/sl-vco+.svg b/orig/icons/sl-vco+.svg index 6b20870..6b20870 100644 --- a/icons/sl-vco+.svg +++ b/orig/icons/sl-vco+.svg diff --git a/icons/sl-vco-menu.svg b/orig/icons/sl-vco-menu.svg index c73b410..c73b410 100644 --- a/icons/sl-vco-menu.svg +++ b/orig/icons/sl-vco-menu.svg diff --git a/icons/sl-voice+.svg b/orig/icons/sl-voice+.svg index 3e19ef1..3e19ef1 100644 --- a/icons/sl-voice+.svg +++ b/orig/icons/sl-voice+.svg diff --git a/icons/sl-voice-menu.svg b/orig/icons/sl-voice-menu.svg index 525b290..525b290 100644 --- a/icons/sl-voice-menu.svg +++ b/orig/icons/sl-voice-menu.svg diff --git a/icons/sl-wguide+.svg b/orig/icons/sl-wguide+.svg index 3dcf5a8..3dcf5a8 100644 --- a/icons/sl-wguide+.svg +++ b/orig/icons/sl-wguide+.svg diff --git a/icons/sl-wguide-menu.svg b/orig/icons/sl-wguide-menu.svg index 6326493..6326493 100644 --- a/icons/sl-wguide-menu.svg +++ b/orig/icons/sl-wguide-menu.svg |
