diff options
| author | Walter Bender <walter.bender@gmail.com> | 2011-08-01 10:45:26 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@sugarlabs.org> | 2011-08-01 11:06:10 (GMT) |
| commit | 73829f7e63a548920d58ed78d5b3aabfdde81883 (patch) | |
| tree | 6216e14cf98bfc18df708771163a0fdf688e2647 /Mini | |
| parent | cbcedfac523a0b416f422139a7bb60e16930c634 (diff) | |
add support for new toolbars to TamTamMini
Adds support for new toolbars to TamTamMini. Note that TamTamMini has play and record toolbars that are currently commented out in this code. If we do decide to reinstate these toolbars, we will need to decide on toolbar icons (placeholders are used for the moment).
Diffstat (limited to 'Mini')
| -rw-r--r-- | Mini/miniTamTamMain.py | 34 | ||||
| -rw-r--r-- | Mini/miniToolbars.py | 5 |
2 files changed, 34 insertions, 5 deletions
diff --git a/Mini/miniTamTamMain.py b/Mini/miniTamTamMain.py index 5230633..4f3b0e4 100644 --- a/Mini/miniTamTamMain.py +++ b/Mini/miniTamTamMain.py @@ -140,8 +140,35 @@ class miniTamTamMain(gtk.EventBox): #------------------------------------------------------------------- # Toolbar - self.activity.activity_toolbar.share.show() - self._playToolbar = playToolbar(self.activity.toolbox, self) + if self.activity.have_toolbox: + from sugar.graphics.toolbarbox import ToolbarButton + + # no sharing + # self.max_participants = 1 + + self._playToolbar = playToolbar(self) + ## Uncomment to show play and record tabs ## + ''' + play_toolbar_button = ToolbarButton(label=_('Play'), + page=self._playToolbar, + # Fixme: need an icon + icon_name='activity-start') + self._playToolbar.show() + play_toolbar_button.show() + self.activity.toolbox.toolbar.insert(play_toolbar_button, -1) + + self._recordToolbar = recordToolbar(self) + record_toolbar_button = ToolbarButton(label=_('Record'), + page=self._recordToolbar, + # Fixme: need an icon + icon_name='media-record') + self._recordToolbar.show() + record_toolbar_button.show() + self.activity.toolbox.toolbar.insert(record_toolbar_button, -1) + ''' + self.activity.add_stop_button() + else: + self._playToolbar = playToolbar(self) ## set to 1 to show play and record tabs ## if 0: @@ -152,7 +179,8 @@ class miniTamTamMain(gtk.EventBox): self._playToolbar.show() self._recordToolbar.show() - self.activity.connect( "shared", self.shared ) + if not self.activity.have_toolbox: + self.activity.connect( "shared", self.shared ) if os.path.isfile("FORCE_SHARE"): # HOST r = random.random() diff --git a/Mini/miniToolbars.py b/Mini/miniToolbars.py index 867e00a..50cb013 100644 --- a/Mini/miniToolbars.py +++ b/Mini/miniToolbars.py @@ -11,7 +11,7 @@ from sugar.graphics.palette import Palette from gettext import gettext as _ class playToolbar(gtk.Toolbar): - def __init__(self,toolbox, miniTamTam): + def __init__(self, miniTamTam): gtk.Toolbar.__init__(self) def _insertSeparator(x = 1): @@ -21,7 +21,6 @@ class playToolbar(gtk.Toolbar): self.insert(self.separator,-1) self.separator.show() - self.toolbox = toolbox self.miniTamTam = miniTamTam self.tooltips = gtk.Tooltips() @@ -76,6 +75,8 @@ class playToolbar(gtk.Toolbar): self.reverbSliderTool.show() self.reverbSliderTool.set_tooltip(self.tooltips, _('Reverb')) + self.show_all() + class recordToolbar(gtk.Toolbar): def __init__(self,toolbox, miniTamTam): |