diff options
Diffstat (limited to 'classroomkit.py')
| -rw-r--r-- | classroomkit.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/classroomkit.py b/classroomkit.py index 4f2f289..e8c7e0d 100644 --- a/classroomkit.py +++ b/classroomkit.py @@ -19,6 +19,7 @@ from sugar.presence import presenceservice from broadcast import Broadcast from viewer import Viewer +from utilities import Utilities # Telepathy service setup SERVICE = 'org.sugarlabs.ClassroomKit' @@ -38,6 +39,9 @@ class ClassroomKitActivity(activity.Activity): # UI _toolbar = None + # Utilities + _utilities = None + def __init__(self, handle): """Constructor """ @@ -50,6 +54,9 @@ class ClassroomKitActivity(activity.Activity): # UI self.loadUI() + # Utilities + self._utilities = Utilities() + # Broadcast if not self._shared_activity: self._broadcast = Broadcast(self) @@ -67,25 +74,26 @@ class ClassroomKitActivity(activity.Activity): self._broadcast.startBroadcast() self._broadcast.showStatus() else: - self._viewer.startViewer("192.168.1.69") - self._viewer.showStatus() + self._viewer.startViewer(self._utilities.getNetworkDict()) + #self._viewer.showStatus() def loadUI(self): """Create and show UI """ # Toolbar + # Broadcast if not self._shared_activity: toolbox = ActivityToolbox(self) self._toolbar = toolbox.get_activity_toolbar() self.set_toolbox(toolbox) + # Viewer else: # we do not have collaboration features # make the share option insensitive self.max_participants = 1 - # Toolbar toolbox = ActivityToolbox(self) self._toolbar = toolbox.get_activity_toolbar() |