From 3fb33e8f841cb2cc0fd378148bf7e4d49c69fba8 Mon Sep 17 00:00:00 2001 From: karlito139 Date: Wed, 6 Aug 2014 15:11:11 +0200 Subject: [PATCH] [ground_segment] different icons for the different applications of paparazzi. This should prevent the clicking on every icon and parsing through all the windows when we are searching for the messages. closes #787 --- data/pictures/penguin_icon_gcs.png | Bin 0 -> 3050 bytes data/pictures/penguin_icon_msg.png | Bin 0 -> 3086 bytes data/pictures/penguin_icon_rep.png | Bin 0 -> 2998 bytes data/pictures/penguin_icon_vid.png | Bin 0 -> 2992 bytes data/pictures/penguin_logo_gcs.svg | 102 ++++++++++++++++++++ data/pictures/penguin_logo_msg.svg | 102 ++++++++++++++++++++ data/pictures/penguin_logo_rep.svg | 102 ++++++++++++++++++++ data/pictures/penguin_logo_vid.svg | 102 ++++++++++++++++++++ sw/ground_segment/cockpit/gcs.ml | 2 +- sw/ground_segment/tmtc/messages.ml | 2 +- sw/ground_segment/tmtc/video_synchronizer.c | 6 +- sw/lib/ocaml/env.ml | 3 + sw/lib/ocaml/env.mli | 9 ++ sw/logalizer/play.ml | 2 +- 14 files changed, 426 insertions(+), 6 deletions(-) create mode 100644 data/pictures/penguin_icon_gcs.png create mode 100644 data/pictures/penguin_icon_msg.png create mode 100644 data/pictures/penguin_icon_rep.png create mode 100644 data/pictures/penguin_icon_vid.png create mode 100644 data/pictures/penguin_logo_gcs.svg create mode 100644 data/pictures/penguin_logo_msg.svg create mode 100644 data/pictures/penguin_logo_rep.svg create mode 100644 data/pictures/penguin_logo_vid.svg diff --git a/data/pictures/penguin_icon_gcs.png b/data/pictures/penguin_icon_gcs.png new file mode 100644 index 0000000000000000000000000000000000000000..a3f3e37da04d9b2b1d44ad74aac8c7fd7d36cba0 GIT binary patch literal 3050 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 literal 0 HcmV?d00001 diff --git a/data/pictures/penguin_icon_msg.png b/data/pictures/penguin_icon_msg.png new file mode 100644 index 0000000000000000000000000000000000000000..636b42c9d5d39e739b122ea38dac455f7f34d784 GIT binary patch literal 3086 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 literal 0 HcmV?d00001 diff --git a/data/pictures/penguin_icon_vid.png b/data/pictures/penguin_icon_vid.png new file mode 100644 index 0000000000000000000000000000000000000000..dcf6a16f203012bfe892d3418a0b88b4f6cf13a0 GIT binary patch literal 2992 zcmV;h3s3ZkP)LLP7!oLI?o?X^0?Dk%*vz z_&{D_M0pBoD^wItp$dBNSZl2nOQZHdt0+E@fK;duc}0R$uz&)Gw;D*o+q_8F>}%%s zkL=145?CJY-`qR*e)ldhGya>Q{MZV7U;LlIkB$F50;cK8&~P>3w(SNmA{bQCyR>(1ec?fe&|FG!ZhpWMV0**DfBLsKfu0S5E+>rM zb%S$k{ulftgIg;EHE2P0Y(ph~p6*J{NK?dDN7>p{Xl*Y%&Uqz=y{|1;$0wUm_gXOX zB}a$0=sJIz_O}_MwG&bb{`)Lha`Xd}uj%ACD5YR2g_V7a>u6D~$yIr7uF7-s*1wpg zQ%1U`0MMg(#+8ms3iSGk^PUyY>xT;8H#x>F&PXZjV;|HiTC~*U#CTC2BEhYb)QU(F zXI8s?v&Xq!M99)VIDt_&IC^heU>>N-bMuYeorO{gZkZ@fg%zyIbMva->1V?Pq!iq( zqvJ^VNA5@xoIl^3+f)P^j6%0&QrbhqoQpc8&{gYqSk~wJt#$xlXkAZN=@x$gk3aRgci^Wx z1G50s0O-fe!Lw(Bs~WOqJ@^2?PyisJcmS=Kd1rls%~7FxlYnB40RJT2I)GbcsyKunFL+|kON={fE7`!SqETLR0NpG zcxg%S?LX$$jKA29%)Az$L4e2t@Lm*3gxBpSqC_H!127E03sEd$+YH`*1z)+po$0@z!3vR(`9`8x1SG#Z>e8`veKI0f*P z5LgBv55SVTt{H(gMARO@7y#V?JWyBQl83ngMCwq(^{57R?toSN*jX$0YGywGFf;4A zS^&_<@E9=|nqT>mvPCsU9 zTxn`tZfcxsxQyDnGgtip`>AJYhG?B>67_6b)`-XFO zrK$06b;q`*us~Eoy6)(uX=oq5j*CN_(}~VfiVrnS9S|ZA&~>p^N~FZZApT}uEc}Dv zI9*|CyxMRDW=m&wQxJ%{pfOEX1_0Q$Jptf}g80c15EHktom2?43yBq_gNlEqh_qou zt-Ju1vUO@V^Mbd}2Ie%n`=CxmHp*~)ypjClPgV1Y^Mr`>yEU~>nV?pm*>(>N|89&EUhGKkcq z+INL=vME!D=|uDxGy58qz}4i;9tzS9z%H$3sFmOy13=C6~>PSah$YOwU#* z@nN>V1o*ErNeqt#^?Tgo8@1jv*X^Oeln#unwxGaHw##amj+Ft2w<>&a8`CxbP5_NU zpuVu_#6@b@vAP(t-E{d&P0b!E#c*cEJj1zajp?cyAB*&+h%^@)7aZo8+0PAxCex&r zU7*bA0CIcg6DcL`Iq>#!4x+NGbe>Of67pYW#xk z*c4gJhubSsibXEh`IeAU?JK2N5!z#ML)BZeW{7RnL}nO{YorvL!wRNJb$?~(Tr}KJ z*VjWJJOWaR6`Cd{>AHBmJ{e6D6C1)!` zI>f1}nwpfIx5AFYS)294gLZ}Z_SNr!#sZ0kN ztcmSj04``K9XMBPAerdQx3$U03m|~nn)PBxv28n#2ua}y+s6GHH*PKvhU>DZGrwiAMd}^x`vZ>M?7j6tW9DdQ ziwU{ zm)SmDPan3#wrLR&%9*js>kY2|WC!!D*Sk8$xMjV!CP5{Zznf>`du2~j5d6LbHuCDWl6Z9Tll_NQIMk#i_Cfhdy3mP%r}BxFE)Ag9Njy) zzw1<@uFP>d(M3x2dMTBik=a()#a&H(m^<&{;bGdGsUuw#`SXq4FHY6^*SBEi{o2N= zJU16FHTlIyKxi6HThrY3MfCMF_{nY|5JZ2CQV>x4LdzNQAnnLh8+ zqn7Y_e|YG+IubxGzRM%ZbsmpDn%3c!p();ql;U0~#o>?@*8QLsXe me61!_jyC#pnu@>=h5rDQ{8RSL8Jm;<0000 + + + + + + + + + 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);