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: GTree.view)
=
?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);
~callback:(fun a -> GMain.Main.quit ();callback a));
ignore(m#connect#close
~callback:(fun _ -> GMain.Main.quit ();callback `POPUPCLOSED));
+ if show = true then
+ m#show ();
GtkThread.main ();
m#destroy ()