The unified diff between revisions [670626de..] and [aaae92d1..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "Makefile"
# from [a17e94ff0a8cfc06ea9cdb256cad9dd608264861]
# to [32653cf1b11ec035b32a203fff2901341794ea76]
#
# patch "autocolor.ml"
# from [9d59f87e56d79aad8c632cff38b12fab557814df]
# to [f65e7ff180df5254be893399fc6f2872e941c8fb]
#
# patch "ui.ml"
# from [149a93e54cb48f3458c6c937dc22d024240286e8]
# to [966f78220372d018943bd4049f8ffc4e910098d0]
#
# patch "view.ml"
# from [aef3e25bf8bb163d45dbd5bd8ddeef96950664ed]
# to [1e5e6a1a88d2bdc2627821f1e770b5aa4c3c86b3]
#
============================================================
--- Makefile a17e94ff0a8cfc06ea9cdb256cad9dd608264861
+++ Makefile 32653cf1b11ec035b32a203fff2901341794ea76
@@ -99,7 +99,7 @@ gnomecanvas_hack.o : CINCDIRS = -c
endif
crypto/ocaml-openssl.o : CINCDIRS = -ccopt "$(CRYPTO_CFLAGS)"
gnomecanvas_hack.o : CINCDIRS = -ccopt "$(GNOMECANVAS_CFLAGS)"
-$(EXTLIB)/unzip.% : MLFLAGS += -w y
+#$(EXTLIB)/unzip.% : MLFLAGS += -w y
REVISION_FILE := $(shell test -r MT/revision && echo MT/revision)
REVISION_ID = $(if $(REVISION_FILE),$(shell cat $(REVISION_FILE)))
============================================================
--- autocolor.ml 9d59f87e56d79aad8c632cff38b12fab557814df
+++ autocolor.ml f65e7ff180df5254be893399fc6f2872e941c8fb
@@ -31,11 +31,11 @@ let autocolor_hash s =
let hash = Crypto.sha1 s in
let f_of_hash p = float (Char.code hash.[p]) /. 256. in
(* take 8 bits for hue *)
- let hue = f_of_hash 0 in
+ let hue = f_of_hash 5 in
(* take 8 bits for lightness and map to [75% .. 90%] *)
- let li = f_of_hash 1 *. 0.15 +. 0.75 in
+ let li = f_of_hash 1 *. 0.15 +. 0.55 in
(* take 8 bits for saturation and map to [50% .. 80%]*)
- let sat = f_of_hash 2 *. 0.3 +. 0.5 in
+ let sat = f_of_hash 2 *. 0.5 +. 0.5 in
let (r, g, b) as triplet = hls_to_rgb hue li sat in
if Viz_misc.debug "color"
then
============================================================
--- ui.ml 149a93e54cb48f3458c6c937dc22d024240286e8
+++ ui.ml 966f78220372d018943bd4049f8ffc4e910098d0
@@ -402,6 +402,9 @@ let make () =
m#insert_action_group g_popup 3 ;
m#insert_action_group g_view 4 ;
ignore (m#add_ui_from_string ui_info) ;
+ let tb = new GButton.toolbar (GtkButton.Toolbar.cast (get_obj m "/toolbar")) in
+ tb#set_style `ICONS ;
+ tb#set_icon_size `SMALL_TOOLBAR ;
let menubar = m#get_widget "/menubar" in
let toolbar = m#get_widget "/toolbar" in
{ manager = m ;
============================================================
--- view.ml aef3e25bf8bb163d45dbd5bd8ddeef96950664ed
+++ view.ml 1e5e6a1a88d2bdc2627821f1e770b5aa4c3c86b3
@@ -929,7 +929,7 @@ module Canvas = struct
}
let make ~aa ~packing =
- let sw = GBin.scrolled_window ~width:700 ~height:400 ~packing () in
+ let sw = GBin.scrolled_window ~width:1024 ~height:400 ~packing () in
let canvas = GnoCanvas.canvas ~aa ~packing:sw#add () in
let selection_rect = GnoCanvas.rect ~fill_color:"tomato" canvas#root in
selection_rect#hide () ;