X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=matita%2Fmatita%2FmatitaMathView.ml;h=5b40bb4195ed2795b1dd6b2cbc563b34d38172e9;hb=364d23cb116e167d3b23f6ef0412830e816e5e92;hp=2a17d938b9d74d0017776db845430ec5e1f5f73f;hpb=6ab0b3e34eee7c4efa628e2994b461347d1bcebf;p=helm.git diff --git a/matita/matita/matitaMathView.ml b/matita/matita/matitaMathView.ml index 2a17d938b..5b40bb419 100644 --- a/matita/matita/matitaMathView.ml +++ b/matita/matita/matitaMathView.ml @@ -238,7 +238,8 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) let is_uri txt = Pcre.pmatch ~rex:uri_RE txt in let is_dir txt = Pcre.pmatch ~rex:dir_RE txt in let gui = MatitaMisc.get_gui () in - let (win: MatitaGuiTypes.browserWin) = gui#newBrowserWin () in + let win = new MatitaGeneratedGui.browserWin () in + let _ = win#browserUri#misc#grab_focus () in let gviz = LablGraphviz.graphviz ~packing:win#graphScrolledWin#add () in let searchText = GSourceView2.source_view ~auto_indent:false ~editable:false () @@ -290,7 +291,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) let module Pp = GraphvizPp.Dot in let filename, oc = Filename.open_temp_file "matita" ".dot" in let fmt = Format.formatter_of_out_channel oc in - let status = (get_matita_script_current ())#grafite_status in + let status = (get_matita_script_current ())#status in Pp.header ~name:"Hints" ~graph_type:"graph" @@ -313,7 +314,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) ~name:"Coercions" ~node_attrs:["fontsize", "9"; "width", ".4"; "height", ".4"] ~edge_attrs:["fontsize", "10"] fmt; - let status = (get_matita_script_current ())#grafite_status in + let status = (get_matita_script_current ())#status in NCicCoercion.generate_dot_file status fmt; Pp.trailer fmt; Pp.raw "@." fmt; @@ -550,19 +551,17 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) self#_showSearch method private grammar () = - self#_loadText (Print_grammar.ebnf_of_term self#script#grafite_status); + self#_loadText (Print_grammar.ebnf_of_term self#script#status); method private home () = self#_showMath; - match self#script#grafite_status#ng_mode with - `ProofMode -> - self#_loadNObj self#script#grafite_status - self#script#grafite_status#obj + match self#script#status#ng_mode with + `ProofMode -> self#_loadNObj self#script#status self#script#status#obj | _ -> self#blank () method private _loadNReference (NReference.Ref (uri,_)) = let obj = NCicEnvironment.get_checked_obj uri in - self#_loadNObj self#script#grafite_status obj + self#_loadNObj self#script#status obj method private _loadDir dir = let content = Http_getter.ls ~local:false dir in @@ -592,7 +591,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) method private _loadTermNCic term m s c = let d = 0 in let m = (0,([],c,term))::m in - let status = (get_matita_script_current ())#grafite_status in + let status = (get_matita_script_current ())#status in mathView#nload_sequent status m s d; self#_showMath