diff options
| -rw-r--r-- | TamTamEdit.activity/Edit/EditToolbars.py | 9 | ||||
| -rw-r--r-- | TamTamJam.activity/Jam/Toolbars.py | 12 | ||||
| -rw-r--r-- | TamTamSynthLab.activity/SynthLab/SynthLabToolbars.py | 30 | ||||
| -rw-r--r-- | common/Config.py | 7 |
4 files changed, 38 insertions, 20 deletions
diff --git a/TamTamEdit.activity/Edit/EditToolbars.py b/TamTamEdit.activity/Edit/EditToolbars.py index cada07b..ecde886 100644 --- a/TamTamEdit.activity/Edit/EditToolbars.py +++ b/TamTamEdit.activity/Edit/EditToolbars.py @@ -86,7 +86,8 @@ class mainToolbar(gtk.Toolbar): #Pointer button self._pointerPalette = pointerPalette(_('Select Tool'), self.edit) - self.pointerButton = RadioToolButton('edit-pointer', group = None) + self.pointerButton = RadioToolButton(group = None) + self.pointerButton.set_named_icon('edit-pointer') self.pointerButton.set_palette(self._pointerPalette) self.pointerButton.connect('toggled', self.edit.handleToolClick, 'default') self.insert(self.pointerButton, -1) @@ -94,7 +95,8 @@ class mainToolbar(gtk.Toolbar): #Draw button self._drawPalette = drawPalette(_('Draw Tool'), self.edit) - self.drawButton = RadioToolButton('edit-pencil', group = self.pointerButton) + self.drawButton = RadioToolButton(group = self.pointerButton) + self.drawButton.set_named_icon('edit-pencil') self.drawButton.set_palette(self._drawPalette) self.drawButton.connect('toggled', self.edit.handleToolClick, 'draw') self.insert(self.drawButton, -1) @@ -102,7 +104,8 @@ class mainToolbar(gtk.Toolbar): #Paint button self._paintPalette = paintPalette(_('Paint Tool'), self.edit) - self.paintButton = RadioToolButton('edit-brush', group = self.pointerButton) + self.paintButton = RadioToolButton(group = self.pointerButton) + self.paintButton.set_named_icon('edit-brush') self.paintButton.set_palette(self._paintPalette) self.paintButton.connect('toggled', self.edit.handleToolClick, 'paint') self.insert(self.paintButton, -1) diff --git a/TamTamJam.activity/Jam/Toolbars.py b/TamTamJam.activity/Jam/Toolbars.py index 80598c0..16213b3 100644 --- a/TamTamJam.activity/Jam/Toolbars.py +++ b/TamTamJam.activity/Jam/Toolbars.py @@ -156,14 +156,16 @@ class PlaybackToolbar( gtk.Toolbar ): self.blockBeat = False self.beatWheel = [] - btn = RadioToolButton( 'beats', group = None ) + btn = RadioToolButton(group = None ) + btn.set_named_icon('beats') btn.connect( 'toggled', self.setBeat, 0 ) btn.set_tooltip( _('Jump To Beat') ) self.insert( btn, -1 ) self.beatWheel.append( btn ) for i in range(1,12): - btn = RadioToolButton( 'beats', group = self.beatWheel[0] ) + btn = RadioToolButton(group = self.beatWheel[0] ) + btn.set_named_icon('beats') btn.connect( 'toggled', self.setBeat, i ) btn.set_tooltip( _('Jump To Beat') ) self.insert( btn, -1 ) @@ -264,14 +266,16 @@ class DesktopToolbar( gtk.Toolbar ): self.desktop = [] - btn = RadioToolButton( 'preset1', group = None ) + btn = RadioToolButton(group = None ) + btn.set_named_icon('preset1') btn.connect( 'toggled', self.setDesktop, 0 ) btn.set_tooltip( _('Desktop 1') ) self.insert( btn, -1 ) self.desktop.append( btn ) for i in range(2,11): - btn = RadioToolButton( 'preset%d'%i, group = self.desktop[0] ) + btn = RadioToolButton( group = self.desktop[0] ) + btn.set_named_icon('preset%d'%i) btn.connect( 'toggled', self.setDesktop, i-1 ) btn.set_tooltip( _('Desktop %d'%i) ) self.insert( btn, -1 ) diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabToolbars.py b/TamTamSynthLab.activity/SynthLab/SynthLabToolbars.py index 58a3c9c..c55fc34 100644 --- a/TamTamSynthLab.activity/SynthLab/SynthLabToolbars.py +++ b/TamTamSynthLab.activity/SynthLab/SynthLabToolbars.py @@ -116,61 +116,71 @@ class presetToolbar(gtk.Toolbar): self.toolbox = toolbox self.synthLab = synthLab - self.preset1Button = RadioToolButton('preset1', group = None) + self.preset1Button = RadioToolButton(group = None) + self.preset1Button.set_named_icon('preset1') self.preset1Button.connect('clicked',self.synthLab.presetCallback,1) self.insert(self.preset1Button, -1) self.preset1Button.show() self.preset1Button.set_tooltip(_('Preset 1')) - self.preset2Button = RadioToolButton('preset2', group = self.preset1Button) + self.preset2Button = RadioToolButton(group = self.preset1Button) + self.preset2Button.set_named_icon('preset2') self.preset2Button.connect('clicked',self.synthLab.presetCallback,2) self.insert(self.preset2Button, -1) self.preset2Button.show() self.preset2Button.set_tooltip(_('Preset 2')) - self.preset3Button = RadioToolButton('preset3', group = self.preset1Button) + self.preset3Button = RadioToolButton(group = self.preset1Button) + self.preset3Button.set_named_icon('preset3') self.preset3Button.connect('clicked',self.synthLab.presetCallback,3) self.insert(self.preset3Button, -1) self.preset3Button.show() self.preset3Button.set_tooltip(_('Preset 3')) - self.preset4Button = RadioToolButton('preset4', group = self.preset1Button) + self.preset4Button = RadioToolButton(group = self.preset1Button) + self.preset4Button.set_named_icon('preset4') self.preset4Button.connect('clicked',self.synthLab.presetCallback,4) self.insert(self.preset4Button, -1) self.preset4Button.show() self.preset4Button.set_tooltip(_('Preset 4')) - self.preset5Button = RadioToolButton('preset5', group = self.preset1Button) + self.preset5Button = RadioToolButton(group = self.preset1Button) + self.preset5Button.set_named_icon('preset5') self.preset5Button.connect('clicked',self.synthLab.presetCallback,5) self.insert(self.preset5Button, -1) self.preset5Button.show() self.preset5Button.set_tooltip(_('Preset 5')) - self.preset6Button = RadioToolButton('preset6', group = self.preset1Button) + self.preset6Button = RadioToolButton(group = self.preset1Button) + self.preset6Button.set_named_icon('preset6') self.preset6Button.connect('clicked',self.synthLab.presetCallback,6) self.insert(self.preset6Button, -1) self.preset6Button.show() self.preset6Button.set_tooltip(_('Preset 6')) - self.preset7Button = RadioToolButton('preset7', group = self.preset1Button) + self.preset7Button = RadioToolButton(group = self.preset1Button) + self.preset7Button.set_named_icon('preset7') self.preset7Button.connect('clicked',self.synthLab.presetCallback,7) self.insert(self.preset7Button, -1) self.preset7Button.show() self.preset7Button.set_tooltip(_('Preset 7')) - self.preset8Button = RadioToolButton('preset8', group = self.preset1Button) + self.preset8Button = RadioToolButton(group = self.preset1Button) + self.preset8Button.set_named_icon('preset8') self.preset8Button.connect('clicked',self.synthLab.presetCallback,8) self.insert(self.preset8Button, -1) self.preset8Button.show() self.preset8Button.set_tooltip(_('Preset 8')) - self.preset9Button = RadioToolButton('preset9', group = self.preset1Button) + self.preset9Button = RadioToolButton(group = self.preset1Button) + self.preset9Button.set_named_icon('preset9') self.preset9Button.connect('clicked',self.synthLab.presetCallback,9) self.insert(self.preset9Button, -1) self.preset9Button.show() self.preset9Button.set_tooltip(_('Preset 9')) - self.preset10Button = RadioToolButton('preset10', group = self.preset1Button) + self.preset10Button = RadioToolButton(group = self.preset1Button) + self.preset10Button.set_named_icon('preset10') self.preset10Button.connect('clicked',self.synthLab.presetCallback,10) self.insert(self.preset10Button, -1) self.preset10Button.show() diff --git a/common/Config.py b/common/Config.py index 474bd82..c620627 100644 --- a/common/Config.py +++ b/common/Config.py @@ -30,6 +30,7 @@ def logwrite(level, msg): TAM_TAM_ROOT = get_bundle_path() print 'INFO: loaded TAMTAM_ROOT=%s' % TAM_TAM_ROOT +EDIT_RESOURCES = os.path.join(TAM_TAM_ROOT, "../TamTamEdit.activity/common/Resources") FILES_DIR = TAM_TAM_ROOT + "/common/Resources" #PATHS @@ -37,8 +38,8 @@ if os.path.isdir("/usr/share/tamtam/Sounds"): SOUNDS_DIR = "/usr/share/tamtam/Sounds" LIB_DIR = "/usr/share/tamtam" else: - SOUNDS_DIR = "/home/olpc/Activities/TamTamEdit.activity/common/Resources/Sounds" - LIB_DIR = "/home/olpc/Activities/TamTamEdit.activity/common/Resources" + SOUNDS_DIR = os.path.join(EDIT_RESOURCES, "Sounds") + LIB_DIR = EDIT_RESOURCES if SugarMode == True: if not os.path.isdir(os.path.join(get_activity_root(), 'data', 'snds_info')): @@ -101,7 +102,7 @@ LANGUAGE = 'En' if os.path.isdir("/usr/share/tamtam/Images"): IMAGE_ROOT = '/usr/share/tamtam/Images/' else: - IMAGE_ROOT = "/home/olpc/Activities/TamTamEdit.activity/common/Resources/Images/" + IMAGE_ROOT = os.path.join(EDIT_RESOURCES, "Images") + '/' MAIN_WINDOW_PADDING = 5 BG_COLOR = '#404040' |