From 2ca06d5b69e22af6327e0202bfcbda69aa571209 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Fri, 5 Jun 2020 22:16:02 +0100 Subject: [PATCH] Launcher: move PNGs to assets/ subdir --- src/GUI/{ => assets}/airplane-icon.png | Bin src/GUI/{ => assets}/airport-closed-icon.png | Bin src/GUI/{ => assets}/airport-icon.png | Bin src/GUI/{ => assets}/airport-tower-icon.png | Bin src/GUI/{ => assets}/arrow-left-icon.png | Bin src/GUI/{ => assets}/arrow-right-icon.png | Bin src/GUI/{ => assets}/heliport-icon.png | Bin src/GUI/{ => assets}/history-icon.png | Bin src/GUI/{ => assets}/ndb-icon.png | Bin src/GUI/{ => assets}/ndb-large-icon.png | Bin src/GUI/{ => assets}/ndb-small-icon.png | Bin src/GUI/{ => assets}/preview-close.png | Bin src/GUI/{ => assets}/preview-icon.png | Bin src/GUI/{ => assets}/preview-left-arrow.png | Bin src/GUI/{ => assets}/preview-right-arrow.png | Bin src/GUI/{ => assets}/seaport-icon.png | Bin src/GUI/{ => assets}/seaport-tower-icon.png | Bin src/GUI/{ => assets}/search-icon-small.png | Bin src/GUI/{ => assets}/settings-gear-white.png | Bin src/GUI/{ => assets}/spinner.gif | Bin src/GUI/{ => assets}/toolbox-addons.png | Bin src/GUI/{ => assets}/toolbox-aircraft.png | Bin src/GUI/{ => assets}/toolbox-environment.png | Bin src/GUI/{ => assets}/toolbox-fly.png | Bin src/GUI/{ => assets}/toolbox-location.png | Bin src/GUI/{ => assets}/toolbox-settings.png | Bin src/GUI/{ => assets}/toolbox-summary.png | Bin src/GUI/{ => assets}/up-down-arrow.png | Bin src/GUI/{ => assets}/vor-dme-icon.png | Bin src/GUI/{ => assets}/vor-icon.png | Bin src/GUI/{ => assets}/vortac-icon.png | Bin src/GUI/{ => assets}/waypoint-icon.png | Bin src/GUI/resources.qrc | 64 +++++++++---------- 33 files changed, 32 insertions(+), 32 deletions(-) rename src/GUI/{ => assets}/airplane-icon.png (100%) rename src/GUI/{ => assets}/airport-closed-icon.png (100%) rename src/GUI/{ => assets}/airport-icon.png (100%) rename src/GUI/{ => assets}/airport-tower-icon.png (100%) rename src/GUI/{ => assets}/arrow-left-icon.png (100%) rename src/GUI/{ => assets}/arrow-right-icon.png (100%) rename src/GUI/{ => assets}/heliport-icon.png (100%) rename src/GUI/{ => assets}/history-icon.png (100%) rename src/GUI/{ => assets}/ndb-icon.png (100%) rename src/GUI/{ => assets}/ndb-large-icon.png (100%) rename src/GUI/{ => assets}/ndb-small-icon.png (100%) rename src/GUI/{ => assets}/preview-close.png (100%) rename src/GUI/{ => assets}/preview-icon.png (100%) rename src/GUI/{ => assets}/preview-left-arrow.png (100%) rename src/GUI/{ => assets}/preview-right-arrow.png (100%) rename src/GUI/{ => assets}/seaport-icon.png (100%) rename src/GUI/{ => assets}/seaport-tower-icon.png (100%) rename src/GUI/{ => assets}/search-icon-small.png (100%) rename src/GUI/{ => assets}/settings-gear-white.png (100%) rename src/GUI/{ => assets}/spinner.gif (100%) rename src/GUI/{ => assets}/toolbox-addons.png (100%) rename src/GUI/{ => assets}/toolbox-aircraft.png (100%) rename src/GUI/{ => assets}/toolbox-environment.png (100%) rename src/GUI/{ => assets}/toolbox-fly.png (100%) rename src/GUI/{ => assets}/toolbox-location.png (100%) rename src/GUI/{ => assets}/toolbox-settings.png (100%) rename src/GUI/{ => assets}/toolbox-summary.png (100%) rename src/GUI/{ => assets}/up-down-arrow.png (100%) rename src/GUI/{ => assets}/vor-dme-icon.png (100%) rename src/GUI/{ => assets}/vor-icon.png (100%) rename src/GUI/{ => assets}/vortac-icon.png (100%) rename src/GUI/{ => assets}/waypoint-icon.png (100%) diff --git a/src/GUI/airplane-icon.png b/src/GUI/assets/airplane-icon.png similarity index 100% rename from src/GUI/airplane-icon.png rename to src/GUI/assets/airplane-icon.png diff --git a/src/GUI/airport-closed-icon.png b/src/GUI/assets/airport-closed-icon.png similarity index 100% rename from src/GUI/airport-closed-icon.png rename to src/GUI/assets/airport-closed-icon.png diff --git a/src/GUI/airport-icon.png b/src/GUI/assets/airport-icon.png similarity index 100% rename from src/GUI/airport-icon.png rename to src/GUI/assets/airport-icon.png diff --git a/src/GUI/airport-tower-icon.png b/src/GUI/assets/airport-tower-icon.png similarity index 100% rename from src/GUI/airport-tower-icon.png rename to src/GUI/assets/airport-tower-icon.png diff --git a/src/GUI/arrow-left-icon.png b/src/GUI/assets/arrow-left-icon.png similarity index 100% rename from src/GUI/arrow-left-icon.png rename to src/GUI/assets/arrow-left-icon.png diff --git a/src/GUI/arrow-right-icon.png b/src/GUI/assets/arrow-right-icon.png similarity index 100% rename from src/GUI/arrow-right-icon.png rename to src/GUI/assets/arrow-right-icon.png diff --git a/src/GUI/heliport-icon.png b/src/GUI/assets/heliport-icon.png similarity index 100% rename from src/GUI/heliport-icon.png rename to src/GUI/assets/heliport-icon.png diff --git a/src/GUI/history-icon.png b/src/GUI/assets/history-icon.png similarity index 100% rename from src/GUI/history-icon.png rename to src/GUI/assets/history-icon.png diff --git a/src/GUI/ndb-icon.png b/src/GUI/assets/ndb-icon.png similarity index 100% rename from src/GUI/ndb-icon.png rename to src/GUI/assets/ndb-icon.png diff --git a/src/GUI/ndb-large-icon.png b/src/GUI/assets/ndb-large-icon.png similarity index 100% rename from src/GUI/ndb-large-icon.png rename to src/GUI/assets/ndb-large-icon.png diff --git a/src/GUI/ndb-small-icon.png b/src/GUI/assets/ndb-small-icon.png similarity index 100% rename from src/GUI/ndb-small-icon.png rename to src/GUI/assets/ndb-small-icon.png diff --git a/src/GUI/preview-close.png b/src/GUI/assets/preview-close.png similarity index 100% rename from src/GUI/preview-close.png rename to src/GUI/assets/preview-close.png diff --git a/src/GUI/preview-icon.png b/src/GUI/assets/preview-icon.png similarity index 100% rename from src/GUI/preview-icon.png rename to src/GUI/assets/preview-icon.png diff --git a/src/GUI/preview-left-arrow.png b/src/GUI/assets/preview-left-arrow.png similarity index 100% rename from src/GUI/preview-left-arrow.png rename to src/GUI/assets/preview-left-arrow.png diff --git a/src/GUI/preview-right-arrow.png b/src/GUI/assets/preview-right-arrow.png similarity index 100% rename from src/GUI/preview-right-arrow.png rename to src/GUI/assets/preview-right-arrow.png diff --git a/src/GUI/seaport-icon.png b/src/GUI/assets/seaport-icon.png similarity index 100% rename from src/GUI/seaport-icon.png rename to src/GUI/assets/seaport-icon.png diff --git a/src/GUI/seaport-tower-icon.png b/src/GUI/assets/seaport-tower-icon.png similarity index 100% rename from src/GUI/seaport-tower-icon.png rename to src/GUI/assets/seaport-tower-icon.png diff --git a/src/GUI/search-icon-small.png b/src/GUI/assets/search-icon-small.png similarity index 100% rename from src/GUI/search-icon-small.png rename to src/GUI/assets/search-icon-small.png diff --git a/src/GUI/settings-gear-white.png b/src/GUI/assets/settings-gear-white.png similarity index 100% rename from src/GUI/settings-gear-white.png rename to src/GUI/assets/settings-gear-white.png diff --git a/src/GUI/spinner.gif b/src/GUI/assets/spinner.gif similarity index 100% rename from src/GUI/spinner.gif rename to src/GUI/assets/spinner.gif diff --git a/src/GUI/toolbox-addons.png b/src/GUI/assets/toolbox-addons.png similarity index 100% rename from src/GUI/toolbox-addons.png rename to src/GUI/assets/toolbox-addons.png diff --git a/src/GUI/toolbox-aircraft.png b/src/GUI/assets/toolbox-aircraft.png similarity index 100% rename from src/GUI/toolbox-aircraft.png rename to src/GUI/assets/toolbox-aircraft.png diff --git a/src/GUI/toolbox-environment.png b/src/GUI/assets/toolbox-environment.png similarity index 100% rename from src/GUI/toolbox-environment.png rename to src/GUI/assets/toolbox-environment.png diff --git a/src/GUI/toolbox-fly.png b/src/GUI/assets/toolbox-fly.png similarity index 100% rename from src/GUI/toolbox-fly.png rename to src/GUI/assets/toolbox-fly.png diff --git a/src/GUI/toolbox-location.png b/src/GUI/assets/toolbox-location.png similarity index 100% rename from src/GUI/toolbox-location.png rename to src/GUI/assets/toolbox-location.png diff --git a/src/GUI/toolbox-settings.png b/src/GUI/assets/toolbox-settings.png similarity index 100% rename from src/GUI/toolbox-settings.png rename to src/GUI/assets/toolbox-settings.png diff --git a/src/GUI/toolbox-summary.png b/src/GUI/assets/toolbox-summary.png similarity index 100% rename from src/GUI/toolbox-summary.png rename to src/GUI/assets/toolbox-summary.png diff --git a/src/GUI/up-down-arrow.png b/src/GUI/assets/up-down-arrow.png similarity index 100% rename from src/GUI/up-down-arrow.png rename to src/GUI/assets/up-down-arrow.png diff --git a/src/GUI/vor-dme-icon.png b/src/GUI/assets/vor-dme-icon.png similarity index 100% rename from src/GUI/vor-dme-icon.png rename to src/GUI/assets/vor-dme-icon.png diff --git a/src/GUI/vor-icon.png b/src/GUI/assets/vor-icon.png similarity index 100% rename from src/GUI/vor-icon.png rename to src/GUI/assets/vor-icon.png diff --git a/src/GUI/vortac-icon.png b/src/GUI/assets/vortac-icon.png similarity index 100% rename from src/GUI/vortac-icon.png rename to src/GUI/assets/vortac-icon.png diff --git a/src/GUI/waypoint-icon.png b/src/GUI/assets/waypoint-icon.png similarity index 100% rename from src/GUI/waypoint-icon.png rename to src/GUI/assets/waypoint-icon.png diff --git a/src/GUI/resources.qrc b/src/GUI/resources.qrc index c371045ac..eed10409e 100644 --- a/src/GUI/resources.qrc +++ b/src/GUI/resources.qrc @@ -1,33 +1,33 @@ <RCC> <qresource prefix="/"> - <file alias="history-icon">history-icon.png</file> - <file alias="right-arrow-icon">arrow-right-icon.png</file> - <file alias="left-arrow-icon">arrow-left-icon.png</file> + <file alias="history-icon">assets/history-icon.png</file> + <file alias="right-arrow-icon">assets/arrow-right-icon.png</file> + <file alias="left-arrow-icon">assets/arrow-left-icon.png</file> <file alias="app-icon-large">../../icons/128x128/apps/flightgear.png</file> - <file alias="spinner">spinner.gif</file> - <file alias="heliport-icon">heliport-icon.png</file> - <file alias="seaport-icon">seaport-icon.png</file> - <file alias="vor-icon">vor-icon.png</file> - <file alias="vortac-icon">vortac-icon.png</file> - <file alias="waypoint-icon">waypoint-icon.png</file> - <file alias="ndb-icon">ndb-icon.png</file> - <file alias="airport-icon">airport-icon.png</file> - <file alias="airport-tower-icon">airport-tower-icon.png</file> - <file alias="vor-dme-icon">vor-dme-icon.png</file> - <file alias="seaport-tower-icon">seaport-tower-icon.png</file> - <file alias="ndb-small-icon">ndb-small-icon.png</file> - <file alias="ndb-large-icon">ndb-large-icon.png</file> - <file alias="airplane-icon">airplane-icon.png</file> - <file alias="airport-closed-icon">airport-closed-icon.png</file> - <file alias="preview-icon">preview-icon.png</file> - <file alias="settings-gear-white">settings-gear-white.png</file> - <file alias="toolbox-aircraft">toolbox-aircraft.png</file> - <file alias="toolbox-environment">toolbox-environment.png</file> - <file alias="toolbox-fly">toolbox-fly.png</file> - <file alias="toolbox-location">toolbox-location.png</file> - <file alias="toolbox-settings">toolbox-settings.png</file> - <file alias="toolbox-summary">toolbox-summary.png</file> - <file alias="toolbox-addons">toolbox-addons.png</file> + <file alias="spinner">assets/spinner.gif</file> + <file alias="heliport-icon">assets/heliport-icon.png</file> + <file alias="seaport-icon">assets/seaport-icon.png</file> + <file alias="vor-icon">assets/vor-icon.png</file> + <file alias="vortac-icon">assets/vortac-icon.png</file> + <file alias="waypoint-icon">assets/waypoint-icon.png</file> + <file alias="ndb-icon">assets/ndb-icon.png</file> + <file alias="airport-icon">assets/airport-icon.png</file> + <file alias="airport-tower-icon">assets/airport-tower-icon.png</file> + <file alias="vor-dme-icon">assets/vor-dme-icon.png</file> + <file alias="seaport-tower-icon">assets/seaport-tower-icon.png</file> + <file alias="ndb-small-icon">assets/ndb-small-icon.png</file> + <file alias="ndb-large-icon">assets/ndb-large-icon.png</file> + <file alias="airplane-icon">assets/airplane-icon.png</file> + <file alias="airport-closed-icon">assets/airport-closed-icon.png</file> + <file alias="preview-icon">assets/preview-icon.png</file> + <file alias="settings-gear-white">assets/settings-gear-white.png</file> + <file alias="toolbox-aircraft">assets/toolbox-aircraft.png</file> + <file alias="toolbox-environment">assets/toolbox-environment.png</file> + <file alias="toolbox-fly">assets/toolbox-fly.png</file> + <file alias="toolbox-location">assets/toolbox-location.png</file> + <file alias="toolbox-settings">assets/toolbox-settings.png</file> + <file alias="toolbox-summary">assets/toolbox-summary.png</file> + <file alias="toolbox-addons">assets/toolbox-addons.png</file> <file>qml/AircraftList.qml</file> <file>qml/AircraftRating.qml</file> <file>qml/ArrowButton.qml</file> @@ -46,9 +46,9 @@ <file>qml/ToggleSwitch.qml</file> <file>qml/RatingSlider.qml</file> <file>qml/PopupChoice.qml</file> - <file alias="up-down-arrow">up-down-arrow.png</file> + <file alias="up-down-arrow">assets/up-down-arrow.png</file> <file>qml/AircraftVariantChoice.qml</file> - <file alias="search-icon-small">search-icon-small.png</file> + <file alias="search-icon-small">assets/search-icon-small.png</file> <file>qml/AircraftRatingsPanel.qml</file> <file>qml/NoDefaultCatalogPanel.qml</file> <file>qml/ListHeaderBox.qml</file> @@ -136,9 +136,9 @@ <file alias="favourite-icon-outline">assets/icons8-christmas-star-outline.png</file> </qresource> <qresource prefix="/preview"> - <file alias="close-icon">preview-close.png</file> - <file alias="left-arrow-icon">preview-left-arrow.png</file> - <file alias="right-arrow-icon">preview-right-arrow.png</file> + <file alias="close-icon">assets/preview-close.png</file> + <file alias="left-arrow-icon">assets/preview-left-arrow.png</file> + <file alias="right-arrow-icon">assets/preview-right-arrow.png</file> </qresource> <qresource prefix="/svg"> <file alias="toolbox-fly">assets/icons8-airplane-take-off.svg</file>