matitamake is integrated with matita

[helm.git] / helm / matita / matitaGtkMisc.ml

diff --git a/helm/matita/matitaGtkMisc.ml b/helm/matita/matitaGtkMisc.ml
index 8a7048bbdf4cd7557213d78a064c9d2ee34385a2..686f54399327801a5193dd0c42dfa7df18fef898 100644 (file)
--- a/helm/matita/matitaGtkMisc.ml
+++ b/helm/matita/matitaGtkMisc.ml
@@ -83,35 +83,89 @@ let add_key_binding key callback (evbox: GBin.event_box) =
         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)
 =