* http://helm.cs.unibo.it/
*)
-(*
-class stringListModel' uriChoiceDialog =
- let tree_view = uriChoiceDialog#uriChoiceTreeView in
- let column_list = new GTree.column_list in
- let text_column = column_list#add Gobject.Data.string in
- let list_store = GTree.list_store column_list in
- let renderer = (GTree.cell_renderer_text [], ["text", text_column]) in
- let view_column = GTree.view_column ~renderer () in
- let _ = tree_view#set_model (Some (list_store :> GTree.model)) in
- let _ = tree_view#append_column view_column in
- object
- method append s =
- let tree_iter = list_store#append () in
- list_store#set ~row:tree_iter ~column:text_column s
- method clear () = list_store#clear ()
- end
-*)
-
open Printf
open MatitaGeneratedGui
open MatitaGtkMisc
open MatitaMisc
+let gui_instance = ref None ;;
+
+class console ~evbox ~phrase_sep ~packing ~paned () =
+ let console = MatitaConsole.console ~evbox ~phrase_sep ~packing ~paned () in
+ object
+ method clear = console#clear
+ method echo_error = console#echo_error
+ method echo_message = console#echo_message
+ method wrap_exn: 'a. (unit -> 'a) -> 'a option = console#wrap_exn
+ method choose_uri uris =
+ let g = match !gui_instance with None -> assert false | Some g -> g in
+ let ul = g#newUriDialog () in
+ ul#toplevel#show ();
+ let model = new stringListModel ul#uriChoiceTreeView in
+ List.iter model#easy_append uris;
+ ul#uriChoiceDialog#set_title "Hints";
+ ul#uriChoiceLabel#set_text "Suggested uris";
+ ul#uriChoiceAbortButton#misc#hide ();
+ ul#uriChoiceAutoButton#misc#hide ();
+ ul#uriChoiceConstantsButton#misc#hide ();
+ ul#hbox2#misc#hide ();
+ ul#uriChoiceTreeView#selection#set_mode
+ (`SINGLE :> Gtk.Tags.selection_mode);
+ let _ = ul#uriChoiceTreeView#selection#connect#changed
+ ~callback:(fun () -> ()) in
+ let _ = ul#toplevel#connect#destroy
+ ~callback:(fun () -> GMain.Main.quit ()) in
+ let choices = ref None in
+ let _ = ul#uriChoiceSelectedButton#connect#clicked
+ ~callback:(fun () ->
+ (match model#easy_selection () with
+ | [] -> ()
+ | [uri] -> choices := (Some uri)
+ | _ -> assert false);
+ ul#uriChoiceDialog#destroy ();
+ GMain.Main.quit ()) in
+ GMain.main ();
+ match !choices with
+ | Some u -> u
+ | None -> raise MatitaTypes.Cancel
+
+ method show = console#show
+
+ method console = console
+ end
+
class gui file =
(* creation order _is_ relevant for windows placement *)
let toolbar = new toolBarWin ~file () in
let main = new mainWin ~file () in
let about = new aboutWin ~file () in
let fileSel = new fileSelectionWin ~file () in
- let proof = new proofWin ~file () in
- let check = new checkWin ~file () in
let script = new scriptWin ~file () in
let keyBindingBoxes = (* event boxes which should receive global key events *)
- [ toolbar#toolBarEventBox; proof#proofWinEventBox; main#mainWinEventBox;
- check#checkWinEventBox; script#scriptWinEventBox ]
+ [ toolbar#toolBarEventBox; main#mainWinEventBox;
+ script#scriptWinEventBox; main#consoleEventBox ]
in
let console =
- MatitaConsole.console ~evbox:main#consoleEventBox ~phrase_sep:";;"
- ~packing:main#scrolledConsole#add ()
+ new console ~evbox:main#consoleEventBox
+ ~phrase_sep:BuildTimeConf.phrase_sep
+ ~packing:main#scrolledConsole#add ~paned:main#mainVPanes ()
in
- let script_buf = script#scriptTextView#buffer in
object (self)
val mutable chosen_file = None
- (** text mark and tag representing locked part of a script *)
- val locked_mark =
- script_buf#create_mark ~name:"locked" ~left_gravity:true
- script_buf#start_iter
- val locked_tag =
- script_buf#create_tag [`BACKGROUND "green"; `EDITABLE false]
-
initializer
(* glade's check widgets *)
List.iter (fun w -> w#check_widgets ())
(let c w = (w :> <check_widgets: unit -> unit>) in
- [ c about; c fileSel; c main; c proof; c toolbar; c check; c script ]);
- (* show/hide commands *)
- toggle_visibility toolbar#toolBarWin main#showToolBarMenuItem;
- toggle_visibility proof#proofWin main#showProofMenuItem;
- toggle_visibility check#checkWin main#showCheckMenuItem;
- toggle_visibility script#scriptWin main#showScriptMenuItem;
- (* "global" key bindings *)
- List.iter (fun (key, callback) -> self#addKeyBinding key callback)
+ [ c about; c fileSel; c main; c toolbar; c script ]);
+ (* key bindings *)
+ List.iter (* global key bindings *)
+ (fun (key, callback) -> self#addKeyBinding key callback)
+(*
[ GdkKeysyms._F3,
toggle_win ~check:main#showProofMenuItem proof#proofWin;
GdkKeysyms._F4,
toggle_win ~check:main#showCheckMenuItem check#checkWin;
- GdkKeysyms._F5,
+*)
+ [ GdkKeysyms._F5,
toggle_win ~check:main#showScriptMenuItem script#scriptWin;
+ GdkKeysyms._x, (fun () -> console#console#toggle ());
];
+ add_key_binding GdkKeysyms._Escape console#console#hide
+ main#consoleEventBox;
(* about win *)
ignore (about#aboutWin#event#connect#delete (fun _ -> true));
ignore (main#aboutMenuItem#connect#activate (fun _ ->
about#aboutWin#show ()));
- ignore (about#aboutDismissButton#connect#clicked (fun _ ->
- about#aboutWin#misc#hide ()));
+ connect_button about#aboutDismissButton (fun _ ->
+ about#aboutWin#misc#hide ());
about#aboutLabel#set_label (Pcre.replace ~pat:"@VERSION@"
~templ:BuildTimeConf.version about#aboutLabel#label);
(* file selection win *)
| `DELETE_EVENT -> return None));
(* script *)
(* menus *)
+ toggle_visibility toolbar#toolBarWin main#showToolBarMenuItem;
+(*
+ toggle_visibility proof#proofWin main#showProofMenuItem;
+ toggle_visibility check#checkWin main#showCheckMenuItem;
+*)
+ toggle_visibility script#scriptWin main#showScriptMenuItem;
List.iter (fun w -> w#misc#set_sensitive false)
[ main#saveMenuItem; main#saveAsMenuItem ];
main#helpMenu#set_right_justified true;
+ ignore (main#showConsoleMenuItem#connect#activate console#console#toggle);
+ (* main *)
+ connect_button main#hideConsoleButton console#console#hide;
(* console *)
console#echo_message (sprintf "\tMatita version %s\n"
BuildTimeConf.version);
- console#echo_prompt ();
- console#misc#grab_focus ()
+ console#console#echo_prompt ();
+ console#console#misc#grab_focus ();
method about = about
- method check = check
- method console = console
+ method console = (console :> MatitaTypes.console)
method fileSel = fileSel
method main = main
- method proof = proof
method script = script
method toolbar = toolbar
+ method newBrowserWin () =
+ let win = new browserWin ~file () in
+ win#check_widgets ();
+ win
+
method newUriDialog () =
let dialog = new uriChoiceDialog ~file () in
dialog#check_widgets ();
ignore (main#quitMenuItem#connect#activate callback);
self#addKeyBinding GdkKeysyms._q callback
- method setPhraseCallback = console#set_callback
+ method setPhraseCallback = console#console#set_callback
method chooseFile () =
fileSel#fileSelectionWin#show ();
GMain.Main.quit ()
in
ignore (dialog#textDialog#event#connect#delete (fun _ -> true));
- ignore (dialog#textDialogCancelButton#connect#clicked (fun _ ->
- return None));
- ignore (dialog#textDialogOkButton#connect#clicked (fun _ ->
+ connect_button dialog#textDialogCancelButton (fun _ -> return None);
+ connect_button dialog#textDialogOkButton (fun _ ->
let text = dialog#textDialogTextView#buffer#get_text () in
- return (Some text)));
+ return (Some text));
dialog#textDialog#show ();
GtkThread.main ();
!text
- method lockScript offset =
- let mark = `MARK locked_mark in
- script_buf#move_mark mark ~where:(script_buf#get_iter_at_char offset);
- script_buf#remove_tag locked_tag ~start:script_buf#start_iter
- ~stop:script_buf#end_iter;
- script_buf#apply_tag locked_tag ~start:script_buf#start_iter
- ~stop:(script_buf#get_iter_at_mark mark)
-
end
-let instance =
- let gui = lazy (new gui (Helm_registry.get "matita.glade_file")) in
- fun () -> Lazy.force gui
+let gui () =
+ let g = new gui (Helm_registry.get "matita.glade_file") in
+ gui_instance := Some g;
+ g
+
+let instance = singleton gui