Fixes component alignments and small improvements to Firmware View

src/ui/configuration/ApmFirmwareConfig.cc

@@ -410,110 +410,47 @@ void ApmFirmwareConfig::firmwareListFinished()
     QString outstr = "";
     if (stripVersionFromGitReply(reply->url().toString(),replystr,"apm2-heli",(m_betaFirmwareChecked ? "beta" : "stable"),&outstr))
     {
-        if (m_betaFirmwareChecked)
-        {
-            ui.copterLabel->setText("BETA " + outstr);
-        }
-        else
-        {
-            ui.copterLabel->setText(outstr);
-        }
+        ui.copterLabel->setText(outstr);
         return;
     }
     if (stripVersionFromGitReply(reply->url().toString(),replystr,"apm2-quad",(m_betaFirmwareChecked ? "beta" : "stable"),&outstr))
     {
-        if (m_betaFirmwareChecked)
-        {
-            ui.quadLabel->setText("BETA " + outstr);
-        }
-        else
-        {
-            ui.quadLabel->setText(outstr);
-        }
+        ui.quadLabel->setText(outstr);
         return;
     }
     if (stripVersionFromGitReply(reply->url().toString(),replystr,"apm2-hexa",(m_betaFirmwareChecked ? "beta" : "stable"),&outstr))
     {
-        if (m_betaFirmwareChecked)
-        {
-            ui.hexaLabel->setText("BETA " + outstr);
-        }
-        else
-        {
-            ui.hexaLabel->setText(outstr);
-        }
+        ui.hexaLabel->setText(outstr);
         return;
     }
     if (stripVersionFromGitReply(reply->url().toString(),replystr,"apm2-octa-quad",(m_betaFirmwareChecked ? "beta" : "stable"),&outstr))
     {
-        if (m_betaFirmwareChecked)
-        {
-            ui.octaQuadLabel->setText("BETA " + outstr);
-        }
-        else
-        {
-            ui.octaQuadLabel->setText(outstr);
-        }
+        ui.octaQuadLabel->setText(outstr);
         return;
     }
     if (stripVersionFromGitReply(reply->url().toString(),replystr,"apm2-octa",(m_betaFirmwareChecked ? "beta" : "stable"),&outstr))
     {
-        if (m_betaFirmwareChecked)
-        {
-            ui.octaLabel->setText("BETA " + outstr);
-        }
-        else
-        {
-            ui.octaLabel->setText(outstr);
-        }
+        ui.octaLabel->setText(outstr);
         return;
     }
     if (stripVersionFromGitReply(reply->url().toString(),replystr,"apm2-tri",(m_betaFirmwareChecked ? "beta" : "stable"),&outstr))
     {
-        if (m_betaFirmwareChecked)
-        {
-            ui.triLabel->setText("BETA " + outstr);
-        }
-        else
-        {
-            ui.triLabel->setText(outstr);
-        }
+        ui.triLabel->setText(outstr);
         return;
     }
     if (stripVersionFromGitReply(reply->url().toString(),replystr,"apm2-y6",(m_betaFirmwareChecked ? "beta" : "stable"),&outstr))
     {
-        if (m_betaFirmwareChecked)
-        {
-            ui.y6Label->setText("BETA " + outstr);
-        }
-        else
-        {
-            ui.y6Label->setText(outstr);
-        }
+        ui.y6Label->setText(outstr);
         return;
     }
     if (stripVersionFromGitReply(reply->url().toString(),replystr,"Plane",(m_betaFirmwareChecked ? "beta" : "stable"),&outstr))
     {
-        if (m_betaFirmwareChecked)
-        {
-            ui.planeLabel->setText("BETA " + outstr);
-        }
-        else
-        {
-            ui.planeLabel->setText(outstr);
-        }
+        ui.planeLabel->setText(outstr);
         return;
     }
     if (stripVersionFromGitReply(reply->url().toString(),replystr,"Rover",(m_betaFirmwareChecked ? "beta" : "stable"),&outstr))
     {
-        if (m_betaFirmwareChecked)
-        {
-            ui.roverLabel->setText("BETA " + outstr);
-        }
-        else
-        {
-            ui.roverLabel->setText(outstr);
-        }
+        ui.roverLabel->setText(outstr);
         return;
     }
     qDebug() << "Match not found for:" << reply->url();

src/ui/configuration/ApmFirmwareConfig.ui

@@ -447,9 +447,9 @@
   <widget class="QProgressBar" name="progressBar">
    <property name="geometry">
     <rect>
-     <x>50</x>
+     <x>30</x>
      <y>490</y>
-     <width>791</width>
+     <width>801</width>
      <height>23</height>
     </rect>
    </property>
@@ -460,9 +460,9 @@
   <widget class="QTextBrowser" name="textBrowser">
    <property name="geometry">
     <rect>
-     <x>60</x>
+     <x>30</x>
      <y>520</y>
-     <width>741</width>
+     <width>801</width>
      <height>151</height>
     </rect>
    </property>
@@ -503,7 +503,7 @@
     </rect>
    </property>
    <property name="text">
-    <string>&lt;h3&gt;&lt;font color=#FFAA00&gt;WARNING: Only install BETA firmware if you are an experienced tester.&lt;/font&gt;&lt;/h3&gt;</string>
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:large; font-weight:600; color:#e90000;&quot;&gt;WARNING:&lt;/span&gt;&lt;span style=&quot; font-size:large; font-weight:600; color:#ffaa00;&quot;&gt; Only install BETA firmware if you are an experienced tester.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
   </widget>
  </widget>