diff --git a/artwork/3D Model/backgrounds/default_background.psd b/artwork/3D Model/backgrounds/default_background.psd deleted file mode 100644 index 4f4dc4adf..000000000 Binary files a/artwork/3D Model/backgrounds/default_background.psd and /dev/null differ diff --git a/artwork/3D Model/backgrounds/default_background.png b/artwork/backgrounds/default_background.png similarity index 100% rename from artwork/3D Model/backgrounds/default_background.png rename to artwork/backgrounds/default_background.png diff --git a/artwork/3D Model/backgrounds/standard/01.png b/artwork/backgrounds/standard/01.png similarity index 100% rename from artwork/3D Model/backgrounds/standard/01.png rename to artwork/backgrounds/standard/01.png diff --git a/artwork/3D Model/backgrounds/standard/02.png b/artwork/backgrounds/standard/02.png similarity index 100% rename from artwork/3D Model/backgrounds/standard/02.png rename to artwork/backgrounds/standard/02.png diff --git a/artwork/3D Model/backgrounds/standard/03.png b/artwork/backgrounds/standard/03.png similarity index 100% rename from artwork/3D Model/backgrounds/standard/03.png rename to artwork/backgrounds/standard/03.png diff --git a/artwork/3D Model/backgrounds/standard/04.png b/artwork/backgrounds/standard/04.png similarity index 100% rename from artwork/3D Model/backgrounds/standard/04.png rename to artwork/backgrounds/standard/04.png diff --git a/artwork/3D Model/backgrounds/standard/05.png b/artwork/backgrounds/standard/05.png similarity index 100% rename from artwork/3D Model/backgrounds/standard/05.png rename to artwork/backgrounds/standard/05.png diff --git a/artwork/3D Model/backgrounds/standard/06.png b/artwork/backgrounds/standard/06.png similarity index 100% rename from artwork/3D Model/backgrounds/standard/06.png rename to artwork/backgrounds/standard/06.png diff --git a/artwork/3D Model/backgrounds/standard/07.png b/artwork/backgrounds/standard/07.png similarity index 100% rename from artwork/3D Model/backgrounds/standard/07.png rename to artwork/backgrounds/standard/07.png diff --git a/artwork/3D Model/backgrounds/standard/08.png b/artwork/backgrounds/standard/08.png similarity index 100% rename from artwork/3D Model/backgrounds/standard/08.png rename to artwork/backgrounds/standard/08.png diff --git a/artwork/3D Model/backgrounds/standard/09.png b/artwork/backgrounds/standard/09.png similarity index 100% rename from artwork/3D Model/backgrounds/standard/09.png rename to artwork/backgrounds/standard/09.png diff --git a/artwork/3D Model/backgrounds/standard/10.png b/artwork/backgrounds/standard/10.png similarity index 100% rename from artwork/3D Model/backgrounds/standard/10.png rename to artwork/backgrounds/standard/10.png diff --git a/artwork/3D Model/backgrounds/standard/11.png b/artwork/backgrounds/standard/11.png similarity index 100% rename from artwork/3D Model/backgrounds/standard/11.png rename to artwork/backgrounds/standard/11.png diff --git a/artwork/3D Model/backgrounds/standard/12.png b/artwork/backgrounds/standard/12.png similarity index 100% rename from artwork/3D Model/backgrounds/standard/12.png rename to artwork/backgrounds/standard/12.png diff --git a/artwork/3D Model/backgrounds/standard/13.jpg b/artwork/backgrounds/standard/13.jpg similarity index 100% rename from artwork/3D Model/backgrounds/standard/13.jpg rename to artwork/backgrounds/standard/13.jpg diff --git a/artwork/3D Model/backgrounds/wide/01w.png b/artwork/backgrounds/wide/01w.png similarity index 100% rename from artwork/3D Model/backgrounds/wide/01w.png rename to artwork/backgrounds/wide/01w.png diff --git a/artwork/3D Model/backgrounds/wide/02w.png b/artwork/backgrounds/wide/02w.png similarity index 100% rename from artwork/3D Model/backgrounds/wide/02w.png rename to artwork/backgrounds/wide/02w.png diff --git a/artwork/3D Model/backgrounds/wide/03w.png b/artwork/backgrounds/wide/03w.png similarity index 100% rename from artwork/3D Model/backgrounds/wide/03w.png rename to artwork/backgrounds/wide/03w.png diff --git a/artwork/3D Model/backgrounds/wide/04w.png b/artwork/backgrounds/wide/04w.png similarity index 100% rename from artwork/3D Model/backgrounds/wide/04w.png rename to artwork/backgrounds/wide/04w.png diff --git a/artwork/3D Model/backgrounds/wide/05w.png b/artwork/backgrounds/wide/05w.png similarity index 100% rename from artwork/3D Model/backgrounds/wide/05w.png rename to artwork/backgrounds/wide/05w.png diff --git a/artwork/3D Model/backgrounds/wide/06w.png b/artwork/backgrounds/wide/06w.png similarity index 100% rename from artwork/3D Model/backgrounds/wide/06w.png rename to artwork/backgrounds/wide/06w.png diff --git a/artwork/3D Model/backgrounds/wide/07w.png b/artwork/backgrounds/wide/07w.png similarity index 100% rename from artwork/3D Model/backgrounds/wide/07w.png rename to artwork/backgrounds/wide/07w.png diff --git a/artwork/3D Model/backgrounds/wide/08w.png b/artwork/backgrounds/wide/08w.png similarity index 100% rename from artwork/3D Model/backgrounds/wide/08w.png rename to artwork/backgrounds/wide/08w.png diff --git a/artwork/3D Model/backgrounds/wide/09w.png b/artwork/backgrounds/wide/09w.png similarity index 100% rename from artwork/3D Model/backgrounds/wide/09w.png rename to artwork/backgrounds/wide/09w.png diff --git a/artwork/3D Model/backgrounds/wide/10w.png b/artwork/backgrounds/wide/10w.png similarity index 100% rename from artwork/3D Model/backgrounds/wide/10w.png rename to artwork/backgrounds/wide/10w.png diff --git a/artwork/3D Model/backgrounds/wide/11w.png b/artwork/backgrounds/wide/11w.png similarity index 100% rename from artwork/3D Model/backgrounds/wide/11w.png rename to artwork/backgrounds/wide/11w.png diff --git a/artwork/3D Model/backgrounds/wide/12w.png b/artwork/backgrounds/wide/12w.png similarity index 100% rename from artwork/3D Model/backgrounds/wide/12w.png rename to artwork/backgrounds/wide/12w.png diff --git a/artwork/3D Model/backgrounds/wide/13w.jpg b/artwork/backgrounds/wide/13w.jpg similarity index 100% rename from artwork/3D Model/backgrounds/wide/13w.jpg rename to artwork/backgrounds/wide/13w.jpg diff --git a/ground/gcs/src/share/models/backgrounds/default_background.png b/ground/gcs/src/share/backgrounds/default_background.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/default_background.png rename to ground/gcs/src/share/backgrounds/default_background.png diff --git a/ground/gcs/src/share/models/backgrounds/standard/01.png b/ground/gcs/src/share/backgrounds/standard/01.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/standard/01.png rename to ground/gcs/src/share/backgrounds/standard/01.png diff --git a/ground/gcs/src/share/models/backgrounds/standard/02.png b/ground/gcs/src/share/backgrounds/standard/02.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/standard/02.png rename to ground/gcs/src/share/backgrounds/standard/02.png diff --git a/ground/gcs/src/share/models/backgrounds/standard/03.png b/ground/gcs/src/share/backgrounds/standard/03.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/standard/03.png rename to ground/gcs/src/share/backgrounds/standard/03.png diff --git a/ground/gcs/src/share/models/backgrounds/standard/04.png b/ground/gcs/src/share/backgrounds/standard/04.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/standard/04.png rename to ground/gcs/src/share/backgrounds/standard/04.png diff --git a/ground/gcs/src/share/models/backgrounds/standard/05.png b/ground/gcs/src/share/backgrounds/standard/05.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/standard/05.png rename to ground/gcs/src/share/backgrounds/standard/05.png diff --git a/ground/gcs/src/share/models/backgrounds/standard/06.png b/ground/gcs/src/share/backgrounds/standard/06.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/standard/06.png rename to ground/gcs/src/share/backgrounds/standard/06.png diff --git a/ground/gcs/src/share/models/backgrounds/standard/07.png b/ground/gcs/src/share/backgrounds/standard/07.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/standard/07.png rename to ground/gcs/src/share/backgrounds/standard/07.png diff --git a/ground/gcs/src/share/models/backgrounds/standard/08.png b/ground/gcs/src/share/backgrounds/standard/08.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/standard/08.png rename to ground/gcs/src/share/backgrounds/standard/08.png diff --git a/ground/gcs/src/share/models/backgrounds/standard/09.png b/ground/gcs/src/share/backgrounds/standard/09.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/standard/09.png rename to ground/gcs/src/share/backgrounds/standard/09.png diff --git a/ground/gcs/src/share/models/backgrounds/standard/10.png b/ground/gcs/src/share/backgrounds/standard/10.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/standard/10.png rename to ground/gcs/src/share/backgrounds/standard/10.png diff --git a/ground/gcs/src/share/models/backgrounds/standard/11.png b/ground/gcs/src/share/backgrounds/standard/11.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/standard/11.png rename to ground/gcs/src/share/backgrounds/standard/11.png diff --git a/ground/gcs/src/share/models/backgrounds/standard/12.png b/ground/gcs/src/share/backgrounds/standard/12.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/standard/12.png rename to ground/gcs/src/share/backgrounds/standard/12.png diff --git a/ground/gcs/src/share/models/backgrounds/standard/13.jpg b/ground/gcs/src/share/backgrounds/standard/13.jpg similarity index 100% rename from ground/gcs/src/share/models/backgrounds/standard/13.jpg rename to ground/gcs/src/share/backgrounds/standard/13.jpg diff --git a/ground/gcs/src/share/models/backgrounds/wide/01w.png b/ground/gcs/src/share/backgrounds/wide/01w.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/wide/01w.png rename to ground/gcs/src/share/backgrounds/wide/01w.png diff --git a/ground/gcs/src/share/models/backgrounds/wide/02w.png b/ground/gcs/src/share/backgrounds/wide/02w.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/wide/02w.png rename to ground/gcs/src/share/backgrounds/wide/02w.png diff --git a/ground/gcs/src/share/models/backgrounds/wide/03w.png b/ground/gcs/src/share/backgrounds/wide/03w.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/wide/03w.png rename to ground/gcs/src/share/backgrounds/wide/03w.png diff --git a/ground/gcs/src/share/models/backgrounds/wide/04w.png b/ground/gcs/src/share/backgrounds/wide/04w.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/wide/04w.png rename to ground/gcs/src/share/backgrounds/wide/04w.png diff --git a/ground/gcs/src/share/models/backgrounds/wide/05w.png b/ground/gcs/src/share/backgrounds/wide/05w.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/wide/05w.png rename to ground/gcs/src/share/backgrounds/wide/05w.png diff --git a/ground/gcs/src/share/models/backgrounds/wide/06w.png b/ground/gcs/src/share/backgrounds/wide/06w.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/wide/06w.png rename to ground/gcs/src/share/backgrounds/wide/06w.png diff --git a/ground/gcs/src/share/models/backgrounds/wide/07w.png b/ground/gcs/src/share/backgrounds/wide/07w.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/wide/07w.png rename to ground/gcs/src/share/backgrounds/wide/07w.png diff --git a/ground/gcs/src/share/models/backgrounds/wide/08w.png b/ground/gcs/src/share/backgrounds/wide/08w.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/wide/08w.png rename to ground/gcs/src/share/backgrounds/wide/08w.png diff --git a/ground/gcs/src/share/models/backgrounds/wide/09w.png b/ground/gcs/src/share/backgrounds/wide/09w.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/wide/09w.png rename to ground/gcs/src/share/backgrounds/wide/09w.png diff --git a/ground/gcs/src/share/models/backgrounds/wide/10w.png b/ground/gcs/src/share/backgrounds/wide/10w.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/wide/10w.png rename to ground/gcs/src/share/backgrounds/wide/10w.png diff --git a/ground/gcs/src/share/models/backgrounds/wide/11w.png b/ground/gcs/src/share/backgrounds/wide/11w.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/wide/11w.png rename to ground/gcs/src/share/backgrounds/wide/11w.png diff --git a/ground/gcs/src/share/models/backgrounds/wide/12w.png b/ground/gcs/src/share/backgrounds/wide/12w.png similarity index 100% rename from ground/gcs/src/share/models/backgrounds/wide/12w.png rename to ground/gcs/src/share/backgrounds/wide/12w.png diff --git a/ground/gcs/src/share/models/backgrounds/wide/13w.jpg b/ground/gcs/src/share/backgrounds/wide/13w.jpg similarity index 100% rename from ground/gcs/src/share/models/backgrounds/wide/13w.jpg rename to ground/gcs/src/share/backgrounds/wide/13w.jpg diff --git a/ground/gcs/src/share/configurations/default.xml b/ground/gcs/src/share/configurations/default.xml index 33bac006d..3f5c2a059 100644 --- a/ground/gcs/src/share/configurations/default.xml +++ b/ground/gcs/src/share/configurations/default.xml @@ -1550,7 +1550,7 @@ %%DATAPATH%%models/multi/aeroquad/aeroquad_+.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1561,7 +1561,7 @@ %%DATAPATH%%models/boards/CopterControl/CopterControl.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1572,7 +1572,7 @@ %%DATAPATH%%models/boards/CC3D/CC3D.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1583,7 +1583,7 @@ %%DATAPATH%%models/boards/Revolution/revolution.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1594,7 +1594,7 @@ %%DATAPATH%%models/multi/blackout/BlackoutMiniHQuad.3DS - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1605,7 +1605,7 @@ %%DATAPATH%%models/planes/zagi/zagi.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1616,7 +1616,7 @@ %%DATAPATH%%models/multi/easy_quad/easy_quad_X.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1627,7 +1627,7 @@ %%DATAPATH%%models/planes/Easystar/easystar.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1638,7 +1638,7 @@ %%DATAPATH%%models/planes/firecracker/firecracker.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1649,7 +1649,7 @@ %%DATAPATH%%models/planes/funjet/funjet.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1660,7 +1660,7 @@ %%DATAPATH%%models/multi/gaui_330x/gaui_330x.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1671,7 +1671,7 @@ %%DATAPATH%%models/helis/t-rex/t-rex_450_xl.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1682,7 +1682,7 @@ %%DATAPATH%%models/multi/mikrokopter/MK_Hexa.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1693,7 +1693,7 @@ %%DATAPATH%%models/multi/joes_cnc/J14-Q_+.3DS - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1704,7 +1704,7 @@ %%DATAPATH%%models/multi/joes_cnc/J14-Q_X.3DS - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1715,7 +1715,7 @@ %%DATAPATH%%models/multi/joes_cnc/J14-QT_+.3DS - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1726,7 +1726,7 @@ %%DATAPATH%%models/multi/joes_cnc/J14-QT_X.3DS - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1737,7 +1737,7 @@ %%DATAPATH%%models/multi/mikrokopter/MK_L4-ME.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1748,7 +1748,7 @@ %%DATAPATH%%models/multi/ricoo/ricoo.3DS - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1759,7 +1759,7 @@ %%DATAPATH%%models/multi/scorpion_tricopter/scorpion_tricopter.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1770,7 +1770,7 @@ %%DATAPATH%%models/multi/mattL_Y6/mattL_Y6.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1781,7 +1781,7 @@ %%DATAPATH%%models/multi/test_quad/test_quad_+.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1792,7 +1792,7 @@ %%DATAPATH%%models/multi/test_quad/test_quad_X.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false @@ -1803,7 +1803,7 @@ %%DATAPATH%%models/multi/dankers_quad/dankers_quad.3ds - %%DATAPATH%%models/backgrounds/default_background.png + %%DATAPATH%%backgrounds/default_background.png false diff --git a/ground/gcs/src/share/copydata.pro b/ground/gcs/src/share/copydata.pro index 330f95732..3787f3449 100644 --- a/ground/gcs/src/share/copydata.pro +++ b/ground/gcs/src/share/copydata.pro @@ -2,7 +2,7 @@ include(../../gcs.pri) TEMPLATE = aux -DATACOLLECTIONS = vehicletemplates configurations dials models pfd sounds diagrams mapicons stylesheets +DATACOLLECTIONS = vehicletemplates configurations dials models backgrounds pfd sounds diagrams mapicons stylesheets equals(copydata, 1) { for(dir, DATACOLLECTIONS) {