X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatita.ml;h=db0fd2b18e7ec0be350aecbea58d29dc16745933;hb=ad0292419b0204384ff55c946a6aabb73a47c42b;hp=97595d1926004de1e8eb2e844b34affb9b9caf14;hpb=2ba4fdc5cd4af9719fb3286a41a4480aa8b0d48b;p=helm.git

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 97595d192..db0fd2b18 100644
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -32,16 +32,15 @@ open MatitaMisc
 (** {2 Initialization} *)
 
 let _ =
-  Helm_registry.load_from "matita.conf.xml";  (* read conf *)
+  Helm_registry.load_from BuildTimeConf.matita_conf;
+  CicNotation.load_notation BuildTimeConf.core_notation_script;
   Http_getter.init ();
   MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
-  MatitaDb.clean_owner_environment ();
   MatitaDb.create_owner_environment ();
-  GtkMain.Rc.add_default_file BuildTimeConf.gtkrc;  (* loads gtk rc files *)
+  MatitamakeLib.initialize ();
+  GtkMain.Rc.add_default_file BuildTimeConf.gtkrc_file; (* loads gtk rc *)
   ignore (GMain.Main.init ());
-
-  (* environment trust *)
-  CicEnvironment.set_trust
+  CicEnvironment.set_trust (* environment trust *)
     (let trust = Helm_registry.get_bool "matita.environment_trust" in
      fun _ -> trust)
 
@@ -52,6 +51,20 @@ let gui = MatitaGui.instance ()
 let _ =
   ignore (gui#main#newCicBrowserMenuItem#connect#activate (fun _ ->
     ignore (MatitaMathView.cicBrowser ())));
+  (* font sizes *)
+  ignore (gui#main#increaseFontSizeMenuItem#connect#activate (fun _ ->
+    gui#increaseFontSize ();
+    MatitaMathView.increase_font_size ();
+    MatitaMathView.update_font_sizes ()));
+  ignore (gui#main#decreaseFontSizeMenuItem#connect#activate (fun _ ->
+    gui#decreaseFontSize ();
+    MatitaMathView.decrease_font_size ();
+    MatitaMathView.update_font_sizes ()));
+  ignore (gui#main#normalFontSizeMenuItem#connect#activate (fun _ ->
+    gui#resetFontSize ();
+    MatitaMathView.reset_font_size ();
+    MatitaMathView.update_font_sizes ()));
+  MatitaMathView.reset_font_size ();
   (* disambiguator callback *)
   MatitaDisambiguator.set_choose_uris_callback
     (MatitaGui.interactive_uri_choice ());
@@ -60,7 +73,7 @@ let _ =
 
 let script =
   MatitaScript.script 
-    ~buffer:gui#main#scriptTextView#buffer
+    ~view:(gui#sourceView :> GText.view)
     ~init:(Lazy.force MatitaEngine.initial_status) 
     ~mathviewer:(MatitaMathView.mathViewer ())
     ~urichooser:(fun uris ->
@@ -69,9 +82,15 @@ let script =
         ~title:"Matita: URI chooser" 
         ~msg:"Select the URI" ~hide_uri_entry:true
         ~hide_try:true ~ok_label:"_Apply" ~ok_action:`SELECT
-        ~copy_cb:(fun s -> gui#main#scriptTextView#buffer#insert ("\n"^s^"\n"))
+        ~copy_cb:(fun s -> gui#sourceView#buffer#insert ("\n"^s^"\n"))
         () ~id:"boh?" uris
       with MatitaTypes.Cancel -> [])
+    ~set_star:gui#setStar
+    ~ask_confirmation:
+      (fun ~title ~message -> 
+          MatitaGtkMisc.ask_confirmation ~title ~message 
+          ~parent:gui#main#toplevel ())
+    ~develcreator:gui#createDevelopment
     ()
 
   (* math viewers *)
@@ -79,7 +98,7 @@ let _ =
   let sequent_viewer = MatitaMathView.sequentViewer_instance () in
   let sequents_viewer = MatitaMathView.sequentsViewer_instance () in
   sequent_viewer#set_href_callback
-    (Some (fun uri -> (MatitaMathView.cicBrowser ())#load (`Uri uri)));
+    (Some (fun uri -> (MatitaMathView.cicBrowser ())#load (`Uri (UriManager.uri_of_string uri))));
   let browser_observer _ = MatitaMathView.refresh_all_browsers () in
   let sequents_observer status =
     sequents_viewer#reset;
@@ -129,12 +148,6 @@ let _ =
         (MatitaMathView.sequentViewer_instance ())#get_selected_terms);
     addDebugItem "dump getter settings" (fun _ ->
       prerr_endline (Http_getter_env.env_to_string ()));
-    addDebugItem "getter: update"
-      (fun _ ->
-         ignore (Thread.create (fun () ->
-           MatitaLog.message "Rebuilding getter maps in background ...";
-           Http_getter.update ();
-           MatitaLog.message "Getter maps successfully rebuilt.") ()));
     addDebugItem "getter: getalluris" (fun _ ->
       List.iter prerr_endline (Http_getter.getalluris ()));
     addDebugItem "dump script status" script#dump;
@@ -143,33 +156,22 @@ let _ =
          if script#onGoingProof () then
            MatitaLog.debug (CicMetaSubst.ppmetasenv script#proofMetasenv []));
     addDebugItem "dump coercions Db" (fun _ ->
-      List.iter (
-        fun (s,t,u) -> 
-          MatitaLog.debug (
-            UriManager.name_of_uri u ^ ":" ^ 
-            UriManager.name_of_uri s ^ " -> " ^ UriManager.name_of_uri t))
-      (CoercDb.to_list ())
-    );
+      List.iter
+        (fun (s,t,u) -> 
+          MatitaLog.debug
+            (UriManager.name_of_uri u ^ ":"
+             ^ UriManager.name_of_uri s ^ " -> " ^ UriManager.name_of_uri t))
+        (CoercDb.to_list ()));
     addDebugItem "rotate light bulbs"
       (fun _ ->
          let nb = gui#main#hintNotebook in
-         nb#goto_page ((nb#current_page + 1) mod 3));
-         (*
-    addDebugItem "print (on stdout) \"statement\" grammar entry"
-      (fun _ ->
-        Grammar.print_entry Format.std_formatter
-          (Grammar.Entry.obj CicTextualParser2.statement);
-        Format.pp_print_flush Format.std_formatter ());*)
+         nb#goto_page ((nb#current_page + 1) mod 3))
   end
 
   (** </DEBUGGING> *)
 
 let _ =
-  at_exit
-    (fun () ->
-       Http_getter_logger.log "Sync map tree to disk...";
-       Http_getter.sync_dump_file ();
-       print_endline "\nThanks for using Matita!\n");
+  at_exit (fun () -> print_endline "\nThanks for using Matita!\n");
   Sys.catch_break true;
   (try
      gui#loadScript Sys.argv.(1);
@@ -179,7 +181,7 @@ let _ =
     let browser = MatitaMathView.cicBrowser () in
     let entry =
       try
-        `Uri Sys.argv.(1)
+        `Uri (UriManager.uri_of_string Sys.argv.(1))
       with Invalid_argument _ -> `Dir "cic:/"
     in
     browser#load entry