X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaGtkMisc.ml;h=d45452a5235176e88a3d27f43cc609d9ebee6b96;hb=c0f06261e5626228e4681de9973b6412524f09a2;hp=274ee123a2a9ba48e38d5bd811a7317f16ed0586;hpb=de9a83f286eee12117fb478ea2db18f7faebac9a;p=helm.git

diff --git a/helm/matita/matitaGtkMisc.ml b/helm/matita/matitaGtkMisc.ml
index 274ee123a..d45452a52 100644
--- a/helm/matita/matitaGtkMisc.ml
+++ b/helm/matita/matitaGtkMisc.ml
@@ -39,6 +39,9 @@ let wrap_callback f () =
 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))
 
@@ -54,11 +57,19 @@ let connect_key (ev:GObj.event_ops) ?(modifiers = []) ?(stop = false) key
         stop
     | _ -> false)))
 
-let toggle_visibility ~(win: GWindow.window) ~(check: GMenu.check_menu_item) =
+let toggle_widget_visibility ~(widget: GObj.widget) 
+                              ~(check: GMenu.check_menu_item) 
+=
   ignore (check#connect#toggled (fun _ ->
-    if check#active then win#show () else win#misc#hide ()));
-  ignore (win#event#connect#delete (fun _ ->
-    win#misc#hide ();
+    if check#active then widget#misc#show () else widget#misc#hide ()))
+
+let toggle_window_visibility ~(window: GWindow.window) 
+                              ~(check: GMenu.check_menu_item) 
+=
+  ignore (check#connect#toggled (fun _ ->
+    if check#active then window#show () else window#misc#hide ()));
+  ignore (window#event#connect#delete (fun _ ->
+    window#misc#hide ();
     check#set_active false;
     true))
 
@@ -68,6 +79,9 @@ let toggle_win ?(check: GMenu.check_menu_item option) (win: GWindow.window) () =
   | None -> ()
   | Some check -> check#set_active (not check#active)
 
+let toggle_callback ~callback ~(check: GMenu.check_menu_item) =
+  ignore (check#connect#toggled (fun _ -> callback check#active))
+  
 let add_key_binding key callback (evbox: GBin.event_box) =
   ignore (evbox#event#connect#key_press (function
     | key' when GdkEvent.Key.keyval key' = key ->
@@ -79,11 +93,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)
 
@@ -103,7 +116,46 @@ 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
+
+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)
+
+    method list_store = list_store
+
+    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)
+
+    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)
 
+    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
 
 class type gui =