X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaGtkMisc.ml;h=7c8b611a2b0e2daa92efeb8f187a58af85517b54;hb=349a0e23813a7f33853e1f8fe48230276ac22934;hp=e24bf27c1ffae831247b0b42efb630e71a69aba4;hpb=cc465115cdeea9819f43a5ad219b07c4f928c43a;p=helm.git diff --git a/helm/matita/matitaGtkMisc.ml b/helm/matita/matitaGtkMisc.ml index e24bf27c1..7c8b611a2 100644 --- a/helm/matita/matitaGtkMisc.ml +++ b/helm/matita/matitaGtkMisc.ml @@ -1,4 +1,4 @@ -(* Copyright (C) 2004, HELM Team. +(* Copyright (C) 2004-2005, HELM Team. * * This file is part of HELM, an Hypertextual, Electronic * Library of Mathematics, developed at the Computer Science @@ -23,6 +23,40 @@ * http://helm.cs.unibo.it/ *) +open Printf + +open MatitaTypes + +let wrap_callback f = f +(* +let wrap_callback f () = + try + f () + with exn -> + MatitaLog.error (sprintf "Uncaught exception: %s" (Printexc.to_string exn)) +*) + +let connect_button (button: #GButton.button) callback = + ignore (button#connect#clicked (wrap_callback callback)) + +let connect_toggle_button (button: #GButton.toggle_button) callback = + ignore (button#connect#toggled (wrap_callback callback)) + +let connect_menu_item (menu_item: #GMenu.menu_item) callback = + ignore (menu_item#connect#activate (wrap_callback callback)) + +let connect_key (ev:GObj.event_ops) ?(modifiers = []) ?(stop = false) key + callback += + ignore (ev#connect#key_press (fun key' -> + let modifiers' = GdkEvent.Key.state key' in + (match key' with + | key' when GdkEvent.Key.keyval key' = key + && List.for_all (fun m -> List.mem m modifiers') modifiers -> + callback (); + stop + | _ -> false))) + let toggle_visibility ~(win: GWindow.window) ~(check: GMenu.check_menu_item) = ignore (check#connect#toggled (fun _ -> if check#active then win#show () else win#misc#hide ())); @@ -48,11 +82,10 @@ class stringListModel (tree_view: GTree.view) = 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 object (self) - initializer - let renderer = (GTree.cell_renderer_text [], ["text", text_column]) in - let view_column = GTree.view_column ~renderer () in tree_view#set_model (Some (list_store :> GTree.model)); ignore (tree_view#append_column view_column) @@ -72,74 +105,57 @@ class stringListModel (tree_view: GTree.view) = let iter = list_store#get_iter tree_path in list_store#get ~row:iter ~column:text_column) tree_view#selection#get_selected_rows - end -let is_var_uri s = - try - String.sub s (String.length s - 4) 4 = ".var" - with Invalid_argument _ -> false +class taggedStringListModel ~(tags:(string * GdkPixbuf.pixbuf) list) + (tree_view: GTree.view) += + let column_list = new GTree.column_list in + let tag_column = column_list#add Gobject.Data.gobject in + let text_column = column_list#add Gobject.Data.string in + let list_store = GTree.list_store column_list in + let text_renderer = (GTree.cell_renderer_text [], ["text", text_column]) in + let tag_renderer = (GTree.cell_renderer_pixbuf [], ["pixbuf", tag_column]) in + let text_vcolumn = GTree.view_column ~renderer:text_renderer () in + let tag_vcolumn = GTree.view_column ~renderer:tag_renderer () in + let lookup_pixbuf tag = + try List.assoc tag tags with Not_found -> assert false + in + object (self) + initializer + tree_view#set_model (Some (list_store :> GTree.model)); + ignore (tree_view#append_column tag_vcolumn); + ignore (tree_view#append_column text_vcolumn) -let non p x = not (p x) + method list_store = list_store -class type gui = - object - method newUriDialog: unit -> MatitaGeneratedGui.uriChoiceDialog - method newConfirmationDialog: unit -> MatitaGeneratedGui.confirmationDialog - method newTextDialog: unit -> MatitaGeneratedGui.textDialog - end + method easy_append ~tag s = + let tree_iter = list_store#append () in + list_store#set ~row:tree_iter ~column:text_column s; + list_store#set ~row:tree_iter ~column:tag_column (lookup_pixbuf tag) -exception Cancel + method easy_insert pos ~tag s = + let tree_iter = list_store#insert pos in + list_store#set ~row:tree_iter ~column:text_column s; + list_store#set ~row:tree_iter ~column:tag_column (lookup_pixbuf tag) -let interactive_user_uri_choice - ~(gui:#gui) ~(selection_mode:Gtk.Tags.selection_mode) ?(title = "") - ?(msg = "") ?(nonvars_button=false) uris -= - let nonvars_uris = lazy (List.filter (non is_var_uri) uris) in - if (selection_mode <> `SINGLE) && - (Helm_registry.get_bool "matita.auto_disambiguation") - then - Lazy.force nonvars_uris - else begin - let dialog = gui#newUriDialog () in - dialog#uriChoiceTreeView#selection#set_mode selection_mode; - let model = new stringListModel dialog#uriChoiceTreeView in - let choices = ref None in - let nonvars = ref false in - dialog#uriChoiceDialog#set_title title; - dialog#uriChoiceLabel#set_text msg; - List.iter model#easy_append uris; - dialog#uriChoiceConstantsButton#misc#set_sensitive nonvars_button; - let return v = - choices := v; - dialog#uriChoiceDialog#destroy (); - GMain.Main.quit () - in - ignore (dialog#uriChoiceDialog#event#connect#delete (fun _ -> true)); - ignore (dialog#uriChoiceConstantsButton#connect#clicked (fun _ -> - return (Some (Lazy.force nonvars_uris)))); - ignore (dialog#uriChoiceAutoButton#connect#clicked (fun _ -> - Helm_registry.set_bool "matita.auto_disambiguation" true; - return (Some (Lazy.force nonvars_uris)))); - ignore (dialog#uriChoiceSelectedButton#connect#clicked (fun _ -> - match model#easy_selection () with - | [] -> () - | uris -> return (Some uris))); - ignore (dialog#uriChoiceAbortButton#connect#clicked (fun _ -> return None)); - dialog#uriChoiceDialog#show (); - GtkThread.main (); - (match !choices with - | None -> raise Cancel - | Some uris -> uris) + method easy_selection () = + List.map + (fun tree_path -> + let iter = list_store#get_iter tree_path in + list_store#get ~row:iter ~column:text_column) + tree_view#selection#get_selected_rows end -let interactive_interp_choice ~(gui:#gui) choices = - (* TODO Zack implement interactive_interp_choice *) - MatitaTypes.warning - "'interactive_interp_choice' not implemented: returning 1st interpretation"; - [0] +class type gui = + object + method newUriDialog: unit -> MatitaGeneratedGui.uriChoiceDialog + method newInterpDialog: unit -> MatitaGeneratedGui.interpChoiceDialog + method newConfirmationDialog: unit -> MatitaGeneratedGui.confirmationDialog + method newEmptyDialog: unit -> MatitaGeneratedGui.emptyDialog + end -let ask_confirmation ~(gui:#gui) ?(title = "") ?(msg = "") () = +let ask_confirmation ~(gui:#gui) ?(cancel = true) ?(title = "") ?(msg = "") () = let dialog = gui#newConfirmationDialog () in dialog#confirmationDialog#set_title title; dialog#confirmationDialogLabel#set_label msg; @@ -150,38 +166,41 @@ let ask_confirmation ~(gui:#gui) ?(title = "") ?(msg = "") () = GMain.Main.quit () in ignore (dialog#confirmationDialog#event#connect#delete (fun _ -> true)); - ignore (dialog#confirmationDialogOkButton#connect#clicked (return true)); - ignore (dialog#confirmationDialogCancelButton#connect#clicked (return false)); + connect_button dialog#confirmationDialogOkButton (return true); + connect_button dialog#confirmationDialogCancelButton (return false); + if not cancel then dialog#confirmationDialogCancelButton#misc#hide (); dialog#confirmationDialog#show (); GtkThread.main (); (match !result with None -> assert false | Some r -> r) let ask_text ~(gui:#gui) ?(title = "") ?(msg = "") ?(multiline = false) () = - let dialog = gui#newTextDialog () in - dialog#textDialog#set_title title; - dialog#textDialogLabel#set_label msg; + let dialog = gui#newEmptyDialog () in + dialog#emptyDialog#set_title title; + dialog#emptyDialogLabel#set_label msg; let result = ref None in let return r = result := r; - dialog#textDialog#destroy (); + dialog#emptyDialog#destroy (); GMain.Main.quit () in - ignore (dialog#textDialog#event#connect#delete (fun _ -> true)); + ignore (dialog#emptyDialog#event#connect#delete (fun _ -> true)); if multiline then begin (* multiline input required: use a TextView widget *) let win = GBin.scrolled_window ~width:400 ~height:150 ~hpolicy:`NEVER - ~vpolicy:`ALWAYS ~packing:dialog#textDialogVBox#add () + ~vpolicy:`ALWAYS ~packing:dialog#emptyDialogVBox#add () in let view = GText.view ~wrap_mode:`CHAR ~packing:win#add () in - ignore (dialog#textDialogOkButton#connect#clicked (fun _ -> - return (Some (view#buffer#get_text ())))) + view#misc#grab_focus (); + connect_button dialog#emptyDialogOkButton (fun _ -> + return (Some (view#buffer#get_text ()))) end else begin (* monoline input required: use a TextEntry widget *) - let entry = GEdit.entry ~packing:dialog#textDialogVBox#add () in - ignore (dialog#textDialogOkButton#connect#clicked (fun _ -> - return (Some entry#text))) + let entry = GEdit.entry ~packing:dialog#emptyDialogVBox#add () in + entry#misc#grab_focus (); + connect_button dialog#emptyDialogOkButton (fun _ -> + return (Some entry#text)) end; - ignore (dialog#textDialogCancelButton#connect#clicked (fun _ -> return None)); - dialog#textDialog#show (); + connect_button dialog#emptyDialogCancelButton (fun _ ->return None); + dialog#emptyDialog#show (); GtkThread.main (); (match !result with None -> raise Cancel | Some r -> r)