fix

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

diff --git a/helm/matita/matitaMathView.ml b/helm/matita/matitaMathView.ml
index f22b3a170b6546d922721b78d56a0ad50bbb51d1..75541ed9d49f93df76d54668e5c6e8502457410f 100644 (file)
--- a/helm/matita/matitaMathView.ml
+++ b/helm/matita/matitaMathView.ml
@@ -359,7 +359,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
 
     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
@@ -368,21 +368,13 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
       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
@@ -414,8 +406,8 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
 
     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 
@@ -523,7 +515,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
       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 =
@@ -579,7 +571,11 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
           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