1 files changed, 2 insertions, 49 deletions
diff --git a/ReckonPrimer.activity/display.py b/ReckonPrimer.activity/display.py
index 5861a77..beb4c67 100755
--- a/ReckonPrimer.activity/display.py
+++ b/ReckonPrimer.activity/display.py
@@ -391,52 +391,5 @@ class Display:
         
     def offer_coll_to_learner(self, collect):
         """TODO: get the users choice from buttons above the settings"""
-#        define_coll_gui()
-#        set_coll_gui()
-        self.topic_box = gtk.HBox(True, 0)
-        self.topic_table.attach(self.topic_box, 0, 6, 0, 1)
-        _i = 0
-        for _t in ['addsub_simp','passten','times_div']:
-            _i = _i + 1
-            self.button = gtk.Button()
-            self.image = gtk.Image()
-            
-            if(_t == 'addsub_simp'):
-                self.image.set_from_file("img/addsub_simp.jpg")
-            elif(_t == 'passten'):
-                self.image.set_from_file("img/passten.jpg")
-            elif(_t == 'times_div'):
-                self.image.set_from_file("img/times_div.jpg")
-
-            self.button.set_image(self.image)
-            self.button.connect("clicked", self.new_topic, _t)
-            self.topic_box.pack_start(self.button)
-            self.button.show()
-        self.topic_box.show()
-            
-         
-    def new_topic(self, widget, topic):
-        """callback: get the users choice from buttons above the settings"""
-        if(self.active_topic == None):
-            self.active_topic = topic
-            print('in Display.new_topic, 422 self._sett=', self._sett)
-            self._co.notify(('new-topic', topic))
-        elif(self.active_topic == topic):
-            pass
-        elif(self.active_topic != topic):
-            self.active_topic = topic
-            self.settings_table.destroy()
-            self.settings_table = gtk.Table(15, 6, True)
-            self.table.attach(self.settings_table, 1, 2, 0, 5)
-            self.settings_table.show()
-            
-            self.table_with_start.destroy()
-            self.table_with_start = gtk.Table(15, 6, True)
-            self.table.attach(self.table_with_start, 1, 2, 0, 5)
-            self.table_with_start.show()
-            self._co.notify(('new-topic', topic))
-            
-            
-        
-        
-        
+        collect.define_coll_gui()
+        collect.set_coll_gui()