logo attached to windows

conf/control_panel.xml.example

@@ -20,6 +20,10 @@
       <arg flag="-b" variable="ivy_bus"/>
     </program>
 
+    <program name="settings" command="sw/ground_segment/tmtc/settings">
+      <arg flag="-b" variable="ivy_bus"/>
+    </program>
+
     <program name="gcs" command="sw/ground_segment/cockpit/gcs">
       <arg flag="-b" variable="ivy_bus"/>
     </program>

debian/paparazzi-bin.postinst

@@ -12,6 +12,7 @@ cd ${DESTDIR}/sw/ground_segment/tmtc
 ${OCAMLC} -custom -I +lablgtk2 -I ${DESTDIR}/sw/lib/ocaml unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma aircraft.cmo wind.cmo airprox.cmo aircraft.cmo wind.cmo airprox.cmo server.cmo -o server
 ${OCAMLC} -custom -I +lablgtk2 -I ${DESTDIR}/sw/lib/ocaml -I ../multimon unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma multimon.cma modem.cmo link.cmo -o link
 ${OCAMLC} -custom -I +lablgtk2 -I ${DESTDIR}/sw/lib/ocaml unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma gtkInit.cmo messages.cmo -o messages
+${OCAMLC} -custom -I +lablgtk2 -I ${DESTDIR}/sw/lib/ocaml -I ../cockpit unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma gtkInit.cmo pages.cmo settings.cmo -o settings
 
 cd ${DESTDIR}/sw/ground_segment/cockpit
 ${OCAMLC} -thread -custom -I +lablgtk2 -I ${DESTDIR}/sw/lib/ocaml unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma lablgnomecanvas.cma xlib-pprz.cma threads.cma gtkThread.cmo gtkInit.cmo horizon.cmo strip.cmo pages.cmo speech.cmo plugin.cmo sectors.cmo map2d.cmo editFP.cmo live.cmo particules.cmo gcs.cmo -o gcs

sw/ground_segment/cockpit/gcs.ml

@@ -498,7 +498,8 @@ let _main =
   let window, switch_fullscreen =
     match !wid with
       None ->
-	let window = GWindow.window ~title:"Paparazzi GCS" ~border_width:1 ~width ~height ~allow_shrink:true () in
+	let icon = GdkPixbuf.from_file Env.icon_file in
+  	let window = GWindow.window ~icon ~title:"GCS" ~border_width:1 ~width ~height ~allow_shrink:true () in
 	if !maximize then
 	  window#maximize ();
 	if !fullscreen then

sw/ground_segment/tmtc/Makefile

@@ -52,7 +52,7 @@ messages : messages.cmo
 	$(Q)$(OCAMLC) -custom $(INCLUDES) -o $@ unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma gtkInit.cmo $^
 
 
-settings : settings.ml
+settings : settings.cmo
 	@echo OL $@
 	$(Q)$(OCAMLC) -custom $(INCLUDES) -I ../cockpit -o $@ unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma gtkInit.cmo pages.cmo $^
 
@@ -85,6 +85,8 @@ ihm :  ihm.cmo
 	$(Q)$(OCAMLC) -custom $(INCLUDES) -o $@ unix.cma str.cma xml-light.cma lablgtk.cma glibivy-ocaml.cma lib-pprz.cma $^
 
 
+settings.cmo : INCLUDES += -I ../cockpit
+
 %.cmo : %.ml $(LIBPPRZCMA)
 	@echo OC $<
 	$(Q)$(OCAMLC) $(INCLUDES) -c $<

sw/ground_segment/tmtc/messages.ml

@@ -171,7 +171,8 @@ let _ =
   Ivy.start !ivy_bus;
 
   (** Open the window container with its notebook*)
