From 000298d86273d1a98ad16430b2cc381b16c5ca5f Mon Sep 17 00:00:00 2001 From: JRG 2 Date: Wed, 01 Jan 2014 21:50:35 +0000 Subject: fullscreen --- diff --git a/activity.py b/activity.py index 40bde74..3d73db3 100755 --- a/activity.py +++ b/activity.py @@ -18,6 +18,8 @@ from gettext import gettext as _ import logging logger = logging.getLogger('cartoon-builder') +#from gi.repository import GObject +from sugar.graphics.toolbarbox import ToolbarButton from sugar.graphics.toolbutton import ToolButton from sugar.graphics.toggletoolbutton import ToggleToolButton from sugar.activity.activity import ActivityToolbox @@ -54,6 +56,7 @@ class CartoonBuilderActivity(SharedActivity): self.notebook.append_page(self.lessons) toolbox = ToolbarBox() + toolbox.connect('show', self.__show_toolbar_cb) toolbox.show() toolbox.toolbar.insert(ActivityToolbarButton(self), -1) @@ -67,6 +70,20 @@ class CartoonBuilderActivity(SharedActivity): lessons_button.set_tooltip(_('Lessons')) toolbox.toolbar.insert(lessons_button, -1) + view_subtoolbar = ToolbarButton() + view_toolbar = gtk.Toolbar() + view_subtoolbar.props.page = view_toolbar + view_subtoolbar.props.icon_name = 'toolbar-view' + view_subtoolbar.label = _('View') + toolbox.toolbar.insert(view_subtoolbar, -1) + + fullscreen_btn = ToolButton('view-fullscreen') + fullscreen_btn.set_tooltip(_('Fullscreen')) + fullscreen_btn.props.accelerator = 'Return' + fullscreen_btn.connect('clicked', self.__full_screen_cb) + view_toolbar.insert(fullscreen_btn, -1) + fullscreen_btn.show() + separator = gtk.SeparatorToolItem() separator.set_draw(False) toolbox.toolbar.insert(separator, -1) @@ -148,6 +165,27 @@ class CartoonBuilderActivity(SharedActivity): return toolbar + def __full_screen_cb(self, widget): + self.montage._char_combo.hide() + self.montage._ground_combo.hide() + self.montage._sound_combo.hide() + self.montage.right_panel.hide() + self.montage.bottom_panel.hide() + self.montage.left_panel.hide() + sound.play() + self.montage.play() + self.fullscreen() + + def __show_toolbar_cb(self, widget): + self.montage._char_combo.show() + self.montage._ground_combo.show() + self.montage._sound_combo.show() + self.montage.right_panel.show() + self.montage.bottom_panel.show() + self.montage.left_panel.show() + sound.stop() + self.montage.stop() + def __clear_tape_cb(self, widget): for i in range(theme.TAPE_COUNT): self.montage.props.frame = (i, None) diff --git a/montage.py b/montage.py index 4769969..a194212 100644 --- a/montage.py +++ b/montage.py @@ -116,7 +116,8 @@ class View(gtk.EventBox): return combo - self.controlbox.pack_start(new_combo(char.THEMES, self._char_cb), + self._char_combo = new_combo(char.THEMES, self._char_cb) + self.controlbox.pack_start(self._char_combo, False, False) self._ground_combo = new_combo(ground.THEMES, self._combo_cb, Document.ground, self._ground_cb) @@ -188,6 +189,7 @@ class View(gtk.EventBox): frames_box.pack_start(yellow_frames, True, True) frames_box.pack_start(yelow_arrow, False, False) frames_box.props.border_width = theme.BORDER_WIDTH + self.right_panel = frames_box # screen @@ -245,6 +247,7 @@ class View(gtk.EventBox): leftbox.set_size_request(logo.props.pixbuf.get_width(), -1) leftbox.pack_start(logo, False, False) leftbox.pack_start(self.controlbox, True, True) + self.left_panel = leftbox # screen box @@ -283,6 +286,7 @@ class View(gtk.EventBox): tape_box.props.border_width = theme.BORDER_WIDTH tape_box.pack_start(arrow, False, False) tape_box.pack_start(tape_hbox) + self.bottom_panel = tape_box desktop = gtk.VBox() desktop.pack_start(hdesktop, True, True, 0) -- cgit v0.9.1