Fix strings in GUI & warnings for better comprehension on who do what...

gui/cadbiom_gui/gt_gui/chart_checker/chart_checker_controler.py

@@ -201,7 +201,7 @@ class OccurenceForm(object):
         # get info
         final_prop = self.property_entry.get_text()
         if len(final_prop) == 0:
-            cancel_warn("Void property")
+            cancel_warn("Missing property")
             return
         inv_prop = self.inv_prop_entry.get_text()
         start_prop = self.start_prop_entry.get_text()
@@ -262,7 +262,7 @@ class OccurenceForm(object):
         # get info
         final_prop = self.property_entry.get_text()
         if len(final_prop) == 0:
-            cancel_warn("Void property")
+            cancel_warn("Missing property")
             return
         inv_prop = self.inv_prop_entry.get_text()
         start_prop = self.start_prop_entry.get_text()
@@ -327,7 +327,7 @@ class OccurenceForm(object):
         self.max_sol = max_sol
 
         if len(self.lsol) == 0:
-            cancel_warn("No conditions")
+            cancel_warn("No solution")
             return
 
         # activate buttons
@@ -360,16 +360,16 @@ class OccurenceForm(object):
         """
         launch mac computations
         """
-        ask = confirm(None, 'This process takes time' + '\n' +
-                    'You will not be able to use cadbiom.'+'\n' +
-                    ' Do you want to continue ?')
+        ask = confirm(None, 'This process takes time.\n' +
+                      'You will not be able to use cadbiom.\n' +
+                      'Do you want to continue ?')
         if ask:
             query = MCLSimpleQuery(self.start_prop,
                                    self.inv_prop, self.property)
             cam_list = self.mcla.mac_search(query, self.max_step)
             if len(cam_list)==0 :
-                ok_warn("The solver returns an empty list" +
-                        "\n"+" you should refine your query")
+                ok_warn("The solver could not find a MAC," +
+                        "\n you should refine your query")
             else :
                 CNSWindow(cam_list, self.__emvc,
                           self.__error_reporter, self)

gui/cadbiom_gui/gt_gui/chart_glade/occurence_form.glade

@@ -139,13 +139,13 @@
                                     <child>
                                       <widget class="GtkLabel" id="label7">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">Starting with the property</property>
+                                        <property name="label" translatable="yes">Starting with the property (start prop)</property>
                                       </widget>
                                     </child>
                                     <child>
                                       <widget class="GtkLabel" id="label10">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">Without checking the property</property>
+                                        <property name="label" translatable="yes">Without checking the property (invariant prop)</property>
                                       </widget>
                                       <packing>
                                         <property name="position">1</property>
@@ -256,7 +256,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="label" translatable="yes">Yes/No</property>
+                            <property name="label" translatable="yes">Is the problem satisfiable ?</property>
                             <property name="response_id">0</property>
                           </widget>
                           <packing>
@@ -269,7 +269,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="label" translatable="yes">Minimal Activation Conditions</property>
+                            <property name="label" translatable="yes">Search Minimal Activation Conditions</property>
                             <property name="response_id">0</property>
                           </widget>
                           <packing>
@@ -300,7 +300,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="label" translatable="yes"> Frontier Initialisations</property>
+                            <property name="label" translatable="yes"> Search solutions</property>
                             <property name="response_id">0</property>
                           </widget>
                           <packing>

gui/cadbiom_gui/gt_gui/chart_static/chart_stat_controler.py

@@ -446,13 +446,15 @@ class SCCWindow(object):
         # info label
         info = self.wtree.get_widget("label_nbsol")
         if not SCC_found:
-            info.set_text("No isolated Strongly Connected Components found.")
+            info.set_text("No isolated Strongly Connected Component(s) found.")
             return
         else:
-            info.set_text(str(len(self.l_solutions)) + \
-                          " isolated Strongly Connected Components found.\n"
-                          "(Only 1 node of each of them requires an input "
-                          "transition with a StartNode)")
+            info.set_text(
+                str(len(self.l_solutions)) + \
+                " isolated Strongly Connected Components found.\n"
+                "Only 1 node of each of them requires an input transition "
+                "with a StartNode.\nWithout this, places in such a part of the "
+                "model will remain unactivated in any scenario.")
 
         self.frame_sol =  self.wtree.get_widget("frame_sol")
         # button frame