diff options
| author | Aleksey Lim <alsroot@sugarlabs.org> | 2011-08-01 12:43:18 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@sugarlabs.org> | 2011-08-01 12:43:24 (GMT) |
| commit | a89a915761942812fa54dbe6e5a330c4d23a63c3 (patch) | |
| tree | 1a2abc3f46ac8f933e2c1187460ea7f5e2bcf4ef /Mini | |
| parent | 73829f7e63a548920d58ed78d5b3aabfdde81883 (diff) | |
Polish new toolbars related code; use only one bar for Mini since there is plenty of space; update TODO
Diffstat (limited to 'Mini')
| -rw-r--r-- | Mini/miniTamTamMain.py | 7 | ||||
| -rw-r--r-- | Mini/miniToolbars.py | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Mini/miniTamTamMain.py b/Mini/miniTamTamMain.py index 4f3b0e4..f1b142a 100644 --- a/Mini/miniTamTamMain.py +++ b/Mini/miniTamTamMain.py @@ -140,7 +140,7 @@ class miniTamTamMain(gtk.EventBox): #------------------------------------------------------------------- # Toolbar - if self.activity.have_toolbox: + if Config.HAVE_TOOLBOX: from sugar.graphics.toolbarbox import ToolbarButton # no sharing @@ -166,20 +166,19 @@ class miniTamTamMain(gtk.EventBox): 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: - self._recordToolbar = recordToolbar(self.activity.toolbox, self) + self._recordToolbar = recordToolbar(self) self.activity.toolbox.add_toolbar(_('Play'), self._playToolbar) self.activity.toolbox.add_toolbar(_('Record'), self._recordToolbar) self.activity.toolbox.set_current_toolbar(1) self._playToolbar.show() self._recordToolbar.show() - if not self.activity.have_toolbox: + if not Config.HAVE_TOOLBOX: self.activity.connect( "shared", self.shared ) if os.path.isfile("FORCE_SHARE"): # HOST diff --git a/Mini/miniToolbars.py b/Mini/miniToolbars.py index 50cb013..3a78af1 100644 --- a/Mini/miniToolbars.py +++ b/Mini/miniToolbars.py @@ -79,7 +79,7 @@ class playToolbar(gtk.Toolbar): class recordToolbar(gtk.Toolbar): - def __init__(self,toolbox, miniTamTam): + def __init__(self, miniTamTam): gtk.Toolbar.__init__(self) def _insertSeparator(x = 1): @@ -89,7 +89,6 @@ class recordToolbar(gtk.Toolbar): self.insert(self.separator,-1) self.separator.show() - self.toolbox = toolbox self.miniTamTam = miniTamTam self.micRec1Button = ToolButton('rec1') |