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
(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
| `String of string
]
-exception Browser_failure of string
-
class type cicBrowser =
object
method load: MatitaTypes.mathViewer_entry -> unit
method loadInput: string -> unit
end
+let reloadable = function
+ | `About `Current_proof
+ | `Dir _ ->
+ true
+ | _ -> false
+
class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
()
=
let whelp_RE = Pcre.regexp "^\\s*whelp" in
let uri_RE =
Pcre.regexp
- "^cic:/(\\w+/)*\\w+\\.(con|ind|var)(#xpointer\\(\\d+(/\\d+)+\\))?$"
+ "^cic:/([^/]+/)*[^/]+\\.(con|ind|var)(#xpointer\\(\\d+(/\\d+)+\\))?$"
in
- let dir_RE = Pcre.regexp "^cic:((/(\\w+/)*\\w+(/)?)|/|)$" in
+ let dir_RE = Pcre.regexp "^cic:((/([^/]+/)*[^/]+(/)?)|/|)$" in
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
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
+ ~parent:toplevel ()
in
let tags =
[ "dir", GdkPixbuf.from_file (MatitaMisc.image_path "matita-folder.png");
let handle_error f =
try
f ()
- with exn ->
- fail (sprintf "Uncaught exception:\n%s" (Printexc.to_string exn))
+ with exn -> fail (MatitaExcPp.to_string exn)
in
let handle_error' f = (fun () -> handle_error (fun () -> f ())) in
object (self)
GMain.quit ();
false));
ignore(win#whelpResultTreeview#connect#row_activated
- ~callback:(fun _ _ -> self#loadInput (self#_getSelectedUri ())));
+ ~callback:(fun _ _ ->
+ handle_error (fun () -> self#loadInput (self#_getSelectedUri ()))));
mathView#set_href_callback (Some (fun uri ->
- handle_error (fun () -> self#load (`Uri (UriManager.uri_of_string uri)))));
+ handle_error (fun () ->
+ self#load (`Uri (UriManager.uri_of_string uri)))));
self#_load (`About `Blank);
toplevel#show ()
val model =
new MatitaGtkMisc.taggedStringListModel tags win#whelpResultTreeview
+ val mutable lastDir = "" (* last loaded "directory" *)
+
method private _getSelectedUri () =
match model#easy_selection () with
| [sel] when is_uri sel -> sel (* absolute URI selected *)
- | [sel] -> win#browserUri#entry#text ^ sel (* relative URI selected *)
+(* | [sel] -> win#browserUri#entry#text ^ sel |+ relative URI selected +| *)
+ | [sel] -> lastDir ^ sel
| _ -> assert false
(** history RATIONALE
* @param uri string *)
method private _load entry =
try
- if entry <> current_entry || entry = `About `Current_proof then begin
- (match entry with
- | `About `Current_proof -> self#home ()
- | `About `Blank -> self#blank ()
- | `About `Us -> () (* TODO implement easter egg here :-] *)
- | `Check term -> self#_loadCheck term
- | `Cic (term, metasenv) -> self#_loadTermCic term metasenv
- | `Dir dir -> self#_loadDir dir
- | `Uri uri -> self#_loadUriManagerUri uri
- | `Whelp (query, results) ->
- set_whelp_query query;
- self#_loadList (List.map (fun r -> "obj", UriManager.string_of_uri r) results));
- self#setEntry entry
- end
- with
- | UriManager.IllFormedUri uri -> fail (sprintf "invalid uri: %s" uri)
- | CicEnvironment.Object_not_found uri ->
- fail (sprintf "object not found: %s" (UriManager.string_of_uri uri))
- | Browser_failure msg -> fail msg
+ if entry <> current_entry || reloadable entry then begin
+ (match entry with
+ | `About `Current_proof -> self#home ()
+ | `About `Blank -> self#blank ()
+ | `About `Us -> () (* TODO implement easter egg here :-] *)
+ | `Check term -> self#_loadCheck term
+ | `Cic (term, metasenv) -> self#_loadTermCic term metasenv
+ | `Dir dir -> self#_loadDir dir
+ | `Uri uri -> self#_loadUriManagerUri uri
+ | `Whelp (query, results) ->
+ set_whelp_query query;
+ self#_loadList (List.map (fun r -> "obj",
+ UriManager.string_of_uri r) results));
+ self#setEntry entry
+ end
+ with exn -> fail (MatitaExcPp.to_string exn)
method private blank () =
self#_showMath;
| Http_getter_types.Ls_object o -> "obj", o.Http_getter_types.uri)
content
in
- if l = [] then raise (Browser_failure "no such directory");
+ lastDir <- dir;
self#_loadList l
method private setEntry entry =
(try
entry_of_string txt
with Invalid_argument _ ->
- raise (Browser_failure (sprintf "unsupported uri: %s" txt)))
+ command_error (sprintf "unsupported uri: %s" txt))
in
self#_load entry;
self#_historyAdd entry
method history = history
method currentEntry = current_entry
method refresh () =
- if current_entry = `About `Current_proof then
- self#_load (`About `Current_proof)
- end
+ if reloadable current_entry then self#_load current_entry
+ end
let sequentsViewer ~(notebook:GPack.notebook)
~(sequentViewer:sequentViewer) ()
projects / helm.git / blobdiff