Code cleaned

3 files changed, 49 insertions, 34 deletions

diff --git a/classroomviewer_activity.py b/classroomviewer_activity.py
index e445738..580cb04 100644
--- a/classroomviewer_activity.py
+++ b/classroomviewer_activity.py
@@ -11,49 +11,64 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import logging
-from gettext import gettext as _
+import gtk
+
 from sugar.activity import activity
 from sugar.activity.activity import ActivityToolbox
-import gtk
-import subprocess
-import os
-import socket
-import commands
+from sugar.presence import presenceservice
 
+from viewer import Viewer
 
 class ClassRoomViewerActivity(activity.Activity):
     """Class Room Viewer Activity
     """
 
-    # GUI
+    # Viewer Component
+    _viewer = None
+
+    # UI
     _toolbar = None
 
     def __init__(self, handle):
-        """Class constructor
+        """Constructor
         """
-
-        # Initialize parent class
+        # initialize activity
         activity.Activity.__init__(self, handle)
 
-        # Remove colaboration features
-        self.max_participants = 1
+        # debug msg
+        logging.debug("Starting Classroom Kit Activity")
 
-        # Debug msg
-        logging.debug("Starting Class Room Viewer Activity")
+        # UI
+        self.loadUI()
 
-        # Load GUI
-        self.loadGUI()
+        # create broadcast component
+        self._viewer = Viewer(self)
+        self._viewer.loadUI();
 
-    def loadGUI(self):
-        """Create and show GUI
+        # Show UI
+        self.showUI()
+
+        # Show status
+        self._viewer.showStatus()
+
+    def loadUI(self):
+        """Create and show UI
         """
+        # 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()
+
         self._toolbar.remove(self._toolbar.share)
         self._toolbar.share = None
+        self._toolbar.remove(self._toolbar.keep)
+        self._toolbar.keep = None
         self.set_toolbox(toolbox)
 
+    def showUI(self):
+        """Show UI elements
+        """
         self.show_all()
-
diff --git a/i18n.py b/i18n.py
index b438938..5b48f93 100644
--- a/i18n.py
+++ b/i18n.py
@@ -13,8 +13,8 @@
 from gettext import gettext as _
 
 # UI Buttons
-START = _('Start')
-STOP = _('Stop')
+CONNECT = _('Connect')
+DISCONNECT = _('Disconnect')
 
 # Process
 IPS = _('IPs')
diff --git a/viewer.py b/viewer.py
index cc2771a..874dfe0 100644
--- a/viewer.py
+++ b/viewer.py
@@ -4,16 +4,16 @@ import pango
 from utilities import Utilities
 import i18n
 
-class BroadcastProcess():
-    """Broadcast process component
+class ViewerProcess():
+    """Viewer process component
     """
 
     # utilities
     _utilities = None
 
     # process details
-    _programName = "x11vnc"
-    _args = ["-viewonly", "-shared", "-bg", "-forever", "-solid", "-wireframe"]
+    _programName = "vncviewer"
+    _args = []
 
     def __init__(self):
         """Constructor
@@ -39,8 +39,8 @@ class BroadcastProcess():
         return self._utilities.getNetworkProcessInfo(self._programName)
 
 
-class BroadcastUI():
-    """Broadcast UI component for Classroom Kit Activity
+class ViewerUI():
+    """Viewer UI component for Classroom Kit Activity
     """
     # Constants
     _greenColor = '#00E500'
@@ -118,15 +118,15 @@ class BroadcastUI():
 
         if not state:
             self.setButtonBG(self._greenColor)
-            self.setButtonLabel(i18n.START)
+            self.setButtonLabel(i18n.CONNECT)
             self.setLabelTXT("")
         else:
             self.setButtonBG(self._redColor)
-            self.setButtonLabel(i18n.STOP)
+            self.setButtonLabel(i18n.DISCONNECT)
             self.setLabelTXT(self._process.getProcessInfo())
 
-class Broadcast():
-    """Broadcast component for Classroom Kit Activity
+class Viewer():
+    """Viewer component for Classroom Kit Activity
     """
     _activity = None
     _process = None
@@ -136,8 +136,8 @@ class Broadcast():
         """Constructor
         """
         self._activity = activity
-        self._process = BroadcastProcess()
-        self._ui = BroadcastUI(self._activity, self._process)
+        self._process = ViewerProcess()
+        self._ui = ViewerUI(self._activity, self._process)
 
     def loadUI(self):
         """Load UI
@@ -145,6 +145,6 @@ class Broadcast():
         self._ui.loadUI()
 
     def showStatus(self):
-        """Show broadcast status
+        """Show Viewer status
         """
         self._ui.showStatus()