Add singular access point for getting image files; add 73% scaled images for resolution <=800

5 files changed, 150 insertions, 86 deletions

diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py
index 996f517..e2b41e4 100644
--- a/Edit/EditToolbars.py
+++ b/Edit/EditToolbars.py
@@ -525,13 +525,13 @@ class generationPalette(Palette):
         self.predrawIdleAbort = False
         self.predrawBuffer = False
         # self.predrawBuffer is initialized in handlePreviewAlloc
-        pix = gtk.gdk.pixbuf_new_from_file( Config.IMAGE_ROOT+"sampleBG.png" )
+        pix = gtk.gdk.pixbuf_new_from_file(imagefile('sampleBG.png'))
         self.sampleBg = gtk.gdk.Pixmap( win, pix.get_width(), pix.get_height() )
         self.sampleBg.draw_pixbuf( self.gc, pix, 0, 0, 0, 0, pix.get_width(), pix.get_height(), gtk.gdk.RGB_DITHER_NONE )
         self.sampleBg.endOffset = pix.get_width()-5
         self.sampleNoteHeight = 7
         if True:  # load clipmask
-            pix = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT+'sampleNoteMask.png')
+            pix = gtk.gdk.pixbuf_new_from_file(imagefile('sampleNoteMask.png'))
             pixels = pix.get_pixels()
             stride = pix.get_rowstride()
             channels = pix.get_n_channels()
@@ -830,7 +830,10 @@ class propertiesPalette(Palette):
         self.pageColorLabel = gtk.Label(_('Page color: '))
         self.pageColorComboBox = BigComboBox()
         for color in (0,1,2,3):
-            self.pageColorComboBox.append_item(color, text = None, icon_name = Config.IMAGE_ROOT + 'pageThumbnailBG' + str(color) + '.png', size = (30,40))
+            self.pageColorComboBox.append_item(color, text=None,
+                    icon_name=imagefile(
+                        'pageThumbnailBG' + str(color) + '.png'),
+                    size=(30,40))
         self.pageColorComboBox.set_active(0)
         self.pageColorComboBox.connect('changed', self.handleColor)
         self.pageColorBox.pack_start(self.pageColorLabel, False, False, padding = 5)
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py
index 4351985..a9c04bf 100644
--- a/Edit/MainWindow.py
+++ b/Edit/MainWindow.py
@@ -133,9 +133,11 @@ class MainWindow(gtk.EventBox):
                 self.GUI["2instrumentIcons"] = {}
                 for i in instruments:
                     try:
-                        self.GUI["2instrumentIcons"][i.name] = gtk.gdk.pixbuf_new_from_file(i.img)
+                        pixbuf = gtk.gdk.pixbuf_new_from_file(i.img)
                     except:
-                        self.GUI["2instrumentIcons"][i.name] = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT + 'generic.png')
+                        pixbuf = gtk.gdk.pixbuf_new_from_file(
+                                imagefile('generic.png'))
+                    self.GUI['2instrumentIcons'][i.name] = pixbuf
             TP.ProfileBegin("init_GUI::instrument icons")
             draw_inst_icons()
             TP.ProfileEnd("init_GUI::instrument icons")
@@ -163,7 +165,8 @@ class MainWindow(gtk.EventBox):
                 #self.GUI["2instrument1volumeSlider"].set_inverted(True)
                 #self.GUI["2instrument1volumeSlider"].set_size_request( 30, -1 )
                 #self.GUI["2instrument1volumeAdjustment"].connect( "value-changed", self.handleTrackVolume, 0 )
-                self.GUI["2instrument1muteButton"] = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg")
+                self.GUI["2instrument1muteButton"] = ImageToggleButton(
+                        'checkOff.png', 'checkOn.png')
                 self.GUI["2instrument1muteButton"].connect("toggled",self.handlemuteButton,0)
                 self.GUI["2instrument1muteButton"].connect("button-press-event",self.handlemuteButtonRightClick,0)
                 self.GUI["2instrument1muteButton"].set_active(True)
@@ -186,7 +189,8 @@ class MainWindow(gtk.EventBox):
                 #self.GUI["2instrument2volumeSlider"].set_inverted(True)
                 #self.GUI["2instrument2volumeSlider"].set_size_request( 30, -1 )
                 #self.GUI["2instrument2volumeAdjustment"].connect( "value-changed", self.handleTrackVolume, 1 )
-                self.GUI["2instrument2muteButton"] = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg")
+                self.GUI["2instrument2muteButton"] = ImageToggleButton(
+                        'checkOff.png', 'checkOn.png')
                 self.GUI["2instrument2muteButton"].connect("toggled",self.handlemuteButton,1)
                 self.GUI["2instrument2muteButton"].connect("button-press-event",self.handlemuteButtonRightClick,1)
                 self.GUI["2instrument2muteButton"].set_active(True)
@@ -209,7 +213,8 @@ class MainWindow(gtk.EventBox):
                 #self.GUI["2instrument3volumeSlider"].set_inverted(True)
                 #elf.GUI["2instrument3volumeSlider"].set_size_request( 30, -1 )
                 #self.GUI["2instrument3volumeAdjustment"].connect( "value-changed", self.handleTrackVolume, 2 )
-                self.GUI["2instrument3muteButton"] = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg")
+                self.GUI["2instrument3muteButton"] = ImageToggleButton(
+                        'checkOff.png', 'checkOn.png')
                 self.GUI["2instrument3muteButton"].connect("toggled",self.handlemuteButton,2)
                 self.GUI["2instrument3muteButton"].connect("button-press-event",self.handlemuteButtonRightClick,2)
                 self.GUI["2instrument3muteButton"].set_active(True)
