various updates, removed proofs for now because they are the real bottleneck!!

[helm.git] / helm / matita / matitaMathView.ml

diff --git a/helm/matita/matitaMathView.ml b/helm/matita/matitaMathView.ml
index 75541ed9d49f93df76d54668e5c6e8502457410f..f913639f945e2f0c2919dfd2e77355d195f0144d 100644 (file)
--- a/helm/matita/matitaMathView.ml
+++ b/helm/matita/matitaMathView.ml
@@ -56,6 +56,16 @@ object (self)
   method private script = MatitaScript.instance ()
 end
 
+let cicBrowsers = ref []
+
+let default_font_size () =
+  Helm_registry.get_opt_default Helm_registry.int
+    ~default:BuildTimeConf.default_font_size "matita.font_size"
+let current_font_size = ref ~-1
+let increase_font_size () = incr current_font_size
+let decrease_font_size () = decr current_font_size
+let reset_font_size () = current_font_size := default_font_size ()
+
 class clickableMathView obj =
   let href = Gdome.domString "href" in
   let xref = Gdome.domString "xref" in
@@ -66,23 +76,24 @@ class clickableMathView obj =
     method set_href_callback f = href_callback <- f
 
     initializer
+      self#set_font_size !current_font_size;
       ignore (self#connect#selection_changed self#choose_selection);
       ignore (self#connect#click (fun (gdome_elt, _, _, _) ->
         match gdome_elt with
         | Some elt  (* element is an hyperlink, use href_callback on it *)
-          when elt#hasAttributeNS ~namespaceURI:Misc.xlink_ns ~localName:href ->
+          when elt#hasAttributeNS ~namespaceURI:DomMisc.xlink_ns ~localName:href ->
             (match href_callback with
             | None -> ()
             | Some f ->
                 let uri =
-                  elt#getAttributeNS ~namespaceURI:Misc.xlink_ns ~localName:href
+                  elt#getAttributeNS ~namespaceURI:DomMisc.xlink_ns ~localName:href
                 in
                 f (uri#to_string))
         | Some elt -> ignore (self#action_toggle elt)
         | None -> ()))
     method private choose_selection gdome_elt =
       let rec aux elt =
-        if elt#hasAttributeNS ~namespaceURI:Misc.helm_ns ~localName:xref then
+        if elt#hasAttributeNS ~namespaceURI:DomMisc.helm_ns ~localName:xref then
           self#set_selection (Some elt)
         else
           try
@@ -95,6 +106,10 @@ class clickableMathView obj =
       match gdome_elt with
       | Some elt -> aux elt
       | None   -> self#set_selection None
+
+    method update_font_size = 
+      self#set_font_size !current_font_size
+      
   end
 
 let clickableMathView ?hadjustment ?vadjustment ?font_size ?log_verbosity =
@@ -111,14 +126,14 @@ class sequentViewer obj =
     inherit clickableMathView obj
 
     val mutable current_infos = None
-
+    
     method get_selected_terms =
       let selections = self#get_selections in
       list_map_fail
         (fun node ->
           let xpath =
             ((node : Gdome.element)#getAttributeNS
-              ~namespaceURI:Misc.helm_ns
+              ~namespaceURI:DomMisc.helm_ns
               ~localName:(Gdome.domString "xref"))#to_string
           in
           if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
@@ -135,7 +150,7 @@ class sequentViewer obj =
         (fun node ->
           let xpath =
             ((node : Gdome.element)#getAttributeNS
-              ~namespaceURI:Misc.helm_ns
+              ~namespaceURI:DomMisc.helm_ns
               ~localName:(Gdome.domString "xref"))#to_string
           in
           if xpath = "" then assert false (* "ERROR: No xref found!!!" *)
@@ -154,7 +169,7 @@ class sequentViewer obj =
     current_infos <- Some (ids_to_terms, ids_to_father_ids, ids_to_hypotheses);
 (*
     debug_print "load_sequent: dumping MathML to ./prova";
-    ignore (Misc.domImpl#saveDocumentToFile ~name:"./prova" ~doc:mathml ());
+    ignore (DomMisc.domImpl#saveDocumentToFile ~name:"./prova" ~doc:mathml ());
 *)
     self#load_root ~root:mathml#get_documentElement
  end
@@ -287,8 +302,6 @@ type term_source =
 
 exception Browser_failure of string
 
-let cicBrowsers = ref []
-
 class type cicBrowser =
 object
   method load: MatitaTypes.mathViewer_entry -> unit
@@ -337,9 +350,8 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
   in
   let toplevel = win#toplevel in
   let mathView = sequentViewer ~packing:win#scrolledBrowser#add () in
-  let fail msg =
-    ignore (MatitaGtkMisc.ask_confirmation ~gui:(MatitaGui.instance ())
-      ~title:"Cic browser" ~msg ~cancel:false ());
+  let fail message = 
+    MatitaGtkMisc.report_error ~title:"Cic browser" ~message ()  
   in
   let tags =
     [ "dir", GdkPixbuf.from_file (MatitaMisc.image_path "matita-folder.png");
@@ -349,7 +361,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
     try
       f ()
     with exn ->
-      fail (sprintf "Uncaught exception:\n%s" (Printexc.to_string exn))
+      fail (MatitaExcPp.to_string exn)
   in
   let handle_error' f = (fun () -> handle_error (fun () -> f ())) in
   object (self)
@@ -393,7 +405,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
       ignore(win#whelpResultTreeview#connect#row_activated 
         ~callback:(fun _ _ -> self#loadInput (self#_getSelectedUri ())));
       mathView#set_href_callback (Some (fun uri ->
-        handle_error (fun () -> self#load (`Uri uri))));
+        handle_error (fun () -> self#load (`Uri (UriManager.uri_of_string uri)))));
       self#_load (`About `Blank);
       toplevel#show ()
 
@@ -462,10 +474,10 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
             | `Check term -> self#_loadCheck term
             | `Cic (term, metasenv) -> self#_loadTermCic term metasenv
             | `Dir dir -> self#_loadDir dir
-            | `Uri uri -> self#_loadUriManagerUri (UriManager.uri_of_string uri)
+            | `Uri uri -> self#_loadUriManagerUri uri
             | `Whelp (query, results) -> 
                 set_whelp_query query;
-                self#_loadList (List.map (fun r -> "obj", r) results));
+                self#_loadList (List.map (fun r -> "obj", UriManager.string_of_uri r) results));
             self#setEntry entry
           end
       with
@@ -569,7 +581,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
       end else begin
         let entry =
           match txt with
-          | txt when is_uri txt -> `Uri (fix_uri txt)
+          | txt when is_uri txt -> `Uri (UriManager.uri_of_string (fix_uri txt))
           | txt when is_dir txt -> `Dir (add_trailing_slash txt)
           | txt ->
               (try
@@ -581,6 +593,10 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
         self#_historyAdd entry
       end
 
+      (** {2 methods accessing underlying GtkMathView} *)
+
+    method updateFontSize = mathView#set_font_size !current_font_size
+
       (** {2 methods used by constructor only} *)
 
     method win = win
@@ -620,8 +636,6 @@ let cicBrowser () =
   let history = new MatitaMisc.browser_history size (`About `Blank) in
   aux history
 
-let refresh_all_browsers () = List.iter (fun b -> b#refresh ()) !cicBrowsers
-
 let default_sequentViewer () = sequentViewer ~show:true ()
 let sequentViewer_instance = MatitaMisc.singleton default_sequentViewer
 
@@ -646,3 +660,10 @@ let mathViewer () =
     method show_uri_list ?(reuse=false) ~entry l =
       (self#get_browser reuse)#load entry
   end
+
+let refresh_all_browsers () = List.iter (fun b -> b#refresh ()) !cicBrowsers
+
+let update_font_sizes () =
+  List.iter (fun b -> b#updateFontSize) !cicBrowsers;
+  (sequentViewer_instance ())#update_font_size
+