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
+ current_font_size := default_font_size ();
+ 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
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
exception Browser_failure of string
-let cicBrowsers = ref []
-
class type cicBrowser =
object
method load: MatitaTypes.mathViewer_entry -> unit
let whelp_query_RE = Pcre.regexp "^\\s*whelp\\s+([^\\s]+)\\s+(.*)$" in
let trailing_slash_RE = Pcre.regexp "/$" in
let has_xpointer_RE = Pcre.regexp "#xpointer\\(\\d+/\\d+(/\\d+)?\\)$" in
+ let is_whelp txt = Pcre.pmatch ~rex:whelp_RE txt in
+ let is_uri txt = Pcre.pmatch ~rex:uri_RE txt in
+ let is_dir txt = Pcre.pmatch ~rex:dir_RE txt in
let gui = MatitaGui.instance () in
let win = gui#newBrowserWin () in
let queries = ["Locate";"Hint";"Match";"Elim";"Instance"] in
with exn ->
fail (sprintf "Uncaught exception:\n%s" (Printexc.to_string exn))
in
- let handle_error' f = fun () -> handle_error f in (* used in callbacks *)
+ let handle_error' f = (fun () -> handle_error (fun () -> f ())) in
object (self)
inherit scriptAccessor
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))));
+ self#load (`About `Current_proof))));
ignore (win#browserRefreshButton#connect#clicked
(handle_error' self#refresh));
ignore (win#browserBackButton#connect#clicked (handle_error' self#back));
GMain.quit ();
false));
ignore(win#whelpResultTreeview#connect#row_activated
- ~callback:(fun _ _ ->
- let selection = self#_getWhelpResultTreeviewSelection () in
- let is_cic s =
- try
- String.sub s 0 5 = "cic:/"
- with Invalid_argument _ -> false
- in
- let txt =
- if is_cic selection then
- selection
- else
- win#browserUri#text ^ selection
- in
- self#loadInput txt));
+ ~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 uri))));
self#_load (`About `Blank);
toplevel#show ()
val mutable current_infos = None
val mutable current_mathml = None
-(* val model = new MatitaGtkMisc.stringListModel win#whelpResultTreeview *)
val model =
new MatitaGtkMisc.taggedStringListModel tags win#whelpResultTreeview
- method private _getWhelpResultTreeviewSelection () =
+ method private _getSelectedUri () =
match model#easy_selection () with
- | [u] -> u
- | _ -> assert false
+ | [sel] when is_uri sel -> sel (* absolute URI selected *)
+ | [sel] -> win#browserUri#entry#text ^ sel (* relative URI selected *)
+ | _ -> assert false
(** history RATIONALE
*
- * all operations about history are done using _historyFoo
- *
- * only toplevel function like load loadInput can call
- * _historyAdd
+ * All operations about history are done using _historyFoo.
+ * Only toplevel functions (ATM load and loadInput) call _historyAdd.
*)
method private _historyAdd item =
method private _showList = win#mathOrListNotebook#goto_page 1
method private _showMath = win#mathOrListNotebook#goto_page 0
-
-
method private back () =
try
self#_load (self#_historyPrev ())
| Http_getter_types.Ls_object o -> "obj", o.Http_getter_types.uri)
content
in
+ if l = [] then raise (Browser_failure "no such directory");
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 =
(** this is what the browser does when you enter a string an hit enter *)
method loadInput txt =
let txt = strip_blanks txt in
- let is_whelp txt = Pcre.pmatch ~rex:whelp_RE txt in
- let is_uri txt = Pcre.pmatch ~rex:uri_RE txt in
- let is_dir txt = Pcre.pmatch ~rex:dir_RE txt in
let fix_uri txt =
UriManager.string_of_uri
(UriManager.strip_xpointer (UriManager.uri_of_string txt))
match txt with
| txt when is_uri txt -> `Uri (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
+