Commit c616ebf9 authored by pixhawk's avatar pixhawk

updated the looks of Onboard Waypoints window, when no UAV is present. Updated...

updated the looks of Onboard Waypoints window, when no UAV is present. Updated mission Save and Load to use version 120
parent 3d5d9f06
......@@ -451,7 +451,7 @@ void UASWaypointManager::saveWaypoints(const QString &saveFile)
QTextStream out(&file);
//write the waypoint list version to the first line for compatibility check
out << "QGC WPL 110\r\n";
out << "QGC WPL 120\r\n";
for (int i = 0; i < waypointsEditable.size(); i++)
{
......@@ -477,7 +477,7 @@ void UASWaypointManager::loadWaypoints(const QString &loadFile)
const QStringList &version = in.readLine().split(" ");
if (!(version.size() == 3 && version[0] == "QGC" && version[1] == "WPL" && version[2] == "110"))
if (!(version.size() == 3 && version[0] == "QGC" && version[1] == "WPL" && version[2] == "120"))
{
emit updateStatusString(tr("The waypoint file is not compatible with the current version of QGroundControl."));
}
......
......@@ -5,7 +5,7 @@ UnconnectedUASInfoWidget::UnconnectedUASInfoWidget(QWidget *parent) :
QGroupBox(parent),
ui(new Ui::UnconnectedUASInfoWidget)
{
ui->setupUi(this);
ui->setupUi(this);
}
UnconnectedUASInfoWidget::~UnconnectedUASInfoWidget()
......
......@@ -13,6 +13,9 @@
<property name="windowTitle">
<string/>
</property>
<property name="styleSheet">
<string notr="true">border:0;</string>
</property>
<property name="title">
<string/>
</property>
......@@ -45,7 +48,7 @@ p, li { white-space: pre-wrap; }
&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
&lt;tr&gt;
&lt;td style=&quot;border: none;&quot;&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:20pt; font-weight:600; color:#b5b5b5;&quot;&gt;NO UAS&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:20pt; font-weight:600; color:#b5b5b5;&quot;&gt;NO UAV&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment