diff --git a/data/pictures/penguin_icon_gcs.png b/data/pictures/penguin_icon_gcs.png new file mode 100644 index 0000000000..a3f3e37da0 Binary files /dev/null and b/data/pictures/penguin_icon_gcs.png differ diff --git a/data/pictures/penguin_icon_msg.png b/data/pictures/penguin_icon_msg.png new file mode 100644 index 0000000000..636b42c9d5 Binary files /dev/null and b/data/pictures/penguin_icon_msg.png differ diff --git a/data/pictures/penguin_icon_rep.png b/data/pictures/penguin_icon_rep.png new file mode 100644 index 0000000000..73e119243a Binary files /dev/null and b/data/pictures/penguin_icon_rep.png differ diff --git a/data/pictures/penguin_icon_vid.png b/data/pictures/penguin_icon_vid.png new file mode 100644 index 0000000000..dcf6a16f20 Binary files /dev/null and b/data/pictures/penguin_icon_vid.png differ diff --git a/data/pictures/penguin_logo_gcs.svg b/data/pictures/penguin_logo_gcs.svg new file mode 100644 index 0000000000..4ded1653fa --- /dev/null +++ b/data/pictures/penguin_logo_gcs.svg @@ -0,0 +1,102 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + GCS + diff --git a/data/pictures/penguin_logo_msg.svg b/data/pictures/penguin_logo_msg.svg new file mode 100644 index 0000000000..015e3acc9f --- /dev/null +++ b/data/pictures/penguin_logo_msg.svg @@ -0,0 +1,102 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + MSG + diff --git a/data/pictures/penguin_logo_rep.svg b/data/pictures/penguin_logo_rep.svg new file mode 100644 index 0000000000..64263056e8 --- /dev/null +++ b/data/pictures/penguin_logo_rep.svg @@ -0,0 +1,102 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + REP + diff --git a/data/pictures/penguin_logo_vid.svg b/data/pictures/penguin_logo_vid.svg new file mode 100644 index 0000000000..f1052d9fa1 --- /dev/null +++ b/data/pictures/penguin_logo_vid.svg @@ -0,0 +1,102 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + VID + diff --git a/sw/ground_segment/cockpit/gcs.ml b/sw/ground_segment/cockpit/gcs.ml index 56587b0683..cb17aef234 100644 --- a/sw/ground_segment/cockpit/gcs.ml +++ b/sw/ground_segment/cockpit/gcs.ml @@ -613,7 +613,7 @@ let () = let window, switch_fullscreen = match !wid with None -> - let icon = GdkPixbuf.from_file Env.icon_file in + let icon = GdkPixbuf.from_file Env.icon_gcs_file in let window = GWindow.window ~icon ~title:"GCS" ~border_width:1 ~width ~height ~allow_shrink:true () in if !maximize then window#maximize (); diff --git a/sw/ground_segment/tmtc/messages.ml b/sw/ground_segment/tmtc/messages.ml index 40aeed971c..11d07a1087 100644 --- a/sw/ground_segment/tmtc/messages.ml +++ b/sw/ground_segment/tmtc/messages.ml @@ -198,7 +198,7 @@ let _ = Ivy.start !ivy_bus; (** Open the window container with its notebook*) - let icon = GdkPixbuf.from_file Env.icon_file in + let icon = GdkPixbuf.from_file Env.icon_mes_file in let window = GWindow.window ~type_hint:`DIALOG ~icon ~title:"Messages" () in let quit = fun () -> GMain.Main.quit (); exit 0 in ignore (window#connect#destroy ~callback:quit); diff --git a/sw/ground_segment/tmtc/video_synchronizer.c b/sw/ground_segment/tmtc/video_synchronizer.c index 291a82fa5c..65cac90059 100644 --- a/sw/ground_segment/tmtc/video_synchronizer.c +++ b/sw/ground_segment/tmtc/video_synchronizer.c @@ -178,8 +178,8 @@ static gboolean __timeout_flashing_window(gpointer data) { white.blue = 0xFFFF; if (i<10) { - if (i%2) gtk_widget_modify_bg(flashWindow, GTK_STATE_NORMAL, &black); - else gtk_widget_modify_bg(flashWindow, GTK_STATE_NORMAL, &white); + if (i%2) gtk_widget_modify_bg(flashWindow, GTK_STATE_NORMAL, &black); + else gtk_widget_modify_bg(flashWindow, GTK_STATE_NORMAL, &white); } else { gtk_widget_destroy(flashWindow); @@ -372,7 +372,7 @@ int main(int argc, char** argv) { gtk_notebook_append_page(tab, (GtkWidget*)captureBox, gtk_label_new("Capture")); gtk_container_add(GTK_CONTAINER(window), (GtkWidget*)tab); - gtk_window_set_icon(GTK_WINDOW(window), create_pixbuf("data/pictures/penguin_icon.png")); + gtk_window_set_icon(GTK_WINDOW(window), create_pixbuf("data/pictures/penguin_icon_vid.png")); gtk_widget_show_all(window); gtk_main(); diff --git a/sw/lib/ocaml/env.ml b/sw/lib/ocaml/env.ml index 1aeeacadf0..a7d172bdb0 100644 --- a/sw/lib/ocaml/env.ml +++ b/sw/lib/ocaml/env.ml @@ -46,6 +46,9 @@ 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" +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 gconf_file = paparazzi_home // "conf" // "%gconf.xml" diff --git a/sw/lib/ocaml/env.mli b/sw/lib/ocaml/env.mli index 6c40cc3b49..3442afa763 100644 --- a/sw/lib/ocaml/env.mli +++ b/sw/lib/ocaml/env.mli @@ -34,6 +34,15 @@ val flight_plan_dtd : string 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) *) + +val icon_gcs_file : string +(** PNG paparazzi logo icon (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) *) + val gconf_file : string (** XML preferences file à la gconf *) diff --git a/sw/logalizer/play.ml b/sw/logalizer/play.ml index 8672bcbcf3..23d9529982 100644 --- a/sw/logalizer/play.ml +++ b/sw/logalizer/play.ml @@ -39,7 +39,7 @@ let open_log = fun window adj () -> let () = let (serial_port, adj, speed) = Play_core.init () in - let icon = GdkPixbuf.from_file Env.icon_file in + let icon = GdkPixbuf.from_file Env.icon_rep_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);