diff --git a/CodingStyle.qml b/CodingStyle.qml index 33622710847109ab85c1919fd1c584045d7df4ad..5962951adaa8f1a2e4d37b0f500602d1aeef8282 100644 --- a/CodingStyle.qml +++ b/CodingStyle.qml @@ -21,7 +21,7 @@ This file is part of the QGROUNDCONTROL project ======================================================================*/ -import QtQuick 2.4 +import QtQuick 2.5 import QtQuick.Controls 1.3 import QGroundControl 1.0 diff --git a/qgcresources.qrc b/qgcresources.qrc index 643113e818ac906e8959058ff3e9b4604fd834cc..df0a8531c8f164ee87171f05eb0990427e699e55 100644 --- a/qgcresources.qrc +++ b/qgcresources.qrc @@ -98,24 +98,11 @@ - resources/LeftArrow.svg - resources/RightArrow.svg - resources/DownArrow.svg - resources/UpArrow.svg - resources/BottomArrow.svg - resources/JumpArrow.svg - resources/PlusSign.svg - resources/MinusSign.svg resources/Play.svg resources/Pause.svg resources/Stop.svg - resources/Launch.svg - resources/Land.svg - resources/Kill.svg - resources/Shutdown.svg resources/Antenna_T.svg resources/Antenna_RC.svg - resources/SystemLockScreen.svg resources/SplashScreen.png resources/QGroundControlConnect.svg resources/PowerButton.svg @@ -153,13 +140,6 @@ resources/mavs/tricopter.svg - - resources/mapproviders/openstreetmap.png - resources/mapproviders/google.png - resources/mapproviders/yahoo.png - resources/mapproviders/googleearth.svg - - resources/calibration/accel_back.png resources/calibration/accel_front.png @@ -214,10 +194,6 @@ resources/styles/style-light.css - - resources/styles/Vera.ttf - - resources/audio/alert.wav diff --git a/resources/BottomArrow.svg b/resources/BottomArrow.svg deleted file mode 100644 index 6cd7c7c71b5a09f7fa49be4e8f879268c03a054a..0000000000000000000000000000000000000000 --- a/resources/BottomArrow.svg +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Go to Bottom - - - go - bottom - - - - - Andreas Nilsson - - - - - - - - - - - - - - - - - - - diff --git a/resources/DownArrow.svg b/resources/DownArrow.svg deleted file mode 100644 index 95b82afd11f63166b2f07d335b8a35951f667b14..0000000000000000000000000000000000000000 --- a/resources/DownArrow.svg +++ /dev/null @@ -1,200 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Go Down - - - go - lower - down - arrow - pointer - > - - - - - Andreas Nilsson - - - - - - - - - - - - - - - - - - - diff --git a/resources/JumpArrow.svg b/resources/JumpArrow.svg deleted file mode 100644 index 4832fe9484bd6d4564ff6a4bd0f30ba6b9be3a00..0000000000000000000000000000000000000000 --- a/resources/JumpArrow.svg +++ /dev/null @@ -1,204 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Go Jump - - - go - jump - seek - arrow - pointer - - - - - - - - - - - - - - - - diff --git a/resources/Kill.svg b/resources/Kill.svg deleted file mode 100644 index 04ce3a79feb4b0da5fdeb6c4658ec64c141e70c4..0000000000000000000000000000000000000000 --- a/resources/Kill.svg +++ /dev/null @@ -1,336 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Stop - 2005-10-16 - - - Andreas Nilsson - - - - - stop - halt - error - - - - - - Jakub Steiner - - - - - - - - - - - - - - - - - - diff --git a/resources/Land.svg b/resources/Land.svg deleted file mode 100644 index 249c105dfbb3ab14d6a973b58b47b321221e0d89..0000000000000000000000000000000000000000 --- a/resources/Land.svg +++ /dev/null @@ -1,1149 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Computer - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/Launch.svg b/resources/Launch.svg deleted file mode 100644 index 901a9aa3501227c6273fe1b95cc4ed236791e245..0000000000000000000000000000000000000000 --- a/resources/Launch.svg +++ /dev/null @@ -1,1164 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Computer - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - - - - - - - diff --git a/resources/LeftArrow.svg b/resources/LeftArrow.svg deleted file mode 100644 index d5381de3a5e362eef5fe90e0cef66807972f0d8e..0000000000000000000000000000000000000000 --- a/resources/LeftArrow.svg +++ /dev/null @@ -1,854 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Go Previous - - - go - previous - left - arrow - pointer - < - - - - - - - - - - - - - - - - - diff --git a/resources/MinusSign.svg b/resources/MinusSign.svg deleted file mode 100644 index 5f109a05c38f37c98d181d6cebe8c40aa56dbe04..0000000000000000000000000000000000000000 --- a/resources/MinusSign.svg +++ /dev/null @@ -1,424 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Remove - 2006-01-04 - - - Andreas Nilsson - - - http://tango-project.org - - - remove - delete - - - - - - - - - - - - - - - - - diff --git a/resources/PlusSign.svg b/resources/PlusSign.svg deleted file mode 100644 index 6eaed4481100ca184d947978663789e4770627b5..0000000000000000000000000000000000000000 --- a/resources/PlusSign.svg +++ /dev/null @@ -1,436 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Add - 2006-01-04 - - - Andreas Nilsson - - - http://tango-project.org - - - add - plus - - - - - - - - - - - - - - - - - - diff --git a/resources/RightArrow.svg b/resources/RightArrow.svg deleted file mode 100644 index 41e5990b8fb71cd6e2dbd956eb3f8da5d4b5b744..0000000000000000000000000000000000000000 --- a/resources/RightArrow.svg +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Go Next - - - go - next - right - arrow - pointer - > - - - - - - - - - - - - - - - - - diff --git a/resources/Shutdown.svg b/resources/Shutdown.svg deleted file mode 100644 index adb95213406a1f8576026ec1bbb24baaa75849ee..0000000000000000000000000000000000000000 --- a/resources/Shutdown.svg +++ /dev/null @@ -1,457 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - System Log Out - - - log out - logout - exit - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/SystemLockScreen.svg b/resources/SystemLockScreen.svg deleted file mode 100644 index e7d9f1b7eb3fe564be2eda895ca9400842f127f1..0000000000000000000000000000000000000000 --- a/resources/SystemLockScreen.svg +++ /dev/null @@ -1,680 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Lock Screen - - - - Jakub Steiner - - - - - video - display - lock - screen - password - session - screensaver - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/UpArrow.svg b/resources/UpArrow.svg deleted file mode 100644 index 54263df3e53745c408e187863ac8ad67aa803f11..0000000000000000000000000000000000000000 --- a/resources/UpArrow.svg +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Go Up - - - go - higher - up - arrow - pointer - > - - - - - Andreas Nilsson - - - - - - - - - - - - - - - - - diff --git a/resources/mapproviders/google.png b/resources/mapproviders/google.png deleted file mode 100644 index 06409c5eaf9a93d6c6dcbd7167c23cd81577755d..0000000000000000000000000000000000000000 Binary files a/resources/mapproviders/google.png and /dev/null differ diff --git a/resources/mapproviders/googleearth.svg b/resources/mapproviders/googleearth.svg deleted file mode 100644 index 0cb3de179f351f02088c7f09bc70cc91942245b8..0000000000000000000000000000000000000000 --- a/resources/mapproviders/googleearth.svg +++ /dev/null @@ -1,383 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/resources/mapproviders/openstreetmap.png b/resources/mapproviders/openstreetmap.png deleted file mode 100644 index 96a4734a7a23ef854dd76503b7ce987a63b21f92..0000000000000000000000000000000000000000 Binary files a/resources/mapproviders/openstreetmap.png and /dev/null differ diff --git a/resources/mapproviders/yahoo.png b/resources/mapproviders/yahoo.png deleted file mode 100644 index 9092985326c9455e3dfec0e7a8ad6b035fe5d071..0000000000000000000000000000000000000000 Binary files a/resources/mapproviders/yahoo.png and /dev/null differ diff --git a/resources/styles/Vera.ttf b/resources/styles/Vera.ttf deleted file mode 100755 index 58cd6b5e61eff273e920942e28041f8ddcf1e1b5..0000000000000000000000000000000000000000 Binary files a/resources/styles/Vera.ttf and /dev/null differ