refactored gui handling code so that MatitaMathView is linked before MatitaGui

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

diff --git a/helm/matita/matitaGui.ml b/helm/matita/matitaGui.ml
index a41215bd476c30526eb2b29f3bdc02ec8a130a19..fe0b4a1f9870ebd3e314363692b8d55040303bac 100644 (file)
--- a/helm/matita/matitaGui.ml
+++ b/helm/matita/matitaGui.ml
@@ -331,7 +331,7 @@ class gui () =
       let clipboard =
        let atom = Gdk.Atom.clipboard in
         GData.clipboard atom in
-      ignore(self#main#editMenu#connect#activate
+      ignore (self#main#editMenu#connect#activate
         ~callback:
           (fun () ->
             let something_selected =
@@ -751,7 +751,23 @@ class gui () =
             clean_locked := false;
             (MatitaScript.instance ())#clean_dirty_lock;
             clean_locked := true
-           end))
+           end));
+      (* math view handling *)
+      connect_menu_item main#newCicBrowserMenuItem (fun () ->
+        ignore (MatitaMathView.cicBrowser ()));
+      connect_menu_item main#increaseFontSizeMenuItem (fun () ->
+        self#increaseFontSize ();
+        MatitaMathView.increase_font_size ();
+        MatitaMathView.update_font_sizes ());
+      connect_menu_item main#decreaseFontSizeMenuItem (fun () ->
+        self#decreaseFontSize ();
+        MatitaMathView.decrease_font_size ();
+        MatitaMathView.update_font_sizes ());
+      connect_menu_item main#normalFontSizeMenuItem (fun () ->
+        self#resetFontSize ();
+        MatitaMathView.reset_font_size ();
+        MatitaMathView.update_font_sizes ());
+      MatitaMathView.reset_font_size ();
     
     method loadScript file =       
       let script = MatitaScript.instance () in
@@ -888,6 +904,7 @@ class gui () =
 let gui () = 
   let g = new gui () in
   gui_instance := Some g;
+  MatitaMathView.set_gui g;
   g
   
 let instance = singleton gui
@@ -1045,3 +1062,12 @@ let interactive_interp_choice () choices =
   GtkThread.main ();
   (match !interp_no with Some row -> [row] | _ -> raise MatitaTypes.Cancel)
 
+let _ =
+  (* disambiguator callbacks *)
+  MatitaDisambiguator.set_choose_uris_callback (interactive_uri_choice ());
+  MatitaDisambiguator.set_choose_interp_callback (interactive_interp_choice ());
+  (* gtk initialization *)
+  GtkMain.Rc.add_default_file BuildTimeConf.gtkrc_file; (* loads gtk rc *)
+  GMathView.add_configuration_path BuildTimeConf.gtkmathview_conf;
+  ignore (GMain.Main.init ())
+