diff options
| author | Walter Bender <walter.bender@gmail.com> | 2011-07-31 21:20:08 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@sugarlabs.org> | 2011-08-01 00:14:04 (GMT) |
| commit | 61ad74a016423a977f82648d9ff5e5fa72bd4dac (patch) | |
| tree | 4590b95f35930045de6d8a17f1b00ed3e271e0ff /Edit | |
| parent | a01ad4582bb9afa30865190f3b5567419f09f022 (diff) | |
add support for new toolbars to Edit
Support for new toolbars. Straightforrward replication of the old-style toolbars. But in a separate patch, I will move the playback buttons to the main toolbar.
Diffstat (limited to 'Edit')
| -rw-r--r-- | Edit/EditToolbars.py | 8 | ||||
| -rw-r--r-- | Edit/MainWindow.py | 40 |
2 files changed, 36 insertions, 12 deletions
diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py index f9eba12..e2cf5ad 100644 --- a/Edit/EditToolbars.py +++ b/Edit/EditToolbars.py @@ -30,7 +30,7 @@ Tooltips = Config.Tooltips() class mainToolbar(gtk.Toolbar): - def __init__(self,toolbox, edit): + def __init__(self, edit): gtk.Toolbar.__init__(self) def _insertSeparator(x = 1): @@ -41,7 +41,6 @@ class mainToolbar(gtk.Toolbar): self.insert(self.separator,-1) self.separator.show() - self.toolbox = toolbox self.edit = edit self.tooltips = gtk.Tooltips() @@ -174,7 +173,7 @@ class mainToolbar(gtk.Toolbar): widget.set_active(False) class generateToolbar(gtk.Toolbar): - def __init__(self,toolbox, edit): + def __init__(self, edit): gtk.Toolbar.__init__(self) def _insertSeparator(x = 1): @@ -185,7 +184,6 @@ class generateToolbar(gtk.Toolbar): self.insert(self.separator,-1) self.separator.show() - self.toolbox = toolbox self.edit = edit self.tooltips = gtk.Tooltips() @@ -1157,7 +1155,7 @@ class propertiesPalette(Palette): self.reverbSliderAdj.set_value( n.cs.reverbSend ) self.attackDurSliderAdj.set_value( n.cs.attack ) self.decayDurSliderAdj.set_value( n.cs.decay ) - self.filterTypeComboBox.set_active(n.cs.filterType) + self.filterTypeComboBox.set_active(int(n.cs.filterType)) self.currentFilterType = n.cs.filterType self.filterCutoffSliderAdj.set_value( n.cs.filterCutoff ) self.setup = False diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py index 14b4f94..6214f4b 100644 --- a/Edit/MainWindow.py +++ b/Edit/MainWindow.py @@ -384,13 +384,39 @@ class MainWindow(gtk.EventBox): self.createNewTune(None) # Toolbar - self._mainToolbar = mainToolbar(self.activity.toolbox, self) - self._generateToolbar = generateToolbar(self.activity.toolbox, self) - self.activity.toolbox.add_toolbar(_('Compose'), self._mainToolbar) - self.activity.toolbox.add_toolbar(_('Generate'), self._generateToolbar) - self.activity.toolbox.set_current_toolbar(1) - self._mainToolbar.show() - self._generateToolbar.show() + if self.activity.have_toolbox: + from sugar.graphics.toolbarbox import ToolbarButton + + self._mainToolbar = mainToolbar(self) + self._mainToolbar.show() + main_toolbar_button = ToolbarButton(label=_('Compose'), + page=self._mainToolbar, + icon_name='edit-brush') + main_toolbar_button.show() + self.activity.toolbox.toolbar.insert(main_toolbar_button, -1) + + self._generateToolbar = generateToolbar(self) + self._generateToolbar.show() + generate_toolbar_button = ToolbarButton(label=_('Generate'), + page=self._generateToolbar, + icon_name='diceB') + 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) + self._mainToolbar.show() + self.activity.toolbox.add_toolbar(_('Compose'), self._mainToolbar) + + self._generateToolbar = generateToolbar(self) + self._generateToolbar.show() + self.activity.toolbox.add_toolbar(_('Generate'), + self._generateToolbar) + + self.activity.toolbox.set_current_toolbar(1) self.show_all() #gtk command |