diff options
Diffstat (limited to 'activity.py')
| -rwxr-xr-x | activity.py | 53 |
1 files changed, 30 insertions, 23 deletions
diff --git a/activity.py b/activity.py index 40bde74..9b35c2a 100755 --- a/activity.py +++ b/activity.py @@ -12,15 +12,17 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import gtk +import gi +from gi.repository import Gtk + from gettext import gettext as _ import logging logger = logging.getLogger('cartoon-builder') -from sugar.graphics.toolbutton import ToolButton -from sugar.graphics.toggletoolbutton import ToggleToolButton -from sugar.activity.activity import ActivityToolbox +from sugar3.graphics.toolbutton import ToolButton +from sugar3.graphics.toggletoolbutton import ToggleToolButton +#from sugar3.activity.activity import ActivityToolbox from toolkit.temposlider import TempoSlider from toolkit.activity import SharedActivity @@ -39,8 +41,10 @@ from utils import * class CartoonBuilderActivity(SharedActivity): + def __init__(self, handle): - self.notebook = gtk.Notebook() + + self.notebook = Gtk.Notebook() SharedActivity.__init__(self, self.notebook, SERVICE, handle) self.notebook.show() @@ -48,17 +52,17 @@ class CartoonBuilderActivity(SharedActivity): self.notebook.props.show_tabs = False self.montage = montage.View() - self.notebook.append_page(self.montage) + self.notebook.append_page(self.montage, Gtk.Label('')) self.lessons = lessons.View() self.lessons.show() - self.notebook.append_page(self.lessons) + self.notebook.append_page(self.lessons, Gtk.Label('')) toolbox = ToolbarBox() toolbox.show() toolbox.toolbar.insert(ActivityToolbarButton(self), -1) - separator = gtk.SeparatorToolItem() + separator = Gtk.SeparatorToolItem() separator.set_draw(False) toolbox.toolbar.insert(separator, -1) @@ -67,18 +71,18 @@ class CartoonBuilderActivity(SharedActivity): lessons_button.set_tooltip(_('Lessons')) toolbox.toolbar.insert(lessons_button, -1) - separator = gtk.SeparatorToolItem() + separator = Gtk.SeparatorToolItem() separator.set_draw(False) toolbox.toolbar.insert(separator, -1) - self.notebook_toolbar = gtk.Notebook() + self.notebook_toolbar = Gtk.Notebook() self.notebook_toolbar.props.show_border = False self.notebook_toolbar.props.show_tabs = False - self.notebook_toolbar.append_page(self._create_montage_toolbar()) - self.notebook_toolbar.append_page(self._create_lessons_toolbar()) + self.notebook_toolbar.append_page(self._create_montage_toolbar(), Gtk.Label('')) + self.notebook_toolbar.append_page(self._create_lessons_toolbar(), Gtk.Label('')) self.notebook_toolbar.show() - notebook_item = gtk.ToolItem() + notebook_item = Gtk.ToolItem() notebook_item.set_expand(True) notebook_item.add(self.notebook_toolbar) notebook_item.show() @@ -110,21 +114,21 @@ class CartoonBuilderActivity(SharedActivity): self.messenger = Messenger(tube_conn, initiating, self.montage) def _create_montage_toolbar(self): - toolbar = gtk.Toolbar() + toolbar = Gtk.Toolbar() - playButtonImg = gtk.Image() + playButtonImg = Gtk.Image() playButtonImg.show() playButtonImg.set_from_icon_name('media-playback-start', - gtk.ICON_SIZE_LARGE_TOOLBAR) + Gtk.IconSize.LARGE_TOOLBAR) - pauseButtonImg = gtk.Image() + pauseButtonImg = Gtk.Image() pauseButtonImg.show() pauseButtonImg.set_from_icon_name('media-playback-pause', - gtk.ICON_SIZE_LARGE_TOOLBAR) + Gtk.IconSize.LARGE_TOOLBAR) self.playButton = ToggleToolButton('media-playback-start') self.playButton.connect('toggled', self.__play_cb, playButtonImg, - pauseButtonImg) + pauseButtonImg) toolbar.insert(self.playButton, -1) self.playButton.set_tooltip(_('Play / Pause')) @@ -132,11 +136,11 @@ class CartoonBuilderActivity(SharedActivity): tempo.adjustment.connect("value-changed", self.__tempo_cb) tempo.set_size_request(250, -1) tempo.set_value(5) - tempo_item = gtk.ToolItem() + tempo_item = Gtk.ToolItem() tempo_item.add(tempo) toolbar.insert(tempo_item, -1) - separator = gtk.SeparatorToolItem() + separator = Gtk.SeparatorToolItem() toolbar.insert(separator,-1) clear_tape = ToolButton('sl-reset') @@ -156,21 +160,24 @@ class CartoonBuilderActivity(SharedActivity): self.montage.set_tempo(widget.value) def __play_cb(self, widget, playButtonImg, pauseButtonImg): + if widget.get_active(): widget.set_icon_widget(pauseButtonImg) sound.play() self.montage.play() + else: widget.set_icon_widget(playButtonImg) sound.stop() self.montage.stop() def _create_lessons_toolbar(self): - toolbar = gtk.Toolbar() + toolbar = Gtk.Toolbar() for lesson in lessons.THEMES: - button = gtk.RadioToolButton() + button = Gtk.RadioToolButton() button.set_label(lesson.name) + if toolbar.get_n_items(): button.props.group = toolbar.get_nth_item(0) button.connect('clicked', self.__lesson_clicked_cb, lesson) |