Skip to content

Commit

Permalink
Better encapsulation of MessageView
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16323 85f007b7-540e-0410-9357-904b9bb8a0f7
  • Loading branch information
ppedrot committed Mar 20, 2013
1 parent cfe99ef commit f5afee3
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ide/coqide.ml
Expand Up @@ -748,7 +748,7 @@ let refresh_editor_prefs () =
(* Fonts *)
sn.script#misc#modify_font fd;
sn.proof#misc#modify_font fd;
sn.messages#misc#modify_font fd;
sn.messages#modify_font fd;
sn.command#refresh_font ();

(* Colors *)
Expand Down
4 changes: 1 addition & 3 deletions ide/session.ml
Expand Up @@ -198,8 +198,6 @@ let build_layout (sn:session) =
~vpolicy:`AUTOMATIC ~hpolicy:`AUTOMATIC ~packing:proof_frame#add () in
let message_frame = GBin.frame ~shadow_type:`IN
~packing:state_paned#add2 () in
let message_scroll = GBin.scrolled_window
~vpolicy:`AUTOMATIC ~hpolicy:`AUTOMATIC ~packing:message_frame#add () in
let session_tab = GPack.hbox ~homogeneous:false () in
let img = GMisc.image ~icon_size:`SMALL_TOOLBAR
~packing:session_tab#pack () in
Expand Down Expand Up @@ -229,7 +227,7 @@ let build_layout (sn:session) =
session_paned#pack2 ~shrink:false ~resize:false (sn.command#frame#coerce);
script_scroll#add sn.script#coerce;
proof_scroll#add sn.proof#coerce;
message_scroll#add sn.messages#coerce;
message_frame#add sn.messages#coerce;
session_tab#pack sn.tab_label#coerce;
img#set_stock `YES;
eval_paned#set_position 1;
Expand Down
10 changes: 8 additions & 2 deletions ide/wg_MessageView.ml
Expand Up @@ -16,18 +16,22 @@ class type message_view =
(** same as [add], but with an explicit level instead of [Notice] *)
method buffer : GText.buffer
(** for more advanced text edition *)
method modify_font : Pango.font_description -> unit
end

let message_view () : message_view =
let buffer = GText.buffer ~tag_table:Tags.Message.table () in
let view = GText.view ~buffer
let box = GPack.vbox () in
let scroll = GBin.scrolled_window
~vpolicy:`AUTOMATIC ~hpolicy:`AUTOMATIC ~packing:(box#pack ~expand:true) () in
let view = GText.view ~buffer ~packing:scroll#add
~editable:false ~cursor_visible:false ~wrap_mode:`WORD ()
in
let default_clipboard = GData.clipboard Gdk.Atom.primary in
let _ = buffer#add_selection_clipboard default_clipboard in
let () = view#set_left_margin 2 in
object (self)
inherit GObj.widget view#as_widget
inherit GObj.widget box#as_widget

method clear =
buffer#set_text ""
Expand All @@ -47,4 +51,6 @@ let message_view () : message_view =

method buffer = buffer

method modify_font fd = view#misc#modify_font fd

end
1 change: 1 addition & 0 deletions ide/wg_MessageView.mli
Expand Up @@ -16,6 +16,7 @@ class type message_view =
(** same as [add], but with an explicit level instead of [Notice] *)
method buffer : GText.buffer
(** for more advanced text edition *)
method modify_font : Pango.font_description -> unit
end

val message_view : unit -> message_view

0 comments on commit f5afee3

Please sign in to comment.