sugar to sugar3

11 files changed, 33 insertions, 33 deletions

diff --git a/button.py b/button.py
index 66cf80b..3879d32 100644
--- a/button.py
+++ b/button.py
@@ -2,8 +2,8 @@ import gobject
 import gtk
 from gettext import gettext as _
 
-from sugar.graphics.palette import Palette
-from sugar.graphics.tray import TrayButton
+from sugar3.graphics.palette import Palette
+from sugar3.graphics.tray import TrayButton
 import constants
 import utils
 
diff --git a/collab.py b/collab.py
index 34a0c21..8b6d5c3 100644
--- a/collab.py
+++ b/collab.py
@@ -6,9 +6,9 @@ import gobject
 import telepathy
 import telepathy.client
 
-from sugar.presence import presenceservice
-from sugar.presence.tubeconn import TubeConnection
-from sugar import util
+from sugar3.presence import presenceservice
+from sugar3.presence.tubeconn import TubeConnection
+from sugar3 import util
 
 import utils
 import serialize
diff --git a/constants.py b/constants.py
index 2e0f54c..3b09683 100644
--- a/constants.py
+++ b/constants.py
@@ -2,7 +2,7 @@
 import os
 from gettext import gettext as _
 
-from sugar.activity import activity
+from sugar3.activity import activity
 
 MODE_PHOTO = 0
 MODE_VIDEO = 1
diff --git a/glive.py b/glive.py
index 8618284..71aa226 100644
--- a/glive.py
+++ b/glive.py
@@ -29,7 +29,7 @@ pygst.require('0.10')
 import gobject
 gobject.threads_init()
 
-from sugar.activity.activity import get_bundle_path
+from sugar3.activity.activity import get_bundle_path
 import logging
 
 from instance import Instance
diff --git a/iconcombobox.py b/iconcombobox.py
index d5eb807..a7cfdc4 100644
--- a/iconcombobox.py
+++ b/iconcombobox.py
@@ -20,8 +20,8 @@
 
 import gtk
 
-from sugar.graphics.combobox import ComboBox
-from sugar.graphics import style
+from sugar3.graphics.combobox import ComboBox
+from sugar3.graphics import style
 
 
 class IconComboBox(gtk.ToolItem):
diff --git a/instance.py b/instance.py
index bcee466..259bc2d 100644
--- a/instance.py
+++ b/instance.py
@@ -1,7 +1,7 @@
 import os
 
-from sugar import profile
-from sugar import util
+from sugar3 import profile
+from sugar3 import util
 
 class Instance:
     key = profile.get_pubkey()
diff --git a/model.py b/model.py
index 1af2487..759cd7d 100644
--- a/model.py
+++ b/model.py
@@ -30,8 +30,8 @@ import json
 import gobject
 import gst
 
-import sugar.profile
-import sugar.env
+import sugar3.profile
+import sugar3.env
 
 import aplay
 import constants
@@ -99,7 +99,7 @@ class Model:
         return self.glive.get_has_camera()
 
     def get_nickname(self):
-        return sugar.profile.get_nick_name()
+        return sugar3.profile.get_nick_name()
 
     def get_mode(self):
         return self._mode
@@ -118,7 +118,7 @@ class Model:
         self.set_state(constants.STATE_READY)
 
     def ui_frozen(self):
-        return not self._state == constants.STATE_READY 
+        return not self._state == constants.STATE_READY
 
     def set_visible(self, visible):
         if visible == self._visible:
@@ -386,7 +386,7 @@ class Model:
         recd.title = _('%(type)s by %(name)s') % {'type': stringType,
                 'name': recd.recorderName}
 
-        color = sugar.profile.get_color()
+        color = sugar3.profile.get_color()
         recd.colorStroke = color.get_stroke_color()
         recd.colorFill = color.get_fill_color()
 
