diff options
| author | Walter Bender <walter.bender@gmail.com> | 2011-07-31 01:27:04 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@sugarlabs.org> | 2011-07-31 22:34:07 (GMT) |
| commit | 7f3ad4e1c292b60035fd7f018fe67a737194a5af (patch) | |
| tree | 6e103bed1b8d403079a9fb9819a494751a2a7a34 /Jam | |
| parent | ab8ab494c9e30abc7cafab485545dfb128157238 (diff) | |
add support for new toolbars
Added support for 0.86 toolbars.
Diffstat (limited to 'Jam')
| -rw-r--r-- | Jam/JamMain.py | 69 |
1 files changed, 59 insertions, 10 deletions
diff --git a/Jam/JamMain.py b/Jam/JamMain.py index 2798d4c..599d483 100644 --- a/Jam/JamMain.py +++ b/Jam/JamMain.py @@ -200,15 +200,60 @@ class JamMain(gtk.EventBox): self.prepareKeyImage( key ) #-- Toolbars ------------------------------------------ - self.jamToolbar = JamToolbar( self ) - self.activity.toolbox.add_toolbar( _("Jam"), self.jamToolbar ) - self.playbackToolbar = PlaybackToolbar( self ) - self.activity.toolbox.add_toolbar( _("Playback"), self.playbackToolbar ) - self.desktopToolbar = DesktopToolbar( self ) - self.activity.toolbox.add_toolbar( _("Desktop"), self.desktopToolbar ) - if Config.FEATURES_MIC or Config.FEATURES_NEWSOUNDS: - self.recordToolbar = RecordToolbar( self ) - self.activity.toolbox.add_toolbar( _("Record"), self.recordToolbar ) + if self.activity.have_toolbox: + from sugar.graphics.toolbarbox import ToolbarButton + + self.jamToolbar = JamToolbar(self) + jam_toolbar_button = ToolbarButton(label=_('Jam'), + page=self.jamToolbar, + icon_name='voltemp') + self.jamToolbar.show() + jam_toolbar_button.show() + self.activity.toolbox.toolbar.insert(jam_toolbar_button, -1) + + self.playbackToolbar = PlaybackToolbar(self) + playback_toolbar_button = ToolbarButton(label=_('Playback'), + page=self.playbackToolbar, + # Fixme: need an icon + icon_name='activity-start') + self.playbackToolbar.show() + playback_toolbar_button.show() + self.activity.toolbox.toolbar.insert(playback_toolbar_button, -1) + + self.desktopToolbar = DesktopToolbar(self) + desktop_toolbar_button = ToolbarButton(label=_('Desktop'), + page=self.desktopToolbar, + icon_name='text-x-generic') + self.desktopToolbar.show() + desktop_toolbar_button.show() + self.activity.toolbox.toolbar.insert(desktop_toolbar_button, -1) + + if Config.FEATURES_MIC or Config.FEATURES_NEWSOUNDS: + self.recordToolbar = RecordToolbar(self) + record_toolbar_button = ToolbarButton(label=_('Record'), + page=self.recordToolbar, + icon_name='microphone') + self.recordToolbar.show() + record_toolbar_button.show() + self.activity.toolbox.toolbar.insert(record_toolbar_button, -1) + + self.activity.add_stop_button() + else: + self.jamToolbar = JamToolbar(self) + self.activity.toolbox.add_toolbar(_("Jam"), self.jamToolbar) + + self.playbackToolbar = PlaybackToolbar(self) + self.activity.toolbox.add_toolbar(_("Playback"), + self.playbackToolbar) + + self.desktopToolbar = DesktopToolbar(self) + self.activity.toolbox.add_toolbar(_("Desktop"), + self.desktopToolbar) + + if Config.FEATURES_MIC or Config.FEATURES_NEWSOUNDS: + self.recordToolbar = RecordToolbar(self) + self.activity.toolbox.add_toolbar(_("Record"), + self.recordToolbar) #-- GUI ----------------------------------------------- if True: # GUI @@ -336,7 +381,11 @@ class JamMain(gtk.EventBox): #-- Final Set Up -------------------------------------- self.setVolume( self.volume ) self.setTempo( self.tempo ) - self.activity.toolbox.set_current_toolbar(1) # JamToolbar + if self.activity.have_toolbox: + # jam_toolbar_button.set_expanded(True) + pass + else: + self.activity.toolbox.set_current_toolbar(1) # JamToolbar self.setDesktop( 0, True ) |