- moved to the view menu toggles for coercion hiding and notation pp

- moved back the high level pp toggle to the debug menu

diff --git a/helm/software/matita/matita.glade b/helm/software/matita/matita.glade
index 8cc437f39acf06f7ed36e1c5caad030706efc5fa..4b3378513d32d4ccc4b77d5e3483e73d6c37777e 100644 (file)
--- a/helm/software/matita/matita.glade
+++ b/helm/software/matita/matita.glade
@@ -1081,7 +1081,7 @@
                              <accelerator key="n" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image979">
+                               <widget class="GtkImage" id="image1013">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-new</property>
                                  <property name="icon_size">1</property>
@@ -1102,7 +1102,7 @@
                              <accelerator key="o" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image980">
+                               <widget class="GtkImage" id="image1014">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-open</property>
                                  <property name="icon_size">1</property>
@@ -1123,7 +1123,7 @@
                              <accelerator key="s" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image981">
+                               <widget class="GtkImage" id="image1015">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-save</property>
                                  <property name="icon_size">1</property>
@@ -1144,7 +1144,7 @@
                              <accelerator key="s" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image982">
+                               <widget class="GtkImage" id="image1016">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-save-as</property>
                                  <property name="icon_size">1</property>
@@ -1165,7 +1165,7 @@
                              <accelerator key="d" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image983">
+                               <widget class="GtkImage" id="image1017">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-execute</property>
                                  <property name="icon_size">1</property>
@@ -1192,7 +1192,7 @@
                              <accelerator key="q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image984">
+                               <widget class="GtkImage" id="image1018">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-quit</property>
                                  <property name="icon_size">1</property>
@@ -1227,7 +1227,7 @@
                              <accelerator key="z" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image985">
+                               <widget class="GtkImage" id="image1019">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-undo</property>
                                  <property name="icon_size">1</property>
@@ -1249,7 +1249,7 @@
                              <accelerator key="z" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image986">
+                               <widget class="GtkImage" id="image1020">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-redo</property>
                                  <property name="icon_size">1</property>
@@ -1276,7 +1276,7 @@
                              <accelerator key="x" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image987">
+                               <widget class="GtkImage" id="image1021">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-cut</property>
                                  <property name="icon_size">1</property>
@@ -1297,7 +1297,7 @@
                              <accelerator key="c" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image988">
+                               <widget class="GtkImage" id="image1022">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-copy</property>
                                  <property name="icon_size">1</property>
@@ -1318,7 +1318,7 @@
                              <accelerator key="v" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image989">
+                               <widget class="GtkImage" id="image1023">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-paste</property>
                                  <property name="icon_size">1</property>
@@ -1346,7 +1346,7 @@
                              <property name="use_underline">True</property>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image990">
+                               <widget class="GtkImage" id="image1024">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-delete</property>
                                  <property name="icon_size">1</property>
@@ -1387,7 +1387,7 @@
                              <accelerator key="f" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image991">
+                               <widget class="GtkImage" id="image1025">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-find-and-replace</property>
                                  <property name="icon_size">1</property>
@@ -1555,7 +1555,7 @@
                              <accelerator key="plus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image992">
+                               <widget class="GtkImage" id="image1026">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-zoom-in</property>
                                  <property name="icon_size">1</property>
@@ -1576,7 +1576,7 @@
                              <accelerator key="minus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image993">
+                               <widget class="GtkImage" id="image1027">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-zoom-out</property>
                                  <property name="icon_size">1</property>
@@ -1597,7 +1597,7 @@
                              <accelerator key="equal" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image994">
+                               <widget class="GtkImage" id="image1028">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-zoom-100</property>
                                  <property name="icon_size">1</property>
@@ -1617,12 +1617,20 @@
                          </child>
 
                          <child>
-                           <widget class="GtkCheckMenuItem" id="formulaePpMenuItem">
+                           <widget class="GtkCheckMenuItem" id="ppNotationMenuItem">
                              <property name="visible">True</property>
