Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 13:55:40 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[ground_segment] improve readability of icons and add a few more

Browse Source
This commit is contained in:
Gautier Hattenberger
2014-12-10 22:20:11 +01:00
parent e6a6aa9f0c
commit 3c8ee22880
19 changed files with 390 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/lib/ocaml/env.ml
+3
View File
@@ -49,6 +49,9 @@ let icon_file = paparazzi_home // "data/pictures/penguin_icon.png"
let icon_gcs_file = paparazzi_home // "data/pictures/penguin_icon_gcs.png"
let icon_mes_file = paparazzi_home // "data/pictures/penguin_icon_msg.png"
let icon_rep_file = paparazzi_home // "data/pictures/penguin_icon_rep.png"
let icon_rtp_file = paparazzi_home // "data/pictures/penguin_icon_rtp.png"
let icon_log_file = paparazzi_home // "data/pictures/penguin_icon_log.png"
let icon_sim_file = paparazzi_home // "data/pictures/penguin_icon_sim.png"
let gconf_file = paparazzi_home // "conf" // "%gconf.xml"
sw/lib/ocaml/env.mli
+12 -3
View File
@@ -35,13 +35,22 @@ val icon_file : string
(** PNG paparazzi logo icon (48 x 48, 8-bit/color RGBA, non-interlaced) *)
val icon_mes_file : string
(** PNG paparazzi logo icon (48 x 48, 8-bit/color RGBA, non-interlaced) *)
(** PNG paparazzi logo icon for messages (48 x 48, 8-bit/color RGBA, non-interlaced) *)
val icon_gcs_file : string
(** PNG paparazzi logo icon (48 x 48, 8-bit/color RGBA, non-interlaced) *)
(** PNG paparazzi logo icon for GCS (48 x 48, 8-bit/color RGBA, non-interlaced) *)
val icon_rep_file : string
(** PNG paparazzi logo icon (48 x 48, 8-bit/color RGBA, non-interlaced) *)
(** PNG paparazzi logo icon for replay (48 x 48, 8-bit/color RGBA, non-interlaced) *)
val icon_rtp_file : string
(** PNG paparazzi logo icon for RT plotter (48 x 48, 8-bit/color RGBA, non-interlaced) *)
val icon_log_file : string
(** PNG paparazzi logo icon for log plotter (48 x 48, 8-bit/color RGBA, non-interlaced) *)
val icon_sim_file : string
(** PNG paparazzi logo icon for simulator (48 x 48, 8-bit/color RGBA, non-interlaced) *)
val gconf_file : string
(** XML preferences file à la gconf *)
sw/logalizer/plot.ml
+1 -1
View File
@@ -801,7 +801,7 @@ let rec plot_window = fun ?export init ->
let oid = plotter#get_oid in
Hashtbl.add windows oid ();
plotter#set_icon (Some (GdkPixbuf.from_file Env.icon_file));
plotter#set_icon (Some (GdkPixbuf.from_file Env.icon_log_file));
let vbox = GPack.vbox ~packing:plotter#add () in
let quit = fun () -> GMain.Main.quit (); exit 0 in
let close = fun () ->
sw/logalizer/plotter.ml
+1 -1
View File
@@ -350,7 +350,7 @@ let rec plot_window = fun window ->
Hashtbl.add windows oid [];
ignore (plotter#parse_geometry window.geometry);
plotter#set_icon (Some (GdkPixbuf.from_file Env.icon_file));
plotter#set_icon (Some (GdkPixbuf.from_file Env.icon_rtp_file));
let vbox = GPack.vbox ~packing:plotter#add () in
let menubar = GMenu.menu_bar ~packing:vbox#pack () in
let factory = new GMenu.factory menubar in
sw/simulator/sim.ml
+1 -1
View File
@@ -122,7 +122,7 @@ module Make(AircraftItl : AIRCRAFT_ITL) = struct
ref ground_alt
let main () =
let icon = GdkPixbuf.from_file Env.icon_file in
let icon = GdkPixbuf.from_file Env.icon_sim_file in
let window = GWindow.window ~type_hint:`DIALOG ~icon ~title: !ac_name () in
let quit = fun () -> GMain.Main.quit (); exit 0 in
ignore (window#connect#destroy ~callback:quit);