diff options
| author | amartin <olpc@xo-05-28-21.localdomain> | 2007-07-20 03:02:42 (GMT) |
|---|---|---|
| committer | amartin <olpc@xo-05-28-21.localdomain> | 2007-07-20 03:02:42 (GMT) |
| commit | aaf336b1bca82b0a7da43f039c1295598202b25d (patch) | |
| tree | f4fb568c28b0d6d7fb788fef1fb2d90976492c3a /miniTamTam | |
| parent | 0c51f7abf29eb0b8534e6e47e4fddba7c0164142 (diff) | |
network
Diffstat (limited to 'miniTamTam')
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index 4355abf..258f8e4 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -19,6 +19,7 @@ Net = Util.Network # convinience assignment import Config +from miniTamTam.miniToolbar import miniToolbar from Util.ThemeWidgets import * from Util.CSoundNote import CSoundNote from Util import NoteDB @@ -36,6 +37,8 @@ from Util.Trackpad import Trackpad from Util.InstrumentPanel import InstrumentPanel from Util import Instrument +from gettext import gettext as _ + Tooltips = Config.Tooltips from SubActivity import SubActivity @@ -47,6 +50,7 @@ class miniTamTamMain(SubActivity): self.activity = activity + self.set_border_width(Config.MAIN_WINDOW_PADDING) self.firstTime = False @@ -138,6 +142,13 @@ class miniTamTamMain(SubActivity): self.syncTimeout = gobject.timeout_add( 1000, self.updateSync ) #------------------------------------------------------------------- + # Toolbar + self._miniToolbar = miniToolbar(self.activity.toolbox, self) + self.activity.activity_toolbar.share.show() + self.activity.toolbox.add_toolbar(_('Play'), self._miniToolbar) + self._miniToolbar.show() + + self.activity.connect( "shared", self.shared ) if os.path.isfile("FORCE_SHARE"): # HOST r = random.random() @@ -145,13 +156,13 @@ class miniTamTamMain(SubActivity): #self.activity.set_title(_gettext("TTDBG%f" % r)) print "::::: Sharing as TamTam :::::" self.activity.set_title(_gettext("TamTam")) - self.activity.connect( "shared", self.shared ) self.activity.share() elif self.activity._shared_activity: # PEER self.activity._shared_activity.connect( "buddy-joined", self.buddy_joined ) self.activity._shared_activity.connect( "buddy-left", self.buddy_left ) self.activity.connect( "joined", self.joined ) self.network.setMode( Net.MD_WAIT ) + #self.activity.activity_toolbar.share.hide() def drawSliders( self ): mainLowBox = gtk.HBox() |