diff options
Diffstat (limited to 'TurtleArtActivity.py')
| -rw-r--r-- | TurtleArtActivity.py | 73 |
1 files changed, 35 insertions, 38 deletions
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index f5bdd69..92efed4 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -20,10 +20,7 @@ #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN #THE SOFTWARE. -import pygtk -pygtk.require('2.0') -import gtk -import gobject +from util.gtkcompat import Gtk, GObject import dbus import logging @@ -151,7 +148,7 @@ class TurtleArtActivity(activity.Activity): datastore.write(dsobject) dsobject.destroy() - gobject.timeout_add(250, self.save_as_html.set_icon, 'htmloff') + GObject.timeout_add(250, self.save_as_html.set_icon, 'htmloff') self.tw.saved_pictures = [] # Clear queue of pictures we have viewed. return @@ -171,7 +168,7 @@ class TurtleArtActivity(activity.Activity): datastore.write(dsobject) dsobject.destroy() - gobject.timeout_add(250, self.save_as_logo.set_icon, 'logo-saveoff') + GObject.timeout_add(250, self.save_as_logo.set_icon, 'logo-saveoff') return def do_load_ta_project_cb(self, button): @@ -190,7 +187,7 @@ class TurtleArtActivity(activity.Activity): ''' Load Python code from the Journal. ''' self.load_python.set_icon('pippy-openon') self.tw.load_python_code_from_file(fname=None, add_new_block=True) - gobject.timeout_add(250, self.load_python.set_icon, 'pippy-openoff') + GObject.timeout_add(250, self.load_python.set_icon, 'pippy-openoff') def do_save_as_image_cb(self, button): ''' Save the canvas to the Journal. ''' @@ -198,7 +195,7 @@ class TurtleArtActivity(activity.Activity): _logger.debug('saving image to journal') self.tw.save_as_image() - gobject.timeout_add(250, self.save_as_image.set_icon, 'image-saveoff') + GObject.timeout_add(250, self.save_as_image.set_icon, 'image-saveoff') return def do_keep_cb(self, button): @@ -297,28 +294,28 @@ class TurtleArtActivity(activity.Activity): self.eraser_button.set_icon('eraseroff') self.recenter() self.tw.eraser_button() - gobject.timeout_add(250, self.eraser_button.set_icon, 'eraseron') + GObject.timeout_add(250, self.eraser_button.set_icon, 'eraseron') def do_run_cb(self, button): ''' Callback for run button (rabbit) ''' self.run_button.set_icon('run-faston') self.tw.lc.trace = 0 self.tw.run_button(0) - gobject.timeout_add(1000, self.run_button.set_icon, 'run-fastoff') + GObject.timeout_add(1000, self.run_button.set_icon, 'run-fastoff') def do_step_cb(self, button): ''' Callback for step button (turtle) ''' self.step_button.set_icon('run-slowon') self.tw.lc.trace = 1 self.tw.run_button(3) - gobject.timeout_add(1000, self.step_button.set_icon, 'run-slowoff') + GObject.timeout_add(1000, self.step_button.set_icon, 'run-slowoff') def do_debug_cb(self, button): ''' Callback for debug button (bug) ''' self.debug_button.set_icon('debugon') self.tw.lc.trace = 1 self.tw.run_button(9) - gobject.timeout_add(1000, self.debug_button.set_icon, 'debugoff') + GObject.timeout_add(1000, self.debug_button.set_icon, 'debugoff') def do_stop_cb(self, button): ''' Callback for stop button. ''' @@ -462,10 +459,10 @@ class TurtleArtActivity(activity.Activity): def __visibility_notify_cb(self, window, event): ''' Callback method for when the activity's visibility changes. ''' - if event.state == gtk.gdk.VISIBILITY_FULLY_OBSCURED: + if event.get_state() == Gdk.VisibilityState.FULLY_OBSCURED: self.tw.background_plugins() - elif event.state in \ - [gtk.gdk.VISIBILITY_UNOBSCURED, gtk.gdk.VISIBILITY_PARTIAL]: + elif event.get_state() in \ + [Gdk.VISIBILITY_UNOBSCURED, Gdk.VISIBILITY_PARTIAL]: self.tw.foreground_plugins() def _keep_clicked_cb(self, button): @@ -479,18 +476,18 @@ class TurtleArtActivity(activity.Activity): activity_toolbar_button = ActivityToolbarButton(self) - edit_toolbar = gtk.Toolbar() + edit_toolbar = Gtk.Toolbar() edit_toolbar_button = ToolbarButton(label=_('Edit'), page=edit_toolbar, icon_name='toolbar-edit') - view_toolbar = gtk.Toolbar() + view_toolbar = Gtk.Toolbar() view_toolbar_button = ToolbarButton(label=_('View'), page=view_toolbar, icon_name='toolbar-view') - self._palette_toolbar = gtk.Toolbar() + self._palette_toolbar = Gtk.Toolbar() self._palette_toolbar_button = ToolbarButton( page=self._palette_toolbar, icon_name='palette') - self._help_toolbar = gtk.Toolbar() + self._help_toolbar = Gtk.Toolbar() help_toolbar_button = ToolbarButton(label=_('Help'), page=self._help_toolbar, icon_name='help-toolbar') @@ -530,15 +527,15 @@ class TurtleArtActivity(activity.Activity): self._toolbox = activity.ActivityToolbox(self) self.set_toolbox(self._toolbox) - project_toolbar = gtk.Toolbar() + project_toolbar = Gtk.Toolbar() self._toolbox.add_toolbar(_('Project'), project_toolbar) - view_toolbar = gtk.Toolbar() + view_toolbar = Gtk.Toolbar() self._toolbox.add_toolbar(_('View'), view_toolbar) - edit_toolbar = gtk.Toolbar() + edit_toolbar = Gtk.Toolbar() self._toolbox.add_toolbar(_('Edit'), edit_toolbar) - journal_toolbar = gtk.Toolbar() + journal_toolbar = Gtk.Toolbar() self._toolbox.add_toolbar(_('Import/Export'), journal_toolbar) - self._help_toolbar = gtk.Toolbar() + self._help_toolbar = Gtk.Toolbar() self._toolbox.add_toolbar(_('Help'), self._help_toolbar) self._make_palette_buttons(project_toolbar, palette_button=True) @@ -587,10 +584,10 @@ class TurtleArtActivity(activity.Activity): is in use. ''' # FIXME: Temporary work-around gtk problem with XO175 if get_hardware() not in [XO175] and \ - (gtk.gtk_version[0] > 2 or gtk.gtk_version[1] > 16): + (Gtk.gtk_version[0] > 2 or Gtk.gtk_version[1] > 16): self.hover_help_label = self._add_label( _('Move the cursor over the orange palette for help.'), - self._help_toolbar, gtk.gdk.screen_width() - 2 * ICON_SIZE) + self._help_toolbar, Gdk.Screen.width() - 2 * ICON_SIZE) else: self.hover_help_label = self._add_label( _('Move the cursor over the orange palette for help.'), @@ -695,14 +692,14 @@ class TurtleArtActivity(activity.Activity): def _setup_scrolled_window(self): ''' Create a scrolled window to contain the turtle canvas. ''' - self.sw = gtk.ScrolledWindow() + self.sw = Gtk.ScrolledWindow() self.set_canvas(self.sw) - self.sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + self.sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) self.sw.show() - canvas = gtk.DrawingArea() - canvas.set_size_request(gtk.gdk.screen_width() * 2, - gtk.gdk.screen_height() * 2) + canvas = Gtk.DrawingArea() + canvas.set_size_request(Gdk.Screen.width() * 2, + Gdk.Screen.height() * 2) self.sw.add_with_viewport(canvas) hadj = self.sw.get_hadjustment() hadj.connect('value-changed', self._scroll_cb) @@ -723,7 +720,7 @@ class TurtleArtActivity(activity.Activity): vadj = self.sw.get_vadjustment() self.vadj_value = vadj.get_value() if not self.tw.hw in [XO1]: - gobject.idle_add(self.tw.move_palettes, self.hadj_value, + GObject.idle_add(self.tw.move_palettes, self.hadj_value, self.vadj_value) def _setup_canvas(self, canvas_window): @@ -753,7 +750,7 @@ class TurtleArtActivity(activity.Activity): def _setup_visibility_handler(self): ''' Notify me when the visibility state changes. ''' - self.add_events(gtk.gdk.VISIBILITY_NOTIFY_MASK) + self.add_events(Gdk.EventMask.VISIBILITY_NOTIFY_MASK) self.connect('visibility-notify-event', self.__visibility_notify_cb) def write_file(self, file_path): @@ -816,7 +813,7 @@ class TurtleArtActivity(activity.Activity): def _copy_cb(self, button): ''' Copy to the clipboard. ''' - clipboard = gtk.Clipboard() + clipboard = Gtk.Clipboard() _logger.debug('Serialize the project and copy to clipboard.') data = self.tw.assemble_data_to_save(False, False) if data is not []: @@ -826,7 +823,7 @@ class TurtleArtActivity(activity.Activity): def _paste_cb(self, button): ''' Paste from the clipboard. ''' - clipboard = gtk.Clipboard() + clipboard = Gtk.Clipboard() _logger.debug('Paste to the project.') text = clipboard.wait_for_text() if text is not None: @@ -842,12 +839,12 @@ class TurtleArtActivity(activity.Activity): def _add_label(self, string, toolbar, width=None): ''' Add a label to a toolbar. ''' - label = gtk.Label(string) + label = Gtk.Label(label=string) label.set_line_wrap(True) if width is not None: label.set_size_request(width, -1) label.show() - toolitem = gtk.ToolItem() + toolitem = Gtk.ToolItem() toolitem.add(label) toolbar.insert(toolitem, -1) toolitem.show() @@ -855,7 +852,7 @@ class TurtleArtActivity(activity.Activity): def _add_separator(self, toolbar, expand=False, visible=True): ''' Add a separator to a toolbar. ''' - separator = gtk.SeparatorToolItem() + separator = Gtk.SeparatorToolItem() separator.props.draw = visible separator.set_expand(expand) if hasattr(toolbar, 'insert'): |