additional development

3 files changed, 24 insertions, 5 deletions

diff --git a/activity/activity.info b/activity/activity.info
index 23398d2..bdb6d9e 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -3,5 +3,5 @@ name = Data Manager
 service_name = org.olenepal.DataManager
 class = datamanager.DataManager
 icon = datamanager-activity
-activity_version = 1
+activity_version = 2
 show_launcher = yes
diff --git a/datamanager.py b/datamanager.py
index 0cb6e74..548b262 100644
--- a/datamanager.py
+++ b/datamanager.py
@@ -71,8 +71,8 @@ class DataManager(activity.Activity):
         self.set_toolbox(toolbox)
         toolbox.show()
         self.viewer = Listview()
-        treeView = self.viewer.get_treeView()
-        treeView.set_model(self.viewer.create_model(self.usageTB))
+        #treeView = self.viewer.get_treeView()
+        #treeView.set_model(self.viewer.create_model(self.usageTB))
         #set up main screen
         self.main_screen = gtk.VBox()
         #self.main_screen.pack_start(self.alert, False, False, 0)
@@ -83,6 +83,10 @@ class DataManager(activity.Activity):
         self.viewer.set_label('canvas set')
         #self.alert.hide()
 
+    def start_cb(self, widget):
+        treeView = self.viewer.get_treeView()
+        treeView.set_model(self.viewer.create_model(self.usageTB))
+
     def close_cb(self, widget):
         #debug switch to cancel uploads
         #return True
@@ -260,7 +264,6 @@ class Listview(gtk.VBox):
             response = urllib2.urlopen(url)
         except:
             response = None
-        print 'Commons response', response
         if response:
             self.online = True
             online = True
@@ -270,7 +273,6 @@ class Listview(gtk.VBox):
             response = urllib2.urlopen(url)
         except:
             response = None
-        print 'schoolserver response', response
         if response:
             self.online = True
             online = True
@@ -488,6 +490,11 @@ class UsageToolbar(gtk.Toolbar):
         self.item2.add(self.fuelguage2)
         self.insert(self.item2, -1)
 
+        self.startbtn = ToolButton('btngo')
+        self.startbtn.connect('clicked', activity.start_cb)
+        self.startbtn.show()
+        self.insert(self.startbtn, -1)
+
         self.closebtn = ToolButton("btncancel")
         self.closebtn.connect('clicked', activity.close_cb)
         self.closebtn.show()
diff --git a/setup.py b/setup.py
new file mode 100755
index 0000000..77e788c
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+try:
+	from sugar.activity import bundlebuilder
+	bundlebuilder.start("ClassroomPresenter")
+except ImportError:
+	import os
+	#os.system("find ./ | sed 's,^./,ClassroomPresenter.activity/,g' > MANIFEST")
+	os.system('rm ClassroomPresenter.xo')
+	os.chdir('..')
+	os.system('zip -r ClassroomPresenter.xo ClassroomPresenter.activity')
+	os.system('mv ClassroomPresenter.xo ./ClassroomPresenter.activity')
+	os.chdir('ClassroomPresenter.activity')