Fixed a few bugs

3 files changed, 19 insertions, 32 deletions

diff --git a/activity_review/src/Model.py b/activity_review/src/Model.py
index 096dc39..2176d44 100644
--- a/activity_review/src/Model.py
+++ b/activity_review/src/Model.py
@@ -75,7 +75,6 @@ class ReviewModel(object):
 		# If the graph is not found, create it
 		if graph == None:
 			graph = gstore.create_graph(name="Comments")
-			graph.add_share(util.public_uri())
 			
 		# Record the comment
 		comment_resource = graph.create_resource(uid=None, category='Comment')
diff --git a/activity_review/src/View.py b/activity_review/src/View.py
index fc477b1..f9fc923 100644
--- a/activity_review/src/View.py
+++ b/activity_review/src/View.py
@@ -3,7 +3,7 @@ Created on 22 Oct 2012
 
 @author: cgueret
 '''
-from gi.repository import Gtk, GObject
+from gi.repository import Gtk, Gdk, GObject
 from semanticxo import graphstore
 from Model import ReviewModel
 
@@ -92,9 +92,6 @@ class TalkPanel(object):
 		# Load the comments
 		self.update_comments(model)
 
-		# The timeout to reload the talks
-		self._timeout_id = GObject.timeout_add(120000, self.update_comments, model)
-			
 		# Connect the mood bar buttons to the call back
 		for mood_id in [1, 2, 3, 4]:
 			radio = builder.get_object("radiobutton%d" % mood_id)
@@ -102,7 +99,9 @@ class TalkPanel(object):
 		
 		# Connect the question send button to the call back
 		button = builder.get_object("new_question_button")
-		button.connect("clicked", self.on_comment_button_clicked, builder.get_object("new_question"))
+		text_entry = builder.get_object("new_question")
+		button.connect("clicked", self.on_comment_button_clicked, text_entry)
+		text_entry.connect("key-press-event", self.on_entry_key_pressed)
 		
 	def get_widget(self):
 		return self._widget
@@ -125,11 +124,20 @@ class TalkPanel(object):
 		model.add_new_comment_for_talk(talk=self._identifier, comment=entry.get_text())
 		entry.set_text("")
 		self.update_comments(model)
-			
+	
+	def on_entry_key_pressed(self, entry, event):
+		'''
+		If the key pressed is enter, post the comment
+		'''
+		if event.keyval == Gdk.KEY_Return:
+			model = ReviewModel()
+			model.add_new_comment_for_talk(talk=self._identifier, comment=entry.get_text())
+			entry.set_text("")
+			self.update_comments(model)
+		
 	def update_comments(self, model):
 		for (comment_id, message, date, author) in model.get_comments_for_talk(talk=self._identifier):
 			if comment_id not in self._comments:
 				self._comments_store.append([message, author.split('/')[-1], date])
 				self._comments.add(comment_id)
-		return True
 		
\ No newline at end of file
diff --git a/activity_review/src/review_ui.glade b/activity_review/src/review_ui.glade
index a40516e..5851392 100644
--- a/activity_review/src/review_ui.glade
+++ b/activity_review/src/review_ui.glade
@@ -110,26 +110,6 @@
       <action-widget response="1">button3</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkImage" id="face-plain">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">face-plain</property>
-  </object>
-  <object class="GtkImage" id="face-smile">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">face-smile</property>
-  </object>
-  <object class="GtkImage" id="face-smirk">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">face-smirk</property>
-  </object>
-  <object class="GtkImage" id="face-surprise">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">face-surprise</property>
-  </object>
   <object class="GtkBox" id="main_box">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -260,10 +240,10 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton1">
+                        <property name="label" translatable="yes">:-)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="image">face-smile</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -276,10 +256,10 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton2">
+                        <property name="label" translatable="yes">:-o</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="image">face-surprise</property>
                         <property name="xalign">0</property>
                         <property name="always_show_image">True</property>
                         <property name="draw_indicator">True</property>
@@ -294,10 +274,10 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton3">
+                        <property name="label" translatable="yes">:-/</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="image">face-smirk</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">radiobutton1</property>
@@ -311,10 +291,10 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton4">
+                        <property name="label" translatable="yes">:-|</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="image">face-plain</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">radiobutton1</property>