From 2931f2f1bc98096eb8d270ea467f8244a67e808c Mon Sep 17 00:00:00 2001 From: Aleksey Lim Date: Wed, 06 Jun 2012 07:18:26 +0000 Subject: Add singular access point for getting image files; add 73% scaled images for resolution <=800 --- (limited to 'common') diff --git a/common/Config.py b/common/Config.py index 85fa2bf..75bd43d 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 @@ -322,3 +324,13 @@ KEY_MAP_NOTPIANO = {24: 24, # Q 57: 48} # N KEY_MAP = KEY_MAP_PIANO + +if max(gtk.gdk.screen_width(), gtk.gdk.screen_height()) <= 800: + # Images created using `convert $i -resize 73%` command + IMAGE_ROOT = join(IMAGE_ROOT, '73', '') + + +def imagefile(filename): + if filename and not filename.startswith(os.sep): + filename = IMAGE_ROOT + 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 new file mode 100644 index 0000000..29d70cb --- /dev/null +++ b/common/Resources/Images/73/TamTam.png Binary files differ diff --git a/common/Resources/Images/73/acguit.png b/common/Resources/Images/73/acguit.png new file mode 100644 index 0000000..2c0d35a --- /dev/null +++ b/common/Resources/Images/73/acguit.png Binary files differ diff --git a/common/Resources/Images/73/acguitsel.png b/common/Resources/Images/73/acguitsel.png new file mode 100644 index 0000000..fc0d797 --- /dev/null +++ b/common/Resources/Images/73/acguitsel.png Binary files differ diff --git a/common/Resources/Images/73/alarm.png b/common/Resources/Images/73/alarm.png new file mode 100644 index 0000000..caa6875 --- /dev/null +++ b/common/Resources/Images/73/alarm.png Binary files differ diff --git a/common/Resources/Images/73/alarmsel.png b/common/Resources/Images/73/alarmsel.png new file mode 100644 index 0000000..cd582b2 --- /dev/null +++ b/common/Resources/Images/73/alarmsel.png Binary files differ diff --git a/common/Resources/Images/73/all.png b/common/Resources/Images/73/all.png new file mode 100644 index 0000000..68e85d0 --- /dev/null +++ b/common/Resources/Images/73/all.png Binary files differ diff --git a/common/Resources/Images/73/allsel.png b/common/Resources/Images/73/allsel.png new file mode 100644 index 0000000..8703951 --- /dev/null +++ b/common/Resources/Images/73/allsel.png Binary files differ diff --git a/common/Resources/Images/73/animals.png b/common/Resources/Images/73/animals.png new file mode 100644 index 0000000..31ae423 --- /dev/null +++ b/common/Resources/Images/73/animals.png Binary files differ diff --git a/common/Resources/Images/73/animalssel.png b/common/Resources/Images/73/animalssel.png new file mode 100644 index 0000000..213f8ad --- /dev/null +++ b/common/Resources/Images/73/animalssel.png Binary files differ diff --git a/common/Resources/Images/73/armbone.png b/common/Resources/Images/73/armbone.png new file mode 100644 index 0000000..c371010 --- /dev/null +++ b/common/Resources/Images/73/armbone.png Binary files differ diff --git a/common/Resources/Images/73/armbonesel.png b/common/Resources/Images/73/armbonesel.png new file mode 100644 index 0000000..86cfab4 --- /dev/null +++ b/common/Resources/Images/73/armbonesel.png Binary files differ diff --git a/common/Resources/Images/73/arrowEditDown.png b/common/Resources/Images/73/arrowEditDown.png new file mode 100644 index 0000000..a585971 --- /dev/null +++ b/common/Resources/Images/73/arrowEditDown.png Binary files differ diff --git a/common/Resources/Images/73/arrowEditDownDown.png b/common/Resources/Images/73/arrowEditDownDown.png new file mode 100644 index 0000000..ab178d9 --- /dev/null +++ b/common/Resources/Images/73/arrowEditDownDown.png Binary files differ diff --git a/common/Resources/Images/73/arrowEditDownOver.png b/common/Resources/Images/73/arrowEditDownOver.png new file mode 100644 index 0000000..51cfe9a --- /dev/null +++ b/common/Resources/Images/73/arrowEditDownOver.png Binary files differ diff --git a/common/Resources/Images/73/arrowEditLeft.png b/common/Resources/Images/73/arrowEditLeft.png new file mode 100644 index 0000000..903051c --- /dev/null +++ b/common/Resources/Images/73/arrowEditLeft.png Binary files differ diff --git a/common/Resources/Images/73/arrowEditLeftDown.png b/common/Resources/Images/73/arrowEditLeftDown.png new file mode 100644 index 0000000..3b27dda --- /dev/null +++ b/common/Resources/Images/73/arrowEditLeftDown.png Binary files differ diff --git a/common/Resources/Images/73/arrowEditLeftOver.png b/common/Resources/Images/73/arrowEditLeftOver.png new file mode 100644 index 0000000..625fbed --- /dev/null +++ b/common/Resources/Images/73/arrowEditLeftOver.png Binary files differ diff --git a/common/Resources/Images/73/arrowEditRight.png b/common/Resources/Images/73/arrowEditRight.png new file mode 100644 index 0000000..ae01105 --- /dev/null +++ b/common/Resources/Images/73/arrowEditRight.png Binary files differ diff --git a/common/Resources/Images/73/arrowEditRightDown.png b/common/Resources/Images/73/arrowEditRightDown.png new file mode 100644 index 0000000..29fcd55 --- /dev/null +++ b/common/Resources/Images/73/arrowEditRightDown.png Binary files differ diff --git a/common/Resources/Images/73/arrowEditRightOver.png b/common/Resources/Images/73/arrowEditRightOver.png new file mode 100644 index 0000000..794ca87 --- /dev/null +++ b/common/Resources/Images/73/arrowEditRightOver.png Binary files differ diff --git a/common/Resources/Images/73/arrowEditUp.png b/common/Resources/Images/73/arrowEditUp.png new file mode 100644 index 0000000..423ecca --- /dev/null +++ b/common/Resources/Images/73/arrowEditUp.png Binary files differ diff --git a/common/Resources/Images/73/arrowEditUpDown.png b/common/Resources/Images/73/arrowEditUpDown.png new file mode 100644 index 0000000..2a7f8fa --- /dev/null +++ b/common/Resources/Images/73/arrowEditUpDown.png Binary files differ diff --git a/common/Resources/Images/73/arrowEditUpOver.png b/common/Resources/Images/73/arrowEditUpOver.png new file mode 100644 index 0000000..c0dadc9 --- /dev/null +++ b/common/Resources/Images/73/arrowEditUpOver.png Binary files differ diff --git a/common/Resources/Images/73/au_pipes.png b/common/Resources/Images/73/au_pipes.png new file mode 100644 index 0000000..bf3e525 --- /dev/null +++ b/common/Resources/Images/73/au_pipes.png Binary files differ diff --git a/common/Resources/Images/73/au_pipessel.png b/common/Resources/Images/73/au_pipessel.png new file mode 100644 index 0000000..8747c38 --- /dev/null +++ b/common/Resources/Images/73/au_pipessel.png Binary files differ diff --git a/common/Resources/Images/73/babylaugh.png b/common/Resources/Images/73/babylaugh.png new file mode 100644 index 0000000..6e318fd --- /dev/null +++ b/common/Resources/Images/73/babylaugh.png Binary files differ diff --git a/common/Resources/Images/73/babylaughsel.png b/common/Resources/Images/73/babylaughsel.png new file mode 100644 index 0000000..29b9e26 --- /dev/null +++ b/common/Resources/Images/73/babylaughsel.png Binary files differ diff --git a/common/Resources/Images/73/babyuhoh.png b/common/Resources/Images/73/babyuhoh.png new file mode 100644 index 0000000..1c4bbf1 --- /dev/null +++ b/common/Resources/Images/73/babyuhoh.png Binary files differ diff --git a/common/Resources/Images/73/babyuhohsel.png b/common/Resources/Images/73/babyuhohsel.png new file mode 100644 index 0000000..b139be3 --- /dev/null +++ b/common/Resources/Images/73/babyuhohsel.png Binary files differ diff --git a/common/Resources/Images/73/banjo.png b/common/Resources/Images/73/banjo.png new file mode 100644 index 0000000..f76b0b2 --- /dev/null +++ b/common/Resources/Images/73/banjo.png Binary files differ diff --git a/common/Resources/Images/73/banjosel.png b/common/Resources/Images/73/banjosel.png new file mode 100644 index 0000000..84ae371 --- /dev/null +++ b/common/Resources/Images/73/banjosel.png Binary files differ diff --git a/common/Resources/Images/73/basse.png b/common/Resources/Images/73/basse.png new file mode 100644 index 0000000..8e23fdb --- /dev/null +++ b/common/Resources/Images/73/basse.png Binary files differ diff --git a/common/Resources/Images/73/basse2.png b/common/Resources/Images/73/basse2.png new file mode 100644 index 0000000..ac6e398 --- /dev/null +++ b/common/Resources/Images/73/basse2.png Binary files differ diff --git a/common/Resources/Images/73/basse2sel.png b/common/Resources/Images/73/basse2sel.png new file mode 100644 index 0000000..7ee6576 --- /dev/null +++ b/common/Resources/Images/73/basse2sel.png Binary files differ diff --git a/common/Resources/Images/73/bassesel.png b/common/Resources/Images/73/bassesel.png new file mode 100644 index 0000000..9d07b69 --- /dev/null +++ b/common/Resources/Images/73/bassesel.png Binary files differ diff --git a/common/Resources/Images/73/beat1.png b/common/Resources/Images/73/beat1.png new file mode 100644 index 0000000..672f7aa --- /dev/null +++ b/common/Resources/Images/73/beat1.png Binary files differ diff --git a/common/Resources/Images/73/beat10.png b/common/Resources/Images/73/beat10.png new file mode 100644 index 0000000..48b6c01 --- /dev/null +++ b/common/Resources/Images/73/beat10.png Binary files differ diff --git a/common/Resources/Images/73/beat11.png b/common/Resources/Images/73/beat11.png new file mode 100644 index 0000000..1bda66a --- /dev/null +++ b/common/Resources/Images/73/beat11.png Binary files differ diff --git a/common/Resources/Images/73/beat2.png b/common/Resources/Images/73/beat2.png new file mode 100644 index 0000000..0be767b --- /dev/null +++ b/common/Resources/Images/73/beat2.png Binary files differ diff --git a/common/Resources/Images/73/beat3.png b/common/Resources/Images/73/beat3.png new file mode 100644 index 0000000..26d477f --- /dev/null +++ b/common/Resources/Images/73/beat3.png Binary files differ diff --git a/common/Resources/Images/73/beat4.png b/common/Resources/Images/73/beat4.png new file mode 100644 index 0000000..8099683 --- /dev/null +++ b/common/Resources/Images/73/beat4.png Binary files differ diff --git a/common/Resources/Images/73/beat5.png b/common/Resources/Images/73/beat5.png new file mode 100644 index 0000000..33e67ff --- /dev/null +++ b/common/Resources/Images/73/beat5.png Binary files differ diff --git a/common/Resources/Images/73/beat6.png b/common/Resources/Images/73/beat6.png new file mode 100644 index 0000000..9e9c1c9 --- /dev/null +++ b/common/Resources/Images/73/beat6.png Binary files differ diff --git a/common/Resources/Images/73/beat7.png b/common/Resources/Images/73/beat7.png new file mode 100644 index 0000000..10b877e --- /dev/null +++ b/common/Resources/Images/73/beat7.png Binary files differ diff --git a/common/Resources/Images/73/beat8.png b/common/Resources/Images/73/beat8.png new file mode 100644 index 0000000..95b555f --- /dev/null +++ b/common/Resources/Images/73/beat8.png Binary files differ diff --git a/common/Resources/Images/73/beat9.png b/common/Resources/Images/73/beat9.png new file mode 100644 index 0000000..0ad6fcd --- /dev/null +++ b/common/Resources/Images/73/beat9.png Binary files differ diff --git a/common/Resources/Images/73/bird.png b/common/Resources/Images/73/bird.png new file mode 100644 index 0000000..3b2dadd --- /dev/null +++ b/common/Resources/Images/73/bird.png Binary files differ diff --git a/common/Resources/Images/73/birdsel.png b/common/Resources/Images/73/birdsel.png new file mode 100644 index 0000000..b131a07 --- /dev/null +++ b/common/Resources/Images/73/birdsel.png Binary files differ diff --git a/common/Resources/Images/73/bottle.png b/common/Resources/Images/73/bottle.png new file mode 100644 index 0000000..295ce5d --- /dev/null +++ b/common/Resources/Images/73/bottle.png Binary files differ diff --git a/common/Resources/Images/73/bottlesel.png b/common/Resources/Images/73/bottlesel.png new file mode 100644 index 0000000..c8cd79c --- /dev/null +++ b/common/Resources/Images/73/bottlesel.png Binary files differ diff --git a/common/Resources/Images/73/bubbles.png b/common/Resources/Images/73/bubbles.png new file mode 100644 index 0000000..4e50f99 --- /dev/null +++ b/common/Resources/Images/73/bubbles.png Binary files differ diff --git a/common/Resources/Images/73/bubblessel.png b/common/Resources/Images/73/bubblessel.png new file mode 100644 index 0000000..91d9bed --- /dev/null +++ b/common/Resources/Images/73/bubblessel.png Binary files differ diff --git a/common/Resources/Images/73/byke.png b/common/Resources/Images/73/byke.png new file mode 100644 index 0000000..5a8fa03 --- /dev/null +++ b/common/Resources/Images/73/byke.png Binary files differ diff --git a/common/Resources/Images/73/bykesel.png b/common/Resources/Images/73/bykesel.png new file mode 100644 index 0000000..d0d5444 --- /dev/null +++ b/common/Resources/Images/73/bykesel.png Binary files differ diff --git a/common/Resources/Images/73/camera.png b/common/Resources/Images/73/camera.png new file mode 100644 index 0000000..44fc82f --- /dev/null +++ b/common/Resources/Images/73/camera.png Binary files differ diff --git a/common/Resources/Images/73/camerasel.png b/common/Resources/Images/73/camerasel.png new file mode 100644 index 0000000..ac047ef --- /dev/null +++ b/common/Resources/Images/73/camerasel.png Binary files differ diff --git a/common/Resources/Images/73/car.png b/common/Resources/Images/73/car.png new file mode 100644 index 0000000..aa3ba31 --- /dev/null +++ b/common/Resources/Images/73/car.png Binary files differ diff --git a/common/Resources/Images/73/carhorn.png b/common/Resources/Images/73/carhorn.png new file mode 100644 index 0000000..3cd94e0 --- /dev/null +++ b/common/Resources/Images/73/carhorn.png Binary files differ diff --git a/common/Resources/Images/73/carhornsel.png b/common/Resources/Images/73/carhornsel.png new file mode 100644 index 0000000..b654815 --- /dev/null +++ b/common/Resources/Images/73/carhornsel.png Binary files differ diff --git a/common/Resources/Images/73/carsel.png b/common/Resources/Images/73/carsel.png new file mode 100644 index 0000000..9cdcfac --- /dev/null +++ b/common/Resources/Images/73/carsel.png Binary files differ diff --git a/common/Resources/Images/73/cat.png b/common/Resources/Images/73/cat.png new file mode 100644 index 0000000..cc4f5b2 --- /dev/null +++ b/common/Resources/Images/73/cat.png Binary files differ diff --git a/common/Resources/Images/73/catsel.png b/common/Resources/Images/73/catsel.png new file mode 100644 index 0000000..af664b9 --- /dev/null +++ b/common/Resources/Images/73/catsel.png Binary files differ diff --git a/common/Resources/Images/73/cello.png b/common/Resources/Images/73/cello.png new file mode 100644 index 0000000..f0d9347 --- /dev/null +++ b/common/Resources/Images/73/cello.png Binary files differ diff --git a/common/Resources/Images/73/cellosel.png b/common/Resources/Images/73/cellosel.png new file mode 100644 index 0000000..cd9a1f1 --- /dev/null +++ b/common/Resources/Images/73/cellosel.png Binary files differ diff --git a/common/Resources/Images/73/check.png b/common/Resources/Images/73/check.png new file mode 100644 index 0000000..ebeaedf --- /dev/null +++ b/common/Resources/Images/73/check.png Binary files differ diff --git a/common/Resources/Images/73/checkOff.png b/common/Resources/Images/73/checkOff.png new file mode 100644 index 0000000..93689ed --- /dev/null +++ b/common/Resources/Images/73/checkOff.png Binary files differ diff --git a/common/Resources/Images/73/checkOn.png b/common/Resources/Images/73/checkOn.png new file mode 100644 index 0000000..a161876 --- /dev/null +++ b/common/Resources/Images/73/checkOn.png Binary files differ diff --git a/common/Resources/Images/73/chiken.png b/common/Resources/Images/73/chiken.png new file mode 100644 index 0000000..eef1a45 --- /dev/null +++ b/common/Resources/Images/73/chiken.png Binary files differ diff --git a/common/Resources/Images/73/chikensel.png b/common/Resources/Images/73/chikensel.png new file mode 100644 index 0000000..b51f9b6 --- /dev/null +++ b/common/Resources/Images/73/chikensel.png Binary files differ diff --git a/common/Resources/Images/73/chimes.png b/common/Resources/Images/73/chimes.png new file mode 100644 index 0000000..eb06371 --- /dev/null +++ b/common/Resources/Images/73/chimes.png Binary files differ diff --git a/common/Resources/Images/73/chimessel.png b/common/Resources/Images/73/chimessel.png new file mode 100644 index 0000000..b466ad8 --- /dev/null +++ b/common/Resources/Images/73/chimessel.png Binary files differ diff --git a/common/Resources/Images/73/clang.png b/common/Resources/Images/73/clang.png new file mode 100644 index 0000000..26aec58 --- /dev/null +++ b/common/Resources/Images/73/clang.png Binary files differ diff --git a/common/Resources/Images/73/clang2.png b/common/Resources/Images/73/clang2.png new file mode 100644 index 0000000..1a7aeca --- /dev/null +++ b/common/Resources/Images/73/clang2.png Binary files differ diff --git a/common/Resources/Images/73/clang2sel.png b/common/Resources/Images/73/clang2sel.png new file mode 100644 index 0000000..702ba9d --- /dev/null +++ b/common/Resources/Images/73/clang2sel.png Binary files differ diff --git a/common/Resources/Images/73/clangsel.png b/common/Resources/Images/73/clangsel.png new file mode 100644 index 0000000..394b099 --- /dev/null +++ b/common/Resources/Images/73/clangsel.png Binary files differ diff --git a/common/Resources/Images/73/clarinette.png b/common/Resources/Images/73/clarinette.png new file mode 100644 index 0000000..bbd0cfd --- /dev/null +++ b/common/Resources/Images/73/clarinette.png Binary files differ diff --git a/common/Resources/Images/73/clarinettesel.png b/common/Resources/Images/73/clarinettesel.png new file mode 100644 index 0000000..badec87 --- /dev/null +++ b/common/Resources/Images/73/clarinettesel.png Binary files differ diff --git a/common/Resources/Images/73/clavinet.png b/common/Resources/Images/73/clavinet.png new file mode 100644 index 0000000..e4816b0 --- /dev/null +++ b/common/Resources/Images/73/clavinet.png Binary files differ diff --git a/common/Resources/Images/73/clavinetsel.png b/common/Resources/Images/73/clavinetsel.png new file mode 100644 index 0000000..ddff775 --- /dev/null +++ b/common/Resources/Images/73/clavinetsel.png Binary files differ diff --git a/common/Resources/Images/73/cling.png b/common/Resources/Images/73/cling.png new file mode 100644 index 0000000..47ee501 --- /dev/null +++ b/common/Resources/Images/73/cling.png Binary files differ diff --git a/common/Resources/Images/73/clingsel.png b/common/Resources/Images/73/clingsel.png new file mode 100644 index 0000000..e35d0d8 --- /dev/null +++ b/common/Resources/Images/73/clingsel.png Binary files differ diff --git a/common/Resources/Images/73/complex1.png b/common/Resources/Images/73/complex1.png new file mode 100644 index 0000000..01d7978 --- /dev/null +++ b/common/Resources/Images/73/complex1.png Binary files differ diff --git a/common/Resources/Images/73/complex2.png b/common/Resources/Images/73/complex2.png new file mode 100644 index 0000000..788660e --- /dev/null +++ b/common/Resources/Images/73/complex2.png Binary files differ diff --git a/common/Resources/Images/73/complex3.png b/common/Resources/Images/73/complex3.png new file mode 100644 index 0000000..9db32aa --- /dev/null +++ b/common/Resources/Images/73/complex3.png Binary files differ diff --git a/common/Resources/Images/73/complex4.png b/common/Resources/Images/73/complex4.png new file mode 100644 index 0000000..3c2e430 --- /dev/null +++ b/common/Resources/Images/73/complex4.png Binary files differ diff --git a/common/Resources/Images/73/complex5.png b/common/Resources/Images/73/complex5.png new file mode 100644 index 0000000..2c064cd --- /dev/null +++ b/common/Resources/Images/73/complex5.png Binary files differ diff --git a/common/Resources/Images/73/complex6.png b/common/Resources/Images/73/complex6.png new file mode 100644 index 0000000..40af2b8 --- /dev/null +++ b/common/Resources/Images/73/complex6.png Binary files differ diff --git a/common/Resources/Images/73/complex7.png b/common/Resources/Images/73/complex7.png new file mode 100644 index 0000000..3b3dab0 --- /dev/null +++ b/common/Resources/Images/73/complex7.png Binary files differ diff --git a/common/Resources/Images/73/complex8.png b/common/Resources/Images/73/complex8.png new file mode 100644 index 0000000..3beaf44 --- /dev/null +++ b/common/Resources/Images/73/complex8.png Binary files differ diff --git a/common/Resources/Images/73/concret.png b/common/Resources/Images/73/concret.png new file mode 100644 index 0000000..28c9381 --- /dev/null +++ b/common/Resources/Images/73/concret.png Binary files differ diff --git a/common/Resources/Images/73/concretsel.png b/common/Resources/Images/73/concretsel.png new file mode 100644 index 0000000..d0b1243 --- /dev/null +++ b/common/Resources/Images/73/concretsel.png Binary files differ diff --git a/common/Resources/Images/73/cow.png b/common/Resources/Images/73/cow.png new file mode 100644 index 0000000..0191296 --- /dev/null +++ b/common/Resources/Images/73/cow.png Binary files differ diff --git a/common/Resources/Images/73/cowsel.png b/common/Resources/Images/73/cowsel.png new file mode 100644 index 0000000..a4be894 --- /dev/null +++ b/common/Resources/Images/73/cowsel.png Binary files differ diff --git a/common/Resources/Images/73/crash.png b/common/Resources/Images/73/crash.png new file mode 100644 index 0000000..3e7c110 --- /dev/null +++ b/common/Resources/Images/73/crash.png Binary files differ diff --git a/common/Resources/Images/73/crashsel.png b/common/Resources/Images/73/crashsel.png new file mode 100644 index 0000000..f63a502 --- /dev/null +++ b/common/Resources/Images/73/crashsel.png Binary files differ diff --git a/common/Resources/Images/73/cricket.png b/common/Resources/Images/73/cricket.png new file mode 100644 index 0000000..0cc1a41 --- /dev/null +++ b/common/Resources/Images/73/cricket.png Binary files differ diff --git a/common/Resources/Images/73/cricketsel.png b/common/Resources/Images/73/cricketsel.png new file mode 100644 index 0000000..c199ab5 --- /dev/null +++ b/common/Resources/Images/73/cricketsel.png Binary files differ diff --git a/common/Resources/Images/73/dice.png b/common/Resources/Images/73/dice.png new file mode 100644 index 0000000..3ccd0a0 --- /dev/null +++ b/common/Resources/Images/73/dice.png Binary files differ diff --git a/common/Resources/Images/73/diceProp.png b/common/Resources/Images/73/diceProp.png new file mode 100644 index 0000000..0a0255e --- /dev/null +++ b/common/Resources/Images/73/diceProp.png Binary files differ diff --git a/common/Resources/Images/73/dicePropSel.png b/common/Resources/Images/73/dicePropSel.png new file mode 100644 index 0000000..4a170e3 --- /dev/null +++ b/common/Resources/Images/73/dicePropSel.png Binary files differ diff --git a/common/Resources/Images/73/diceblur.png b/common/Resources/Images/73/diceblur.png new file mode 100644 index 0000000..c0c7329 --- /dev/null +++ b/common/Resources/Images/73/diceblur.png Binary files differ diff --git a/common/Resources/Images/73/diceinst.png b/common/Resources/Images/73/diceinst.png new file mode 100644 index 0000000..342ccd3 --- /dev/null +++ b/common/Resources/Images/73/diceinst.png Binary files differ diff --git a/common/Resources/Images/73/diceinstsel.png b/common/Resources/Images/73/diceinstsel.png new file mode 100644 index 0000000..570ef4b --- /dev/null +++ b/common/Resources/Images/73/diceinstsel.png Binary files differ diff --git a/common/Resources/Images/73/didjeridu.png b/common/Resources/Images/73/didjeridu.png new file mode 100644 index 0000000..c0dcd55 --- /dev/null +++ b/common/Resources/Images/73/didjeridu.png Binary files differ diff --git a/common/Resources/Images/73/didjeridusel.png b/common/Resources/Images/73/didjeridusel.png new file mode 100644 index 0000000..d81d32b --- /dev/null +++ b/common/Resources/Images/73/didjeridusel.png Binary files differ diff --git a/common/Resources/Images/73/dog.png b/common/Resources/Images/73/dog.png new file mode 100644 index 0000000..c1a703e --- /dev/null +++ b/common/Resources/Images/73/dog.png Binary files differ diff --git a/common/Resources/Images/73/dogsel.png b/common/Resources/Images/73/dogsel.png new file mode 100644 index 0000000..b2033b0 --- /dev/null +++ b/common/Resources/Images/73/dogsel.png Binary files differ diff --git a/common/Resources/Images/73/door.png b/common/Resources/Images/73/door.png new file mode 100644 index 0000000..b2b54c1 --- /dev/null +++ b/common/Resources/Images/73/door.png Binary files differ diff --git a/common/Resources/Images/73/doorsel.png b/common/Resources/Images/73/doorsel.png new file mode 100644 index 0000000..0fde352 --- /dev/null +++ b/common/Resources/Images/73/doorsel.png Binary files differ diff --git a/common/Resources/Images/73/dru0.png b/common/Resources/Images/73/dru0.png new file mode 100644 index 0000000..92b6194 --- /dev/null +++ b/common/Resources/Images/73/dru0.png Binary files differ diff --git a/common/Resources/Images/73/dru1.png b/common/Resources/Images/73/dru1.png new file mode 100644 index 0000000..3286465 --- /dev/null +++ b/common/Resources/Images/73/dru1.png Binary files differ diff --git a/common/Resources/Images/73/dru2.png b/common/Resources/Images/73/dru2.png new file mode 100644 index 0000000..7f34c15 --- /dev/null +++ b/common/Resources/Images/73/dru2.png Binary files differ diff --git a/common/Resources/Images/73/dru3.png b/common/Resources/Images/73/dru3.png new file mode 100644 index 0000000..c16cbe7 --- /dev/null +++ b/common/Resources/Images/73/dru3.png Binary files differ diff --git a/common/Resources/Images/73/dru4.png b/common/Resources/Images/73/dru4.png new file mode 100644 index 0000000..e1afe0a --- /dev/null +++ b/common/Resources/Images/73/dru4.png Binary files differ diff --git a/common/Resources/Images/73/drum1kit.png b/common/Resources/Images/73/drum1kit.png new file mode 100644 index 0000000..9690b04 --- /dev/null +++ b/common/Resources/Images/73/drum1kit.png Binary files differ diff --git a/common/Resources/Images/73/drum1kitsel.png b/common/Resources/Images/73/drum1kitsel.png new file mode 100644 index 0000000..5f48ad4 --- /dev/null +++ b/common/Resources/Images/73/drum1kitsel.png Binary files differ diff --git a/common/Resources/Images/73/drum1kitselgen.png b/common/Resources/Images/73/drum1kitselgen.png new file mode 100644 index 0000000..4e0e890 --- /dev/null +++ b/common/Resources/Images/73/drum1kitselgen.png Binary files differ diff --git a/common/Resources/Images/73/drum2kit.png b/common/Resources/Images/73/drum2kit.png new file mode 100644 index 0000000..09e4831 --- /dev/null +++ b/common/Resources/Images/73/drum2kit.png Binary files differ diff --git a/common/Resources/Images/73/drum2kitsel.png b/common/Resources/Images/73/drum2kitsel.png new file mode 100644 index 0000000..00cd688 --- /dev/null +++ b/common/Resources/Images/73/drum2kitsel.png Binary files differ diff --git a/common/Resources/Images/73/drum2kitselgen.png b/common/Resources/Images/73/drum2kitselgen.png new file mode 100644 index 0000000..8fe89e5 --- /dev/null +++ b/common/Resources/Images/73/drum2kitselgen.png Binary files differ diff --git a/common/Resources/Images/73/drum3kit.png b/common/Resources/Images/73/drum3kit.png new file mode 100644 index 0000000..53eb495 --- /dev/null +++ b/common/Resources/Images/73/drum3kit.png Binary files differ diff --git a/common/Resources/Images/73/drum3kitsel.png b/common/Resources/Images/73/drum3kitsel.png new file mode 100644 index 0000000..6ae2a0e --- /dev/null +++ b/common/Resources/Images/73/drum3kitsel.png Binary files differ diff --git a/common/Resources/Images/73/drum3kitselgen.png b/common/Resources/Images/73/drum3kitselgen.png new file mode 100644 index 0000000..b47803c --- /dev/null +++ b/common/Resources/Images/73/drum3kitselgen.png Binary files differ diff --git a/common/Resources/Images/73/drum4kit.png b/common/Resources/Images/73/drum4kit.png new file mode 100644 index 0000000..e9512ea --- /dev/null +++ b/common/Resources/Images/73/drum4kit.png Binary files differ diff --git a/common/Resources/Images/73/drum4kitsel.png b/common/Resources/Images/73/drum4kitsel.png new file mode 100644 index 0000000..5f10d0b --- /dev/null +++ b/common/Resources/Images/73/drum4kitsel.png Binary files differ diff --git a/common/Resources/Images/73/drum4kitselgen.png b/common/Resources/Images/73/drum4kitselgen.png new file mode 100644 index 0000000..4322354 --- /dev/null +++ b/common/Resources/Images/73/drum4kitselgen.png Binary files differ diff --git a/common/Resources/Images/73/drum5kit.png b/common/Resources/Images/73/drum5kit.png new file mode 100644 index 0000000..5b72e65 --- /dev/null +++ b/common/Resources/Images/73/drum5kit.png Binary files differ diff --git a/common/Resources/Images/73/drum5kitsel.png b/common/Resources/Images/73/drum5kitsel.png new file mode 100644 index 0000000..dde38d9 --- /dev/null +++ b/common/Resources/Images/73/drum5kitsel.png Binary files differ diff --git a/common/Resources/Images/73/drum5kitselgen.png b/common/Resources/Images/73/drum5kitselgen.png new file mode 100644 index 0000000..820af88 --- /dev/null +++ b/common/Resources/Images/73/drum5kitselgen.png Binary files differ diff --git a/common/Resources/Images/73/drum6kit.png b/common/Resources/Images/73/drum6kit.png new file mode 100644 index 0000000..99abd05 --- /dev/null +++ b/common/Resources/Images/73/drum6kit.png Binary files differ diff --git a/common/Resources/Images/73/drum6kitsel.png b/common/Resources/Images/73/drum6kitsel.png new file mode 100644 index 0000000..229b76c --- /dev/null +++ b/common/Resources/Images/73/drum6kitsel.png Binary files differ diff --git a/common/Resources/Images/73/drum6kitselgen.png b/common/Resources/Images/73/drum6kitselgen.png new file mode 100644 index 0000000..0f8852a --- /dev/null +++ b/common/Resources/Images/73/drum6kitselgen.png Binary files differ diff --git a/common/Resources/Images/73/duck.png b/common/Resources/Images/73/duck.png new file mode 100644 index 0000000..c4aff11 --- /dev/null +++ b/common/Resources/Images/73/duck.png Binary files differ diff --git a/common/Resources/Images/73/duck2.png b/common/Resources/Images/73/duck2.png new file mode 100644 index 0000000..a49098f --- /dev/null +++ b/common/Resources/Images/73/duck2.png Binary files differ diff --git a/common/Resources/Images/73/duck2sel.png b/common/Resources/Images/73/duck2sel.png new file mode 100644 index 0000000..2e6a32a --- /dev/null +++ b/common/Resources/Images/73/duck2sel.png Binary files differ diff --git a/common/Resources/Images/73/ducksel.png b/common/Resources/Images/73/ducksel.png new file mode 100644 index 0000000..79a4b3e --- /dev/null +++ b/common/Resources/Images/73/ducksel.png Binary files differ diff --git a/common/Resources/Images/73/editTam.png b/common/Resources/Images/73/editTam.png new file mode 100644 index 0000000..202dd13 --- /dev/null +++ b/common/Resources/Images/73/editTam.png Binary files differ diff --git a/common/Resources/Images/73/editTamDown.png b/common/Resources/Images/73/editTamDown.png new file mode 100644 index 0000000..ba5f448 --- /dev/null +++ b/common/Resources/Images/73/editTamDown.png Binary files differ diff --git a/common/Resources/Images/73/editTamOver.png b/common/Resources/Images/73/editTamOver.png new file mode 100644 index 0000000..bdee1b3 --- /dev/null +++ b/common/Resources/Images/73/editTamOver.png Binary files differ diff --git a/common/Resources/Images/73/electronic.png b/common/Resources/Images/73/electronic.png new file mode 100644 index 0000000..c696073 --- /dev/null +++ b/common/Resources/Images/73/electronic.png Binary files differ diff --git a/common/Resources/Images/73/electronicsel.png b/common/Resources/Images/73/electronicsel.png new file mode 100644 index 0000000..2ac3505 --- /dev/null +++ b/common/Resources/Images/73/electronicsel.png Binary files differ diff --git a/common/Resources/Images/73/fingercymbals.png b/common/Resources/Images/73/fingercymbals.png new file mode 100644 index 0000000..a1e5867 --- /dev/null +++ b/common/Resources/Images/73/fingercymbals.png Binary files differ diff --git a/common/Resources/Images/73/fingercymbalssel.png b/common/Resources/Images/73/fingercymbalssel.png new file mode 100644 index 0000000..7648360 --- /dev/null +++ b/common/Resources/Images/73/fingercymbalssel.png Binary files differ diff --git a/common/Resources/Images/73/flugel.png b/common/Resources/Images/73/flugel.png new file mode 100644 index 0000000..85f5fbd --- /dev/null +++ b/common/Resources/Images/73/flugel.png Binary files differ diff --git a/common/Resources/Images/73/flugelsel.png b/common/Resources/Images/73/flugelsel.png new file mode 100644 index 0000000..e0001a5 --- /dev/null +++ b/common/Resources/Images/73/flugelsel.png Binary files differ diff --git a/common/Resources/Images/73/flute.png b/common/Resources/Images/73/flute.png new file mode 100644 index 0000000..6a2b613 --- /dev/null +++ b/common/Resources/Images/73/flute.png Binary files differ diff --git a/common/Resources/Images/73/flutesel.png b/common/Resources/Images/73/flutesel.png new file mode 100644 index 0000000..da33f0e --- /dev/null +++ b/common/Resources/Images/73/flutesel.png Binary files differ diff --git a/common/Resources/Images/73/foghorn.png b/common/Resources/Images/73/foghorn.png new file mode 100644 index 0000000..379bbeb --- /dev/null +++ b/common/Resources/Images/73/foghorn.png Binary files differ diff --git a/common/Resources/Images/73/foghornsel.png b/common/Resources/Images/73/foghornsel.png new file mode 100644 index 0000000..f1292ea --- /dev/null +++ b/common/Resources/Images/73/foghornsel.png Binary files differ diff --git a/common/Resources/Images/73/frogs.png b/common/Resources/Images/73/frogs.png new file mode 100644 index 0000000..bf4db68 --- /dev/null +++ b/common/Resources/Images/73/frogs.png Binary files differ diff --git a/common/Resources/Images/73/frogssel.png b/common/Resources/Images/73/frogssel.png new file mode 100644 index 0000000..5a8cb15 --- /dev/null +++ b/common/Resources/Images/73/frogssel.png Binary files differ diff --git a/common/Resources/Images/73/gam.png b/common/Resources/Images/73/gam.png new file mode 100644 index 0000000..0e19dc6 --- /dev/null +++ b/common/Resources/Images/73/gam.png Binary files differ diff --git a/common/Resources/Images/73/gamsel.png b/common/Resources/Images/73/gamsel.png new file mode 100644 index 0000000..267eaab --- /dev/null +++ b/common/Resources/Images/73/gamsel.png Binary files differ diff --git a/common/Resources/Images/73/generic.png b/common/Resources/Images/73/generic.png new file mode 100644 index 0000000..f981834 --- /dev/null +++ b/common/Resources/Images/73/generic.png Binary files differ diff --git a/common/Resources/Images/73/genericsel.png b/common/Resources/Images/73/genericsel.png new file mode 100644 index 0000000..d84ef9c --- /dev/null +++ b/common/Resources/Images/73/genericsel.png Binary files differ diff --git a/common/Resources/Images/73/guit.png b/common/Resources/Images/73/guit.png new file mode 100644 index 0000000..be4680b --- /dev/null +++ b/common/Resources/Images/73/guit.png Binary files differ diff --git a/common/Resources/Images/73/guit2.png b/common/Resources/Images/73/guit2.png new file mode 100644 index 0000000..7d221a3 --- /dev/null +++ b/common/Resources/Images/73/guit2.png Binary files differ diff --git a/common/Resources/Images/73/guit2sel.png b/common/Resources/Images/73/guit2sel.png new file mode 100644 index 0000000..19f356c --- /dev/null +++ b/common/Resources/Images/73/guit2sel.png Binary files differ diff --git a/common/Resources/Images/73/guitmute.png b/common/Resources/Images/73/guitmute.png new file mode 100644 index 0000000..6a71bda --- /dev/null +++ b/common/Resources/Images/73/guitmute.png Binary files differ diff --git a/common/Resources/Images/73/guitmutesel.png b/common/Resources/Images/73/guitmutesel.png new file mode 100644 index 0000000..8f7ef07 --- /dev/null +++ b/common/Resources/Images/73/guitmutesel.png Binary files differ diff --git a/common/Resources/Images/73/guitsel.png b/common/Resources/Images/73/guitsel.png new file mode 100644 index 0000000..9a3128f --- /dev/null +++ b/common/Resources/Images/73/guitsel.png Binary files differ diff --git a/common/Resources/Images/73/guitshort.png b/common/Resources/Images/73/guitshort.png new file mode 100644 index 0000000..c41790d --- /dev/null +++ b/common/Resources/Images/73/guitshort.png Binary files differ diff --git a/common/Resources/Images/73/guitshortsel.png b/common/Resources/Images/73/guitshortsel.png new file mode 100644 index 0000000..d5eb7ae --- /dev/null +++ b/common/Resources/Images/73/guitshortsel.png Binary files differ diff --git a/common/Resources/Images/73/harmonica.png b/common/Resources/Images/73/harmonica.png new file mode 100644 index 0000000..ef66048 --- /dev/null +++ b/common/Resources/Images/73/harmonica.png Binary files differ diff --git a/common/Resources/Images/73/harmonicasel.png b/common/Resources/Images/73/harmonicasel.png new file mode 100644 index 0000000..0552024 --- /dev/null +++ b/common/Resources/Images/73/harmonicasel.png Binary files differ diff --git a/common/Resources/Images/73/harmonium.png b/common/Resources/Images/73/harmonium.png new file mode 100644 index 0000000..d2417ee --- /dev/null +++ b/common/Resources/Images/73/harmonium.png Binary files differ diff --git a/common/Resources/Images/73/harmoniumsel.png b/common/Resources/Images/73/harmoniumsel.png new file mode 100644 index 0000000..eee389d --- /dev/null +++ b/common/Resources/Images/73/harmoniumsel.png Binary files differ diff --git a/common/Resources/Images/73/harpsichord.png b/common/Resources/Images/73/harpsichord.png new file mode 100644 index 0000000..8a9e1c7 --- /dev/null +++ b/common/Resources/Images/73/harpsichord.png Binary files differ diff --git a/common/Resources/Images/73/harpsichordsel.png b/common/Resources/Images/73/harpsichordsel.png new file mode 100644 index 0000000..71e1cac --- /dev/null +++ b/common/Resources/Images/73/harpsichordsel.png Binary files differ diff --git a/common/Resources/Images/73/helpTam.png b/common/Resources/Images/73/helpTam.png new file mode 100644 index 0000000..ba5f448 --- /dev/null +++ b/common/Resources/Images/73/helpTam.png Binary files differ diff --git a/common/Resources/Images/73/helpTamDown.png b/common/Resources/Images/73/helpTamDown.png new file mode 100644 index 0000000..202dd13 --- /dev/null +++ b/common/Resources/Images/73/helpTamDown.png Binary files differ diff --git a/common/Resources/Images/73/helpTamOver.png b/common/Resources/Images/73/helpTamOver.png new file mode 100644 index 0000000..bdee1b3 --- /dev/null +++ b/common/Resources/Images/73/helpTamOver.png Binary files differ diff --git a/common/Resources/Images/73/hey.png b/common/Resources/Images/73/hey.png new file mode 100644 index 0000000..916fc87 --- /dev/null +++ b/common/Resources/Images/73/hey.png Binary files differ diff --git a/common/Resources/Images/73/heysel.png b/common/Resources/Images/73/heysel.png new file mode 100644 index 0000000..45046d7 --- /dev/null +++ b/common/Resources/Images/73/heysel.png Binary files differ diff --git a/common/Resources/Images/73/hit.png b/common/Resources/Images/73/hit.png new file mode 100644 index 0000000..553475b --- /dev/null +++ b/common/Resources/Images/73/hit.png Binary files differ diff --git a/common/Resources/Images/73/hitSelected.png b/common/Resources/Images/73/hitSelected.png new file mode 100644 index 0000000..bfe03aa --- /dev/null +++ b/common/Resources/Images/73/hitSelected.png Binary files differ diff --git a/common/Resources/Images/73/horse.png b/common/Resources/Images/73/horse.png new file mode 100644 index 0000000..c2431f2 --- /dev/null +++ b/common/Resources/Images/73/horse.png Binary files differ diff --git a/common/Resources/Images/73/horsesel.png b/common/Resources/Images/73/horsesel.png new file mode 100644 index 0000000..82d9630 --- /dev/null +++ b/common/Resources/Images/73/horsesel.png Binary files differ diff --git a/common/Resources/Images/73/instr0.png b/common/Resources/Images/73/instr0.png new file mode 100644 index 0000000..5cbdda0 --- /dev/null +++ b/common/Resources/Images/73/instr0.png Binary files differ diff --git a/common/Resources/Images/73/instr1.png b/common/Resources/Images/73/instr1.png new file mode 100644 index 0000000..fcee927 --- /dev/null +++ b/common/Resources/Images/73/instr1.png Binary files differ diff --git a/common/Resources/Images/73/instr2.png b/common/Resources/Images/73/instr2.png new file mode 100644 index 0000000..80b1001 --- /dev/null +++ b/common/Resources/Images/73/instr2.png Binary files differ diff --git a/common/Resources/Images/73/instr3.png b/common/Resources/Images/73/instr3.png new file mode 100644 index 0000000..51cd856 --- /dev/null +++ b/common/Resources/Images/73/instr3.png Binary files differ diff --git a/common/Resources/Images/73/instr4.png b/common/Resources/Images/73/instr4.png new file mode 100644 index 0000000..1ddc859 --- /dev/null +++ b/common/Resources/Images/73/instr4.png Binary files differ diff --git a/common/Resources/Images/73/jam-blockMask.png b/common/Resources/Images/73/jam-blockMask.png new file mode 100644 index 0000000..d12e743 --- /dev/null +++ b/common/Resources/Images/73/jam-blockMask.png Binary files differ diff --git a/common/Resources/Images/73/kalimba.png b/common/Resources/Images/73/kalimba.png new file mode 100644 index 0000000..4cdcb22 --- /dev/null +++ b/common/Resources/Images/73/kalimba.png Binary files differ diff --git a/common/Resources/Images/73/kalimbasel.png b/common/Resources/Images/73/kalimbasel.png new file mode 100644 index 0000000..42f068d --- /dev/null +++ b/common/Resources/Images/73/kalimbasel.png Binary files differ diff --git a/common/Resources/Images/73/keyboard.png b/common/Resources/Images/73/keyboard.png new file mode 100644 index 0000000..f0d1c01 --- /dev/null +++ b/common/Resources/Images/73/keyboard.png Binary files differ diff --git a/common/Resources/Images/73/keyboardsel.png b/common/Resources/Images/73/keyboardsel.png new file mode 100644 index 0000000..36ef0cf --- /dev/null +++ b/common/Resources/Images/73/keyboardsel.png Binary files differ diff --git a/common/Resources/Images/73/koto.png b/common/Resources/Images/73/koto.png new file mode 100644 index 0000000..2bc7e5c --- /dev/null +++ b/common/Resources/Images/73/koto.png Binary files differ diff --git a/common/Resources/Images/73/kotosel.png b/common/Resources/Images/73/kotosel.png new file mode 100644 index 0000000..8ce0745 --- /dev/null +++ b/common/Resources/Images/73/kotosel.png Binary files differ diff --git a/common/Resources/Images/73/lab1.png b/common/Resources/Images/73/lab1.png new file mode 100644 index 0000000..5ce174d --- /dev/null +++ b/common/Resources/Images/73/lab1.png Binary files differ diff --git a/common/Resources/Images/73/lab1sel.png b/common/Resources/Images/73/lab1sel.png new file mode 100644 index 0000000..ab0fb5b --- /dev/null +++ b/common/Resources/Images/73/lab1sel.png Binary files differ diff --git a/common/Resources/Images/73/lab2.png b/common/Resources/Images/73/lab2.png new file mode 100644 index 0000000..9ee6eba --- /dev/null +++ b/common/Resources/Images/73/lab2.png Binary files differ diff --git a/common/Resources/Images/73/lab2sel.png b/common/Resources/Images/73/lab2sel.png new file mode 100644 index 0000000..f6db95f --- /dev/null +++ b/common/Resources/Images/73/lab2sel.png Binary files differ diff --git a/common/Resources/Images/73/lab3.png b/common/Resources/Images/73/lab3.png new file mode 100644 index 0000000..3628a81 --- /dev/null +++ b/common/Resources/Images/73/lab3.png Binary files differ diff --git a/common/Resources/Images/73/lab3sel.png b/common/Resources/Images/73/lab3sel.png new file mode 100644 index 0000000..de9cd59 --- /dev/null +++ b/common/Resources/Images/73/lab3sel.png Binary files differ diff --git a/common/Resources/Images/73/lab4.png b/common/Resources/Images/73/lab4.png new file mode 100644 index 0000000..0cff38e --- /dev/null +++ b/common/Resources/Images/73/lab4.png Binary files differ diff --git a/common/Resources/Images/73/lab4sel.png b/common/Resources/Images/73/lab4sel.png new file mode 100644 index 0000000..376bcf3 --- /dev/null +++ b/common/Resources/Images/73/lab4sel.png Binary files differ diff --git a/common/Resources/Images/73/lab5.png b/common/Resources/Images/73/lab5.png new file mode 100644 index 0000000..d06b961 --- /dev/null +++ b/common/Resources/Images/73/lab5.png Binary files differ diff --git a/common/Resources/Images/73/lab5sel.png b/common/Resources/Images/73/lab5sel.png new file mode 100644 index 0000000..57d2287 --- /dev/null +++ b/common/Resources/Images/73/lab5sel.png Binary files differ diff --git a/common/Resources/Images/73/lab6.png b/common/Resources/Images/73/lab6.png new file mode 100644 index 0000000..7075a74 --- /dev/null +++ b/common/Resources/Images/73/lab6.png Binary files differ diff --git a/common/Resources/Images/73/lab6sel.png b/common/Resources/Images/73/lab6sel.png new file mode 100644 index 0000000..40a58db --- /dev/null +++ b/common/Resources/Images/73/lab6sel.png Binary files differ diff --git a/common/Resources/Images/73/laugh.png b/common/Resources/Images/73/laugh.png new file mode 100644 index 0000000..8a5f818 --- /dev/null +++ b/common/Resources/Images/73/laugh.png Binary files differ diff --git a/common/Resources/Images/73/laughsel.png b/common/Resources/Images/73/laughsel.png new file mode 100644 index 0000000..c6a0065 --- /dev/null +++ b/common/Resources/Images/73/laughsel.png Binary files differ diff --git a/common/Resources/Images/73/mando.png b/common/Resources/Images/73/mando.png new file mode 100644 index 0000000..303628b --- /dev/null +++ b/common/Resources/Images/73/mando.png Binary files differ diff --git a/common/Resources/Images/73/mandosel.png b/common/Resources/Images/73/mandosel.png new file mode 100644 index 0000000..6a83298 --- /dev/null +++ b/common/Resources/Images/73/mandosel.png Binary files differ diff --git a/common/Resources/Images/73/marimba.png b/common/Resources/Images/73/marimba.png new file mode 100644 index 0000000..d39e50a --- /dev/null +++ b/common/Resources/Images/73/marimba.png Binary files differ diff --git a/common/Resources/Images/73/marimbasel.png b/common/Resources/Images/73/marimbasel.png new file mode 100644 index 0000000..766f81b --- /dev/null +++ b/common/Resources/Images/73/marimbasel.png Binary files differ diff --git a/common/Resources/Images/73/marquis.png b/common/Resources/Images/73/marquis.png new file mode 100644 index 0000000..0696a0d --- /dev/null +++ b/common/Resources/Images/73/marquis.png Binary files differ diff --git a/common/Resources/Images/73/mic1.png b/common/Resources/Images/73/mic1.png new file mode 100644 index 0000000..576025b --- /dev/null +++ b/common/Resources/Images/73/mic1.png Binary files differ diff --git a/common/Resources/Images/73/mic1sel.png b/common/Resources/Images/73/mic1sel.png new file mode 100644 index 0000000..30bd464 --- /dev/null +++ b/common/Resources/Images/73/mic1sel.png Binary files differ diff --git a/common/Resources/Images/73/mic2.png b/common/Resources/Images/73/mic2.png new file mode 100644 index 0000000..a98eeac --- /dev/null +++ b/common/Resources/Images/73/mic2.png Binary files differ diff --git a/common/Resources/Images/73/mic2sel.png b/common/Resources/Images/73/mic2sel.png new file mode 100644 index 0000000..c0d9863 --- /dev/null +++ b/common/Resources/Images/73/mic2sel.png Binary files differ diff --git a/common/Resources/Images/73/mic3.png b/common/Resources/Images/73/mic3.png new file mode 100644 index 0000000..fe7b843 --- /dev/null +++ b/common/Resources/Images/73/mic3.png Binary files differ diff --git a/common/Resources/Images/73/mic3sel.png b/common/Resources/Images/73/mic3sel.png new file mode 100644 index 0000000..52c0d36 --- /dev/null +++ b/common/Resources/Images/73/mic3sel.png Binary files differ diff --git a/common/Resources/Images/73/mic4.png b/common/Resources/Images/73/mic4.png new file mode 100644 index 0000000..c23b130 --- /dev/null +++ b/common/Resources/Images/73/mic4.png Binary files differ diff --git a/common/Resources/Images/73/mic4sel.png b/common/Resources/Images/73/mic4sel.png new file mode 100644 index 0000000..7fb2988 --- /dev/null +++ b/common/Resources/Images/73/mic4sel.png Binary files differ diff --git a/common/Resources/Images/73/miniTam.png b/common/Resources/Images/73/miniTam.png new file mode 100644 index 0000000..f6dbc22 --- /dev/null +++ b/common/Resources/Images/73/miniTam.png Binary files differ diff --git a/common/Resources/Images/73/miniTamDown.png b/common/Resources/Images/73/miniTamDown.png new file mode 100644 index 0000000..a32fbd9 --- /dev/null +++ b/common/Resources/Images/73/miniTamDown.png Binary files differ diff --git a/common/Resources/Images/73/miniTamOver.png b/common/Resources/Images/73/miniTamOver.png new file mode 100644 index 0000000..9b998ff --- /dev/null +++ b/common/Resources/Images/73/miniTamOver.png Binary files differ diff --git a/common/Resources/Images/73/miniplay.png b/common/Resources/Images/73/miniplay.png new file mode 100644 index 0000000..6695e49 --- /dev/null +++ b/common/Resources/Images/73/miniplay.png Binary files differ diff --git a/common/Resources/Images/73/mysounds.png b/common/Resources/Images/73/mysounds.png new file mode 100644 index 0000000..8544d5d --- /dev/null +++ b/common/Resources/Images/73/mysounds.png Binary files differ diff --git a/common/Resources/Images/73/mysoundssel.png b/common/Resources/Images/73/mysoundssel.png new file mode 100644 index 0000000..af5c01c --- /dev/null +++ b/common/Resources/Images/73/mysoundssel.png Binary files differ diff --git a/common/Resources/Images/73/note.png b/common/Resources/Images/73/note.png new file mode 100644 index 0000000..d48e5f1 --- /dev/null +++ b/common/Resources/Images/73/note.png Binary files differ diff --git a/common/Resources/Images/73/noteSelected.png b/common/Resources/Images/73/noteSelected.png new file mode 100644 index 0000000..fc0d30b --- /dev/null +++ b/common/Resources/Images/73/noteSelected.png Binary files differ diff --git a/common/Resources/Images/73/ocarina.png b/common/Resources/Images/73/ocarina.png new file mode 100644 index 0000000..9767a95 --- /dev/null +++ b/common/Resources/Images/73/ocarina.png Binary files differ diff --git a/common/Resources/Images/73/ocarinasel.png b/common/Resources/Images/73/ocarinasel.png new file mode 100644 index 0000000..6f264e3 --- /dev/null +++ b/common/Resources/Images/73/ocarinasel.png Binary files differ diff --git a/common/Resources/Images/73/ounk.png b/common/Resources/Images/73/ounk.png new file mode 100644 index 0000000..411608e --- /dev/null +++ b/common/Resources/Images/73/ounk.png Binary files differ diff --git a/common/Resources/Images/73/ounksel.png b/common/Resources/Images/73/ounksel.png new file mode 100644 index 0000000..3bb4a85 --- /dev/null +++ b/common/Resources/Images/73/ounksel.png Binary files differ diff --git a/common/Resources/Images/73/ow.png b/common/Resources/Images/73/ow.png new file mode 100644 index 0000000..bc253d7 --- /dev/null +++ b/common/Resources/Images/73/ow.png Binary files differ diff --git a/common/Resources/Images/73/owsel.png b/common/Resources/Images/73/owsel.png new file mode 100644 index 0000000..f1deeae --- /dev/null +++ b/common/Resources/Images/73/owsel.png Binary files differ diff --git a/common/Resources/Images/73/pageThumbnailBG.png b/common/Resources/Images/73/pageThumbnailBG.png new file mode 100644 index 0000000..eb7a65d --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBG.png Binary files differ diff --git a/common/Resources/Images/73/pageThumbnailBG0.png b/common/Resources/Images/73/pageThumbnailBG0.png new file mode 100644 index 0000000..b61658d --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBG0.png Binary files differ diff --git a/common/Resources/Images/73/pageThumbnailBG1.png b/common/Resources/Images/73/pageThumbnailBG1.png new file mode 100644 index 0000000..41bd9c6 --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBG1.png Binary files differ diff --git a/common/Resources/Images/73/pageThumbnailBG2.png b/common/Resources/Images/73/pageThumbnailBG2.png new file mode 100644 index 0000000..0365c40 --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBG2.png Binary files differ diff --git a/common/Resources/Images/73/pageThumbnailBG3.png b/common/Resources/Images/73/pageThumbnailBG3.png new file mode 100644 index 0000000..66a5cd5 --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBG3.png Binary files differ diff --git a/common/Resources/Images/73/pageThumbnailBut0.png b/common/Resources/Images/73/pageThumbnailBut0.png new file mode 100644 index 0000000..8c1a5cc --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut0.png Binary files differ diff --git a/common/Resources/Images/73/pageThumbnailBut0Down.png b/common/Resources/Images/73/pageThumbnailBut0Down.png new file mode 100644 index 0000000..c6beffc --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut0Down.png Binary files differ diff --git a/common/Resources/Images/73/pageThumbnailBut1.png b/common/Resources/Images/73/pageThumbnailBut1.png new file mode 100644 index 0000000..adb1d17 --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut1.png Binary files differ diff --git a/common/Resources/Images/73/pageThumbnailBut1Down.png b/common/Resources/Images/73/pageThumbnailBut1Down.png new file mode 100644 index 0000000..ede8ff5 --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut1Down.png Binary files differ diff --git a/common/Resources/Images/73/pageThumbnailBut2.png b/common/Resources/Images/73/pageThumbnailBut2.png new file mode 100644 index 0000000..dbfe428 --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut2.png Binary files differ diff --git a/common/Resources/Images/73/pageThumbnailBut2Down.png b/common/Resources/Images/73/pageThumbnailBut2Down.png new file mode 100644 index 0000000..f357bf8 --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut2Down.png Binary files differ diff --git a/common/Resources/Images/73/pageThumbnailBut3.png b/common/Resources/Images/73/pageThumbnailBut3.png new file mode 100644 index 0000000..62e2b48 --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut3.png Binary files differ diff --git a/common/Resources/Images/73/pageThumbnailBut3Down.png b/common/Resources/Images/73/pageThumbnailBut3Down.png new file mode 100644 index 0000000..6e00b1b --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailBut3Down.png Binary files differ diff --git a/common/Resources/Images/73/pageThumbnailMask.png b/common/Resources/Images/73/pageThumbnailMask.png new file mode 100644 index 0000000..a974b21 --- /dev/null +++ b/common/Resources/Images/73/pageThumbnailMask.png Binary files differ diff --git a/common/Resources/Images/73/people.png b/common/Resources/Images/73/people.png new file mode 100644 index 0000000..b08ea93 --- /dev/null +++ b/common/Resources/Images/73/people.png Binary files differ diff --git a/common/Resources/Images/73/peoplesel.png b/common/Resources/Images/73/peoplesel.png new file mode 100644 index 0000000..447a394 --- /dev/null +++ b/common/Resources/Images/73/peoplesel.png Binary files differ diff --git a/common/Resources/Images/73/percussions.png b/common/Resources/Images/73/percussions.png new file mode 100644 index 0000000..d24fb2e --- /dev/null +++ b/common/Resources/Images/73/percussions.png Binary files differ diff --git a/common/Resources/Images/73/percussionssel.png b/common/Resources/Images/73/percussionssel.png new file mode 100644 index 0000000..4fd4736 --- /dev/null +++ b/common/Resources/Images/73/percussionssel.png Binary files differ diff --git a/common/Resources/Images/73/piano.png b/common/Resources/Images/73/piano.png new file mode 100644 index 0000000..c4498b1 --- /dev/null +++ b/common/Resources/Images/73/piano.png Binary files differ diff --git a/common/Resources/Images/73/pianosel.png b/common/Resources/Images/73/pianosel.png new file mode 100644 index 0000000..4d32cbf --- /dev/null +++ b/common/Resources/Images/73/pianosel.png Binary files differ diff --git a/common/Resources/Images/73/plane.png b/common/Resources/Images/73/plane.png new file mode 100644 index 0000000..769e679 --- /dev/null +++ b/common/Resources/Images/73/plane.png Binary files differ diff --git a/common/Resources/Images/73/planesel.png b/common/Resources/Images/73/planesel.png new file mode 100644 index 0000000..d969600 --- /dev/null +++ b/common/Resources/Images/73/planesel.png Binary files differ diff --git a/common/Resources/Images/73/reverb0.png b/common/Resources/Images/73/reverb0.png new file mode 100644 index 0000000..998bccf --- /dev/null +++ b/common/Resources/Images/73/reverb0.png Binary files differ diff --git a/common/Resources/Images/73/reverb1.png b/common/Resources/Images/73/reverb1.png new file mode 100644 index 0000000..69978ed --- /dev/null +++ b/common/Resources/Images/73/reverb1.png Binary files differ diff --git a/common/Resources/Images/73/reverb2.png b/common/Resources/Images/73/reverb2.png new file mode 100644 index 0000000..d97a84a --- /dev/null +++ b/common/Resources/Images/73/reverb2.png Binary files differ diff --git a/common/Resources/Images/73/reverb3.png b/common/Resources/Images/73/reverb3.png new file mode 100644 index 0000000..1663e63 --- /dev/null +++ b/common/Resources/Images/73/reverb3.png Binary files differ diff --git a/common/Resources/Images/73/reverb4.png b/common/Resources/Images/73/reverb4.png new file mode 100644 index 0000000..26487cf --- /dev/null +++ b/common/Resources/Images/73/reverb4.png Binary files differ diff --git a/common/Resources/Images/73/reverb5.png b/common/Resources/Images/73/reverb5.png new file mode 100644 index 0000000..bf10188 --- /dev/null +++ b/common/Resources/Images/73/reverb5.png Binary files differ diff --git a/common/Resources/Images/73/rhodes.png b/common/Resources/Images/73/rhodes.png new file mode 100644 index 0000000..93d31f4 --- /dev/null +++ b/common/Resources/Images/73/rhodes.png Binary files differ diff --git a/common/Resources/Images/73/rhodessel.png b/common/Resources/Images/73/rhodessel.png new file mode 100644 index 0000000..eac1d77 --- /dev/null +++ b/common/Resources/Images/73/rhodessel.png Binary files differ diff --git a/common/Resources/Images/73/sampleBG.png b/common/Resources/Images/73/sampleBG.png new file mode 100644 index 0000000..39c75c7 --- /dev/null +++ b/common/Resources/Images/73/sampleBG.png Binary files differ diff --git a/common/Resources/Images/73/sampleNoteMask.png b/common/Resources/Images/73/sampleNoteMask.png new file mode 100644 index 0000000..4fe7cf4 --- /dev/null +++ b/common/Resources/Images/73/sampleNoteMask.png Binary files differ diff --git a/common/Resources/Images/73/sarangi.png b/common/Resources/Images/73/sarangi.png new file mode 100644 index 0000000..cb872ea --- /dev/null +++ b/common/Resources/Images/73/sarangi.png Binary files differ diff --git a/common/Resources/Images/73/sarangisel.png b/common/Resources/Images/73/sarangisel.png new file mode 100644 index 0000000..bca2d7e --- /dev/null +++ b/common/Resources/Images/73/sarangisel.png Binary files differ diff --git a/common/Resources/Images/73/saxo.png b/common/Resources/Images/73/saxo.png new file mode 100644 index 0000000..d2cc94d --- /dev/null +++ b/common/Resources/Images/73/saxo.png Binary files differ diff --git a/common/Resources/Images/73/saxosel.png b/common/Resources/Images/73/saxosel.png new file mode 100644 index 0000000..4523b5f --- /dev/null +++ b/common/Resources/Images/73/saxosel.png Binary files differ diff --git a/common/Resources/Images/73/saxsoprano.png b/common/Resources/Images/73/saxsoprano.png new file mode 100644 index 0000000..6b13d5d --- /dev/null +++ b/common/Resources/Images/73/saxsoprano.png Binary files differ diff --git a/common/Resources/Images/73/saxsopranosel.png b/common/Resources/Images/73/saxsopranosel.png new file mode 100644 index 0000000..4aa8a95 --- /dev/null +++ b/common/Resources/Images/73/saxsopranosel.png Binary files differ diff --git a/common/Resources/Images/73/scrollBar.png b/common/Resources/Images/73/scrollBar.png new file mode 100644 index 0000000..6b56ec4 --- /dev/null +++ b/common/Resources/Images/73/scrollBar.png Binary files differ diff --git a/common/Resources/Images/73/sheep.png b/common/Resources/Images/73/sheep.png new file mode 100644 index 0000000..1b50e4f --- /dev/null +++ b/common/Resources/Images/73/sheep.png Binary files differ diff --git a/common/Resources/Images/73/sheepsel.png b/common/Resources/Images/73/sheepsel.png new file mode 100644 index 0000000..4f26bcd --- /dev/null +++ b/common/Resources/Images/73/sheepsel.png Binary files differ diff --git a/common/Resources/Images/73/shenai.png b/common/Resources/Images/73/shenai.png new file mode 100644 index 0000000..f9b205e --- /dev/null +++ b/common/Resources/Images/73/shenai.png Binary files differ diff --git a/common/Resources/Images/73/shenaisel.png b/common/Resources/Images/73/shenaisel.png new file mode 100644 index 0000000..89c6425 --- /dev/null +++ b/common/Resources/Images/73/shenaisel.png Binary files differ diff --git a/common/Resources/Images/73/sitar.png b/common/Resources/Images/73/sitar.png new file mode 100644 index 0000000..0af9e10 --- /dev/null +++ b/common/Resources/Images/73/sitar.png Binary files differ diff --git a/common/Resources/Images/73/sitarsel.png b/common/Resources/Images/73/sitarsel.png new file mode 100644 index 0000000..e31fc0d --- /dev/null +++ b/common/Resources/Images/73/sitarsel.png Binary files differ diff --git a/common/Resources/Images/73/slap.png b/common/Resources/Images/73/slap.png new file mode 100644 index 0000000..93a35fb --- /dev/null +++ b/common/Resources/Images/73/slap.png Binary files differ diff --git a/common/Resources/Images/73/slapsel.png b/common/Resources/Images/73/slapsel.png new file mode 100644 index 0000000..8809531 --- /dev/null +++ b/common/Resources/Images/73/slapsel.png Binary files differ diff --git a/common/Resources/Images/73/sliderDrum.png b/common/Resources/Images/73/sliderDrum.png new file mode 100644 index 0000000..ccf19fd --- /dev/null +++ b/common/Resources/Images/73/sliderDrum.png Binary files differ diff --git a/common/Resources/Images/73/sliderEditTempo.png b/common/Resources/Images/73/sliderEditTempo.png new file mode 100644 index 0000000..10bbcdc --- /dev/null +++ b/common/Resources/Images/73/sliderEditTempo.png Binary files differ diff --git a/common/Resources/Images/73/sliderEditVolume.png b/common/Resources/Images/73/sliderEditVolume.png new file mode 100644 index 0000000..d38ae21 --- /dev/null +++ b/common/Resources/Images/73/sliderEditVolume.png Binary files differ diff --git a/common/Resources/Images/73/sliderInst1.png b/common/Resources/Images/73/sliderInst1.png new file mode 100644 index 0000000..11e7413 --- /dev/null +++ b/common/Resources/Images/73/sliderInst1.png Binary files differ diff --git a/common/Resources/Images/73/sliderInst2.png b/common/Resources/Images/73/sliderInst2.png new file mode 100644 index 0000000..536c67c --- /dev/null +++ b/common/Resources/Images/73/sliderInst2.png Binary files differ diff --git a/common/Resources/Images/73/sliderInst3.png b/common/Resources/Images/73/sliderInst3.png new file mode 100644 index 0000000..f2c785f --- /dev/null +++ b/common/Resources/Images/73/sliderInst3.png Binary files differ diff --git a/common/Resources/Images/73/sliderInst4.png b/common/Resources/Images/73/sliderInst4.png new file mode 100644 index 0000000..079aed5 --- /dev/null +++ b/common/Resources/Images/73/sliderInst4.png Binary files differ diff --git a/common/Resources/Images/73/sliderbutbleu.png b/common/Resources/Images/73/sliderbutbleu.png new file mode 100644 index 0000000..46278d2 --- /dev/null +++ b/common/Resources/Images/73/sliderbutbleu.png Binary files differ diff --git a/common/Resources/Images/73/sliderbutjaune.png b/common/Resources/Images/73/sliderbutjaune.png new file mode 100644 index 0000000..40bfcfc --- /dev/null +++ b/common/Resources/Images/73/sliderbutjaune.png Binary files differ diff --git a/common/Resources/Images/73/sliderbutred.png b/common/Resources/Images/73/sliderbutred.png new file mode 100644 index 0000000..6c31e98 --- /dev/null +++ b/common/Resources/Images/73/sliderbutred.png Binary files differ diff --git a/common/Resources/Images/73/sliderbutvert.png b/common/Resources/Images/73/sliderbutvert.png new file mode 100644 index 0000000..c2d6874 --- /dev/null +++ b/common/Resources/Images/73/sliderbutvert.png Binary files differ diff --git a/common/Resources/Images/73/sliderbutviolet.png b/common/Resources/Images/73/sliderbutviolet.png new file mode 100644 index 0000000..7ef5f16 --- /dev/null +++ b/common/Resources/Images/73/sliderbutviolet.png Binary files differ diff --git a/common/Resources/Images/73/sliderlong.png b/common/Resources/Images/73/sliderlong.png new file mode 100644 index 0000000..2096202 --- /dev/null +++ b/common/Resources/Images/73/sliderlong.png Binary files differ diff --git a/common/Resources/Images/73/slidershort.png b/common/Resources/Images/73/slidershort.png new file mode 100644 index 0000000..0fa8aab --- /dev/null +++ b/common/Resources/Images/73/slidershort.png Binary files differ diff --git a/common/Resources/Images/73/stop.png b/common/Resources/Images/73/stop.png new file mode 100644 index 0000000..a8cf7e6 --- /dev/null +++ b/common/Resources/Images/73/stop.png Binary files differ diff --git a/common/Resources/Images/73/strings.png b/common/Resources/Images/73/strings.png new file mode 100644 index 0000000..751c3eb --- /dev/null +++ b/common/Resources/Images/73/strings.png Binary files differ diff --git a/common/Resources/Images/73/stringssel.png b/common/Resources/Images/73/stringssel.png new file mode 100644 index 0000000..e312143 --- /dev/null +++ b/common/Resources/Images/73/stringssel.png Binary files differ diff --git a/common/Resources/Images/73/synthTam.png b/common/Resources/Images/73/synthTam.png new file mode 100644 index 0000000..5a23fc1 --- /dev/null +++ b/common/Resources/Images/73/synthTam.png Binary files differ diff --git a/common/Resources/Images/73/synthTamDown.png b/common/Resources/Images/73/synthTamDown.png new file mode 100644 index 0000000..941b345 --- /dev/null +++ b/common/Resources/Images/73/synthTamDown.png Binary files differ diff --git a/common/Resources/Images/73/synthTamOver.png b/common/Resources/Images/73/synthTamOver.png new file mode 100644 index 0000000..3063284 --- /dev/null +++ b/common/Resources/Images/73/synthTamOver.png Binary files differ diff --git a/common/Resources/Images/73/synthlabMask.png b/common/Resources/Images/73/synthlabMask.png new file mode 100644 index 0000000..8cae1ac --- /dev/null +++ b/common/Resources/Images/73/synthlabMask.png Binary files differ diff --git a/common/Resources/Images/73/tchiwo.png b/common/Resources/Images/73/tchiwo.png new file mode 100644 index 0000000..69a477c --- /dev/null +++ b/common/Resources/Images/73/tchiwo.png Binary files differ diff --git a/common/Resources/Images/73/tchiwosel.png b/common/Resources/Images/73/tchiwosel.png new file mode 100644 index 0000000..bb43d12 --- /dev/null +++ b/common/Resources/Images/73/tchiwosel.png Binary files differ diff --git a/common/Resources/Images/73/templebell.png b/common/Resources/Images/73/templebell.png new file mode 100644 index 0000000..872c7f5 --- /dev/null +++ b/common/Resources/Images/73/templebell.png Binary files differ diff --git a/common/Resources/Images/73/templebellsel.png b/common/Resources/Images/73/templebellsel.png new file mode 100644 index 0000000..118f58d --- /dev/null +++ b/common/Resources/Images/73/templebellsel.png Binary files differ diff --git a/common/Resources/Images/73/tempo1.png b/common/Resources/Images/73/tempo1.png new file mode 100644 index 0000000..129a907 --- /dev/null +++ b/common/Resources/Images/73/tempo1.png Binary files differ diff --git a/common/Resources/Images/73/tempo2.png b/common/Resources/Images/73/tempo2.png new file mode 100644 index 0000000..825676a --- /dev/null +++ b/common/Resources/Images/73/tempo2.png Binary files differ diff --git a/common/Resources/Images/73/tempo3.png b/common/Resources/Images/73/tempo3.png new file mode 100644 index 0000000..15f04b0 --- /dev/null +++ b/common/Resources/Images/73/tempo3.png Binary files differ diff --git a/common/Resources/Images/73/tempo4.png b/common/Resources/Images/73/tempo4.png new file mode 100644 index 0000000..a6fb245 --- /dev/null +++ b/common/Resources/Images/73/tempo4.png Binary files differ diff --git a/common/Resources/Images/73/tempo5.png b/common/Resources/Images/73/tempo5.png new file mode 100644 index 0000000..0595ef5 --- /dev/null +++ b/common/Resources/Images/73/tempo5.png Binary files differ diff --git a/common/Resources/Images/73/tempo6.png b/common/Resources/Images/73/tempo6.png new file mode 100644 index 0000000..6c8f36a --- /dev/null +++ b/common/Resources/Images/73/tempo6.png Binary files differ diff --git a/common/Resources/Images/73/tempo7.png b/common/Resources/Images/73/tempo7.png new file mode 100644 index 0000000..45a2c80 --- /dev/null +++ b/common/Resources/Images/73/tempo7.png Binary files differ diff --git a/common/Resources/Images/73/tempo8.png b/common/Resources/Images/73/tempo8.png new file mode 100644 index 0000000..ef959a2 --- /dev/null +++ b/common/Resources/Images/73/tempo8.png Binary files differ diff --git a/common/Resources/Images/73/trackBG.png b/common/Resources/Images/73/trackBG.png new file mode 100644 index 0000000..177d9b6 --- /dev/null +++ b/common/Resources/Images/73/trackBG.png Binary files differ diff --git a/common/Resources/Images/73/trackBGDrum.png b/common/Resources/Images/73/trackBGDrum.png new file mode 100644 index 0000000..38cec90 --- /dev/null +++ b/common/Resources/Images/73/trackBGDrum.png Binary files differ diff --git a/common/Resources/Images/73/trackBGDrumSelected.png b/common/Resources/Images/73/trackBGDrumSelected.png new file mode 100644 index 0000000..01b3c7e --- /dev/null +++ b/common/Resources/Images/73/trackBGDrumSelected.png Binary files differ diff --git a/common/Resources/Images/73/trackBGSelected.png b/common/Resources/Images/73/trackBGSelected.png new file mode 100644 index 0000000..9a07a6f --- /dev/null +++ b/common/Resources/Images/73/trackBGSelected.png Binary files differ diff --git a/common/Resources/Images/73/triangle.png b/common/Resources/Images/73/triangle.png new file mode 100644 index 0000000..600a236 --- /dev/null +++ b/common/Resources/Images/73/triangle.png Binary files differ diff --git a/common/Resources/Images/73/trianglesel.png b/common/Resources/Images/73/trianglesel.png new file mode 100644 index 0000000..ce52407 --- /dev/null +++ b/common/Resources/Images/73/trianglesel.png Binary files differ diff --git a/common/Resources/Images/73/trumpet.png b/common/Resources/Images/73/trumpet.png new file mode 100644 index 0000000..956d8f0 --- /dev/null +++ b/common/Resources/Images/73/trumpet.png Binary files differ diff --git a/common/Resources/Images/73/trumpetsel.png b/common/Resources/Images/73/trumpetsel.png new file mode 100644 index 0000000..4a61b50 --- /dev/null +++ b/common/Resources/Images/73/trumpetsel.png Binary files differ diff --git a/common/Resources/Images/73/tuba.png b/common/Resources/Images/73/tuba.png new file mode 100644 index 0000000..12ca664 --- /dev/null +++ b/common/Resources/Images/73/tuba.png Binary files differ diff --git a/common/Resources/Images/73/tubasel.png b/common/Resources/Images/73/tubasel.png new file mode 100644 index 0000000..50dd738 --- /dev/null +++ b/common/Resources/Images/73/tubasel.png Binary files differ diff --git a/common/Resources/Images/73/ukulele.png b/common/Resources/Images/73/ukulele.png new file mode 100644 index 0000000..818715f --- /dev/null +++ b/common/Resources/Images/73/ukulele.png Binary files differ diff --git a/common/Resources/Images/73/ukulelesel.png b/common/Resources/Images/73/ukulelesel.png new file mode 100644 index 0000000..d32f55f --- /dev/null +++ b/common/Resources/Images/73/ukulelesel.png Binary files differ diff --git a/common/Resources/Images/73/violin.png b/common/Resources/Images/73/violin.png new file mode 100644 index 0000000..2d1d05a --- /dev/null +++ b/common/Resources/Images/73/violin.png Binary files differ diff --git a/common/Resources/Images/73/violinsel.png b/common/Resources/Images/73/violinsel.png new file mode 100644 index 0000000..78ef758 --- /dev/null +++ b/common/Resources/Images/73/violinsel.png Binary files differ diff --git a/common/Resources/Images/73/voix.png b/common/Resources/Images/73/voix.png new file mode 100644 index 0000000..60d62bc --- /dev/null +++ b/common/Resources/Images/73/voix.png Binary files differ diff --git a/common/Resources/Images/73/voixsel.png b/common/Resources/Images/73/voixsel.png new file mode 100644 index 0000000..9ce06ad --- /dev/null +++ b/common/Resources/Images/73/voixsel.png Binary files differ diff --git a/common/Resources/Images/73/volume0.png b/common/Resources/Images/73/volume0.png new file mode 100644 index 0000000..bb3b04f --- /dev/null +++ b/common/Resources/Images/73/volume0.png Binary files differ diff --git a/common/Resources/Images/73/volume1.png b/common/Resources/Images/73/volume1.png new file mode 100644 index 0000000..fb59c95 --- /dev/null +++ b/common/Resources/Images/73/volume1.png Binary files differ diff --git a/common/Resources/Images/73/volume2.png b/common/Resources/Images/73/volume2.png new file mode 100644 index 0000000..5bfffe1 --- /dev/null +++ b/common/Resources/Images/73/volume2.png Binary files differ diff --git a/common/Resources/Images/73/volume3.png b/common/Resources/Images/73/volume3.png new file mode 100644 index 0000000..93c9eff --- /dev/null +++ b/common/Resources/Images/73/volume3.png Binary files differ diff --git a/common/Resources/Images/73/water.png b/common/Resources/Images/73/water.png new file mode 100644 index 0000000..2c8c24a --- /dev/null +++ b/common/Resources/Images/73/water.png Binary files differ diff --git a/common/Resources/Images/73/watersel.png b/common/Resources/Images/73/watersel.png new file mode 100644 index 0000000..825bccb --- /dev/null +++ b/common/Resources/Images/73/watersel.png Binary files differ diff --git a/common/Resources/Images/73/winds.png b/common/Resources/Images/73/winds.png new file mode 100644 index 0000000..bd467da --- /dev/null +++ b/common/Resources/Images/73/winds.png Binary files differ diff --git a/common/Resources/Images/73/windssel.png b/common/Resources/Images/73/windssel.png new file mode 100644 index 0000000..0c5fd75 --- /dev/null +++ b/common/Resources/Images/73/windssel.png Binary files differ diff --git a/common/Resources/Images/73/zap.png b/common/Resources/Images/73/zap.png new file mode 100644 index 0000000..e1a4a30 --- /dev/null +++ b/common/Resources/Images/73/zap.png Binary files differ diff --git a/common/Resources/Images/73/zapsel.png b/common/Resources/Images/73/zapsel.png new file mode 100644 index 0000000..43234ed --- /dev/null +++ b/common/Resources/Images/73/zapsel.png Binary files differ diff --git a/common/Resources/Images/checkOff.png b/common/Resources/Images/checkOff.png new file mode 100644 index 0000000..8df162a --- /dev/null +++ b/common/Resources/Images/checkOff.png Binary files differ diff --git a/common/Resources/Images/checkOff.svg b/common/Resources/Images/checkOff.svg deleted file mode 100644 index 9357b87..0000000 --- a/common/Resources/Images/checkOff.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/common/Resources/Images/checkOn.png b/common/Resources/Images/checkOn.png new file mode 100644 index 0000000..83c2913 --- /dev/null +++ b/common/Resources/Images/checkOn.png Binary files differ diff --git a/common/Resources/Images/checkOn.svg b/common/Resources/Images/checkOn.svg deleted file mode 100644 index 5b91ddf..0000000 --- a/common/Resources/Images/checkOn.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - 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..3fc2ecb 100644 --- a/common/Util/Instruments.py +++ b/common/Util/Instruments.py @@ -2,6 +2,7 @@ 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 @@ -19,8 +20,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 -- cgit v0.9.1