mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-05-26 16:30:07 +08:00
[ground_segment] improve readability of icons and add a few more
This commit is contained in:
Gautier Hattenberger
Binary file not shown.
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 3.7 KiB |
@@ -9,14 +9,14 @@
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
inkscape:export-ydpi="12"
|
||||
inkscape:export-xdpi="12"
|
||||
inkscape:export-filename="/home/karlito/MAV/delfly_desperado/paparazzi/data/pictures/icon_mes.png"
|
||||
inkscape:export-ydpi="12.845805"
|
||||
inkscape:export-xdpi="12.845805"
|
||||
inkscape:export-filename="/home/gautier/dev/paparazzi/data/pictures/penguin_icon_gcs.png"
|
||||
width="360"
|
||||
height="330"
|
||||
id="svg2"
|
||||
sodipodi:version="0.32"
|
||||
inkscape:version="0.48.4 r9939"
|
||||
inkscape:version="0.48.5 r10040"
|
||||
sodipodi:docname="penguin_logo_gcs.svg"
|
||||
version="1.1">
|
||||
<defs
|
||||
@@ -29,14 +29,14 @@
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1.2277142"
|
||||
inkscape:cx="242.70492"
|
||||
inkscape:cx="94.054689"
|
||||
inkscape:cy="180.73241"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:window-width="1366"
|
||||
inkscape:window-height="744"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="24"
|
||||
inkscape:window-width="1293"
|
||||
inkscape:window-height="748"
|
||||
inkscape:window-x="-2"
|
||||
inkscape:window-y="-3"
|
||||
showgrid="false"
|
||||
fit-margin-top="10"
|
||||
fit-margin-left="10"
|
||||
@@ -51,7 +51,7 @@
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
@@ -90,13 +90,15 @@
|
||||
<flowRoot
|
||||
xml:space="preserve"
|
||||
id="flowRoot2986"
|
||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||
transform="matrix(1.6708683,0,0,1.9988508,-168.28151,-2.1057021)"><flowRegion
|
||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.18876266;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Sans"
|
||||
transform="matrix(2.3973979,0,0,3.0095594,-385.11838,-14.797054)"><flowRegion
|
||||
id="flowRegion2988"><rect
|
||||
id="rect2990"
|
||||
width="95.424126"
|
||||
height="47.210255"
|
||||
x="218.29184"
|
||||
y="16.409105" /></flowRegion><flowPara
|
||||
id="flowPara2992">GCS</flowPara></flowRoot> </g>
|
||||
y="16.409105"
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.18876266;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></flowRegion><flowPara
|
||||
id="flowPara2992"
|
||||
style="font-weight:bold;line-height:125%;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.18876266;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;-inkscape-font-specification:Sans Bold">GCS</flowPara></flowRoot> </g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 34 KiB |
@@ -9,14 +9,14 @@
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
inkscape:export-ydpi="12"
|
||||
inkscape:export-xdpi="12"
|
||||
inkscape:export-filename="/home/karlito/MAV/delfly_desperado/paparazzi/data/pictures/icon_mes.png"
|
||||
inkscape:export-ydpi="12.899817"
|
||||
inkscape:export-xdpi="12.899817"
|
||||
inkscape:export-filename="/home/gautier/dev/paparazzi/data/pictures/penguin_icon_msg.png"
|
||||
width="360"
|
||||
height="330"
|
||||
id="svg2"
|
||||
sodipodi:version="0.32"
|
||||
inkscape:version="0.48.4 r9939"
|
||||
inkscape:version="0.48.5 r10040"
|
||||
sodipodi:docname="penguin_logo_msg.svg"
|
||||
version="1.1">
|
||||
<defs
|
||||
@@ -29,14 +29,14 @@
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1.2277142"
|
||||
inkscape:cx="242.70492"
|
||||
inkscape:cx="94.054689"
|
||||
inkscape:cy="180.73241"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:window-width="1366"
|
||||
inkscape:window-height="744"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="24"
|
||||
inkscape:window-width="1293"
|
||||
inkscape:window-height="748"
|
||||
inkscape:window-x="-2"
|
||||
inkscape:window-y="-3"
|
||||
showgrid="false"
|
||||
fit-margin-top="10"
|
||||
fit-margin-left="10"
|
||||
@@ -51,7 +51,7 @@
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
@@ -90,13 +90,14 @@
|
||||
<flowRoot
|
||||
xml:space="preserve"
|
||||
id="flowRoot2986"
|
||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||
transform="matrix(1.6708683,0,0,1.9988508,-168.28151,-2.1057021)"><flowRegion
|
||||
style="font-size:40px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.18876266;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
|
||||
transform="matrix(2.1438808,0,0,2.6488064,-320.29124,7.4696022)"><flowRegion
|
||||
id="flowRegion2988"><rect
|
||||
id="rect2990"
|
||||
width="95.424126"
|
||||
height="47.210255"
|
||||
x="218.29184"
|
||||
y="16.409105" /></flowRegion><flowPara
|
||||
id="flowPara2992">MSG</flowPara></flowRoot> </g>
|
||||
width="122.77421"
|
||||
height="64.711922"
|
||||
x="214.12987"
|
||||
y="14.221399"
|
||||
style="font-weight:bold;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.18876266;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
|
||||
id="flowPara3760">MSG</flowPara></flowRoot> </g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
@@ -9,14 +9,14 @@
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
inkscape:export-ydpi="12"
|
||||
inkscape:export-xdpi="12"
|
||||
inkscape:export-filename="/home/karlito/MAV/delfly_desperado/paparazzi/data/pictures/icon_mes.png"
|
||||
inkscape:export-ydpi="13.01829"
|
||||
inkscape:export-xdpi="13.01829"
|
||||
inkscape:export-filename="/home/gautier/dev/paparazzi/data/pictures/penguin_icon_rep.png"
|
||||
width="360"
|
||||
height="330"
|
||||
id="svg2"
|
||||
sodipodi:version="0.32"
|
||||
inkscape:version="0.48.4 r9939"
|
||||
inkscape:version="0.48.5 r10040"
|
||||
sodipodi:docname="penguin_logo_rep.svg"
|
||||
version="1.1">
|
||||
<defs
|
||||
@@ -29,14 +29,14 @@
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1.2277142"
|
||||
inkscape:cx="242.70492"
|
||||
inkscape:cx="94.054689"
|
||||
inkscape:cy="180.73241"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:window-width="1366"
|
||||
inkscape:window-height="744"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="24"
|
||||
inkscape:window-width="1293"
|
||||
inkscape:window-height="748"
|
||||
inkscape:window-x="-2"
|
||||
inkscape:window-y="-3"
|
||||
showgrid="false"
|
||||
fit-margin-top="10"
|
||||
fit-margin-left="10"
|
||||
@@ -51,7 +51,7 @@
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
@@ -90,13 +90,14 @@
|
||||
<flowRoot
|
||||
xml:space="preserve"
|
||||
id="flowRoot2986"
|
||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||
transform="matrix(1.6708683,0,0,1.9988508,-156.06368,1.1523852)"><flowRegion
|
||||
style="font-size:40px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.18876266;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
|
||||
transform="matrix(2.4053169,0,0,3.0509988,-384.88826,-2.8065549)"><flowRegion
|
||||
id="flowRegion2988"><rect
|
||||
id="rect2990"
|
||||
width="95.424126"
|
||||
height="47.210255"
|
||||
x="218.29184"
|
||||
y="16.409105" /></flowRegion><flowPara
|
||||
y="16.409105"
|
||||
style="font-weight:bold;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.18876266;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
|
||||
id="flowPara2992">REP</flowPara></flowRoot> </g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 34 KiB 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 |
@@ -9,15 +9,15 @@
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
inkscape:export-ydpi="12"
|
||||
inkscape:export-xdpi="12"
|
||||
inkscape:export-filename="/home/karlito/MAV/delfly_desperado/paparazzi/data/pictures/icon_mes.png"
|
||||
inkscape:export-ydpi="13.066053"
|
||||
inkscape:export-xdpi="13.066053"
|
||||
inkscape:export-filename="/home/gautier/dev/paparazzi/data/pictures/penguin_icon_vid.png"
|
||||
width="360"
|
||||
height="330"
|
||||
id="svg2"
|
||||
sodipodi:version="0.32"
|
||||
inkscape:version="0.48.4 r9939"
|
||||
sodipodi:docname="penguin_logo_messages (copy).svg"
|
||||
inkscape:version="0.48.5 r10040"
|
||||
sodipodi:docname="penguin_logo_vid.svg"
|
||||
version="1.1">
|
||||
<defs
|
||||
id="defs3" />
|
||||
@@ -29,14 +29,14 @@
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1.2277142"
|
||||
inkscape:cx="242.70492"
|
||||
inkscape:cx="94.054689"
|
||||
inkscape:cy="180.73241"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:window-width="1366"
|
||||
inkscape:window-height="744"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="24"
|
||||
inkscape:window-width="1293"
|
||||
inkscape:window-height="748"
|
||||
inkscape:window-x="-2"
|
||||
inkscape:window-y="-3"
|
||||
showgrid="false"
|
||||
fit-margin-top="10"
|
||||
fit-margin-left="10"
|
||||
@@ -51,7 +51,7 @@
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
@@ -90,13 +90,14 @@
|
||||
<flowRoot
|
||||
xml:space="preserve"
|
||||
id="flowRoot2986"
|
||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||
transform="matrix(1.6708683,0,0,1.9988508,-156.06368,1.1523852)"><flowRegion
|
||||
style="font-size:40px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.18876266;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
|
||||
transform="matrix(2.7025299,0,0,3.0112736,-452.82803,-6.4445575)"><flowRegion
|
||||
id="flowRegion2988"><rect
|
||||
id="rect2990"
|
||||
width="95.424126"
|
||||
height="47.210255"
|
||||
x="218.29184"
|
||||
y="16.409105" /></flowRegion><flowPara
|
||||
y="16.409105"
|
||||
style="font-weight:bold;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.18876266;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;-inkscape-font-specification:Sans Bold" /></flowRegion><flowPara
|
||||
id="flowPara2992">VID</flowPara></flowRoot> </g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
@@ -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"
|
||||
|
||||
|
||||
+12
-3
@@ -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 *)
|
||||
|
||||
@@ -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 () ->
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user