Disable capture video button when video not streaming

Author: DonLakeFlyer

src/Camera/SimulatedCameraControl.cc

@@ -28,6 +28,7 @@ SimulatedCameraControl::SimulatedCameraControl(Vehicle *vehicle, QObject *parent
         emit videoCaptureStatusChanged();
     });
     connect(videoManager, &VideoManager::hasVideoChanged, this, &SimulatedCameraControl::infoChanged);
+    connect(videoManager, &VideoManager::decodingChanged, this, &SimulatedCameraControl::infoChanged);
 
     (void) connect(SettingsManager::instance()->flyViewSettings()->showSimpleCameraControl(), &Fact::rawValueChanged, this, &SimulatedCameraControl::infoChanged);
 
@@ -193,7 +194,7 @@ bool SimulatedCameraControl::capturesPhotos() const
 
 bool SimulatedCameraControl::hasVideoStream() const
 {
-    return VideoManager::instance()->hasVideo();
+    return VideoManager::instance()->decoding();
 }
 
 void SimulatedCameraControl::setPhotoCaptureMode(MavlinkCameraControl::PhotoCaptureMode photoCaptureMode)

src/FlightMap/Widgets/PhotoVideoControl.qml

@@ -35,7 +35,6 @@ Rectangle {
     property bool   _photoCaptureSingleIdle:    _camera.photoCaptureStatus === MavlinkCameraControl.PHOTO_CAPTURE_IDLE
     property bool   _photoCaptureIntervalIdle:  _camera.photoCaptureStatus === MavlinkCameraControl.PHOTO_CAPTURE_INTERVAL_IDLE
     property bool   _photoCaptureIdle:          _photoCaptureSingleIdle || _photoCaptureIntervalIdle
-    property color  _captureButtonColor:       _cameraInPhotoMode ? qgcPal.photoCaptureButtonColor : qgcPal.videoCaptureButtonColor
 
 /*
     // Used for testing camera ui options. Set _camera to testCamera to use.
@@ -214,18 +213,24 @@ Rectangle {
 
                 // Take Photo, Start/Stop Video button
                 Rectangle {
+                    id:                 captureButton
                     Layout.alignment:   Qt.AlignHCenter
-                    color:              qgcPal.button
+                    color:              captureButtonPalette.button
                     width:              ScreenTools.defaultFontPixelWidth * 6
                     height:             width
                     radius:             width * 0.5
                     border.width:       1
-                    border.color:       qgcPal.buttonBorder
+                    border.color:       captureButtonPalette.buttonBorder
+                    enabled:            _cameraInPhotoMode || (_cameraInVideoMode && _camera.hasVideoStream)
 
-                   Rectangle {
+                    property color  captureButtonColor:  _cameraInPhotoMode ? captureButtonPalette.photoCaptureButtonColor : captureButtonPalette.videoCaptureButtonColor
+
+                    QGCPalette { id: captureButtonPalette; colorGroupEnabled: captureButton.enabled }
+
+                    Rectangle {
                         anchors.centerIn:           parent
                         anchors.alignWhenCentered:  false // Prevents anchors.centerIn from snapping to integer coordinates, which can throw off centering.
-                        color:                      qgcPal.buttonBorder
+                        color:                      captureButton.captureButtonPalette.buttonBorder
                         width:                      parent.width * 0.75
                         height:                     width
                         radius:                     width * 0.5
@@ -237,9 +242,9 @@ Rectangle {
                         width:                      parent.width * (_isShootingInCurrentMode ? 0.5 : 0.75)
                         height:                     width
                         radius:                     _isShootingInCurrentMode ? ScreenTools.defaultFontPixelWidth * 0.5 : width * 0.5
-                        color:                      _captureButtonColor
+                        color:                      captureButton.captureButtonColor
                         border.width:               1
-                        border.color:               qgcPal.buttonBorder
+                        border.color:               captureButton.captureButtonPalette.buttonBorder
 
                         property bool _isShootingInPhotoMode:   _cameraInPhotoMode && _camera.photoCaptureStatus === MavlinkCameraControl.PHOTO_CAPTURE_IN_PROGRESS
                         property bool _isShootingInVideoMode:   (!_cameraInPhotoMode && _camera.videoCaptureStatus === MavlinkCameraControl.VIDEO_CAPTURE_STATUS_RUNNING)
@@ -271,7 +276,7 @@ Rectangle {
                 // Record time / Capture count
                 Rectangle {
                     Layout.alignment:       Qt.AlignHCenter
-                    color:                  _videoCaptureIdle && _photoCaptureIdle ? "transparent" : _captureButtonColor
+                    color:                  _videoCaptureIdle && _photoCaptureIdle ? "transparent" : captureButton.captureButtonColor
                     Layout.preferredWidth:  (_cameraInVideoMode ? videoRecordTime.width : photoCaptureCount.width) + (_smallMargins * 2)
                     Layout.preferredHeight: (_cameraInVideoMode ? videoRecordTime.height : photoCaptureCount.height)
                     radius:                 _smallMargins

src/QmlControls/QGCPalette.cc

@@ -92,8 +92,8 @@ void QGCPalette::_buildMap()
     DECLARE_QGC_NONTHEMED_COLOR(brandingPurple,             "#4A2C6D", "#4A2C6D")
     DECLARE_QGC_NONTHEMED_COLOR(brandingBlue,               "#48D6FF", "#6045c5")
     DECLARE_QGC_NONTHEMED_COLOR(toolStripFGColor,           "#707070", "#ffffff")
-    DECLARE_QGC_NONTHEMED_COLOR(photoCaptureButtonColor,    "#ffffff", "#ffffff")
-    DECLARE_QGC_NONTHEMED_COLOR(videoCaptureButtonColor,    "#f32836", "#f32836")
+    DECLARE_QGC_NONTHEMED_COLOR(photoCaptureButtonColor,    "#707070", "#ffffff")
+    DECLARE_QGC_NONTHEMED_COLOR(videoCaptureButtonColor,    "#f89a9e", "#f32836")
 
     // Colors not affecting by theming or enable/disable
     DECLARE_QGC_SINGLE_COLOR(mapWidgetBorderLight,          "#ffffff")