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
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
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 =
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!!!" *)
(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!!!" *)
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
exception Browser_failure of string
-let cicBrowsers = ref []
-
class type cicBrowser =
object
method load: MatitaTypes.mathViewer_entry -> unit
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");
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)
initializer
activate_combo_query "" "locate";
- win#comboVbox#add (combo :> GObj.widget);
+ win#whelpBarComboVbox#add combo#coerce;
let start_query () =
let query = String.lowercase (List.nth queries combo#active) in
let input = win#queryInputText#text in
in
ignore(win#queryInputText#connect#activate ~callback:start_query);
ignore(combo#connect#changed ~callback:start_query);
- win#whelpImage2#set_file "icons/whelp.png";
- win#whelpBarToggleButton#set_active false;
- win#whelpBarBox#misc#hide ();
+ win#whelpBarImage#set_file (MatitaMisc.image_path "whelp.png");
win#mathOrListNotebook#set_show_tabs false;
- MatitaGtkMisc.connect_toggle_button win#whelpBarToggleButton
- (fun () ->
- if win#whelpBarToggleButton#active then
- win#whelpBarBox#misc#show ()
- else
- win#whelpBarBox#misc#hide ());
win#browserForwardButton#misc#set_sensitive false;
win#browserBackButton#misc#set_sensitive false;
- ignore (win#browserUri#connect#activate (handle_error' (fun () ->
- self#loadInput win#browserUri#text)));
+ ignore (win#browserUri#entry#connect#activate (handle_error' (fun () ->
+ self#loadInput win#browserUri#entry#text)));
ignore (win#browserHomeButton#connect#clicked (handle_error' (fun () ->
self#load (`About `Current_proof))));
ignore (win#browserRefreshButton#connect#clicked
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 ()
method private _getSelectedUri () =
match model#easy_selection () with
- | [sel] when is_uri sel -> sel (* absolute URI selected *)
- | [sel] -> win#browserUri#text ^ sel (* relative URI selected *)
+ | [sel] when is_uri sel -> sel (* absolute URI selected *)
+ | [sel] -> win#browserUri#entry#text ^ sel (* relative URI selected *)
| _ -> assert false
(** history RATIONALE
| `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
self#_loadList l
method private setEntry entry =
- win#browserUri#set_text (string_of_entry entry);
+ win#browserUri#entry#set_text (string_of_entry entry);
current_entry <- entry
method private _loadObj obj =
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)
- | _ -> raise (Browser_failure (sprintf "unsupported uri: %s" txt))
+ | txt ->
+ (try
+ entry_of_string txt
+ with Invalid_argument _ ->
+ raise (Browser_failure (sprintf "unsupported uri: %s" txt)))
in
self#_load entry;
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
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
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
+