zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Some .ui files still pointed to an old mavground.qrc file. They now point to the proper qgroundcontrol.qrc file.

QGC4.4
Bryant 12 years ago
parent
1dedf29750
commit
5a8d202a8d
5 changed files with 22 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/ui/AudioOutputWidget.ui
  2. 6
      src/ui/DebugConsole.ui
  3. 6
      src/ui/OpalLinkSettings.ui
  4. 10
      src/ui/UASControl.ui
  5. 18
      src/ui/UASView.ui

4
src/ui/AudioOutputWidget.ui
Unescape View File

@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
<string>Mute</string>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/status/audio-volume-muted.svg</normaloff>:/files/images/status/audio-volume-muted.svg</iconset>
</property>
<property name="iconSize">
@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
</layout>
</widget>
<resources>
<include location="../../mavground.qrc"/>
<include location="../../qgroundcontrol.qrc"/>
</resources>
<connections/>
</ui>

6
src/ui/DebugConsole.ui
Unescape View File

@ -200,7 +200,7 @@ @@ -200,7 +200,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/actions/list-add.svg</normaloff>:/files/images/actions/list-add.svg</iconset>
</property>
</widget>
@ -224,7 +224,7 @@ @@ -224,7 +224,7 @@
<string>Send</string>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/devices/network-wireless.svg</normaloff>:/files/images/devices/network-wireless.svg</iconset>
</property>
</widget>
@ -287,7 +287,7 @@ @@ -287,7 +287,7 @@
</layout>
</widget>
<resources>
<include location="../../mavground.qrc"/>
<include location="../../qgroundcontrol.qrc"/>
</resources>
<connections>
<connection>

6
src/ui/OpalLinkSettings.ui
Unescape View File

@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
<string>Change</string>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/status/folder-open.svg</normaloff>:/files/images/status/folder-open.svg</iconset>
</property>
</widget>
@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
<string>Change</string>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/status/folder-open.svg</normaloff>:/files/images/status/folder-open.svg</iconset>
</property>
</widget>
@ -150,7 +150,7 @@ @@ -150,7 +150,7 @@
</action>
</widget>
<resources>
<include location="../../mavground.qrc"/>
<include location="../../qgroundcontrol.qrc"/>
</resources>
<connections>
<connection>

10
src/ui/UASControl.ui
Unescape View File

@ -112,7 +112,7 @@ @@ -112,7 +112,7 @@
<string>Start</string>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/control/launch.svg</normaloff>:/files/images/control/launch.svg</iconset>
</property>
</widget>
@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
<string>Land</string>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/control/land.svg</normaloff>:/files/images/control/land.svg</iconset>
</property>
</widget>
@ -158,7 +158,7 @@ @@ -158,7 +158,7 @@
<string>Halt</string>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/actions/system-log-out.svg</normaloff>:/files/images/actions/system-log-out.svg</iconset>
</property>
</widget>
@ -199,7 +199,7 @@ @@ -199,7 +199,7 @@
<string>Set</string>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/devices/network-wireless.svg</normaloff>:/files/images/devices/network-wireless.svg</iconset>
</property>
</widget>
@ -274,7 +274,7 @@ @@ -274,7 +274,7 @@
</layout>
</widget>
<resources>
<include location="../../mavground.qrc"/>
<include location="../../qgroundcontrol.qrc"/>
</resources>
<connections/>
</ui>

18
src/ui/UASView.ui
Unescape View File

@ -315,7 +315,7 @@ QMenu::separator { @@ -315,7 +315,7 @@ QMenu::separator {
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/mavs/unknown.svg</normaloff>:/files/images/mavs/unknown.svg</iconset>
</property>
<property name="iconSize">
@ -647,7 +647,7 @@ QMenu::separator { @@ -647,7 +647,7 @@ QMenu::separator {
<string/>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/control/launch.svg</normaloff>:/files/images/control/launch.svg</iconset>
</property>
</widget>
@ -676,7 +676,7 @@ QMenu::separator { @@ -676,7 +676,7 @@ QMenu::separator {
<string/>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/actions/media-playback-pause.svg</normaloff>:/files/images/actions/media-playback-pause.svg</iconset>
</property>
</widget>
@ -705,7 +705,7 @@ QMenu::separator { @@ -705,7 +705,7 @@ QMenu::separator {
<string/>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/actions/media-playback-start.svg</normaloff>:/files/images/actions/media-playback-start.svg</iconset>
</property>
</widget>
@ -734,7 +734,7 @@ QMenu::separator { @@ -734,7 +734,7 @@ QMenu::separator {
<string/>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/control/land.svg</normaloff>:/files/images/control/land.svg</iconset>
</property>
</widget>
@ -757,7 +757,7 @@ QMenu::separator { @@ -757,7 +757,7 @@ QMenu::separator {
<string/>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/actions/system-log-out.svg</normaloff>:/files/images/actions/system-log-out.svg</iconset>
</property>
</widget>
@ -792,7 +792,7 @@ QMenu::separator { @@ -792,7 +792,7 @@ QMenu::separator {
<string/>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/actions/media-playback-stop.svg</normaloff>:/files/images/actions/media-playback-stop.svg</iconset>
</property>
</widget>
@ -821,7 +821,7 @@ QMenu::separator { @@ -821,7 +821,7 @@ QMenu::separator {
<string/>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/actions/process-stop.svg</normaloff>:/files/images/actions/process-stop.svg</iconset>
</property>
</widget>
@ -890,7 +890,7 @@ QMenu::separator { @@ -890,7 +890,7 @@ QMenu::separator {
</layout>
</widget>
<resources>
<include location="../../mavground.qrc"/>
<include location="../../qgroundcontrol.qrc"/>
</resources>
<connections/>
</ui>

Write Preview
Loading…
Cancel
Save