diff options
author | gareuselesinge <gareuselesinge@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2013-10-11 20:44:13 +0000 |
---|---|---|
committer | gareuselesinge <gareuselesinge@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2013-10-11 20:44:13 +0000 |
commit | 38d9a3342f626d16bcf5c993bf15ff3e6e8ee8d9 (patch) | |
tree | d5f8cba2a5e80d645e66ee3cea09d50b9e0aacd0 /ide | |
parent | 6b1bbec0f721306451626538f2f5bb95e153f912 (diff) |
CoqIDE: make error background configurable
#FFCCCC is quite dark on some beamers
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16881 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'ide')
-rw-r--r-- | ide/preferences.ml | 18 | ||||
-rw-r--r-- | ide/preferences.mli | 1 | ||||
-rw-r--r-- | ide/tags.ml | 10 | ||||
-rw-r--r-- | ide/tags.mli | 3 |
4 files changed, 30 insertions, 2 deletions
diff --git a/ide/preferences.ml b/ide/preferences.ml index b36e42d4c..d9a9d0e3a 100644 --- a/ide/preferences.ml +++ b/ide/preferences.ml @@ -143,6 +143,7 @@ type pref = mutable background_color : string; mutable processing_color : string; mutable processed_color : string; + mutable error_color : string; mutable dynamic_word_wrap : bool; mutable show_line_number : bool; @@ -221,6 +222,7 @@ let current = { background_color = "cornsilk"; processed_color = "light green"; processing_color = "light blue"; + error_color = "#FFCCCC"; dynamic_word_wrap = false; show_line_number = false; @@ -291,6 +293,7 @@ let save_pref () = add "background_color" [p.background_color] ++ add "processing_color" [p.processing_color] ++ add "processed_color" [p.processed_color] ++ + add "error_color" [p.error_color] ++ add "dynamic_word_wrap" [string_of_bool p.dynamic_word_wrap] ++ add "show_line_number" [string_of_bool p.show_line_number] ++ add "auto_indent" [string_of_bool p.auto_indent] ++ @@ -375,6 +378,7 @@ let load_pref () = set_hd "background_color" (fun v -> np.background_color <- v); set_hd "processing_color" (fun v -> np.processing_color <- v); set_hd "processed_color" (fun v -> np.processed_color <- v); + set_hd "error_color" (fun v -> np.error_color <- v); set_bool "dynamic_word_wrap" (fun v -> np.dynamic_word_wrap <- v); set_bool "show_line_number" (fun v -> np.show_line_number <- v); set_bool "auto_indent" (fun v -> np.auto_indent <- v); @@ -454,9 +458,14 @@ let configure ?(apply=(fun () -> ())) () = ~text:"Background color of text being processed" ~packing:(table#attach ~expand:`X ~left:0 ~top:2) () in + let error_label = GMisc.label + ~text:"Background color of errors" + ~packing:(table#attach ~expand:`X ~left:0 ~top:3) () + in let () = background_label#set_xalign 0. in let () = processed_label#set_xalign 0. in let () = processing_label#set_xalign 0. in + let () = error_label#set_xalign 0. in let background_button = GButton.color_button ~color:(Tags.color_of_string (current.background_color)) ~packing:(table#attach ~left:1 ~top:0) () @@ -469,6 +478,10 @@ let configure ?(apply=(fun () -> ())) () = ~color:(Tags.get_processing_color ()) ~packing:(table#attach ~left:1 ~top:2) () in + let error_button = GButton.color_button + ~color:(Tags.get_error_color ()) + ~packing:(table#attach ~left:1 ~top:3) () + in let reset_button = GButton.button ~label:"Reset" ~packing:box#pack () @@ -477,6 +490,7 @@ let configure ?(apply=(fun () -> ())) () = background_button#set_color (Tags.color_of_string "cornsilk"); processing_button#set_color (Tags.color_of_string "light blue"); processed_button#set_color (Tags.color_of_string "light green"); + error_button#set_color (Tags.color_of_string "#FFCCCC"); in let _ = reset_button#connect#clicked ~callback:reset_cb in let label = "Color configuration" in @@ -484,9 +498,11 @@ let configure ?(apply=(fun () -> ())) () = current.background_color <- Tags.string_of_color background_button#color; current.processing_color <- Tags.string_of_color processing_button#color; current.processed_color <- Tags.string_of_color processed_button#color; + current.error_color <- Tags.string_of_color error_button#color; !refresh_editor_hook (); Tags.set_processing_color processing_button#color; - Tags.set_processed_color processed_button#color + Tags.set_processed_color processed_button#color; + Tags.set_error_color error_button#color in custom ~label box callback true in diff --git a/ide/preferences.mli b/ide/preferences.mli index 0c5b7f6e1..26dc51f39 100644 --- a/ide/preferences.mli +++ b/ide/preferences.mli @@ -70,6 +70,7 @@ type pref = mutable background_color : string; mutable processing_color : string; mutable processed_color : string; + mutable error_color : string; mutable dynamic_word_wrap : bool; mutable show_line_number : bool; diff --git a/ide/tags.ml b/ide/tags.ml index cc615d9e1..89675d8ef 100644 --- a/ide/tags.ml +++ b/ide/tags.ml @@ -15,13 +15,14 @@ let make_tag (tt:GText.tag_table) ~name prop = let processed_color = ref "light green" let processing_color = ref "light blue" +let error_color = ref "#FFCCCC" module Script = struct let table = GText.tag_table () let comment = make_tag table ~name:"comment" [] let error = make_tag table ~name:"error" [`UNDERLINE `SINGLE ; `FOREGROUND "red"] - let error_bg = make_tag table ~name:"error_bg" [`BACKGROUND "#FFCCCC"] + let error_bg = make_tag table ~name:"error_bg" [`BACKGROUND !error_color] let to_process = make_tag table ~name:"to_process" [`BACKGROUND !processing_color] let processed = make_tag table ~name:"processed" [`BACKGROUND !processed_color] let unjustified = make_tag table ~name:"unjustified" [`BACKGROUND "gold"] @@ -81,3 +82,10 @@ let set_processing_color clr = let s = string_of_color clr in processing_color := s; Script.to_process#set_property (`BACKGROUND s) + +let get_error_color () = color_of_string !error_color + +let set_error_color clr = + let s = string_of_color clr in + error_color := s; + Script.error_bg#set_property (`BACKGROUND s) diff --git a/ide/tags.mli b/ide/tags.mli index 3c5900269..e2447aabe 100644 --- a/ide/tags.mli +++ b/ide/tags.mli @@ -49,3 +49,6 @@ val set_processed_color : Gdk.color -> unit val get_processing_color : unit -> Gdk.color val set_processing_color : Gdk.color -> unit + +val get_error_color : unit -> Gdk.color +val set_error_color : Gdk.color -> unit |