Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/classroomkit.py
diff options
context:
space:
mode:
Diffstat (limited to 'classroomkit.py')
-rw-r--r--classroomkit.py27
1 files changed, 23 insertions, 4 deletions
diff --git a/classroomkit.py b/classroomkit.py
index ac201dd..81273ad 100644
--- a/classroomkit.py
+++ b/classroomkit.py
@@ -18,7 +18,12 @@ from sugar.activity.activity import ActivityToolbox
from sugar.presence import presenceservice
from broadcast import Broadcast
+from viewer import Viewer
+# Telepathy service setup
+SERVICE = 'org.sugarlabs.ClassroomKit'
+IFACE = SERVICE
+PATH = '/org/sugarlabs/ClassroomKit'
class ClassroomKitActivity(activity.Activity):
"""Classroom Kit Activity
@@ -27,6 +32,9 @@ class ClassroomKitActivity(activity.Activity):
# Broadcast Component
_broadcast = None
+ # Viewer Component
+ _viewer = None
+
# UI
_toolbar = None
@@ -42,15 +50,26 @@ class ClassroomKitActivity(activity.Activity):
# UI
self.loadUI()
- # create broadcast component
- self._broadcast = Broadcast(self)
- self._broadcast.loadUI();
+ # Broadcast
+ if not self._shared_activity:
+ self._broadcast = Broadcast(self)
+ self._broadcast.loadUI();
+ # Viewer
+ else:
+ self._viewer = Viewer(self)
+ self._viewer.loadUI();
# Show UI
self.showUI()
# Show status
- self._broadcast.showStatus()
+ if not self._shared_activity:
+ self._broadcast.startBroadcast()
+ self._broadcast.showStatus()
+ else:
+ self._viewer.startViewer("192.168.1.69")
+ self._viewer.showStatus()
+
def loadUI(self):
"""Create and show UI