mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-03-15 07:29:15 +01:00
Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into thread/OP-1222_FW_Wizard
This commit is contained in:
commit
4273f6a1fc
File diff suppressed because one or more lines are too long
Before Width: | Height: | Size: 173 KiB After Width: | Height: | Size: 181 KiB |
@ -31,7 +31,7 @@
|
||||
#include "uavobjectmanager.h"
|
||||
|
||||
const QString OutputCalibrationPage::MULTI_SVG_FILE = QString(":/setupwizard/resources/multirotor-shapes.svg");
|
||||
const QString OutputCalibrationPage::FIXEDWING_SVG_FILE = QString(":/setupwizard/resources/fixedwing-shapes.svg");
|
||||
const QString OutputCalibrationPage::FIXEDWING_SVG_FILE = QString(":/setupwizard/resources/fixedwing-shapes-wizard.svg");
|
||||
|
||||
OutputCalibrationPage::OutputCalibrationPage(SetupWizard *wizard, QWidget *parent) :
|
||||
AbstractWizardPage(wizard, parent), ui(new Ui::OutputCalibrationPage), m_vehicleBoundsItem(0),
|
||||
|
File diff suppressed because one or more lines are too long
Before Width: | Height: | Size: 270 KiB After Width: | Height: | Size: 274 KiB |
@ -35,8 +35,8 @@
|
||||
<file>resources/bttn-servo-standard-up.png</file>
|
||||
<file>resources/wizard.png</file>
|
||||
<file>resources/multirotor-shapes.svg</file>
|
||||
<file>resources/fixedwing-shapes-wizard.svg</file>
|
||||
<!-- these are different from the files in /config/images -->
|
||||
<file>resources/fixedwing-shapes.svg</file>
|
||||
<file>resources/bttn-illustration-down.png</file>
|
||||
<file>resources/bttn-illustration-up.png</file>
|
||||
<file>resources/bttn-save-down.png</file>
|
||||
|
Loading…
x
Reference in New Issue
Block a user