diff --git a/record.py b/record.py
index d2da3cf..a1cd5f2 100644
--- a/record.py
+++ b/record.py
@@ -33,13 +33,13 @@ import pygst
 pygst.require('0.10')
 import gst
 
-from sugar.activity import activity
-from sugar.graphics.toolcombobox import ToolComboBox
-from sugar.graphics.toolbarbox import ToolbarBox
-from sugar.graphics.toolbarbox import ToolbarButton
-from sugar.graphics.radiotoolbutton import RadioToolButton
-from sugar.activity.widgets import StopButton
-from sugar.activity.widgets import ActivityToolbarButton
+from sugar3.activity import activity
+from sugar3.graphics.toolcombobox import ToolComboBox
+from sugar3.graphics.toolbarbox import ToolbarBox
+from sugar3.graphics.toolbarbox import ToolbarButton
+from sugar3.graphics.radiotoolbutton import RadioToolButton
+from sugar3.activity.widgets import StopButton
+from sugar3.activity.widgets import ActivityToolbarButton
 
 from model import Model
 from button import RecdButton
@@ -632,7 +632,7 @@ class RecordContainer(gtk.Container):
             height = (height / 3) * 3
             width = int(ratio * height)
 
-        return width, height 
+        return width, height
 
     @staticmethod
     def _center_in_plane(plane_size, size):
diff --git a/serialize.py b/serialize.py
index 687bbaa..9cd7f40 100644
--- a/serialize.py
+++ b/serialize.py
@@ -4,7 +4,7 @@ import os
 import gtk
 import logging
 
-from sugar.datastore import datastore
+from sugar3.datastore import datastore
 
 import constants
 from instance import Instance
diff --git a/setup.py b/setup.py
index 876cd3f..95390a3 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-from sugar.activity import bundlebuilder
+from sugar3.activity import bundlebuilder
 
 bundlebuilder.start()
 
diff --git a/tray.py b/tray.py
index 4f7956d..f8a4a2f 100644
--- a/tray.py
+++ b/tray.py
@@ -19,9 +19,9 @@ import gobject
 import gtk
 import hippo
 
-import sugar
-from sugar.graphics import style
-from sugar.graphics.icon import Icon
+import sugar3
+from sugar3.graphics import style
+from sugar3.graphics.icon import Icon
 
 _PREVIOUS_PAGE = 0
 _NEXT_PAGE = 1
@@ -171,12 +171,12 @@ class HTray(gtk.VBox):
         hbox.pack_start(scroll_right_event, False)
 
         scroll_left.set_focus_on_click(False)
-        scroll_left_event.modify_bg(gtk.STATE_NORMAL, sugar.graphics.style.COLOR_TOOLBAR_GREY.get_gdk_color())
-        scroll_left.modify_bg(gtk.STATE_ACTIVE, sugar.graphics.style.COLOR_BUTTON_GREY.get_gdk_color())
+        scroll_left_event.modify_bg(gtk.STATE_NORMAL, sugar3.graphics.style.COLOR_TOOLBAR_GREY.get_gdk_color())
+        scroll_left.modify_bg(gtk.STATE_ACTIVE, sugar3.graphics.style.COLOR_BUTTON_GREY.get_gdk_color())
 
         scroll_right.set_focus_on_click(False)
-        scroll_right_event.modify_bg(gtk.STATE_NORMAL, sugar.graphics.style.COLOR_TOOLBAR_GREY.get_gdk_color())
-        scroll_right.modify_bg(gtk.STATE_ACTIVE, sugar.graphics.style.COLOR_BUTTON_GREY.get_gdk_color())
+        scroll_right_event.modify_bg(gtk.STATE_NORMAL, sugar3.graphics.style.COLOR_TOOLBAR_GREY.get_gdk_color())
+        scroll_right.modify_bg(gtk.STATE_ACTIVE, sugar3.graphics.style.COLOR_BUTTON_GREY.get_gdk_color())
 
         scroll_left.viewport = self._viewport
         scroll_right.viewport = self._viewport