diff options
Diffstat (limited to 'activity.py')
| -rw-r--r-- | activity.py | 86 |
1 files changed, 48 insertions, 38 deletions
diff --git a/activity.py b/activity.py index c13156d..50a80ca 100644 --- a/activity.py +++ b/activity.py @@ -12,26 +12,33 @@ # 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 _ -from sugar.graphics.toggletoolbutton import ToggleToolButton -from sugar.graphics.toolbutton import ToolButton +from sugar3.graphics.toggletoolbutton import ToggleToolButton +from sugar3.graphics.toolbutton import ToolButton +from sugar3.activity.widgets import ActivityToolbarButton +from sugar3.activity.widgets import StopButton from toolkit.activity import SharedActivity from toolkit.temposlider import TempoSlider from toolkit.toolbarbox import ToolbarBox -from toolkit.activity_widgets import * +#from toolkit.activity_widgets import * import model import montage import lessons +#import theme from messenger import Messenger, SERVICE -from theme import * + class flipsticksActivity(SharedActivity): + def __init__(self, handle): - self.notebook = gtk.Notebook() + + self.notebook = Gtk.Notebook() + SharedActivity.__init__(self, self.notebook, SERVICE, handle) self.notebook.show() @@ -39,10 +46,10 @@ class flipsticksActivity(SharedActivity): self.notebook.props.show_tabs = False self.montage = montage.View(self) - 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() @@ -54,18 +61,18 @@ class flipsticksActivity(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(MontageToolbar(self.montage)) - self.notebook_toolbar.append_page(LessonsToolbar()) + self.notebook_toolbar.append_page(MontageToolbar(self.montage), Gtk.Label('')) + self.notebook_toolbar.append_page(LessonsToolbar(), 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() @@ -91,46 +98,49 @@ class flipsticksActivity(SharedActivity): self.notebook_toolbar.set_current_page(page) self.notebook.set_current_page(page) -class MontageToolbar(gtk.Toolbar): +class MontageToolbar(Gtk.Toolbar): + def __init__(self, montage): - gtk.Toolbar.__init__(self) + + Gtk.Toolbar.__init__(self) + self.montage = montage # edit buttons setframe = ToolButton('dialog-ok') setframe.connect('clicked', self._setframe_cb) - setframe.set_tooltip(_('Set frame')) + setframe.set_tooltip_text(_('Set frame')) self.insert(setframe, -1) - clearframe = ToolButton('gtk-delete') + clearframe = ToolButton('Gtk-delete') clearframe.connect('clicked', self._clearframe_cb) - clearframe.set_tooltip(_('Clear frame')) + clearframe.set_tooltip_text(_('Clear frame')) self.insert(clearframe, -1) - resetframe = ToolButton('gtk-cancel') + resetframe = ToolButton('Gtk-cancel') resetframe.connect('clicked', self._resetframe_cb) - resetframe.set_tooltip(_('Reset')) + resetframe.set_tooltip_text(_('Reset')) self.insert(resetframe, -1) - separator = gtk.SeparatorToolItem() + separator = Gtk.SeparatorToolItem() self.insert(separator,-1) # play/pause buttons - play_img_1 = gtk.Image() + play_img_1 = Gtk.Image() play_img_1.set_from_icon_name('media-playback-start-back', - gtk.ICON_SIZE_LARGE_TOOLBAR) - pause_img_1 = gtk.Image() + Gtk.IconSize.LARGE_TOOLBAR) + pause_img_1 = Gtk.Image() pause_img_1.set_from_icon_name('media-playback-pause', - gtk.ICON_SIZE_LARGE_TOOLBAR) + Gtk.IconSize.LARGE_TOOLBAR) - play_img_2 = gtk.Image() + play_img_2 = Gtk.Image() play_img_2.set_from_icon_name('media-playback-start', - gtk.ICON_SIZE_LARGE_TOOLBAR) - pause_img_2 = gtk.Image() + Gtk.IconSize.LARGE_TOOLBAR) + pause_img_2 = Gtk.Image() pause_img_2.set_from_icon_name('media-playback-pause', - gtk.ICON_SIZE_LARGE_TOOLBAR) + Gtk.IconSize.LARGE_TOOLBAR) paly_1 = ToggleToolButton('media-playback-start-back') play_2 = ToggleToolButton('media-playback-start') @@ -139,13 +149,13 @@ class MontageToolbar(gtk.Toolbar): (paly_1, play_2), (play_img_1, pause_img_1), self.montage.playbackwards) self.insert(paly_1, -1) - paly_1.set_tooltip(_('Play backward / Pause')) + paly_1.set_tooltip_text(_('Play backward / Pause')) play_2.connect('toggled', self._play_cb, (play_2, paly_1), (play_img_2, pause_img_2), self.montage.playforwards) self.insert(play_2, -1) - play_2.set_tooltip(_('Play forward / Pause')) + play_2.set_tooltip_text(_('Play forward / Pause')) # tempo button @@ -153,18 +163,18 @@ class MontageToolbar(gtk.Toolbar): tempo.adjustment.connect("value-changed", self._tempo_cb) tempo.set_size_request(200, -1) tempo.set_value(50) - tempo_item = gtk.ToolItem() + tempo_item = Gtk.ToolItem() tempo_item.add(tempo) self.insert(tempo_item, -1) - separator = gtk.SeparatorToolItem() + separator = Gtk.SeparatorToolItem() self.insert(separator,-1) # export buttons exportframe = ToolButton('image') exportframe.connect('clicked', self._exportframe_cb) - exportframe.set_tooltip(_('Snapshot')) + exportframe.set_tooltip_text(_('Snapshot')) self.insert(exportframe, -1) self.show_all() @@ -182,7 +192,7 @@ class MontageToolbar(gtk.Toolbar): self.montage.reset() def _tempo_cb(self, widget): - self.montage.setplayspeed(widget.value) + self.montage.setplayspeed(widget.get_value()) def _play_cb(self, widget, buttons, images, play): if widget.get_active(): @@ -195,13 +205,13 @@ class MontageToolbar(gtk.Toolbar): widget.set_icon_widget(images[0]) self.montage.stop() -class LessonsToolbar(gtk.Toolbar): +class LessonsToolbar(Gtk.Toolbar): def __init__(self): - gtk.Toolbar.__init__(self) + Gtk.Toolbar.__init__(self) self._mask = False for lesson in lessons.THEMES: - button = gtk.ToggleToolButton() + button = Gtk.ToggleToolButton() button.set_label(lesson.name) button.connect('clicked', self._lessons_cb, lesson) self.insert(button, -1) |