-                             <property name="label" translatable="yes">Pretty print formulae</property>
+                             <property name="label" translatable="yes">Pretty print notation</property>
+                             <property name="use_underline">True</property>
+                             <property name="active">True</property>
+                           </widget>
+                         </child>
+
+                         <child>
+                           <widget class="GtkCheckMenuItem" id="hideCoercionsMenuItem">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">Hide coercions</property>
                              <property name="use_underline">True</property>
                              <property name="active">True</property>
-                             <accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                            </widget>
                          </child>
                        </widget>
@@ -1666,7 +1674,7 @@
                              <accelerator key="F1" modifiers="0" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image995">
+                               <widget class="GtkImage" id="image1029">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-help</property>
                                  <property name="icon_size">1</property>
@@ -1686,7 +1694,7 @@
                              <property name="use_underline">True</property>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image996">
+                               <widget class="GtkImage" id="image1030">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-about</property>
                                  <property name="icon_size">1</property>

diff --git a/helm/software/matita/matita.ml b/helm/software/matita/matita.ml
index ce9280dcdc229b6ceda080a4af4e55b12dca7858..a23558aa85e0ff83ca12707b4c732a4ba6db829c 100644 (file)
--- a/helm/software/matita/matita.ml
+++ b/helm/software/matita/matita.ml
@@ -214,28 +214,30 @@ let _ =
     );
     addDebugSeparator ();
 *)
-(* ZACK: moved to a check box menu item in the View menu
     addDebugItem "disable high level pretty printer"
       (fun _ -> CicMetaSubst.use_low_level_ppterm_in_context := true);
     addDebugItem "enable high level pretty printer"
       (fun _ -> CicMetaSubst.use_low_level_ppterm_in_context := false);
-*)
+(* ZACK moved to the View menu
     addDebugItem "disable all (pretty printing) notations"
       (fun _ -> CicNotation.set_active_notations []);
     addDebugItem "enable all (pretty printing) notations"
       (fun _ ->
         CicNotation.set_active_notations
           (List.map fst (CicNotation.get_all_notations ())));
+*)
     addDebugSeparator ();
     addDebugItem "enable multiple disambiguation passes (default)"
       (fun _ -> GrafiteDisambiguator.only_one_pass := false);
     addDebugItem "enable only one disambiguation pass"
       (fun _ -> GrafiteDisambiguator.only_one_pass := true);
     addDebugSeparator ();
+(* ZACK moved to the View menu
     addDebugItem "enable coercions hiding"
       (fun _ -> Acic2content.hide_coercions := true);
     addDebugItem "disable coercions hiding"
       (fun _ -> Acic2content.hide_coercions := false);
+*)
     addDebugItem "show coercions graph" (fun _ ->
       let c = MatitaMathView.cicBrowser () in
       c#load (`About `Coercions));

diff --git a/helm/software/matita/matitaGui.ml b/helm/software/matita/matitaGui.ml
index cc8a885e8837a93e7800fd5dbe73886de1d8340d..f40efe867ea0f19068fd6dc7b31908212e5633fe 100644 (file)
--- a/helm/software/matita/matitaGui.ml
+++ b/helm/software/matita/matitaGui.ml
@@ -1018,10 +1018,15 @@ class gui () =
           | false -> main#toplevel#unfullscreen ())
         ~check:main#fullscreenMenuItem;
       main#fullscreenMenuItem#set_active false;
-      MatitaGtkMisc.toggle_callback
-        ~callback:(fun enabled ->
-          CicMetaSubst.use_low_level_ppterm_in_context := not enabled)
-        ~check:main#formulaePpMenuItem;
+      MatitaGtkMisc.toggle_callback ~check:main#ppNotationMenuItem
+        ~callback:(function
+          | true ->
+              CicNotation.set_active_notations
+                (List.map fst (CicNotation.get_all_notations ()))
+          | false ->
+              CicNotation.set_active_notations []);
+      MatitaGtkMisc.toggle_callback ~check:main#hideCoercionsMenuItem
+        ~callback:(fun enabled -> Acic2content.hide_coercions := enabled);
         (* log *)
       HLog.set_log_callback self#console#log_callback;
       GtkSignal.user_handler :=