Skip to content

Commit 371760d

Browse files
f5sohfilnet
authored andcommitted
Merged in f5soh/librepilot/LP-559_Artwork_for_boards (pull request #477)
LP-559 Artwork for boards Approved-by: Lalanne Laurent <f5soh@free.fr> Approved-by: Philippe Renon <philippe_renon@yahoo.fr>
2 parents dc012a1 + 0ab5e46 commit 371760d

30 files changed

Lines changed: 39713 additions & 1016 deletions

ground/gcs/src/plugins/config/cc_hw_settings.ui

Lines changed: 37 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -290,11 +290,15 @@
290290
</item>
291291
<item row="2" column="1">
292292
<layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0,0">
293-
<item row="4" column="0">
294-
<widget class="QComboBox" name="cbFlexi"/>
295-
</item>
296-
<item row="6" column="0">
297-
<widget class="QComboBox" name="cbTele"/>
293+
<item row="1" column="1" colspan="2" alignment="Qt::AlignLeft">
294+
<widget class="QLabel" name="label_7">
295+
<property name="text">
296+
<string>Receiver Port</string>
297+
</property>
298+
<property name="alignment">
299+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
300+
</property>
301+
</widget>
298302
</item>
299303
<item row="3" column="3">
300304
<widget class="QLabel" name="label_8">
@@ -306,10 +310,16 @@
306310
</property>
307311
</widget>
308312
</item>
309-
<item row="7" column="0">
310-
<widget class="QLabel" name="label_4">
313+
<item row="6" column="3">
314+
<widget class="QComboBox" name="cbUsbVcp"/>
315+
</item>
316+
<item row="3" column="0">
317+
<widget class="QLabel" name="label_5">
311318
<property name="text">
312-
<string/>
319+
<string>Flexi Port</string>
320+
</property>
321+
<property name="alignment">
322+
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
313323
</property>
314324
</widget>
315325
</item>
@@ -323,15 +333,14 @@
323333
</property>
324334
</widget>
325335
</item>
336+
<item row="6" column="0">
337+
<widget class="QComboBox" name="cbTele"/>
338+
</item>
339+
<item row="2" column="1" colspan="2" alignment="Qt::AlignLeft">
340+
<widget class="QComboBox" name="cbRcvr"/>
341+
</item>
326342
<item row="3" column="1" rowspan="5" colspan="2">
327-
<widget class="QLabel" name="label_2">
328-
<property name="text">
329-
<string/>
330-
</property>
331-
<property name="scaledContents">
332-
<bool>false</bool>
333-
</property>
334-
</widget>
343+
<widget class="QSvgWidget" name="boardImg" native="true"/>
335344
</item>
336345
<item row="5" column="0">
337346
<widget class="QLabel" name="label_3">
@@ -343,45 +352,16 @@
343352
</property>
344353
</widget>
345354
</item>
346-
<item row="3" column="0">
347-
<widget class="QLabel" name="label_5">
348-
<property name="text">
349-
<string>Flexi Port</string>
350-
</property>
351-
<property name="alignment">
352-
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
353-
</property>
354-
</widget>
355-
</item>
356355
<item row="4" column="3">
357356
<widget class="QComboBox" name="cbUsbHid"/>
358357
</item>
359-
<item row="4" column="4">
360-
<spacer name="horizontalSpacer_2">
361-
<property name="orientation">
362-
<enum>Qt::Horizontal</enum>
363-
</property>
364-
<property name="sizeHint" stdset="0">
365-
<size>
366-
<width>40</width>
367-
<height>20</height>
368-
</size>
369-
</property>
370-
</spacer>
371-
</item>
372-
<item row="6" column="3">
373-
<widget class="QComboBox" name="cbUsbVcp"/>
374-
</item>
375-
<item row="2" column="1" colspan="2" alignment="Qt::AlignLeft">
376-
<widget class="QComboBox" name="cbRcvr"/>
358+
<item row="4" column="0">
359+
<widget class="QComboBox" name="cbFlexi"/>
377360
</item>
378-
<item row="1" column="1" colspan="2" alignment="Qt::AlignLeft">
379-
<widget class="QLabel" name="label_7">
361+
<item row="7" column="0">
362+
<widget class="QLabel" name="label_4">
380363
<property name="text">
381-
<string>Receiver Port</string>
382-
</property>
383-
<property name="alignment">
384-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
364+
<string/>
385365
</property>
386366
</widget>
387367
</item>
@@ -640,6 +620,13 @@ Beware of not locking yourself out!</string>
640620
</item>
641621
</layout>
642622
</widget>
623+
<customwidgets>
624+
<customwidget>
625+
<class>QSvgWidget</class>
626+
<extends>QWidget</extends>
627+
<header>qsvgwidget.h</header>
628+
</customwidget>
629+
</customwidgets>
643630
<resources>
644631
<include location="../coreplugin/core.qrc"/>
645632
</resources>

0 commit comments

Comments
 (0)