diff options
| -rw-r--r-- | Edit/MainWindow.py | 8 | ||||
| -rw-r--r-- | Jam/JamMain.py | 2 | ||||
| -rw-r--r-- | Mini/miniTamTamMain.py | 7 | ||||
| -rw-r--r-- | Mini/miniToolbars.py | 3 | ||||
| -rw-r--r-- | SynthLab/SynthLabMain.py | 1 | ||||
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | TamTamEdit.py | 31 | ||||
| -rw-r--r-- | TamTamJam.py | 34 | ||||
| -rw-r--r-- | TamTamMini.py | 42 | ||||
| -rw-r--r-- | TamTamSynthLab.py | 34 |
10 files changed, 63 insertions, 102 deletions
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py index b029bfb..98852db 100644 --- a/Edit/MainWindow.py +++ b/Edit/MainWindow.py @@ -403,8 +403,6 @@ class MainWindow(gtk.EventBox): generate_toolbar_button.show() self.activity.toolbox.toolbar.insert(generate_toolbar_button, -1) - self.activity.add_stop_button() - main_toolbar_button.set_expanded(True) else: self._mainToolbar = mainToolbar(self) @@ -1499,8 +1497,10 @@ class MainWindow(gtk.EventBox): def handleKeyboardShortcuts(self,event): keyval = event.keyval - if self.activity.activity_toolbar.title.is_focus(): - return + if not Config.HAVE_TOOLBOX: + # TODO process for Config.HAVE_TOOLBOX as well + if self.activity.activity_toolbar.title.is_focus(): + return # backspace and del keys if keyval == gtk.keysyms.Delete or keyval == gtk.keysyms.BackSpace: diff --git a/Jam/JamMain.py b/Jam/JamMain.py index 3b6bec4..cddf506 100644 --- a/Jam/JamMain.py +++ b/Jam/JamMain.py @@ -289,8 +289,6 @@ class JamMain(gtk.EventBox): separator.show() common_playback_buttons(self.activity.toolbox.toolbar, self) - - self.activity.add_stop_button() else: self.jamToolbar = JamToolbar(self) self.activity.toolbox.add_toolbar(_("Jam"), self.jamToolbar) 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') diff --git a/SynthLab/SynthLabMain.py b/SynthLab/SynthLabMain.py index 3cdeedf..6edfadd 100644 --- a/SynthLab/SynthLabMain.py +++ b/SynthLab/SynthLabMain.py @@ -95,7 +95,6 @@ class SynthLabMain(gtk.EventBox): self._presetToolbar.show() preset_toolbar_button.show() self.activity.toolbox.toolbar.insert(preset_toolbar_button, -1) - self.activity.add_stop_button() else: self.activity.activity_toolbar.keep.show() self._mainToolbar = mainToolbar(self.activity.toolbox, self) @@ -1 +1,4 @@ - per TamTam activity activities should use TamTamSuite gettext domain +- move play button to the main bar in Edit +- return `True` from Edit/MainWindow.py:MainWindow.handleKeyboardShortcuts if key was processed +- process keys in Edit/MainWindow.py:MainWindow.handleKeyboardShortcuts only if within activity canvas diff --git a/TamTamEdit.py b/TamTamEdit.py index 6466b8a..419e40e 100644 --- a/TamTamEdit.py +++ b/TamTamEdit.py @@ -45,7 +45,7 @@ from sugar.activity import activity if Config.HAVE_TOOLBOX: from sugar.graphics.toolbarbox import ToolbarBox - from sugar.activity.widgets import ActivityToolbarButton, StopButton + from sugar.activity import widgets class TamTamEdit(activity.Activity): @@ -75,9 +75,7 @@ class TamTamEdit(activity.Activity): self.max_participants = 1 self.toolbox = ToolbarBox() - activity_button = ActivityToolbarButton(self) - self.toolbox.toolbar.insert(activity_button, 0) - activity_button.show() + self.toolbox.toolbar.insert(widgets.ActivityToolbarButton(self), -1) else: self.toolbox = activity.ActivityToolbox(self) self.set_toolbox(self.toolbox) @@ -95,11 +93,19 @@ class TamTamEdit(activity.Activity): self.set_canvas(self.edit) self.edit.onActivate(arg=None) - self.show() - if not Config.HAVE_TOOLBOX: + if Config.HAVE_TOOLBOX: + separator = gtk.SeparatorToolItem() + separator.props.draw = False + separator.set_expand(True) + self.toolbox.toolbar.insert(separator, -1) + self.toolbox.toolbar.insert(widgets.StopButton(self), -1) + self.toolbox.toolbar.show_all() + else: self.activity_toolbar.share.hide() + self.show() + def onPreloadTimeout(self): if Config.DEBUG > 4: print "TamTam::onPreloadTimeout", self.preloadList @@ -159,16 +165,3 @@ class TamTamEdit(activity.Activity): def write_file(self, file_path): self.edit.handleJournalSave(file_path) - - def add_stop_button(self): - ''' Add a stop button if using the new toolbars ''' - if Config.HAVE_TOOLBOX: - separator = gtk.SeparatorToolItem() - separator.props.draw = False - separator.set_expand(True) - self.toolbox.toolbar.insert(separator, -1) - separator.show() - stop_button = StopButton(self) - stop_button.props.accelerator = '<Ctrl>q' - self.toolbox.toolbar.insert(stop_button, -1) - stop_button.show() diff --git a/TamTamJam.py b/TamTamJam.py index f727414..e419aa6 100644 --- a/TamTamJam.py +++ b/TamTamJam.py @@ -45,7 +45,7 @@ from sugar.activity import activity if Config.HAVE_TOOLBOX: from sugar.graphics.toolbarbox import ToolbarBox - from sugar.activity.widgets import ActivityToolbarButton, StopButton + from sugar.activity import widgets class TamTamJam(activity.Activity): @@ -78,14 +78,8 @@ class TamTamJam(activity.Activity): #load the sugar toolbar if Config.HAVE_TOOLBOX: self.toolbox = ToolbarBox() - activity_button = ActivityToolbarButton(self) - self.toolbox.toolbar.insert(activity_button, 0) - activity_button.show() - separator = gtk.SeparatorToolItem() - separator.props.draw = True - separator.set_expand(False) - self.toolbox.toolbar.insert(separator, -1) - separator.show() + self.toolbox.toolbar.insert(widgets.ActivityToolbarButton(self), -1) + self.toolbox.toolbar.insert(gtk.SeparatorToolItem(), -1) else: self.toolbox = activity.ActivityToolbox(self) self.set_toolbox(self.toolbox) @@ -101,6 +95,15 @@ class TamTamJam(activity.Activity): self.set_canvas(self.jam) self.jam.onActivate(arg=None) + + if Config.HAVE_TOOLBOX: + separator = gtk.SeparatorToolItem() + separator.props.draw = False + separator.set_expand(True) + self.toolbox.toolbar.insert(separator, -1) + self.toolbox.toolbar.insert(widgets.StopButton(self), -1) + self.toolbox.toolbar.show_all() + self.show() def onPreloadTimeout(self): @@ -163,16 +166,3 @@ class TamTamJam(activity.Activity): def write_file(self, file_path): self.jam.handleJournalSave(file_path) - - def add_stop_button(self): - ''' Add a stop button if using the new toolbars ''' - if Config.HAVE_TOOLBOX: - separator = gtk.SeparatorToolItem() - separator.props.draw = False - separator.set_expand(True) - self.toolbox.toolbar.insert(separator, -1) - separator.show() - stop_button = StopButton(self) - stop_button.props.accelerator = '<Ctrl>q' - self.toolbox.toolbar.insert(stop_button, -1) - stop_button.show() diff --git a/TamTamMini.py b/TamTamMini.py index 47e04fc..02d614d 100644 --- a/TamTamMini.py +++ b/TamTamMini.py @@ -44,15 +44,10 @@ from common.Util.Trackpad import Trackpad from gettext import gettext as _ import commands from sugar.activity import activity -try: - from sugar.graphics.toolbarbox import ToolbarBox - HAVE_TOOLBOX = True -except ImportError: - HAVE_TOOLBOX = False -if HAVE_TOOLBOX: - from sugar.activity.widgets import ActivityToolbarButton - from sugar.activity.widgets import StopButton +if Config.HAVE_TOOLBOX: + from sugar.graphics.toolbarbox import ToolbarBox + from sugar.activity import widgets class TamTamMini(activity.Activity): @@ -77,12 +72,11 @@ class TamTamMini(activity.Activity): self.connect('destroy', self.onDestroy) #load the sugar toolbar - self.have_toolbox = HAVE_TOOLBOX - if self.have_toolbox: + if Config.HAVE_TOOLBOX: self.toolbox = ToolbarBox() - activity_button = ActivityToolbarButton(self) - self.toolbox.toolbar.insert(activity_button, 0) - activity_button.show() + self.toolbox.toolbar.insert(widgets.ActivityButton(self), -1) + self.toolbox.toolbar.insert(widgets.TitleEntry(self), -1) + self.toolbox.toolbar.insert(widgets.ShareButton(self), -1) else: self.toolbox = activity.ActivityToolbox(self) self.set_toolbox(self.toolbox) @@ -95,6 +89,15 @@ class TamTamMini(activity.Activity): #self.modeList[mode].regenerate() self.set_canvas(self.mini) + + if Config.HAVE_TOOLBOX: + separator = gtk.SeparatorToolItem() + separator.props.draw = False + separator.set_expand(True) + self.toolbox.toolbar.insert(separator, -1) + self.toolbox.toolbar.insert(widgets.StopButton(self), -1) + self.toolbox.toolbar.show_all() + self.show() def do_size_allocate(self, allocation): @@ -138,16 +141,3 @@ class TamTamMini(activity.Activity): def write_file(self, file_path): f = open(file_path, 'w') f.close() - - def add_stop_button(self): - ''' Add a stop button if using the new toolbars ''' - if self.have_toolbox: - separator = gtk.SeparatorToolItem() - separator.props.draw = False - separator.set_expand(True) - self.toolbox.toolbar.insert(separator, -1) - separator.show() - stop_button = StopButton(self) - stop_button.props.accelerator = '<Ctrl>q' - self.toolbox.toolbar.insert(stop_button, -1) - stop_button.show() diff --git a/TamTamSynthLab.py b/TamTamSynthLab.py index 7f82388..9dd45e1 100644 --- a/TamTamSynthLab.py +++ b/TamTamSynthLab.py @@ -45,7 +45,7 @@ from sugar.activity import activity if Config.HAVE_TOOLBOX: from sugar.graphics.toolbarbox import ToolbarBox - from sugar.activity.widgets import ActivityToolbarButton, StopButton + from sugar.activity import widgets class TamTamSynthLab(activity.Activity): @@ -71,14 +71,8 @@ class TamTamSynthLab(activity.Activity): self.max_participants = 1 self.toolbox = ToolbarBox() - activity_button = ActivityToolbarButton(self) - self.toolbox.toolbar.insert(activity_button, 0) - activity_button.show() - separator = gtk.SeparatorToolItem() - separator.props.draw = True - separator.set_expand(False) - self.toolbox.toolbar.insert(separator, -1) - separator.show() + self.toolbox.toolbar.insert(widgets.ActivityToolbarButton(self), 0) + self.toolbox.toolbar.insert(gtk.SeparatorToolItem(), -1) else: self.toolbox = activity.ActivityToolbox(self) self.set_toolbox(self.toolbox) @@ -100,6 +94,15 @@ class TamTamSynthLab(activity.Activity): self.set_canvas(self.synthLab) self.synthLab.onActivate(arg=None) + + if Config.HAVE_TOOLBOX: + separator = gtk.SeparatorToolItem() + separator.props.draw = False + separator.set_expand(True) + self.toolbox.toolbar.insert(separator, -1) + self.toolbox.toolbar.insert(widgets.StopButton(self), -1) + self.toolbox.toolbar.show_all() + self.show() def onPreloadTimeout(self): @@ -163,16 +166,3 @@ class TamTamSynthLab(activity.Activity): def write_file(self, file_path): self.synthLab.handleJournalSave(file_path) - - def add_stop_button(self): - ''' Add a stop button if using the new toolbars ''' - if Config.HAVE_TOOLBOX: - separator = gtk.SeparatorToolItem() - separator.props.draw = False - separator.set_expand(True) - self.toolbox.toolbar.insert(separator, -1) - separator.show() - stop_button = StopButton(self) - stop_button.props.accelerator = '<Ctrl>q' - self.toolbox.toolbar.insert(stop_button, -1) - stop_button.show() |