Commit d5585439 authored by Raphael Rieu-Helft's avatar Raphael Rieu-Helft

s/labels/attributes/g for IDE

parent b0cef7e3
...@@ -72,7 +72,7 @@ goal_color = "gold" ...@@ -72,7 +72,7 @@ goal_color = "gold"
iconset = "fatcow" iconset = "fatcow"
intro_premises = true intro_premises = true
premise_color = "chartreuse" premise_color = "chartreuse"
print_labels = false print_attributes = false
print_locs = false print_locs = false
print_time_limit = false print_time_limit = false
saving_policy = 2 saving_policy = 2
......
...@@ -16,7 +16,7 @@ max_boxes = 16 ...@@ -16,7 +16,7 @@ max_boxes = 16
neg_premise_color = "pink" neg_premise_color = "pink"
premise_color = "chartreuse" premise_color = "chartreuse"
print_coercions = true print_coercions = true
print_labels = false print_attributes = false
print_locs = false print_locs = false
print_time_limit = false print_time_limit = false
saving_policy = 2 saving_policy = 2
......
...@@ -43,7 +43,7 @@ intro_premises = true ...@@ -43,7 +43,7 @@ intro_premises = true
max_boxes = 16 max_boxes = 16
neg_premise_color = "pink" neg_premise_color = "pink"
premise_color = "chartreuse" premise_color = "chartreuse"
print_labels = false print_attributes = false
print_locs = false print_locs = false
print_time_limit = false print_time_limit = false
saving_policy = 2 saving_policy = 2
......
...@@ -38,7 +38,7 @@ type t = ...@@ -38,7 +38,7 @@ type t =
mutable current_tab : int; mutable current_tab : int;
mutable verbose : int; mutable verbose : int;
mutable show_full_context : bool; mutable show_full_context : bool;
mutable show_labels : bool; mutable show_attributes : bool;
mutable show_coercions : bool; mutable show_coercions : bool;
mutable show_locs : bool; mutable show_locs : bool;
mutable show_time_limit : bool; mutable show_time_limit : bool;
...@@ -73,7 +73,7 @@ type ide = { ...@@ -73,7 +73,7 @@ type ide = {
ide_current_tab : int; ide_current_tab : int;
ide_verbose : int; ide_verbose : int;
ide_show_full_context : bool; ide_show_full_context : bool;
ide_show_labels : bool; ide_show_attributes : bool;
ide_show_coercions : bool; ide_show_coercions : bool;
ide_show_locs : bool; ide_show_locs : bool;
ide_show_time_limit : bool; ide_show_time_limit : bool;
...@@ -99,7 +99,7 @@ let default_ide = ...@@ -99,7 +99,7 @@ let default_ide =
ide_current_tab = 0; ide_current_tab = 0;
ide_verbose = 0; ide_verbose = 0;
ide_show_full_context = false; ide_show_full_context = false;
ide_show_labels = false; ide_show_attributes = false;
ide_show_coercions = true; ide_show_coercions = true;
ide_show_locs = false; ide_show_locs = false;
ide_show_time_limit = false; ide_show_time_limit = false;
...@@ -133,10 +133,10 @@ let load_ide section = ...@@ -133,10 +133,10 @@ let load_ide section =
ide_show_full_context = ide_show_full_context =
get_bool section ~default:default_ide.ide_show_full_context get_bool section ~default:default_ide.ide_show_full_context
"show_full_context"; "show_full_context";
ide_show_labels = ide_show_attributes =
get_bool section ~default:default_ide.ide_show_labels "print_labels"; get_bool section ~default:default_ide.ide_show_attributes "print_attributes";
ide_show_coercions = ide_show_coercions =
get_bool section ~default:default_ide.ide_show_labels "print_coercions"; get_bool section ~default:default_ide.ide_show_attributes "print_coercions";
ide_show_locs = ide_show_locs =
get_bool section ~default:default_ide.ide_show_locs "print_locs"; get_bool section ~default:default_ide.ide_show_locs "print_locs";
ide_show_time_limit = ide_show_time_limit =
...@@ -173,8 +173,8 @@ let load_ide section = ...@@ -173,8 +173,8 @@ let load_ide section =
} }
let set_labels_flag = let set_attr_flag =
let fl = Debug.lookup_flag "print_labels" in let fl = Debug.lookup_flag "print_attributes" in
fun b -> fun b ->
(if b then Debug.set_flag else Debug.unset_flag) fl (if b then Debug.set_flag else Debug.unset_flag) fl
...@@ -194,7 +194,7 @@ let load_config config original_config = ...@@ -194,7 +194,7 @@ let load_config config original_config =
| None -> default_ide | None -> default_ide
| Some s -> load_ide s | Some s -> load_ide s
in in
set_labels_flag ide.ide_show_labels; set_attr_flag ide.ide_show_attributes;
set_coercions_flag ide.ide_show_coercions; set_coercions_flag ide.ide_show_coercions;
set_locs_flag ide.ide_show_locs; set_locs_flag ide.ide_show_locs;
{ window_height = ide.ide_window_height; { window_height = ide.ide_window_height;
...@@ -205,7 +205,7 @@ let load_config config original_config = ...@@ -205,7 +205,7 @@ let load_config config original_config =
font_size = ide.ide_font_size; font_size = ide.ide_font_size;
verbose = ide.ide_verbose; verbose = ide.ide_verbose;
show_full_context= ide.ide_show_full_context ; show_full_context= ide.ide_show_full_context ;
show_labels = ide.ide_show_labels ; show_attributes = ide.ide_show_attributes ;
show_coercions = ide.ide_show_coercions ; show_coercions = ide.ide_show_coercions ;
show_locs = ide.ide_show_locs ; show_locs = ide.ide_show_locs ;
show_time_limit = ide.ide_show_time_limit; show_time_limit = ide.ide_show_time_limit;
...@@ -250,7 +250,7 @@ let save_config t = ...@@ -250,7 +250,7 @@ let save_config t =
let ide = set_int ide "font_size" t.font_size in let ide = set_int ide "font_size" t.font_size in
let ide = set_int ide "verbose" t.verbose in let ide = set_int ide "verbose" t.verbose in
let ide = set_bool ide "show_full_context" t.show_full_context in let ide = set_bool ide "show_full_context" t.show_full_context in
let ide = set_bool ide "print_labels" t.show_labels in let ide = set_bool ide "print_attributes" t.show_attributes in
let ide = set_bool ide "print_coercions" t.show_coercions in let ide = set_bool ide "print_coercions" t.show_coercions in
let ide = set_bool ide "print_locs" t.show_locs in let ide = set_bool ide "print_locs" t.show_locs in
let ide = set_bool ide "print_time_limit" t.show_time_limit in let ide = set_bool ide "print_time_limit" t.show_time_limit in
...@@ -808,17 +808,17 @@ let appearance_settings (c : t) (notebook:GPack.notebook) = ...@@ -808,17 +808,17 @@ let appearance_settings (c : t) (notebook:GPack.notebook) =
showfullcontext#connect#toggled ~callback: showfullcontext#connect#toggled ~callback:
(fun () -> c.show_full_context <- not c.show_full_context) (fun () -> c.show_full_context <- not c.show_full_context)
in in
let showlabels = let showattrs =
GButton.check_button GButton.check_button
~label:"show labels in formulas" ~label:"show attributes in formulas"
~packing:display_options_box#add () ~packing:display_options_box#add ()
~active:c.show_labels ~active:c.show_attributes
in in
let (_ : GtkSignal.id) = let (_ : GtkSignal.id) =
showlabels#connect#toggled ~callback: showattrs#connect#toggled ~callback:
(fun () -> (fun () ->
c.show_labels <- not c.show_labels; c.show_attributes <- not c.show_attributes;
set_labels_flag c.show_labels) set_attr_flag c.show_attributes)
in in
let showcoercions = let showcoercions =
GButton.check_button GButton.check_button
......
...@@ -20,7 +20,7 @@ type t = ...@@ -20,7 +20,7 @@ type t =
mutable current_tab : int; mutable current_tab : int;
mutable verbose : int; mutable verbose : int;
mutable show_full_context : bool; mutable show_full_context : bool;
mutable show_labels : bool; mutable show_attributes : bool;
mutable show_coercions : bool; mutable show_coercions : bool;
mutable show_locs : bool; mutable show_locs : bool;
mutable show_time_limit : bool; mutable show_time_limit : bool;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment