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))
false
| _ -> false))
-class stringListModel (tree_view: GTree.view) =
+class multiStringListModel ~cols (tree_view: GTree.view) =
let column_list = new GTree.column_list in
- let text_column = column_list#add Gobject.Data.string in
+ let text_columns =
+ let rec aux = function
+ | 0 -> []
+ | n -> column_list#add Gobject.Data.string :: aux (n - 1)
+ in
+ aux cols
+ 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 renderers =
+ List.map
+ (fun text_column ->
+ (GTree.cell_renderer_text [], ["text", text_column]))
+ text_columns
+ in
+ let view_columns =
+ List.map
+ (fun renderer -> GTree.view_column ~renderer ())
+ renderers
+ in
object (self)
+ val text_columns = text_columns
+
initializer
tree_view#set_model (Some (list_store :> GTree.model));
- ignore (tree_view#append_column view_column)
+ List.iter
+ (fun view_column -> ignore (tree_view#append_column view_column))
+ view_columns
method list_store = list_store
- method easy_append s =
+ method easy_mappend slist =
let tree_iter = list_store#append () in
- list_store#set ~row:tree_iter ~column:text_column s
+ List.iter2
+ (fun s text_column ->
+ list_store#set ~row:tree_iter ~column:text_column s)
+ slist text_columns
- method easy_insert pos s =
+ method easy_minsert pos s =
let tree_iter = list_store#insert pos in
- list_store#set ~row:tree_iter ~column:text_column s
+ List.iter2
+ (fun s text_column ->
+ list_store#set ~row:tree_iter ~column:text_column s)
+ s text_columns
- method easy_selection () =
+ method easy_mselection () =
List.map
(fun tree_path ->
let iter = list_store#get_iter tree_path in
- list_store#get ~row:iter ~column:text_column)
+ List.map
+ (fun text_column ->
+ list_store#get ~row:iter ~column:text_column)
+ text_columns)
+ tree_view#selection#get_selected_rows
+ end
+
+class stringListModel (tree_view: GTree.view) =
+ object (self)
+ inherit multiStringListModel ~cols:1 tree_view as multi
+
+ method list_store = multi#list_store
+
+ method easy_append s =
+ multi#easy_mappend [s]
+
+ method easy_insert pos s =
+ multi#easy_minsert pos [s]
+
+ method easy_selection () =
+ let m = List.map
+ (fun tree_path ->
+ let iter = self#list_store#get_iter tree_path in
+ List.map
+ (fun text_column ->
+ self#list_store#get ~row:iter ~column:text_column)
+ text_columns)
tree_view#selection#get_selected_rows
+ in
+ List.map (function [x] -> x | _ -> assert false) m
end
class taggedStringListModel ~(tags:(string * GdkPixbuf.pixbuf) list)
tree_view#selection#get_selected_rows
end
+class recordModel (tree_view:GTree.view) =
+ let cols_list = new GTree.column_list in
+ let text_col = cols_list#add Gobject.Data.string in
+(* let combo_col = cols_list#add (Gobject.Data.gobject_by_name "GtkListStore") in *)
+ let combo_col = cols_list#add Gobject.Data.int in
+ let toggle_col = cols_list#add Gobject.Data.boolean in
+ let list_store = GTree.list_store cols_list in
+ let text_rend = (GTree.cell_renderer_text [], ["text", text_col]) in
+ let combo_rend = GTree.cell_renderer_combo [] in
+(* let combo_rend = (GTree.cell_renderer_combo [], [|+"model", combo_col+|]) in *)
+ let toggle_rend =
+ (GTree.cell_renderer_toggle [`ACTIVATABLE true], ["active", toggle_col])
+ in
+ let text_vcol = GTree.view_column ~renderer:text_rend () in
+ let combo_vcol = GTree.view_column ~renderer:(combo_rend, []) () in
+ let _ =
+ combo_vcol#set_cell_data_func combo_rend
+ (fun _ _ ->
+ prerr_endline "qui";
+ let model, col =
+ GTree.store_of_list Gobject.Data.string ["a"; "b"; "c"]
+ in
+ combo_rend#set_properties [
+ `MODEL (Some (model :> GTree.model));
+ `TEXT_COLUMN col
+ ])
+ in
+ let toggle_vcol = GTree.view_column ~renderer:toggle_rend () in
+ object (self)
+ initializer
+ tree_view#set_model (Some (list_store :> GTree.model));
+ ignore (tree_view#append_column text_vcol);
+ ignore (tree_view#append_column combo_vcol);
+ ignore (tree_view#append_column toggle_vcol)
+
+ method list_store = list_store
+
+ method easy_append s (combo:int) (toggle:bool) =
+ let tree_iter = list_store#append () in
+ list_store#set ~row:tree_iter ~column:text_col s;
+ list_store#set ~row:tree_iter ~column:combo_col combo;
+ list_store#set ~row:tree_iter ~column:toggle_col toggle
+ end
+
class type gui =
object
method newUriDialog: unit -> MatitaGeneratedGui.uriChoiceDialog
- method newInterpDialog: unit -> MatitaGeneratedGui.interpChoiceDialog
+ method newRecordDialog: unit -> MatitaGeneratedGui.recordChoiceDialog
method newConfirmationDialog: unit -> MatitaGeneratedGui.confirmationDialog
method newEmptyDialog: unit -> MatitaGeneratedGui.emptyDialog
end
?parent ~destroy_with_parent
~title ~allow_grow ~allow_shrink ?icon ~modal ~resizable ?screen
?type_hint ~position ?wm_name ?wm_class ?border_width ?width ?height
- ~show ()
+ ~show:false ()
in
let stock =
match message_type with
in
let image = GMisc.image ~stock ~icon_size:`DIALOG () in
let label = GMisc.label ~markup:message () in
+ label#set_line_wrap true;
let hbox = GPack.hbox ~spacing:10 () in
hbox#pack ~from:`START ~expand:true ~fill:true (image:>GObj.widget);
hbox#pack ~from:`START ~expand:true ~fill:true (label:>GObj.widget);
m#vbox#pack ~from:`START
~padding:20 ~expand:true ~fill:true (hbox:>GObj.widget);
- List.iter (fun (x,y) -> m#add_button_stock x y) buttons;
+ List.iter (fun (x, y) ->
+ m#add_button_stock x y;
+ if y = `CANCEL then
+ m#set_default_response y
+ ) buttons;
ignore(m#connect#response
~callback:(fun a -> GMain.Main.quit ();callback a));
ignore(m#connect#close
- ~callback:(fun _ -> GMain.Main.quit ();raise PopupClosed));
+ ~callback:(fun _ -> GMain.Main.quit ();callback `POPUPCLOSED));
+ if show = true then
+ m#show ();
GtkThread.main ();
m#destroy ()
| `NO -> rc := `NO
| `CANCEL -> rc := `CANCEL
| `DELETE_EVENT -> rc := `CANCEL
+ | `POPUPCLOSED -> rc := `CANCEL
in
- let buttons = [`CANCEL,`CANCEL ; `NO,`NO ; `YES,`YES] in
- try
+ let buttons = [`YES,`YES ; `NO,`NO ; `CANCEL,`CANCEL] in
popup_message_lowlevel
~title ~message ~message_type:`WARNING ~callback ~buttons ?parent ();
!rc
- with
- | PopupClosed -> `CANCEL
let report_error ~title ~message ?parent () =
let rc = ref false in
| PopupClosed -> ()
-let ask_text ~(gui:#gui) ?(title = "") ?(msg = "") ?(multiline = false) () =
+let ask_text ~(gui:#gui) ?(title = "") ?(message = "") ?(multiline = false)
+ ?default ()
+=
let dialog = gui#newEmptyDialog () in
dialog#emptyDialog#set_title title;
- dialog#emptyDialogLabel#set_label msg;
+ dialog#emptyDialogLabel#set_label message;
let result = ref None in
let return r =
result := r;
~vpolicy:`ALWAYS ~packing:dialog#emptyDialogVBox#add ()
in
let view = GText.view ~wrap_mode:`CHAR ~packing:win#add () in
+ let buffer = view#buffer in
+ (match default with
+ | None -> ()
+ | Some text ->
+ buffer#set_text text;
+ buffer#select_range buffer#start_iter buffer#end_iter);
view#misc#grab_focus ();
connect_button dialog#emptyDialogOkButton (fun _ ->
- return (Some (view#buffer#get_text ())))
+ return (Some (buffer#get_text ())))
end else begin (* monoline input required: use a TextEntry widget *)
let entry = GEdit.entry ~packing:dialog#emptyDialogVBox#add () in
+ (match default with
+ | None -> ()
+ | Some text ->
+ entry#set_text text;
+ entry#select_region ~start:0 ~stop:max_int);
entry#misc#grab_focus ();
connect_button dialog#emptyDialogOkButton (fun _ ->
return (Some entry#text))
GtkThread.main ();
(match !result with None -> raise Cancel | Some r -> r)
+type combo_status = Free of string | Locked of string
+
+let ask_record_choice ~(gui:#gui) ?(title= "") ?(message = "")
+ ~fields ~records ()
+=
+ let fields = Array.of_list fields in
+ let fields_no = Array.length fields in
+ assert (fields_no > 0);
+ let dialog = gui#newRecordDialog () in
+ dialog#recordChoiceDialog#set_title title;
+ dialog#recordChoiceDialogLabel#set_label message;
+ let model = new recordModel dialog#recordChoiceTreeView in
+ dialog#recordChoiceTreeView#set_headers_visible true;
+ let combos =
+ Array.init fields_no
+ (fun _ -> GTree.store_of_list Gobject.Data.string ["a"; "b"; "c"])
+ in
+ let (store, col) = combos.(0) in
+ store#set ~row:(store#append ()) ~column:col "uno";
+ store#set ~row:(store#append ()) ~column:col "due";
+ let toggles = Array.init fields_no (fun _ -> false) in
+ Array.iteri
+ (fun i f -> model#easy_append f i toggles.(i))
+ fields;
+ let status = Array.map (fun s -> Free s) fields in
+ let record_no = ref None in
+ let return _ =
+ dialog#recordChoiceDialog#destroy ();
+ GMain.Main.quit ()
+ in
+ let fail _ = record_no := None; return () in
+ ignore (dialog#recordChoiceDialog#event#connect#delete (fun _ -> true));
+ connect_button dialog#recordChoiceOkButton (fun _ ->
+ match !record_no with None -> () | Some _ -> return ());
+ connect_button dialog#recordChoiceCancelButton fail;
+(* ignore (dialog#recordChoiceTreeView#connect#row_activated (fun path _ ->
+ interp_no := Some (model#get_interp_no path);
+ return ()));
+ let selection = dialog#recordChoiceTreeView#selection in
+ ignore (selection#connect#changed (fun _ ->
+ match selection#get_selected_rows with
+ | [path] -> interp_no := Some (model#get_interp_no path)
+ | _ -> assert false)); *)
+ dialog#recordChoiceDialog#show ();
+ GtkThread.main ();
+ (match !record_no with Some n -> n | _ -> raise MatitaTypes.Cancel)
+
projects / helm.git / blobdiff