diff options
Diffstat (limited to 'YupanaActivity.py')
| -rw-r--r-- | YupanaActivity.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/YupanaActivity.py b/YupanaActivity.py index d065ec3..5df63d9 100644 --- a/YupanaActivity.py +++ b/YupanaActivity.py @@ -1,4 +1,5 @@ #Copyright (c) 2011 Walter Bender +#Copyright (c) 2012 Ignacio Rodriguez # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -9,21 +10,20 @@ # along with this library; if not, write to the Free Software # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA +from gi.repository import Gtk, Gdk, GObject -import gtk - -from sugar.activity import activity -from sugar import profile +from sugar3.activity import activity +from sugar3 import profile try: - from sugar.graphics.toolbarbox import ToolbarBox + from sugar3.graphics.toolbarbox import ToolbarBox _have_toolbox = True except ImportError: _have_toolbox = False if _have_toolbox: - from sugar.activity.widgets import ActivityToolbarButton - from sugar.activity.widgets import StopButton - from sugar.graphics.toolbarbox import ToolbarButton + from sugar3.activity.widgets import ActivityToolbarButton + from sugar3.activity.widgets import StopButton + from sugar3.graphics.toolbarbox import ToolbarButton from toolbar_utils import button_factory, label_factory, separator_factory, \ radio_factory, entry_factory @@ -33,8 +33,8 @@ import telepathy import dbus from dbus.service import signal from dbus.gobject_service import ExportedGObject -from sugar.presence import presenceservice -from sugar.presence.tubeconn import TubeConnection +from sugar3.presence import presenceservice +from sugar3.presence.tubeconn import TubeConnection from gettext import gettext as _ @@ -70,9 +70,9 @@ class YupanaActivity(activity.Activity): self._setup_dispatch_table() # Create a canvas - canvas = gtk.DrawingArea() - canvas.set_size_request(gtk.gdk.screen_width(), \ - gtk.gdk.screen_height()) + canvas = Gtk.DrawingArea() + canvas.set_size_request(Gdk.Screen.width(), \ + Gdk.Screen.height()) self.set_canvas(canvas) canvas.show() self.show_all() @@ -94,8 +94,8 @@ class YupanaActivity(activity.Activity): self.max_participants = 4 - yupana_toolbar = gtk.Toolbar() - self.custom_toolbar = gtk.Toolbar() + yupana_toolbar = Gtk.Toolbar() + self.custom_toolbar = Gtk.Toolbar() if have_toolbox: toolbox = ToolbarBox() |