diff options
author | Enrico Tassi <gareuselesinge@debian.org> | 2015-01-25 14:43:16 +0100 |
---|---|---|
committer | Enrico Tassi <gareuselesinge@debian.org> | 2015-01-25 14:43:16 +0100 |
commit | f219abfed720305c13875c3c63f9240cf63f78bc (patch) | |
tree | 69d2c026916128fdb50b8d1c0dbf1be451340d30 /ide/utils/configwin_ihm.ml | |
parent | 476d60ef0fe0ac015c1e902204cdd7029e10ef0f (diff) | |
parent | cec4741afacd2e80894232850eaf9f9c0e45d6d7 (diff) |
Merge tag 'upstream/8.5_beta1+dfsg'
Upstream version 8.5~beta1+dfsg
Diffstat (limited to 'ide/utils/configwin_ihm.ml')
-rw-r--r-- | ide/utils/configwin_ihm.ml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ide/utils/configwin_ihm.ml b/ide/utils/configwin_ihm.ml index 7dbd0452..c1062a9d 100644 --- a/ide/utils/configwin_ihm.ml +++ b/ide/utils/configwin_ihm.ml @@ -38,7 +38,7 @@ class type widget = let file_html_config = Filename.concat Configwin_messages.home ".configwin_html" let debug = false -let dbg = if debug then prerr_endline else (fun _ -> ()) +let dbg s = if debug then Minilib.log s else () (** Return the config group for the html config file, and the option for bindings. *) @@ -67,7 +67,7 @@ let html_config_file_and_option () = let last_dir = ref "";; (** This function allows the user to select a file and returns the - selected file name. An optional function allows to change the + selected file name. An optional function allows changing the behaviour of the ok button. A VOIR : mutli-selection ? *) let select_files ?dir @@ -1015,7 +1015,7 @@ class configuration_box (tt : GData.tooltips) conf_struct = let set_icon iter = function | None -> () - | Some icon -> tree#set iter icon_col icon + | Some icon -> tree#set ~row:iter ~column:icon_col icon in (* Populate the tree *) @@ -1036,9 +1036,9 @@ class configuration_box (tt : GData.tooltips) conf_struct = method apply () = List.iter (fun param -> param#apply) params end in - let () = tree#set new_iter label_col label in + let () = tree#set ~row:new_iter ~column:label_col label in let () = set_icon new_iter icon in - let () = tree#set new_iter box_col widget in + let () = tree#set ~row:new_iter ~column:box_col widget in () | Section_list (label, icon, struct_list) -> let widget = @@ -1049,9 +1049,9 @@ class configuration_box (tt : GData.tooltips) conf_struct = method box = box#coerce end in - let () = tree#set new_iter label_col label in + let () = tree#set ~row:new_iter ~column:label_col label in let () = set_icon new_iter icon in - let () = tree#set new_iter box_col widget in + let () = tree#set ~row:new_iter ~column:box_col widget in List.iter (make_tree (Some new_iter)) struct_list in |