@@ -232,7 +237,8 @@ class MainWindow(gtk.EventBox):
                 #self.GUI["2instrument4volumeSlider"].set_inverted(True)
                 #self.GUI["2instrument4volumeSlider"].set_size_request( 30, -1 )
                 #self.GUI["2instrument4volumeAdjustment"].connect( "value-changed", self.handleTrackVolume, 3 )
-                self.GUI["2instrument4muteButton"] = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg")
+                self.GUI["2instrument4muteButton"] = ImageToggleButton(
+                        'checkOff.png', 'checkOn.png')
                 self.GUI["2instrument4muteButton"].connect("toggled",self.handlemuteButton,3)
                 self.GUI["2instrument4muteButton"].connect("button-press-event",self.handlemuteButtonRightClick,3)
                 self.GUI["2instrument4muteButton"].set_active(True)
@@ -255,14 +261,17 @@ class MainWindow(gtk.EventBox):
                 #self.GUI["2drumvolumeSlider"].set_inverted(True)
                 #self.GUI["2drumvolumeSlider"].set_size_request( 30, -1 )
                 self.GUI["2drumvolumeAdjustment"].connect( "value-changed", self.handleTrackVolume, 4 )
-                self.GUI["2drumMuteButton"] = ImageToggleButton(Config.IMAGE_ROOT+"checkOff.svg",Config.IMAGE_ROOT+"checkOn.svg")
+                self.GUI["2drumMuteButton"] = ImageToggleButton(
+                        'checkOff.png', 'checkOn.png')
                 self.GUI["2drumMuteButton"].connect("toggled",self.handlemuteButton,4)
                 self.GUI["2drumMuteButton"].connect("button-press-event",self.handlemuteButtonRightClick,4)
                 self.GUI["2drumMuteButton"].set_active(True)
                 #self.GUI["2drumVolBox"].pack_start( self.GUI["2drumvolumeSlider"], True, True, 0 )
                 #self.GUI["2drumVolBox"].pack_start( self.GUI["2drumMuteButton"], False, False, 5 )
                 self.GUI["2drumBox"].pack_start( self.GUI["2drumVolBox"], False, False, 0 )
-                self.GUI["2drumButton"] = ImageToggleButton(Config.IMAGE_ROOT + self.trackInstrument[4].name + '.png', Config.IMAGE_ROOT + self.trackInstrument[4].name + '.png')
+                self.GUI["2drumButton"] = ImageToggleButton(
+                        self.trackInstrument[4].name + '.png',
+                        self.trackInstrument[4].name + '.png')
                 self.GUI["2drumPalette"] = drumPalette(_('Track 5 Properties'), self, 4)
                 self.GUI["2drumButton"].connect("toggled", self.pickDrum)
                 self.GUI["2drumButton"].connect('button-release-event',self.GUI["2drumPalette"].setBlock)
@@ -907,7 +916,7 @@ class MainWindow(gtk.EventBox):
         self._data["volume"] = round(widget.get_value())
         self.csnd.setMasterVolume(self._data["volume"])
         img = min(3,int(4*self._data["volume"]/100)) # volume 0-3
-        #self.GUI["2volumeImage"].set_from_file( Config.IMAGE_ROOT+"volume"+str(img)+".png" )
+        #self.GUI["2volumeImage"].set_from_file(imagefile('volume' + str(img) + '.png'))
 
     def initTrackVolume(self):
         for i in range(Config.NUMBER_OF_TRACKS):
@@ -926,7 +935,7 @@ class MainWindow(gtk.EventBox):
     def handleTempo(self, widget):
         self._data['tempo'] = round(widget.get_value())
         img = min(7,int(8*(self._data["tempo"]-widget.lower)/(widget.upper-widget.lower)))+1  # tempo 1-8
-        #self.GUI["2tempoImage"].set_from_file( Config.IMAGE_ROOT+"tempo"+str(img)+".png" )
+        #self.GUI["2tempoImage"].set_from_file(imagefile('tempo' + str(img) + '.png'))
         if self.playing:
             self.csnd.setTempo(self._data['tempo'])
 
@@ -2202,9 +2211,9 @@ class instrumentPalette(Popup):
         self.categories = Config.CATEGORIES
         self.categoryBox = BigComboBox()
         for category in self.categories:
-            image = Config.IMAGE_ROOT + category.lower() + '.png'
+            image = imagefile(category.lower() + '.png')
             if not os.path.isfile(image):
-                image = Config.IMAGE_ROOT + 'generic.png'
+                image = imagefile('generic.png')
             self.categoryBox.append_item(category, category.capitalize(),
                     icon_name = image, size = instrumentPalette.ICON_SIZE)
         self.categoryBox.connect('changed', self.handleCategoryChange)
@@ -2355,9 +2364,9 @@ class drumPalette(Popup):
     def loadDrumMenu(self, instruments):
         self.drumBox.remove_all()
         for instrument in instruments:
-            image = Config.IMAGE_ROOT + instrument + '.png'
+            image = imagefile(instrument + '.png')
             if not os.path.isfile(image):
-                image = Config.IMAGE_ROOT + 'generic.png'
+                image = imagefile('generic.png')
             self.drumBox.append_item(instrument, text = None, icon_name = image, size = instrumentPalette.ICON_SIZE)
 
     def getDrums(self):
