X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaGtkMisc.ml;h=0301b31f2e3981a02aad48493943af7a04c03223;hb=7564f3a87499807bfc15bc488bd6452dc0392b62;hp=80f5676cd7665ca66c0c59aaa5230d66934b9f64;hpb=07dde6f87105c18b28fc784b7d596a5d242e1225;p=helm.git

diff --git a/helm/matita/matitaGtkMisc.ml b/helm/matita/matitaGtkMisc.ml
index 80f5676cd..0301b31f2 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 ()));
@@ -75,81 +109,60 @@ class stringListModel (tree_view: GTree.view) =
 
   end
 
-let is_var_uri s =
-  try
-    String.sub s (String.length s - 4) 4 = ".var"
-  with Invalid_argument _ -> false
-
-let non p x = not (p x)
-
 class type gui =
   object
-    method newUriDialog: unit -> MatitaGeneratedGui.uriChoiceDialog
-    method newConfirmationDialog :
-      title:string -> msg:string -> unit ->
-        MatitaGeneratedGui.confirmationDialog
-  end
-
-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#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));
-    ignore (dialog#uriChoiceDialog#event#connect#delete (fun _ -> true));
-    dialog#uriChoiceDialog#show ();
-    GtkThread.main ();
-    (match !choices with 
-    | None -> raise MatitaTypes.No_choice
-    | Some uris -> uris)
+    method newUriDialog:          unit -> MatitaGeneratedGui.uriChoiceDialog
+    method newInterpDialog:       unit -> MatitaGeneratedGui.interpChoiceDialog
+    method newConfirmationDialog: unit -> MatitaGeneratedGui.confirmationDialog
+    method newEmptyDialog:        unit -> MatitaGeneratedGui.emptyDialog
   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]
-
-let ask_confirmation ~(gui:#gui) ?(title = "") ?(msg = "") () =
-  let dialog = gui#newConfirmationDialog ~title ~msg () in
+let ask_confirmation ~(gui:#gui) ?(cancel = true) ?(title = "") ?(msg = "") () =
+  let dialog = gui#newConfirmationDialog () in
+  dialog#confirmationDialog#set_title title;
+  dialog#confirmationDialogLabel#set_label msg;
   let result = ref None in
   let return r _ =
     result := Some r;
     dialog#confirmationDialog#destroy ();
     GMain.Main.quit ()
   in
-  ignore (dialog#confirmationDialogOkButton#connect#clicked (return true));
-  ignore (dialog#confirmationDialogCancelButton#connect#clicked (return false));
   ignore (dialog#confirmationDialog#event#connect#delete (fun _ -> true));
+  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#newEmptyDialog () in
+  dialog#emptyDialog#set_title title;
+  dialog#emptyDialogLabel#set_label msg;
+  let result = ref None in
+  let return r =
+    result := r;
+    dialog#emptyDialog#destroy ();
+    GMain.Main.quit ()
+  in
+  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#emptyDialogVBox#add ()
+    in
+    let view = GText.view ~wrap_mode:`CHAR ~packing:win#add () in
+    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#emptyDialogVBox#add () in
+    entry#misc#grab_focus ();
+    connect_button dialog#emptyDialogOkButton (fun _ ->
+      return (Some entry#text))
+  end;
+  connect_button dialog#emptyDialogCancelButton (fun _ ->return None);
+  dialog#emptyDialog#show ();
+  GtkThread.main ();
+  (match !result with None -> raise Cancel | Some r -> r)
+