From 1840f18d0855f2cefb8b5e888929ec4fc7776457 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Fri, 21 Jun 2019 14:58:44 -0300 Subject: [PATCH] Remove stale resources --- qgcresources.qrc | 25 - resources/mavs/airship.svg | 1133 -------------------------- resources/mavs/antenna-tracker.svg | 1133 -------------------------- resources/mavs/coaxial.svg | 1198 ---------------------------- resources/mavs/fixed-wing.svg | 1126 -------------------------- resources/mavs/flapping-wing.svg | 1133 -------------------------- resources/mavs/free-balloon.svg | 1133 -------------------------- resources/mavs/generic.svg | 1133 -------------------------- resources/mavs/ground-rover.svg | 1054 ------------------------ resources/mavs/groundstation.svg | 1134 -------------------------- resources/mavs/helicopter.svg | 1198 ---------------------------- resources/mavs/hexarotor.svg | 1133 -------------------------- resources/mavs/kite.svg | 1133 -------------------------- resources/mavs/octorotor.svg | 1133 -------------------------- resources/mavs/quadrotor.svg | 1159 --------------------------- resources/mavs/rocket.svg | 1133 -------------------------- resources/mavs/submarine.svg | 1133 -------------------------- resources/mavs/surface-boat.svg | 1133 -------------------------- resources/mavs/tricopter.svg | 1133 -------------------------- resources/mavs/unknown.svg | 1133 -------------------------- resources/styles/style-dark.css | 544 ------------- resources/styles/style-light.css | 372 --------- src/QGCApplication.cc | 3 - src/QGCApplication.h | 4 +- 24 files changed, 1 insertion(+), 22545 deletions(-) delete mode 100644 resources/mavs/airship.svg delete mode 100644 resources/mavs/antenna-tracker.svg delete mode 100644 resources/mavs/coaxial.svg delete mode 100644 resources/mavs/fixed-wing.svg delete mode 100644 resources/mavs/flapping-wing.svg delete mode 100644 resources/mavs/free-balloon.svg delete mode 100644 resources/mavs/generic.svg delete mode 100644 resources/mavs/ground-rover.svg delete mode 100644 resources/mavs/groundstation.svg delete mode 100644 resources/mavs/helicopter.svg delete mode 100644 resources/mavs/hexarotor.svg delete mode 100644 resources/mavs/kite.svg delete mode 100644 resources/mavs/octorotor.svg delete mode 100644 resources/mavs/quadrotor.svg delete mode 100644 resources/mavs/rocket.svg delete mode 100644 resources/mavs/submarine.svg delete mode 100644 resources/mavs/surface-boat.svg delete mode 100644 resources/mavs/tricopter.svg delete mode 100644 resources/mavs/unknown.svg delete mode 100644 resources/styles/style-dark.css delete mode 100644 resources/styles/style-light.css diff --git a/qgcresources.qrc b/qgcresources.qrc index fd9ea29b3..1fecc1440 100644 --- a/qgcresources.qrc +++ b/qgcresources.qrc @@ -55,27 +55,6 @@ resources/firmware/apm.png resources/firmware/px4.png - - resources/mavs/airship.svg - resources/mavs/antenna-tracker.svg - resources/mavs/coaxial.svg - resources/mavs/fixed-wing.svg - resources/mavs/flapping-wing.svg - resources/mavs/free-balloon.svg - resources/mavs/generic.svg - resources/mavs/ground-rover.svg - resources/mavs/groundstation.svg - resources/mavs/helicopter.svg - resources/mavs/hexarotor.svg - resources/mavs/kite.svg - resources/mavs/octorotor.svg - resources/mavs/quadrotor.svg - resources/mavs/rocket.svg - resources/mavs/submarine.svg - resources/mavs/surface-boat.svg - resources/mavs/tricopter.svg - resources/mavs/unknown.svg - resources/calibration/accel_back.png resources/calibration/accel_down.png @@ -113,10 +92,6 @@ resources/SDL_GameControllerDB/gamecontrollerdb.txt - - resources/styles/style-dark.css - resources/styles/style-light.css - resources/audio/alert.wav diff --git a/resources/mavs/airship.svg b/resources/mavs/airship.svg deleted file mode 100644 index d56393795..000000000 --- a/resources/mavs/airship.svg +++ /dev/null @@ -1,1133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - AIR - - AIRSHIP - - diff --git a/resources/mavs/antenna-tracker.svg b/resources/mavs/antenna-tracker.svg deleted file mode 100644 index e251ca4bc..000000000 --- a/resources/mavs/antenna-tracker.svg +++ /dev/null @@ -1,1133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - ANT - - ANTENNA - - diff --git a/resources/mavs/coaxial.svg b/resources/mavs/coaxial.svg deleted file mode 100644 index 6c32cb2ee..000000000 --- a/resources/mavs/coaxial.svg +++ /dev/null @@ -1,1198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - COAXIAL - - - - - - - - - - - - - - - - - - diff --git a/resources/mavs/fixed-wing.svg b/resources/mavs/fixed-wing.svg deleted file mode 100644 index c5afe51e1..000000000 --- a/resources/mavs/fixed-wing.svg +++ /dev/null @@ -1,1126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - - - - - AEROPLANE - - diff --git a/resources/mavs/flapping-wing.svg b/resources/mavs/flapping-wing.svg deleted file mode 100644 index 38a507ac1..000000000 --- a/resources/mavs/flapping-wing.svg +++ /dev/null @@ -1,1133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - FLA - - FLAPPING - - diff --git a/resources/mavs/free-balloon.svg b/resources/mavs/free-balloon.svg deleted file mode 100644 index 7c17bf90a..000000000 --- a/resources/mavs/free-balloon.svg +++ /dev/null @@ -1,1133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - BAL - - BALLOON - - diff --git a/resources/mavs/generic.svg b/resources/mavs/generic.svg deleted file mode 100644 index d3a66277f..000000000 --- a/resources/mavs/generic.svg +++ /dev/null @@ -1,1133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - MAV - - GENERIC - - diff --git a/resources/mavs/ground-rover.svg b/resources/mavs/ground-rover.svg deleted file mode 100644 index c58c028ff..000000000 --- a/resources/mavs/ground-rover.svg +++ /dev/null @@ -1,1054 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - ROVER - - - - - - - - - - - diff --git a/resources/mavs/groundstation.svg b/resources/mavs/groundstation.svg deleted file mode 100644 index 6407e3cc5..000000000 --- a/resources/mavs/groundstation.svg +++ /dev/null @@ -1,1134 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - GCS - - HUMAN OPS - - diff --git a/resources/mavs/helicopter.svg b/resources/mavs/helicopter.svg deleted file mode 100644 index e18356f09..000000000 --- a/resources/mavs/helicopter.svg +++ /dev/null @@ -1,1198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - HELICOPTER - - - - - - - - - - - - - - - - - - diff --git a/resources/mavs/hexarotor.svg b/resources/mavs/hexarotor.svg deleted file mode 100644 index 3767e9a6a..000000000 --- a/resources/mavs/hexarotor.svg +++ /dev/null @@ -1,1133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - HEX - - HEXAROTOR - - diff --git a/resources/mavs/kite.svg b/resources/mavs/kite.svg deleted file mode 100644 index 110a28af8..000000000 --- a/resources/mavs/kite.svg +++ /dev/null @@ -1,1133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - KITE - - KITE - - diff --git a/resources/mavs/octorotor.svg b/resources/mavs/octorotor.svg deleted file mode 100644 index bc2213e24..000000000 --- a/resources/mavs/octorotor.svg +++ /dev/null @@ -1,1133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - OCT - - OCTOROTOR - - diff --git a/resources/mavs/quadrotor.svg b/resources/mavs/quadrotor.svg deleted file mode 100644 index d59eb4fc3..000000000 --- a/resources/mavs/quadrotor.svg +++ /dev/null @@ -1,1159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - QUADROTOR - - - - - - - - - - diff --git a/resources/mavs/rocket.svg b/resources/mavs/rocket.svg deleted file mode 100644 index 3425910f7..000000000 --- a/resources/mavs/rocket.svg +++ /dev/null @@ -1,1133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - R - - ROCKET - - diff --git a/resources/mavs/submarine.svg b/resources/mavs/submarine.svg deleted file mode 100644 index 9294f9691..000000000 --- a/resources/mavs/submarine.svg +++ /dev/null @@ -1,1133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - SUB - - SUBMARINE - - diff --git a/resources/mavs/surface-boat.svg b/resources/mavs/surface-boat.svg deleted file mode 100644 index 0d99a95c1..000000000 --- a/resources/mavs/surface-boat.svg +++ /dev/null @@ -1,1133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - BT - - BOAT - - diff --git a/resources/mavs/tricopter.svg b/resources/mavs/tricopter.svg deleted file mode 100644 index 446e771f7..000000000 --- a/resources/mavs/tricopter.svg +++ /dev/null @@ -1,1133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - TRI - - TRICOPTER - - diff --git a/resources/mavs/unknown.svg b/resources/mavs/unknown.svg deleted file mode 100644 index b9d5b9ead..000000000 --- a/resources/mavs/unknown.svg +++ /dev/null @@ -1,1133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - 2005-03-08 - - - Jakub Steiner - - - - - workstation - computer - node - client - - - - http://jimmac.musichall.cz/ - - - - - - - - - - - - - U - - UNKNOWN - - diff --git a/resources/styles/style-dark.css b/resources/styles/style-dark.css deleted file mode 100644 index 3c5bc6c6d..000000000 --- a/resources/styles/style-dark.css +++ /dev/null @@ -1,544 +0,0 @@ -/* - This is the master style sheet as well as the dark style. This style sheet should contain both - color and size/positioning information for all styled controls. This sheet is always loaded first - Then the user specified style sheet is loaded after it to override and color settings. - - Font sizes are defined with tokens, which are parsed and replaced at run time. - -*/ - -* { - background-color: #222; - color: #FFF; -} - -QWidget#viewModeWidget { - border-radius: 12px; - border: 3px solid #465158; -} - -*::disabled { - color: #777; -} - -JoystickButton QLabel { - border: 1px solid #AAA; - border-radius: 4px; - height: 16px; - padding: 0 3px; -} - -QCheckBox { - color: #DDD; -} - -QCheckBox::indicator { - border: 1px solid #777; - border-radius: 2px; - width: 10px; - height: 10px; -} - -QCheckBox::indicator:hover { - background-color: #CCC; -} - -QCheckBox::indicator:pressed, QCheckBox::indicator:checked:pressed { - background-color: #777; -} - -QCheckBox::indicator:checked { - background-color: #B8D3E6; -} - -QCheckBox::indicator:disabled { - border-color: #555; -} - -QCheckBox::indicator:disabled:checked { - background-color: #333; -} - -QComboBox { - border: 1px solid #777; - border-radius: 2px; -} - -QDialog { - border: 1px solid #62676B; - border-radius: 2px; -} - -QDockWidget { - border: 1px solid #666; - border-radius: 1px; -} - -QDockWidget::close-button, QDockWidget::float-button { - background: none; -} - -QDockWidget::close-button:hover, QDockWidget::float-button:hover { - background: #B8D3E6; -} - -QDockWidget::close-button:pressed, QDockWidget::float-button:pressed { - padding: 1px -1px -1px 1px; - background: #899FAD; -} - -QDockWidget::title { - text-align: left; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #3F556A, stop: 1 #293645); - color: #EDEDED; - height: 14px; - padding-left: 2.5em; -} - -QGCMAVLinkLogPlayer { - background: none; -} - -QGCMAVLinkLogPlayer QLabel { - color: #FFF; -} - -QGCMAVLinkLogPlayer QLabel:disabled { - color: #AAA; -} - -QGCToolWidgetItem { - border: 1px solid #666; - border-radius: 3px; - padding: 10px 0 0 0; - margin-top: 1ex; /* leave space at the top for the title */ -} - -QGCUnconnectedInfoWidget QPushButton { - border-radius: 18px; -} - -QGroupBox { - border: 1px solid #666; - border-radius: 3px; - padding: 10px 0 0 0; - margin-top: 1ex; /* leave space at the top for the title */ -} - -QGroupBox::title { - subcontrol-origin: margin; - subcontrol-position: top center; - margin: 0 3px 0 3px; - padding: 0 3px 0 0; - font: bold; - color: #DDD; -} - -QHeaderView::section { - border: none; - border-right: 1px solid #969696; - padding: 2px 0 2px 4px; - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4B4B4B, stop: 0.3 #404040, stop: 0.34 #383838, stop:1 #181818); -} - -QLabel { - background-color: transparent; -} - -QLabel:disabled { - color: #444; - border-color: #444; -} - -QMessageBox { - min-width: 400px; - min-height: 300px; -} - -QLabel#tabTitleLabel { - margin-top: 16px; - margin-bottom: 8px; -} - -QLabel#instructionLabel { - color: #FEC654; -} - -QLineEdit { - border: 1px solid #777; - border-radius: 2px; -} - -QMainWindow::separator { - background-color: #323235; - width: 2px; /* when vertical */ - height: 2px; /* when horizontal */ -} - -QMainWindow::separator:hover { - background-color: #FFF; -} - -QMenu { - border: 1px solid #B8D3E6; -} - -QMenu::item:selected, QMenu::item:checked:selected { - background-color: #CCC; - color: #000; -} - -QMenu::item:checked { - background-color: #B8D3E6; - color: #000; -} - -QMenu::separator { - height: 1px; - background: #B8D3E6; - margin: 8px 5px 4px 5px; -} - -/* - * Fix for bug in Qt5 where QMenuBar items are styled natively on Windows, ignoring inherited settings. - * so we explicitly set their background color here (should match catch-all style background color). - */ -QMenuBar::item { - background-color: #222; -} - -QMenuBar::item:selected { - background-color: #CCC; - color: #000; -} - -QMenuBar::item:disabled { - border: none; - background: none; -} - -QPlainTextEdit { - border: 1px solid #777; - border-radius: 2px; -} - -QProgressBar { - border: 1px solid #4A4A4A; - border-radius: 4px; - text-align: center; - padding: 2px; - color: #DDD; - background: #111; - height: 10px; -} - -QProgressBar::chunk { - background-color: #3C7B9E; -} - -QProgressBar::chunk#batteryBar { - background-color: green; -} - -QProgressBar::chunk#speedBar { - background-color: yellow; -} - -QProgressBar::chunk#thrustBar { - background-color: orange; -} - -QProgressBar:horizontal { - height: 9px; -} - -QProgressBar:vertical { - width: 9px; -} - -QPushButton, QToolButton { - min-height: 20px; - max-height: 20px; - border: 1px solid #465158; - margin: 1px; - border-radius: 4px; - padding-left: 8px; - padding-right: 8px; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #777, stop: 1 #333); -} - -VehicleSetupButton, VehicleComponentButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #333, stop: 1 #111); - border-radius: 5px; - min-height: 64px; - max-height: 64px; - min-width: 80px; - border: 1px solid #000000; -} - -QPushButton#planePushButton, QPushButton#flyingWingPushButton, QPushButton#quadXPushButton, -QPushButton#quadPlusPushButton, QPushButton#hexaXPushButton, QPushButton#hexaPlusPushButton, -QPushButton#octoXPushButton, QPushButton#octoPlusPushButton, QPushButton#hPushButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #777, stop: 1 #333); - border-radius: 5px; - min-height: 140px; - max-height: 240px; - min-width: 140px; - border: 1px solid #465158; -} - -QPushButton:checked#planePushButton, QPushButton:checked#flyingWingPushButton, QPushButton:checked#quadXPushButton, -QPushButton:checked#quadPlusPushButton, QPushButton:checked#hexaXPushButton, QPushButton:checked#hexaPlusPushButton, -QPushButton:checked#octoXPushButton, QPushButton:checked#octoPlusPushButton, QPushButton:checked#hPushButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #77F, stop: 1 #33A); - border: 3px solid #4651A8; -} - -QPushButton#viewModeGeneric, QPushButton#viewModePX4, QPushButton#viewModeAPM, QPushButton#viewModeAR { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #73D95D, stop: 1 #18A154); - border-radius: 12px; - min-height: 120px; - max-height: 140px; - min-width: 120px; - max-width: 140px; - border: 3px solid #465158; -} - -QPushButton#magButton, QPushButton#gyroButton, QPushButton#accelButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #757575, stop: 1 #333); - border-radius: 5px; - border: 1px solid #000000; -} - -QWidget#containerWidget { - background-color: qlineargradient(spread:pad, x1:0.527222, y1:0.961, x2:0.536946, y2:0.198864, stop:0.103448 rgba(65, 65, 65, 255), stop:1 rgba(119, 119, 119, 255)); - border-radius: 16px; - border: 2px solid #CCCCCC; -} - -QWidget#navBarWidget { - background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 #404040, stop:1 #727272); - border-radius: 0px; - border: 1px solid #222222; -} - -QPushButton#connectButton, QPushButton#controlButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #73D95D, stop: 1 #18A154); -} - -QPushButton#controlButton { - min-height: 25px; -} - -QPushButton#deleteButton, QPushButton#killButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #D9002F, stop: 1 #AC0025); -} - -QPushButton:checked, QToolButton:checked { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #09A2B2, stop: 1 #414B52); -} - -QPushButton:checked#connectButton, QPushButton:checked#controlButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #E38000, stop: 1 #945F00); - color: #000; -} - -QPushButton:checked:hover#connectButton, QPushButton:checked:hover#controlButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FF9000, stop: 1 #B37300); -} - -QPushButton:checked:pressed#connectButton, QPushButton:checked:pressed#controlButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #DB7C00, stop: 1 #825400); -} - -QPushButton:disabled, QToolButton:disabled { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #232228, stop: 1 #020208); -} - -QPushButton:hover, QToolButton:hover { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #59666F, stop: 1 #414B52); -} - -QPushButton:hover#connectButton, QPushButton:hover#controlButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #87FF6D, stop: 1 #1FD16D); -} - -QPushButton:hover#deleteButton, QPushButton#killButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F20034, stop: 1 #9E0022); -} - -QPushButton:pressed, QToolButton:pressed { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #bbbbbb, stop: 1 #b0b0b0); -} - -QPushButton:pressed#connectButton, QPushButton:pressed#controlButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #62B84E, stop: 1 #148A47); -} - -QPushButton:pressed#deleteButton, QPushButton#killButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #C9002C, stop: 1 #9C0021); -} - -QScrollBar { - border: 1px solid #333; -} - -QSeparator { - color: #EEE; -} - -QSlider { - background-color: transparent; -} - -QSlider::groove:horizontal { - border: 1px solid #999; - height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */ - background-color: #4A4A4A; - margin: 2px 0; -} - -QSlider::groove:horizontal:disabled { - border: 1px solid #454545; - background-color: #4A4A4A; - height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */ - margin: 2px 0; -} - -QSlider::groove:vertical { - border: 1px solid #999; - width: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */ - background-color: #4A4A4A; - margin: 2px 0; -} - -QSlider::handle:horizontal { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #232228, stop: 1 #020208); - border: 2px solid #B8D3E6; - width: 18px; - margin: -5px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */ - border-radius: 3px; -} - -QSlider::handle:horizontal:disabled { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #535258, stop: 1 #050508); - border: 2px solid #444; - width: 18px; - margin: -5px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */ - border-radius: 3px; -} - -QSlider::handle:vertical { - background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #232228, stop: 1 #020208); - border: 2px solid #B8D3E6; - height: 18px; - margin: 0 -5px; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */ - border-radius: 3px; -} - -QSizeGrip { - background: none; -} - -QSpinBox, QDoubleSpinBox { - min-height: 14px; - max-height: 18px; - border: 1px solid #777; - border-radius: 5px; -} - -QSpinBox::down-arrow, QDoubleSpinBox::down-arrow { - image: url(:/res/DownArrow); - width: 16px; -} - -QSpinBox::down-button, QDoubleSpinBox::down-button { - border: none; -} - -QSpinBox::up-arrow, QDoubleSpinBox::up-arrow { - image: url(:/res/UpArrow); - width: 16px; -} - -QSpinBox::up-button, QDoubleSpinBox::up-button { - border: none; -} - -QStatusBar { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4B4B4B, stop: 0.3 #404040, stop:0.34 #383838, stop:1 #181818); -} - -QTabBar::tab { - border: 2px solid #62676B; - border-radius: 4px; - min-width: 8ex; - padding: 2px; -} - -QTabBar::tab:hover { - border: 2px solid #B8D3E6; -} - -QTabBar::tab:selected { - border: 2px solid #B8D3E6; - background: #555; -} - -QTabWidget::tab-bar { - alignment: center; -} - -QTabWidget::pane { - border: 1px solid #62676B; - border-radius: 2px; - position: absolute; - top: -0.5em; -} - -QTextEdit { - border: 1px solid #777; - border-radius: 2px; -} - -QToolButton { - padding-left: 3px; - padding-right: 3px; -} - -QToolTip { - background-color: #3D5368; - border:0 solid #B8D3E6; - margin: 3px; - border-radius: 3px; - color: #DDD; -} - -QTreeView::item:selected { - color: #000; -} - -UASQuickViewItem QLabel { - padding: 0; - margin: 0; - min-height: 1em; -} - -UASView { - background: #444; - border: 1px solid #AAA; - border-radius: 12px; -} - -UASView QLabel#heartBeatLabel, UASView QLabel#typeLabel { - border: 1px solid #333; - border-radius: 5px; - padding: 2px; -} - -QGCUnconnectedInfoWidget QPushButton#connectButton { - min-height: 150px; - max-height: 275px; - margin: 15px; - padding: 20px; -} diff --git a/resources/styles/style-light.css b/resources/styles/style-light.css deleted file mode 100644 index e48d139bd..000000000 --- a/resources/styles/style-light.css +++ /dev/null @@ -1,372 +0,0 @@ -/* - This is a slave style sheet in relationship to the master style sheet. That means that it should only - contain color settings. It should not contain position or size information. That comes from the master - style sheet. -*/ - -* { - background-color: #F6F6F6; - color: #000; - background-clip: border; -} - -*::disabled { - color: #AAA; -} - -JoystickButton QLabel { - border-color: #777; -} - -QCheckBox { - color: #222; -} - -QCheckBox::indicator { - border-color: #111; -} - -QCheckBox::indicator:hover { - background-color: #CCC; -} - -QCheckBox::indicator:pressed, QCheckBox::indicator:checked:pressed { - background-color: #777; -} - -QCheckBox::indicator:checked { - background-color: #379AC3; -} - -QCheckBox::indicator:disabled { - border-color: #555; -} - -QCheckBox::indicator:disabled:checked { - background-color: #AAA; -} - -QComboBox { - border-color: #777; -} - -QDialog { - border-color: #777; -} - -QDockWidget { - border-color: #666; -} - -QDockWidget::close-button, QDockWidget::float-button { - border-color: transparent; - background: none; -} - -QDockWidget::close-button:hover, QDockWidget::float-button:hover { - background: #777; -} - -QDockWidget::close-button:pressed, QDockWidget::float-button:pressed { - background: #555; -} - -QDockWidget::title { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CCC, stop: 1 #888); - color: #000; -} - -QGCMAVLinkLogPlayer { - background: none; -} - -QGCMAVLinkLogPlayer QLabel { - color: #FFF; -} - -QGCMAVLinkLogPlayer QLabel:disabled { - color: #666; -} - -QGCToolWidgetItem { - border-color: #666; -} - -QGroupBox { - border-color: #666; -} - -QGroupBox::title { - color: #000; -} - -QHeaderView::section { - border-right: #969696; - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #DDD, stop: 1 #999); -} - -QLabel { - background-color: transparent; -} - -QLabel:disabled { - color: #999; - border-color: #999; -} - -QLineEdit { - border-color: #111; -} - -QMainWindow::separator { - background-color: #CCC; -} - -QMainWindow::separator:hover { - background-color: #222; -} - -QMenu { - border-color:#379AC3; -} - -QMenu::item:selected, QMenu::item:checked:selected { - background-color: #555; - color: #FFF; -} - -QMenu::item:checked { - background-color: #379AC3; - color: #FFF; -} - -QMenu::separator { - background: #379AC3; -} - -/* - * Fix for bug in Qt5 where QMenuBar items are styled natively on Windows, ignoring inherited settings. - * so we explicitly set their background color here (should match catch-all style background color). - */ -QMenuBar::item { - background-color: #F6F6F6; -} - -QMenuBar::item:selected { - background-color: #555; - color: #FFF; -} - -QMenuBar::item:disabled { - background: none; -} - -QPlainTextEdit { - border-color: #111; -} - -QProgressBar { - border-color: #666; - color: #000; - background: none; -} - -QProgressBar::chunk { - background-color: #666; -} - -QProgressBar::chunk#batteryBar { - background-color: green; -} - -QProgressBar::chunk#speedBar { - background-color: yellow; -} - -QProgressBar::chunk#thrustBar { - background-color: orange; -} - -QPushButton, QToolButton { - border-color: #465158; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BBB, stop: 1 #777); -} - -QPushButton#connectButton, QPushButton#controlButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #73D95D, stop: 1 #18A154); -} - -QPushButton#deleteButton, QPushButton#killButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #D9002F, stop: 1 #AC0025); -} - -QPushButton:checked, QToolButton:checked { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #444, stop: 1 #888); - color: #FFF; -} - -QPushButton:checked#connectButton, QPushButton:checked#controlButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #E38000, stop: 1 #945F00); - color: #000; -} - -QPushButton:checked:hover#connectButton, QPushButton:checked:hover#controlButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FF9000, stop: 1 #B37300); -} - -QPushButton:checked:pressed#connectButton, QPushButton:checked:pressed#controlButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #DB7C00, stop: 1 #825400); -} - -QPushButton:disabled, QToolButton:disabled { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEE, stop: 1 #CCC); - color: #AAA; -} - -QPushButton:hover, QToolButton:hover { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #B8D3E6, stop: 1 #899FAD); -} - -QPushButton:hover#connectButton, QPushButton:hover#controlButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #87FF6D, stop: 1 #1FD16D); -} - -QPushButton:hover#deleteButton, QPushButton#killButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F20034, stop: 1 #9E0022); -} - -QPushButton:pressed, QToolButton:pressed { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #AAA, stop: 1 #666); -} - -QPushButton:pressed#connectButton, QPushButton:pressed#controlButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #62B84E, stop: 1 #148A47); -} - -QPushButton:pressed#deleteButton, QPushButton#killButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #C9002C, stop: 1 #9C0021); -} - -QPushButton#advancedMenuButton, QPushButton#airframeMenuButton, QPushButton#firmwareMenuButton, -QPushButton#tuningMenuButton, QPushButton#rcMenuButton, QPushButton#sensorMenuButton, -QPushButton#flightModeMenuButton, QPushButton#safetyConfigButton { - border-color: #465158; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BBB, stop: 1 #777); -} - -VehicleSetupButton, VehicleComponentButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BBB, stop: 1 #777); - border-color: #465158; -} - -QPushButton#planePushButton, QPushButton#flyingWingPushButton, QPushButton#quadXPushButton, -QPushButton#quadPlusPushButton, QPushButton#hexaXPushButton, QPushButton#hexaPlusPushButton, -QPushButton#octoXPushButton, QPushButton#octoPlusPushButton, QPushButton#hPushButton { - border-color: #465158; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BBB, stop: 1 #777); -} - -QPushButton:checked#planePushButton, QPushButton:checked#flyingWingPushButton, QPushButton:checked#quadXPushButton, -QPushButton:checked#quadPlusPushButton, QPushButton:checked#hexaXPushButton, QPushButton:checked#hexaPlusPushButton, -QPushButton:checked#octoXPushButton, QPushButton:checked#octoPlusPushButton, QPushButton:checked#hPushButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #444, stop: 1 #888); - color: #FFF; -} - -QWidget#navBarWidget { - background-color: #F6F6F6; -} - -QScrollBar { - border-color: #333; -} - -QSeparator { - color: #000; -} - -QSlider { - background-color: transparent; -} - -QSlider::groove:horizontal { - border-color: #999; - background-color: #4A4A4A; -} - -QSlider::groove:horizontal:disabled { - border-color: #999; - background-color: #CCC; -} - -QSlider::groove:vertical { - border-color: #999; - background-color: #4A4A4A; -} - -QSlider::handle:horizontal { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #232228, stop: 1 #020208); - border-color: #379AC3; -} - -QSlider::handle:horizontal:disabled { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEE, stop: 1 #CCC); - border-color: #777; -} - -QSlider::handle:vertical { - background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #232228, stop: 1 #020208); - border-color: #379AC3; -} - -QSizeGrip { - background: none; -} - -QSpinBox, QDoubleSpinBox { - border-color: #4A4A4A; -} - -QStatusBar { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #DDD, stop: 1 #999); -} - -QTabBar::tab { - border-color: #777; -} - -QTabBar::tab:hover { - border-color: #379AC3; -} - -QTabBar::tab:selected { - border-color:d #379AC3; - background: #CCC; -} - -QTabWidget::pane { - border-color: #777; -} - -QTextEdit { - border-color: #222; -} - -QToolTip { - background-color: #F6F6F6; - border-color: #379AC3; - color: #000; -} - -QTreeView::item { - color: #000; -} - -UASView { - background: #D0D0D0; - border-color: #666; -} - -UASView QLabel#heartBeatLabel, UASView QLabel#typeLabel { - border-color: #333; -} diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index f81b185c9..3ce148e6b 100644 --- a/src/QGCApplication.cc +++ b/src/QGCApplication.cc @@ -126,9 +126,6 @@ QGCApplication* QGCApplication::_app = nullptr; const char* QGCApplication::_deleteAllSettingsKey = "DeleteAllSettingsNextBoot"; const char* QGCApplication::_settingsVersionKey = "SettingsVersion"; -const char* QGCApplication::_darkStyleFile = ":/res/styles/style-dark.css"; -const char* QGCApplication::_lightStyleFile = ":/res/styles/style-light.css"; - // Mavlink status structures for entire app mavlink_status_t m_mavlink_status[MAVLINK_COMM_NUM_BUFFERS]; diff --git a/src/QGCApplication.h b/src/QGCApplication.h index 527d66754..7b93c54dc 100644 --- a/src/QGCApplication.h +++ b/src/QGCApplication.h @@ -171,9 +171,7 @@ private: void _exitWithError (QString errorMessage); - bool _runningUnitTests; ///< true: running unit tests, false: normal app - static const char* _darkStyleFile; - static const char* _lightStyleFile; + bool _runningUnitTests; ///< true: running unit tests, false: normal app static const int _missingParamsDelayedDisplayTimerTimeout = 1000; ///< Timeout to wait for next missing fact to come in before display QTimer _missingParamsDelayedDisplayTimer; ///< Timer use to delay missing fact display QStringList _missingParams; ///< List of missing facts to be displayed -- 2.22.0