diff --git a/Edit/Properties.py b/Edit/Properties.py
index 2dc6d84..b6baf9d 100644
--- a/Edit/Properties.py
+++ b/Edit/Properties.py
@@ -60,30 +60,39 @@ class Properties( gtk.VBox ):
         self.pageBox.set_radius(10)
         beatBox = gtk.VBox()
         self.beatAdjust = gtk.Adjustment( 4, 2, 12, 1, 1, 0)
-        self.GUI['beatSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.beatAdjust, 7 )
+        self.GUI['beatSlider'] = ImageVScale('sliderEditVolume.png',
+                self.beatAdjust, 7)
         self.GUI['beatSlider'].connect("button-release-event", self.handleBeat)
         self.GUI['beatSlider'].set_snap( 1 )
         self.GUI['beatSlider'].set_inverted(True)
         self.GUI['beatSlider'].set_size_request(50, 200)
         beatBox.pack_start( self.GUI['beatSlider'] )
         self.beatLabel = gtk.Image()
-        self.beatLabel.set_from_file(Config.IMAGE_ROOT + 'volume3.png')
+        self.beatLabel.set_from_file(imagefile('volume3.png'))
         self.beatAdjust.connect("value-changed", self.updateBeatLabel)
         self.updateBeatLabel( self.beatAdjust )
         beatBox.pack_start( self.beatLabel )
         self.pageBox.pack_start( beatBox )
         colorBox = gtk.VBox()
-        self.GUI["color0Button"] = ImageRadioButton( None, Config.IMAGE_ROOT+"pageThumbnailBut0.png", Config.IMAGE_ROOT+"pageThumbnailBut0Down.png", backgroundFill = Config.PANEL_COLOR )
+        self.GUI["color0Button"] = ImageRadioButton(None,
+                'pageThumbnailBut0.png', 'pageThumbnailBut0Down.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI["color0Button"].set_size_request( 80, -1 )
         self.GUI["color0Button"].connect( "clicked", self.handleColor, 0 )
         colorBox.pack_start( self.GUI["color0Button"] )
-        self.GUI["color1Button"] = ImageRadioButton( self.GUI["color0Button"], Config.IMAGE_ROOT+"pageThumbnailBut1.png", Config.IMAGE_ROOT+"pageThumbnailBut1Down.png", backgroundFill = Config.PANEL_COLOR )
+        self.GUI["color1Button"] = ImageRadioButton(self.GUI['color0Button'],
+                'pageThumbnailBut1.png', 'pageThumbnailBut1Down.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI["color1Button"].connect( "clicked", self.handleColor, 1 )
         colorBox.pack_start( self.GUI["color1Button"] )
-        self.GUI["color2Button"] = ImageRadioButton( self.GUI["color0Button"], Config.IMAGE_ROOT+"pageThumbnailBut2.png", Config.IMAGE_ROOT+"pageThumbnailBut2Down.png", backgroundFill = Config.PANEL_COLOR )
+        self.GUI["color2Button"] = ImageRadioButton(self.GUI['color0Button'],
+                'pageThumbnailBut2.png', 'pageThumbnailBut2Down.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI["color2Button"].connect( "clicked", self.handleColor, 2 )
         colorBox.pack_start( self.GUI["color2Button"] )
-        self.GUI["color3Button"] = ImageRadioButton( self.GUI["color0Button"], Config.IMAGE_ROOT+"pageThumbnailBut3.png", Config.IMAGE_ROOT+"pageThumbnailBut3Down.png", backgroundFill = Config.PANEL_COLOR )
+        self.GUI["color3Button"] = ImageRadioButton(self.GUI['color0Button'],
+                'pageThumbnailBut3.png', 'pageThumbnailBut3Down.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI["color3Button"].connect( "clicked", self.handleColor, 3 )
         colorBox.pack_start( self.GUI["color3Button"] )
         self.pageBox.pack_start( colorBox )
@@ -94,16 +103,22 @@ class Properties( gtk.VBox ):
         pitchBox = RoundVBox(fillcolor=Config.PANEL_COLOR, bordercolor=Config.INST_BCK_COLOR)
         pitchBox.set_border_width(3)
         pitchBox.set_radius(10)
-        self.GUI['pitchUp'] = ImageButton( Config.IMAGE_ROOT+"arrowEditUp.png", Config.IMAGE_ROOT+"arrowEditUpDown.png", Config.IMAGE_ROOT+"arrowEditUpOver.png", backgroundFill = Config.PANEL_COLOR )
+        self.GUI['pitchUp'] = ImageButton('arrowEditUp.png',
+                'arrowEditUpDown.png', 'arrowEditUpOver.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI['pitchUp'].connect( "clicked", lambda w:self.stepPitch( 1 ) )
-        self.GUI['pitchGen'] = ImageToggleButton( Config.IMAGE_ROOT+"diceProp.png", Config.IMAGE_ROOT+"dicePropSel.png", Config.IMAGE_ROOT+"dicePropSel.png", backgroundFill = Config.PANEL_COLOR )
+        self.GUI['pitchGen'] = ImageToggleButton('diceProp.png',
+                'dicePropSel.png', 'dicePropSel.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI['pitchGen'].connect( "clicked", self.openAlgoBox, 'pitch' )
         pitchBox.pack_start( self.GUI['pitchGen'], False, False, 5 )
         pitchBox.pack_start( self.GUI['pitchUp'] )
         self.pitchIcon = gtk.Image()
-        self.pitchIcon.set_from_file(Config.IMAGE_ROOT + 'propPitch2.png')
+        self.pitchIcon.set_from_file(imagefile('propPitch2.png'))
         pitchBox.pack_start(self.pitchIcon)
-        self.GUI['pitchDown'] = ImageButton( Config.IMAGE_ROOT+"arrowEditDown.png", Config.IMAGE_ROOT+"arrowEditDownDown.png", Config.IMAGE_ROOT+"arrowEditDownOver.png", backgroundFill = Config.PANEL_COLOR )
+        self.GUI['pitchDown'] = ImageButton('arrowEditDown.png',
+                'arrowEditDownDown.png', 'arrowEditDownOver.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI['pitchDown'].connect( "clicked", lambda w:self.stepPitch( -1 ) )
         pitchBox.pack_start( self.GUI['pitchDown'] )
         self.controlsBox.pack_start(pitchBox)
@@ -111,16 +126,22 @@ class Properties( gtk.VBox ):
         volumeBox = RoundVBox(fillcolor=Config.PANEL_COLOR, bordercolor=Config.INST_BCK_COLOR)
         volumeBox.set_border_width(3)
         volumeBox.set_radius(10)
-        self.GUI['volumeUp'] = ImageButton( Config.IMAGE_ROOT+"arrowEditUp.png", Config.IMAGE_ROOT+"arrowEditUpDown.png", Config.IMAGE_ROOT+"arrowEditUpOver.png", backgroundFill = Config.PANEL_COLOR )
+        self.GUI['volumeUp'] = ImageButton('arrowEditUp.png',
+                'arrowEditUpDown.png', 'arrowEditUpOver.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI['volumeUp'].connect( "clicked", lambda w:self.stepVolume( 0.1 ) )
-        self.GUI['volumeGen'] = ImageToggleButton( Config.IMAGE_ROOT+"diceProp.png", Config.IMAGE_ROOT+"dicePropSel.png", Config.IMAGE_ROOT+"dicePropSel.png", backgroundFill = Config.PANEL_COLOR )
+        self.GUI['volumeGen'] = ImageToggleButton('diceProp.png',
+                'dicePropSel.png', 'dicePropSel.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI['volumeGen'].connect( "clicked", self.openAlgoBox, 'volume' )
         volumeBox.pack_start( self.GUI['volumeGen'], False, False, 5 )
         volumeBox.pack_start( self.GUI['volumeUp'] )
         self.volumeIcon = gtk.Image()
-        self.volumeIcon.set_from_file(Config.IMAGE_ROOT + 'volume3.png')
+        self.volumeIcon.set_from_file(imagefile('volume3.png'))
         volumeBox.pack_start(self.volumeIcon)
-        self.GUI['volumeDown'] = ImageButton( Config.IMAGE_ROOT+"arrowEditDown.png", Config.IMAGE_ROOT+"arrowEditDownDown.png", Config.IMAGE_ROOT+"arrowEditDownOver.png", backgroundFill = Config.PANEL_COLOR )
+        self.GUI['volumeDown'] = ImageButton('arrowEditDown.png',
+                'arrowEditDownDown.png', 'arrowEditDownOver.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI['volumeDown'].connect( "clicked", lambda w:self.stepVolume( -0.1 ) )
         volumeBox.pack_start( self.GUI['volumeDown'] )
         self.controlsBox.pack_start(volumeBox)
@@ -129,14 +150,17 @@ class Properties( gtk.VBox ):
         panBox.set_border_width(3)
         panBox.set_radius(10)
         self.panAdjust = gtk.Adjustment( 0.5, 0, 1, .1, .1, 0)
-        self.GUI['panSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.panAdjust, 7 )
+        self.GUI['panSlider'] = ImageVScale('sliderEditVolume.png',
+                self.panAdjust, 7)
         self.panAdjust.connect("value-changed", self.handlePan)
         self.GUI['panSlider'].set_snap( 0.1 )
         self.GUI['panSlider'].set_inverted(True)
         self.GUI['panSlider'].set_size_request(50, 200)
         self.panLabel = gtk.Image()
         self.handlePan( self.panAdjust )
-        self.GUI['panGen'] = ImageToggleButton( Config.IMAGE_ROOT+"diceProp.png", Config.IMAGE_ROOT+"dicePropSel.png", Config.IMAGE_ROOT+"dicePropSel.png", backgroundFill = Config.PANEL_COLOR )
+        self.GUI['panGen'] = ImageToggleButton('diceProp.png',
+                'dicePropSel.png', 'dicePropSel.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI['panGen'].connect( "clicked", self.openAlgoBox, 'pan' )
         panBox.pack_start(self.GUI['panGen'], True, True, 5)
         panBox.pack_start(self.GUI['panSlider'], True, True, 5)
@@ -147,14 +171,17 @@ class Properties( gtk.VBox ):
         reverbBox.set_border_width(3)
         reverbBox.set_radius(10)
         self.reverbAdjust = gtk.Adjustment(0.1, 0, 1, 0.1, 0.1, 0)
-        self.GUI['reverbSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.reverbAdjust, 7 )
+        self.GUI['reverbSlider'] = ImageVScale('sliderEditVolume.png',
+                self.reverbAdjust, 7)
         self.reverbAdjust.connect("value-changed", self.handleReverb)
         self.GUI['reverbSlider'].set_snap( 0.1 )
         self.GUI['reverbSlider'].set_inverted(True)
         self.GUI['reverbSlider'].set_size_request(50, 200)
         self.reverbLabel = gtk.Image()
         self.handleReverb( self.reverbAdjust )
-        self.GUI['reverbGen'] = ImageToggleButton( Config.IMAGE_ROOT+"diceProp.png", Config.IMAGE_ROOT+"dicePropSel.png", Config.IMAGE_ROOT+"dicePropSel.png", backgroundFill = Config.PANEL_COLOR )
+        self.GUI['reverbGen'] = ImageToggleButton('diceProp.png',
+                'dicePropSel.png', 'dicePropSel.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI['reverbGen'].connect( "clicked", self.openAlgoBox, 'reverb' )
         reverbBox.pack_start(self.GUI['reverbGen'], True, True, 5)        
         reverbBox.pack_start(self.GUI['reverbSlider'], True, True, 5)
@@ -165,14 +192,17 @@ class Properties( gtk.VBox ):
         attackBox.set_border_width(3)
         attackBox.set_radius(10)
         self.attackAdjust = gtk.Adjustment(0.04, 0.03, 1, .01, .01, 0)
-        self.GUI['attackSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.attackAdjust, 7 )
+        self.GUI['attackSlider'] = ImageVScale('sliderEditVolume.png',
+                self.attackAdjust, 7)
         self.attackAdjust.connect("value-changed", self.handleAttack)
         self.GUI['attackSlider'].set_snap( 0.01 )
         self.GUI['attackSlider'].set_inverted(True)
         self.GUI['attackSlider'].set_size_request(50, 200)
         self.attackLabel = gtk.Image()
         self.handleAttack( self.attackAdjust )
-        self.GUI['attackGen'] = ImageToggleButton( Config.IMAGE_ROOT+"diceProp.png", Config.IMAGE_ROOT+"dicePropSel.png", Config.IMAGE_ROOT+"dicePropSel.png", backgroundFill = Config.PANEL_COLOR )
+        self.GUI['attackGen'] = ImageToggleButton('diceProp.png',
+                'dicePropSel.png', 'dicePropSel.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI['attackGen'].connect( "clicked", self.openAlgoBox, 'attack' )
         attackBox.pack_start(self.GUI['attackGen'], True, True, 5)        
         attackBox.pack_start(self.GUI['attackSlider'], True, True, 5)
@@ -183,14 +213,17 @@ class Properties( gtk.VBox ):
         decayBox.set_border_width(3)
         decayBox.set_radius(10)
         self.decayAdjust = gtk.Adjustment(0.31, 0.03, 1, .01, .01, 0)
-        self.GUI['decaySlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.decayAdjust, 7 )
+        self.GUI['decaySlider'] = ImageVScale('sliderEditVolume.png',
+                self.decayAdjust, 7)
         self.decayAdjust.connect("value-changed", self.handleDecay)
         self.GUI['decaySlider'].set_snap( 0.01 )
         self.GUI['decaySlider'].set_inverted(True)
         self.GUI['decaySlider'].set_size_request(50, 200)
         self.decayLabel = gtk.Image()
         self.handleDecay( self.decayAdjust )
-        self.GUI['decayGen'] = ImageToggleButton( Config.IMAGE_ROOT+"diceProp.png", Config.IMAGE_ROOT+"dicePropSel.png", Config.IMAGE_ROOT+"dicePropSel.png", backgroundFill = Config.PANEL_COLOR )
+        self.GUI['decayGen'] = ImageToggleButton('diceProp.png',
+                'dicePropSel.png', 'dicePropSel.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI['decayGen'].connect( "clicked", self.openAlgoBox, 'decay' )
         decayBox.pack_start(self.GUI['decayGen'], True, True, 5)        
         decayBox.pack_start(self.GUI['decaySlider'], True, True, 5)
@@ -202,14 +235,17 @@ class Properties( gtk.VBox ):
         filterBox.set_radius(10)
 
         filterTypeBox = gtk.VBox()
-        self.GUI['filterTypeLowButton'] = ImageToggleButton(Config.IMAGE_ROOT + 'propLow3.png', Config.IMAGE_ROOT + 'propLow3Sel.png', Config.IMAGE_ROOT + 'propLow3Over.png')
+        self.GUI['filterTypeLowButton'] = ImageToggleButton('propLow3.png',
+                'propLow3Sel.png', 'propLow3Over.png')
         self.GUI['filterTypeLowButton'].connect( "toggled", self.handleFilterType, 1 )
         filterTypeBox.pack_start( self.GUI['filterTypeLowButton'] )
-        self.GUI['filterTypeHighButton'] = ImageToggleButton(Config.IMAGE_ROOT + 'propHi3.png', Config.IMAGE_ROOT + 'propHi3Sel.png', Config.IMAGE_ROOT + 'propHi3Over.png')
+        self.GUI['filterTypeHighButton'] = ImageToggleButton('propHi3.png',
+                'propHi3Sel.png', 'propHi3Over.png')
         self.GUI['filterTypeHighButton'].connect( "toggled", self.handleFilterType, 2 )
         filterTypeBox.pack_start( self.GUI['filterTypeHighButton'] )
         self.GUI['filterTypeBandButton'] = gtk.ToggleButton( "B" )
-        self.GUI['filterTypeBandButton'] = ImageToggleButton(Config.IMAGE_ROOT + 'propBand3.png', Config.IMAGE_ROOT + 'propBand3Sel.png', Config.IMAGE_ROOT + 'propBand3Over.png')
+        self.GUI['filterTypeBandButton'] = ImageToggleButton('propBand3.png',
+                'propBand3Sel.png', 'propBand3Over.png')
         self.GUI['filterTypeBandButton'].connect( "toggled", self.handleFilterType, 3 )
         filterTypeBox.pack_start( self.GUI['filterTypeBandButton'] )
         filterBox.pack_start( filterTypeBox )
@@ -217,55 +253,66 @@ class Properties( gtk.VBox ):
         self.filterSliderBox = gtk.VBox()
         self.filterSliderBox.set_size_request(50, -1)
         self.cutoffAdjust = gtk.Adjustment(1000, 100, 7000, 100, 100, 0)
-        self.GUI['cutoffSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.cutoffAdjust, 7 )
+        self.GUI['cutoffSlider'] = ImageVScale('sliderEditVolume.png',
+                self.cutoffAdjust, 7)
         self.GUI['cutoffSlider'].set_snap(100)
         self.cutoffAdjust.connect("value-changed", self.handleFilter)
         self.GUI['cutoffSlider'].set_inverted(True)
         self.GUI['cutoffSlider'].set_size_request(50, 200)
-        self.GUI['cutoffGen'] = ImageToggleButton( Config.IMAGE_ROOT+"diceProp.png", Config.IMAGE_ROOT+"dicePropSel.png", Config.IMAGE_ROOT+"dicePropSel.png", backgroundFill = Config.PANEL_COLOR )
+        self.GUI['cutoffGen'] = ImageToggleButton('diceProp.png',
+                'dicePropSel.png', 'dicePropSel.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI['cutoffGen'].connect( "clicked", self.openAlgoBox, 'cutoff' )
         self.filterSliderBox.pack_start(self.GUI['cutoffGen'], True, True, 5)        
         self.filterSliderBox.pack_start(self.GUI['cutoffSlider'], True, True, 5)
         self.filterLabel = gtk.Image()
-        self.filterLabel.set_from_file(Config.IMAGE_ROOT + 'propFilter1.png')
+        self.filterLabel.set_from_file(imagefile('propFilter1.png'))
         self.filterSliderBox.pack_start(self.filterLabel, False, padding=10)
 
         filterBox.pack_start(self.filterSliderBox)
 
         self.controlsBox.pack_start(filterBox)
-        
+
         self.algoBox = RoundVBox(fillcolor=Config.PANEL_COLOR, bordercolor=Config.INST_BCK_COLOR)
         self.algoBox.set_size_request( -1, 378 )
         self.algoBox.set_border_width(3)
         self.algoBox.set_radius(10)
         #self.algoBox = gtk.VBox()
-        
+
         algoUpperBox = gtk.HBox()
-        
+
         algoRadioButtonBox = gtk.VBox()
         algoRadioButtonBox.set_size_request(100, 150)
         #algoRadioButtonBox = RoundHBox(fillcolor=Config.PANEL_COLOR, bordercolor=Config.INST_BCK_COLOR)
         #algoRadioButtonBox.set_border_width(3)
         #algoRadioButtonBox.set_radius(10)
 
-        self.GUI['line'] = ImageRadioButton( None, Config.IMAGE_ROOT + 'propLine.png', Config.IMAGE_ROOT + 'propLineDown.png', Config.IMAGE_ROOT + 'propLineOver.png' )
+        self.GUI['line'] = ImageRadioButton(None, 'propLine.png',
+                'propLineDown.png', 'propLineOver.png')
         self.GUI['line'].connect( "toggled", self.handleAlgo, 0 )
         algoRadioButtonBox.pack_start( self.GUI['line'], False, False, 1 )
-        self.GUI['drunk'] = ImageRadioButton( self.GUI['line'], Config.IMAGE_ROOT + 'propDrunk.png', Config.IMAGE_ROOT + 'propDrunkDown.png', Config.IMAGE_ROOT + 'propDrunkOver.png' )
+        self.GUI['drunk'] = ImageRadioButton(self.GUI['line'], 'propDrunk.png',
+                'propDrunkDown.png', 'propDrunkOver.png')
         self.GUI['drunk'].connect( "toggled", self.handleAlgo, 1 )
         algoRadioButtonBox.pack_start( self.GUI['drunk'], False, False, 1 )
-        self.GUI['droneJump'] = ImageRadioButton( self.GUI['line'], Config.IMAGE_ROOT + 'propDroneJump.png', Config.IMAGE_ROOT + 'propDroneJumpDown.png', Config.IMAGE_ROOT + 'propDroneJumpOver.png' )
+        self.GUI['droneJump'] = ImageRadioButton(self.GUI['line'],
+                'propDroneJump.png', 'propDroneJumpDown.png',
+                'propDroneJumpOver.png')
         self.GUI['droneJump'].connect( "toggled", self.handleAlgo, 2 )
         algoRadioButtonBox.pack_start( self.GUI['droneJump'], False, False, 1 )
-        self.GUI['repeater'] = ImageRadioButton( self.GUI['line'], Config.IMAGE_ROOT + 'propRepeater.png', Config.IMAGE_ROOT + 'propRepeaterDown.png', Config.IMAGE_ROOT + 'propRepeaterOver.png' )
+        self.GUI['repeater'] = ImageRadioButton(self.GUI['line'],
+                'propRepeater.png', 'propRepeaterDown.png',
+                'propRepeaterOver.png')
         self.GUI['repeater'].connect( "toggled", self.handleAlgo, 3 )
         algoRadioButtonBox.pack_start( self.GUI['repeater'], False, False, 1 )
-        self.GUI['loopseg'] = ImageRadioButton( self.GUI['line'], Config.IMAGE_ROOT + 'propLoopseg.png', Config.IMAGE_ROOT + 'propLoopsegDown.png', Config.IMAGE_ROOT + 'propLoopsegOver.png' )
+        self.GUI['loopseg'] = ImageRadioButton(self.GUI['line'],
+                'propLoopseg.png', 'propLoopsegDown.png',
+                'propLoopsegOver.png')
         self.GUI['loopseg'].connect( "toggled", self.handleAlgo, 4 )
         algoRadioButtonBox.pack_start( self.GUI['loopseg'], False, False, 1 )
-        
+
         algoUpperBox.pack_start(algoRadioButtonBox)
-        
+
         algoSlidersBox = gtk.HBox()
         algoSlidersBox.set_size_request(150, 320)
         #algoSlidersBox = RoundHBox(fillcolor=Config.PANEL_COLOR, bordercolor=Config.INST_BCK_COLOR)
@@ -273,38 +320,41 @@ class Properties( gtk.VBox ):
         #algoSlidersBox.set_radius(10)        
         minBox = gtk.VBox()
         self.minAdjust = gtk.Adjustment(0, 0, 100, 1, 1, 0)
-        self.GUI['minSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.minAdjust, 7 )
+        self.GUI['minSlider'] = ImageVScale('sliderEditVolume.png',
+                self.minAdjust, 7)
         self.GUI['minSlider'].set_snap(1)
         self.minAdjust.connect("value-changed", self.handleMin)
         self.GUI['minSlider'].set_inverted(True)
         self.GUI['minSlider'].set_size_request(50, 200)
-        minBox.pack_start(self.GUI['minSlider'], True, True, 5)     
+        minBox.pack_start(self.GUI['minSlider'], True, True, 5)
         algoSlidersBox.pack_start(minBox)
-        
+
         maxBox = gtk.VBox()
         self.maxAdjust = gtk.Adjustment(100, 0, 100, 1, 1, 0)
-        self.GUI['maxSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.maxAdjust, 7 )
+        self.GUI['maxSlider'] = ImageVScale('sliderEditVolume.png',
+                self.maxAdjust, 7)
         self.GUI['maxSlider'].set_snap(1)
         self.maxAdjust.connect("value-changed", self.handleMax)
         self.GUI['maxSlider'].set_inverted(True)
         self.GUI['maxSlider'].set_size_request(50, 200)
-        maxBox.pack_start(self.GUI['maxSlider'], True, True, 5)     
+        maxBox.pack_start(self.GUI['maxSlider'], True, True, 5)
         algoSlidersBox.pack_start(maxBox)
-        
+
         paraBox = gtk.VBox()
         self.paraAdjust = gtk.Adjustment(20, 0, 100, 1, 1, 0)
-        self.GUI['paraSlider'] = ImageVScale( Config.IMAGE_ROOT + "/sliderEditVolume.png", self.paraAdjust, 7 )
+        self.GUI['paraSlider'] = ImageVScale('sliderEditVolume.png',
+                self.paraAdjust, 7)
         self.GUI['paraSlider'].set_snap(1)
         self.paraAdjust.connect("value-changed", self.handlePara)
         self.GUI['paraSlider'].set_inverted(True)
         self.GUI['paraSlider'].set_size_request(50, 200)
-        paraBox.pack_start(self.GUI['paraSlider'], True, True, 5)     
-        algoSlidersBox.pack_start(paraBox)         
-        
+        paraBox.pack_start(self.GUI['paraSlider'], True, True, 5)
+        algoSlidersBox.pack_start(paraBox)
+
         algoUpperBox.pack_start(algoSlidersBox)
-        
+
         self.algoBox.pack_start(algoUpperBox)
-        
+
         #transButtonBox = RoundHBox(fillcolor=Config.PANEL_COLOR, bordercolor=Config.INST_BCK_COLOR)
         #transButtonBox.set_border_width(3)
         #transButtonBox.set_radius(10)
@@ -312,10 +362,12 @@ class Properties( gtk.VBox ):
         transButtonBox.set_size_request(150, 50)
         
         # create cancel/check button
-        self.GUI["checkButton"] = ImageButton(Config.IMAGE_ROOT + 'check.png', backgroundFill=Config.PANEL_COLOR )
+        self.GUI["checkButton"] = ImageButton('check.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI["checkButton"].connect("clicked", self.apply)
  
-        self.GUI["cancelButton"] = ImageButton(Config.IMAGE_ROOT + 'closeA.png', backgroundFill=Config.PANEL_COLOR )
+        self.GUI["cancelButton"] = ImageButton('closeA.png',
+                backgroundFill=Config.PANEL_COLOR)
         self.GUI["cancelButton"].connect("clicked", self.cancel)
         
         transButtonBox.pack_end(self.GUI["checkButton"], False, False, 10)
@@ -443,7 +495,8 @@ class Properties( gtk.VBox ):
 
     def updateBeatLabel( self, adjust ):
         beats = int(adjust.value)
-        self.beatLabel.set_from_file(Config.IMAGE_ROOT + 'propBeats' + str(beats) + '.png')
+        self.beatLabel.set_from_file(
+                imagefile('propBeats' + str(beats) + '.png'))
 
     def handleBeat( self, widget, signal_id ):
         beats = int(widget.get_adjustment().value)
@@ -549,7 +602,7 @@ class Properties( gtk.VBox ):
          
     def handlePan( self, adjust ):
         img = min( 4, int(adjust.value * 5) )
-        self.panLabel.set_from_file(Config.IMAGE_ROOT + 'propPan' + str(img) + '.png')
+        self.panLabel.set_from_file(imagefile('propPan' + str(img) + '.png'))
         if not self.setup:
             stream = []
             for p in self.notes:
@@ -581,7 +634,8 @@ class Properties( gtk.VBox ):
             
     def handleReverb( self, adjust ):
         img = min( 5, int(adjust.value * 6) )
-        self.reverbLabel.set_from_file(Config.IMAGE_ROOT + 'propReverb' + str(img) + '.png')
+        self.reverbLabel.set_from_file(
+                imagefile('propReverb' + str(img) + '.png'))
         if not self.setup:
             stream = []
             for p in self.notes:
@@ -614,7 +668,8 @@ class Properties( gtk.VBox ):
     def handleAttack( self, adjust ):
         val = adjust.value #*adjust.value
         img = min( 4, int(val * 4) )
-        self.attackLabel.set_from_file(Config.IMAGE_ROOT + 'propAtt' + str(img) + '.png')
+        self.attackLabel.set_from_file(
+                imagefile('propAtt' + str(img) + '.png'))
         if not self.setup:
             stream = []
             for p in self.notes:
@@ -647,7 +702,7 @@ class Properties( gtk.VBox ):
     def handleDecay( self, adjust ):
         val = adjust.value #*adjust.value
         img = min( 4, int(val * 4) )
-        self.decayLabel.set_from_file(Config.IMAGE_ROOT + 'propDec' + str(img) + '.png')
+        self.decayLabel.set_from_file(imagefile('propDec' + str(img) + '.png'))
         if not self.setup:
             stream = []
             for p in self.notes:
@@ -799,10 +854,5 @@ class Properties( gtk.VBox ):
     def updateFilterLabel( self ):
         val = (self.cutoffAdjust.value-self.cutoffAdjust.lower)/(self.cutoffAdjust.upper-self.cutoffAdjust.lower)
         img = min( 5, int(val * 6) )
-        self.filterLabel.set_from_file(Config.IMAGE_ROOT + 'propFilter%d.%d' % (self.filterType, img) + '.png')
-
-
-
-
-
-
+        self.filterLabel.set_from_file(
+                imagefile('propFilter%d.%d' % (self.filterType, img) + '.png'))
diff --git a/Edit/TrackInterface.py b/Edit/TrackInterface.py
index ad740ee..73f70df 100644
--- a/Edit/TrackInterface.py
+++ b/Edit/TrackInterface.py
@@ -8,6 +8,7 @@ from math import floor
 import time
 
 import common.Config as Config
+from common.Config import imagefile
 from Edit.NoteInterface import NoteInterface
 from Edit.HitInterface import HitInterface
 from Edit.MainWindow import CONTEXT
@@ -128,13 +129,13 @@ class TrackInterface( gtk.EventBox ):
         self.gc = gtk.gdk.GC( win )
 
         def prepareDrawable( name, width = -1 ):
-            pix = gtk.gdk.pixbuf_new_from_file( Config.IMAGE_ROOT+name+".png" )
+            pix = gtk.gdk.pixbuf_new_from_file(imagefile(name + '.png'))
             if width != -1:
                 pix = pix.scale_simple(width, pix.get_height(), gtk.gdk.INTERP_BILINEAR)
             self.image[name] = gtk.gdk.Pixmap( win, pix.get_width(), pix.get_height() )
             self.image[name].draw_pixbuf( self.gc, pix, 0, 0, 0, 0, pix.get_width(), pix.get_height(), gtk.gdk.RGB_DITHER_NONE )
         def preparePixbuf( name ):
-            self.image[name] = gtk.gdk.pixbuf_new_from_file( Config.IMAGE_ROOT+name+".png" )
+            self.image[name] = gtk.gdk.pixbuf_new_from_file(imagefile(name + '.png'))
 
         prepareDrawable( "trackBG", width )
         prepareDrawable( "trackBGSelected", width )
diff --git a/Edit/TuneInterface.py b/Edit/TuneInterface.py
index f8bc4e7..4702a6d 100644
--- a/Edit/TuneInterface.py
+++ b/Edit/TuneInterface.py
@@ -3,7 +3,7 @@ pygtk.require( '2.0' )
 import gtk
 
 import common.Config as Config
-
+from common.Config import imagefile
 from common.Util.Profiler import TP
 from Edit.MainWindow import CONTEXT
 
@@ -117,13 +117,14 @@ class TuneInterface( gtk.EventBox ):
         self.thumbnailBG = []
         self.gc.foreground = self.bgColor
         for i in range(4):
-            pix = gtk.gdk.pixbuf_new_from_file( Config.IMAGE_ROOT+"pageThumbnailBG%d.png"%i )
+            pix = gtk.gdk.pixbuf_new_from_file(
+                    imagefile('pageThumbnailBG%d.png' % i))
             self.thumbnailBG.append( gtk.gdk.Pixmap( self.defaultwin, Config.PAGE_THUMBNAIL_WIDTH, Config.PAGE_THUMBNAIL_HEIGHT ) )
             self.thumbnailBG[i].draw_rectangle( self.gc, True, 0, 0, Config.PAGE_THUMBNAIL_WIDTH, Config.PAGE_THUMBNAIL_HEIGHT )
             self.thumbnailBG[i].draw_pixbuf( self.gc, pix, 0, 0, 0, 0, Config.PAGE_THUMBNAIL_WIDTH, Config.PAGE_THUMBNAIL_HEIGHT, gtk.gdk.RGB_DITHER_NONE )
 
         # load clipmask
-        pix = gtk.gdk.pixbuf_new_from_file(Config.IMAGE_ROOT+'pageThumbnailMask.png')
+        pix = gtk.gdk.pixbuf_new_from_file(imagefile('pageThumbnailMask.png'))
         pixels = pix.get_pixels()
         stride = pix.get_rowstride()
         channels = pix.get_n_channels()