X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2FmatitaGui.ml;h=8915f7681270ad43bdb94a009047820ac657f10d;hb=abd9e5cfa8e7b6923e0664a4813a0a842f5c4e76;hp=7256601b6964db394c44812753b85f06282240e9;hpb=98af6b692e80b3ce45886b89100812047d67c3bd;p=helm.git diff --git a/helm/matita/matitaGui.ml b/helm/matita/matitaGui.ml index 7256601b6..8915f7681 100644 --- a/helm/matita/matitaGui.ml +++ b/helm/matita/matitaGui.ml @@ -68,10 +68,25 @@ class gui () = [ main#mainWinEventBox ] in let console = new console ~buffer:main#logTextView#buffer () in + let (source_view: GSourceView.source_view) = + GSourceView.source_view + ~auto_indent:true + ~insert_spaces_instead_of_tabs:true ~tabs_width:2 + ~margin:80 ~show_margin:true + ~smart_home_end:true + ~packing:main#scriptScrolledWin#add + () + in + let default_font_size = + Helm_registry.get_opt_default Helm_registry.int + ~default:BuildTimeConf.default_font_size "matita.font_size" + in + let source_buffer = source_view#source_buffer in object (self) val mutable chosen_file = None val mutable _ok_not_exists = false - val mutable script_fname = None + val mutable script_fname = None + val mutable font_size = default_font_size initializer (* glade's check widgets *) @@ -133,7 +148,7 @@ class gui () = in let tac_w_term ast _ = if (MatitaScript.instance ())#onGoingProof () then - let (buf: GText.buffer) = self#main#scriptTextView#buffer in + let buf = source_buffer in buf#insert ~iter:(buf#get_iter_at_mark (`NAME "locked")) ("\n" ^ TacticAstPp.pp_tactic ast) in @@ -154,15 +169,20 @@ class gui () = connect_button tbar#assumptionButton (tac (A.Assumption loc)); connect_button tbar#cutButton (tac_w_term (A.Cut (loc, hole))); connect_button tbar#autoButton (tac (A.Auto (loc,None))); - ignore(self#main#tacticsBarMenuItem#connect#toggled - ~callback:(fun _ -> - if self#main#tacticsBarMenuItem#active then - self#main#tacticsButtonsHandlebox#misc#show () - else - self#main#tacticsButtonsHandlebox#misc#hide ())); + MatitaGtkMisc.toggle_widget_visibility + ~widget:(self#main#tacticsButtonsHandlebox :> GObj.widget) + ~check:self#main#tacticsBarMenuItem; let module Hr = Helm_registry in - if not(Hr.get_opt_default Hr.get_bool false "matita.tactics_bar") then + if + not (Hr.get_opt_default Hr.bool ~default:false "matita.tactics_bar") + then self#main#tacticsBarMenuItem#set_active false; + MatitaGtkMisc.toggle_callback + ~callback:(function + | true -> self#main#toplevel#fullscreen () + | false -> self#main#toplevel#unfullscreen ()) + ~check:self#main#fullscreenMenuItem; + self#main#fullscreenMenuItem#set_active false; (* quit *) self#setQuitCallback (fun () -> exit 0); (* log *) @@ -172,6 +192,15 @@ class gui () = MatitaLog.error (sprintf "Uncaught exception: %s" (Printexc.to_string exn))); (* script *) + let _ = + match GSourceView.source_language_from_file BuildTimeConf.lang_file with + | None -> + MatitaLog.warn (sprintf "can't load language file %s" + BuildTimeConf.lang_file) + | Some matita_lang -> + source_buffer#set_language matita_lang; + source_buffer#set_highlight true + in let s () = MatitaScript.instance () in let disableSave () = script_fname <- None; @@ -205,8 +234,8 @@ class gui () = in let newScript () = (s ())#reset (); disableSave () in let cursor () = - let buf = self#main#scriptTextView#buffer in - buf#place_cursor (buf#get_iter_at_mark (`NAME "locked")) + source_buffer#place_cursor + (source_buffer#get_iter_at_mark (`NAME "locked")) in let advance _ = (MatitaScript.instance ())#advance (); cursor () in let retract _ = (MatitaScript.instance ())#retract (); cursor () in @@ -216,7 +245,7 @@ class gui () = let connect_key sym f = connect_key self#main#mainWinEventBox#event ~modifiers:[`CONTROL] ~stop:true sym f; - connect_key self#main#scriptTextView#event + connect_key self#sourceView#event ~modifiers:[`CONTROL] ~stop:true sym f in connect_button self#main#scriptAdvanceButton advance; @@ -234,28 +263,16 @@ class gui () = connect_menu_item self#main#newMenuItem newScript; connect_key GdkKeysyms._period (fun () -> - let buf = self#main#scriptTextView#buffer in - buf#insert ~iter:(buf#get_iter_at_mark `INSERT) ".\n"; - advance ()); + source_buffer#insert ~iter:(source_buffer#get_iter_at_mark `INSERT) + ".\n"; + advance ()); connect_key GdkKeysyms._Return (fun () -> - let buf = self#main#scriptTextView#buffer in - buf#insert ~iter:(buf#get_iter_at_mark `INSERT) "\n"; - advance ()); + source_buffer#insert ~iter:(source_buffer#get_iter_at_mark `INSERT) + "\n"; + advance ()); (* script monospace font stuff *) - let font = - Helm_registry.get_opt_default Helm_registry.get - BuildTimeConf.default_script_font "matita.script_font" - in -(* let monospace_tag = - self#main#scriptTextView#buffer#create_tag [`FONT_DESC font] - in *) - self#main#scriptTextView#misc#modify_font_by_name font; -(* let _ = - self#main#scriptTextView#buffer#connect#changed ~callback:(fun _ -> - let start, stop = self#main#scriptTextView#buffer#bounds in - self#main#scriptTextView#buffer#apply_tag monospace_tag start stop) - in *) + self#updateFontSize (); (* debug menu *) self#main#debugMenu#misc#hide (); (* status bar *) @@ -263,7 +280,7 @@ class gui () = self#main#hintMediumImage#set_file (image_path "matita-bulb-medium.png"); self#main#hintHighImage#set_file (image_path "matita-bulb-high.png"); (* focus *) - self#main#scriptTextView#misc#grab_focus (); + self#sourceView#misc#grab_focus (); (* main win dimension *) let width = Gdk.Screen.width () in let height = Gdk.Screen.height () in @@ -286,7 +303,7 @@ class gui () = method console = console - + method sourceView: GSourceView.source_view = (source_view: GSourceView.source_view) method about = about method fileSel = fileSel method main = main @@ -357,6 +374,22 @@ class gui () = GtkThread.main (); !text + method private updateFontSize () = + self#sourceView#misc#modify_font_by_name + (sprintf "%s %d" BuildTimeConf.script_font font_size) + + method increaseFontSize () = + font_size <- font_size + 1; + self#updateFontSize () + + method decreaseFontSize () = + font_size <- font_size - 1; + self#updateFontSize () + + method resetFontSize () = + font_size <- default_font_size; + self#updateFontSize () + end let gui () = @@ -369,6 +402,7 @@ let instance = singleton gui let non p x = not (p x) let is_var_uri s = + let s = UriManager.string_of_uri s in try String.sub s (String.length s - 4) 4 = ".var" with Invalid_argument _ -> false @@ -413,7 +447,7 @@ let interactive_uri_choice | _ -> ())); dialog#uriChoiceDialog#set_title title; dialog#uriChoiceLabel#set_text msg; - List.iter model#easy_append uris; + List.iter model#easy_append (List.map UriManager.string_of_uri uris); dialog#uriChoiceConstantsButton#misc#set_sensitive nonvars_button; let return v = choices := v; @@ -431,11 +465,11 @@ let interactive_uri_choice connect_button dialog#uriChoiceAutoButton (fun _ -> match model#easy_selection () with | [] -> () - | uris -> return (Some uris)); + | uris -> return (Some (List.map UriManager.uri_of_string uris))); connect_button dialog#uriChoiceSelectedButton (fun _ -> match model#easy_selection () with | [] -> () - | uris -> return (Some uris)); + | uris -> return (Some (List.map UriManager.uri_of_string uris))); connect_button dialog#uriChoiceAbortButton (fun _ -> return None); dialog#uriChoiceDialog#show (); GtkThread.main ();