From 5a8d202a8d85e94fe3e569b22076ad5766cd253a Mon Sep 17 00:00:00 2001
From: Bryant <bwmairs@ucsc.edu>
Date: Sun, 19 May 2013 01:21:23 -0700
Subject: [PATCH] Some .ui files still pointed to an old mavground.qrc file.
 They now point to the proper qgroundcontrol.qrc file.

---
 src/ui/AudioOutputWidget.ui |  4 ++--
 src/ui/DebugConsole.ui      |  6 +++---
 src/ui/OpalLinkSettings.ui  |  6 +++---
 src/ui/UASControl.ui        | 10 +++++-----
 src/ui/UASView.ui           | 18 +++++++++---------
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/ui/AudioOutputWidget.ui b/src/ui/AudioOutputWidget.ui
index 0a87bcab5..a6b221191 100644
--- a/src/ui/AudioOutputWidget.ui
+++ b/src/ui/AudioOutputWidget.ui
@@ -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 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../mavground.qrc"/>
+  <include location="../../qgroundcontrol.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/ui/DebugConsole.ui b/src/ui/DebugConsole.ui
index addd295e1..772427f5c 100644
--- a/src/ui/DebugConsole.ui
+++ b/src/ui/DebugConsole.ui
@@ -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 @@
         <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 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../mavground.qrc"/>
+  <include location="../../qgroundcontrol.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/ui/OpalLinkSettings.ui b/src/ui/OpalLinkSettings.ui
index 3d29f7d44..419dd0227 100644
--- a/src/ui/OpalLinkSettings.ui
+++ b/src/ui/OpalLinkSettings.ui
@@ -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 @@
       <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 @@
   </action>
  </widget>
  <resources>
-  <include location="../../mavground.qrc"/>
+  <include location="../../qgroundcontrol.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/ui/UASControl.ui b/src/ui/UASControl.ui
index d9c5d898e..70ad156a3 100644
--- a/src/ui/UASControl.ui
+++ b/src/ui/UASControl.ui
@@ -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 @@
         <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 @@
         <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 @@
       <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 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../mavground.qrc"/>
+  <include location="../../qgroundcontrol.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/ui/UASView.ui b/src/ui/UASView.ui
index 66f1b67f3..3c2269fde 100644
--- a/src/ui/UASView.ui
+++ b/src/ui/UASView.ui
@@ -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 {
            <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 {
            <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 {
            <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 {
            <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 {
            <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 {
            <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 {
            <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 {
   </layout>
  </widget>
  <resources>
-  <include location="../../mavground.qrc"/>
+  <include location="../../qgroundcontrol.qrc"/>
  </resources>
  <connections/>
 </ui>
-- 
2.22.0