[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
This commit is contained in:
karlito139
2014-08-06 15:11:11 +02:00
committed by Felix Ruess
parent fd2482beaa
commit 3fb33e8f84
14 changed files with 426 additions and 6 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 34 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 34 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 34 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 34 KiB

+1 -1
View File
@@ -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 ();
+1 -1
View File
@@ -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);
+3 -3
View File
@@ -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();
+3
View File
@@ -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"
+9
View File
@@ -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 *)
+1 -1
View File
@@ -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);