-  let window = GWindow.window ~title:"Paparazzi messages" () in
+  let icon = GdkPixbuf.from_file Env.icon_file in
+  let window = GWindow.window ~icon ~title:"Messages" () in
   let quit = fun () -> GMain.Main.quit (); exit 0 in
   ignore (window#connect#destroy ~callback:quit);
 

sw/ground_segment/tmtc/settings.ml

@@ -78,7 +78,8 @@ let _ =
   Ivy.start !ivy_bus;
 
   (** Open the window container with its notebook*)
-  let window = GWindow.window ~width:400 ~height:300 ~allow_shrink:true ~title:"Paparazzi settings" () in
+  let icon = GdkPixbuf.from_file Env.icon_file in
+  let window = GWindow.window ~icon ~width:400 ~height:300 ~allow_shrink:true ~title:"PaSettings" () in
 
   let notebook = GPack.notebook ~packing:window#add ~tab_pos:`TOP () in
 

sw/lib/ocaml/env.ml

@@ -42,3 +42,5 @@ let paparazzi_home =
 let flight_plans_path = paparazzi_home // "conf" // "flight_plans"
 
 let flight_plan_dtd = flight_plans_path // "flight_plan.dtd"
+
+let icon_file = paparazzi_home // "data/pictures/penguin_icon.png"

sw/lib/ocaml/env.mli

@@ -32,3 +32,5 @@ val paparazzi_src : string
 
 val flight_plans_path : string
 val flight_plan_dtd : string
+
+val icon_file : string

sw/logalizer/play.ml

@@ -161,7 +161,8 @@ let play adj speed =
   
 
 let _ =
-  let window = GWindow.dialog ~title:"Paparazzi Replay" ~width:300 () in
+  let icon = GdkPixbuf.from_file Env.icon_file in
+  let window = GWindow.dialog ~icon ~title:"Replay" ~width:300 () in
   let quit = fun () -> GMain.Main.quit (); exit 0 in
   ignore (window#connect#destroy ~callback:quit);
 

sw/logalizer/plot.ml

@@ -426,6 +426,7 @@ let screenshot = fun frame () ->
 
 let rec plot_window = fun init ->
   let plotter = GWindow.window ~allow_shrink:true ~title:"Log Plotter" () in
+  plotter#set_icon (Some (GdkPixbuf.from_file Env.icon_file));  
   let vbox = GPack.vbox ~packing:plotter#add () in
   let quit = fun () -> GMain.Main.quit (); exit 0 in
 
@@ -459,7 +460,7 @@ let rec plot_window = fun init ->
     !logs_menus;
 
   tooltips#set_tip plot#drawing_area#coerce ~text:"Drop a messages field here to draw it";
-  ignore (plotter#connect#destroy ~callback:(fun () -> plot#destroy ()));
+  ignore (plotter#connect#destroy ~callback:(fun () -> plot#destroy (); quit ()));
 
   (* Auto Scale *)
   let auto_scale = GButton.check_button ~label:"Auto Scale" ~active:true ~packing:h#pack () in

sw/logalizer/plotter.ml

@@ -240,6 +240,7 @@ let size = ref 500
 
 let rec plot_window = fun init ->
   let plotter = GWindow.window ~allow_shrink:true ~title:"Plotter" () in
+  plotter#set_icon (Some (GdkPixbuf.from_file Env.icon_file));
   let vbox = GPack.vbox ~packing:plotter#add () in
   let quit = fun () -> GMain.Main.quit (); exit 0 in
 
@@ -273,7 +274,7 @@ let rec plot_window = fun init ->
   let width = 900 and height = 200 in
   let plot = new plot ~size: !size ~width ~height ~packing:(vbox#pack ~expand:true) () in
   tooltips#set_tip plot#drawing_area#coerce ~text:"Drop a messages field here to draw it";
-  ignore (plotter#connect#destroy ~callback:(fun () -> plot#destroy ()));
+  ignore (plotter#connect#destroy ~callback:(fun () -> plot#destroy (); quit ()));
 
   (* Auto Scale *)
   let auto_scale = GButton.check_button ~label:"Auto Scale" ~active:true ~packing:h#pack () in

sw/simulator/gaia.ml

@@ -43,7 +43,8 @@ let parse_args = fun () ->
 
 let _ =
   parse_args ();
-  let window = GWindow.window ~title:"Gaia" () in
+  let icon = GdkPixbuf.from_file Env.icon_file in
+  let window = GWindow.window ~icon ~title:"Gaia" () in
   let quit = fun () -> GMain.Main.quit (); exit 0 in
   ignore (window#connect#destroy ~callback:quit);
 

sw/simulator/sim.ml

@@ -106,7 +106,8 @@ module Make(AircraftItl : AIRCRAFT_ITL) = struct
     ref ground_alt
 
   let main () =
-    let window = GWindow.window ~title:("Aircraft "^ !ac_name) () in
+    let icon = GdkPixbuf.from_file Env.icon_file in
+    let window = GWindow.window ~icon ~title: !ac_name () in
     let quit = fun () -> GMain.Main.quit (); exit 0 in
     ignore (window#connect#destroy ~callback:quit);
     let vbox = GPack.vbox ~packing:window#add () in

sw/simulator/sitl.ml

@@ -84,7 +84,8 @@ module Make(A:Data.MISSION) = struct
 
   let rc = fun () ->
     let name = Xml.attrib A.ac.Data.radio "name" ^ " " ^ A.ac.Data.name in
-    let window = GWindow.window ~title:name ~border_width:0 ~width:200 ~height:400 () in
+    let icon = GdkPixbuf.from_file Env.icon_file in
+    let window = GWindow.window ~icon ~title:name ~border_width:0 ~width:200 ~height:400 () in
     let quit = fun () -> GMain.Main.quit (); exit 0 in
     ignore (window#connect#destroy ~callback:quit);
     let vbox = GPack.vbox ~height:10 ~spacing: 1 ~border_width: 1 ~packing:window#add () in

sw/supervision/paparazzicenter.ml

@@ -36,6 +36,8 @@ let () =
   ignore (gui#window#connect#destroy ~callback:(fun _ -> CP.close_programs gui; exit 0));
   gui#toplevel#show ();
 
+  gui#window#set_icon (Some (GdkPixbuf.from_file Env.icon_file));
+
   let ac_combo = AC.parse_conf_xml gui#vbox_ac
   and target_combo = combo ["sim";"fbw";"ap"] gui#vbox_target in