From 0b04216328658def3a6a7862d8a33c01fd85a1c2 Mon Sep 17 00:00:00 2001
From: bluebrother <bluebrother@a1c6a512-1295-4272-9138-f99709370657>
Date: Thu, 27 Mar 2008 23:39:49 +0000
Subject: [PATCH] Clean up double path in resource file.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16854 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/aboutbox.ui           |  4 +--
 rbutil/rbutilqt/browsedirtreefrm.ui   |  4 +--
 rbutil/rbutilqt/browseoffrm.ui        |  4 +--
 rbutil/rbutilqt/configure.cpp         |  8 +++---
 rbutil/rbutilqt/configurefrm.ui       | 30 +++++++++----------
 rbutil/rbutilqt/createvoicefrm.ui     |  6 ++--
 rbutil/rbutilqt/encexescfgfrm.ui      |  4 +--
 rbutil/rbutilqt/installfrm.ui         |  6 ++--
 rbutil/rbutilqt/installprogressfrm.ui |  2 +-
 rbutil/rbutilqt/installtalkfrm.ui     |  8 +++---
 rbutil/rbutilqt/installthemesfrm.ui   |  8 +++---
 rbutil/rbutilqt/progressloggergui.cpp | 12 ++++----
 rbutil/rbutilqt/rbspeexcfgfrm.ui      |  4 +--
 rbutil/rbutilqt/rbutilqt.qrc          |  2 +-
 rbutil/rbutilqt/rbutilqtfrm.ui        | 54 +++++++++++++++++------------------
 rbutil/rbutilqt/sapicfgfrm.ui         |  4 +--
 rbutil/rbutilqt/ttsexescfgfrm.ui      |  4 +--
 rbutil/rbutilqt/uninstallfrm.ui       |  6 ++--
 18 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/rbutil/rbutilqt/aboutbox.ui b/rbutil/rbutilqt/aboutbox.ui
index 6ef4ac801..9f8bc9aaa 100644
--- a/rbutil/rbutilqt/aboutbox.ui
+++ b/rbutil/rbutilqt/aboutbox.ui
@@ -13,7 +13,7 @@
    <string>About Rockbox Utility</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="rbutilqt.qrc" >:/icons/icons/rockbox-1.png</iconset>
+   <iconset resource="rbutilqt.qrc" >:/icons/rockbox-1.png</iconset>
   </property>
   <layout class="QGridLayout" >
    <item row="0" column="0" colspan="3" >
@@ -24,7 +24,7 @@
         <string/>
        </property>
        <property name="pixmap" >
-        <pixmap resource="rbutilqt.qrc" >:/icons/icons/rockbox-5.png</pixmap>
+        <pixmap resource="rbutilqt.qrc" >:/icons/rockbox-5.png</pixmap>
        </property>
       </widget>
      </item>
diff --git a/rbutil/rbutilqt/browsedirtreefrm.ui b/rbutil/rbutilqt/browsedirtreefrm.ui
index de95b4702..2b41115c5 100644
--- a/rbutil/rbutilqt/browsedirtreefrm.ui
+++ b/rbutil/rbutilqt/browsedirtreefrm.ui
@@ -47,7 +47,7 @@
         <string>&amp;Ok</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+        <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset>
        </property>
       </widget>
      </item>
@@ -57,7 +57,7 @@
         <string>&amp;Cancel</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+        <iconset resource="rbutilqt.qrc" >:/icons/process-stop.png</iconset>
        </property>
       </widget>
      </item>
diff --git a/rbutil/rbutilqt/browseoffrm.ui b/rbutil/rbutilqt/browseoffrm.ui
index 88f893370..bd4f1dd38 100644
--- a/rbutil/rbutilqt/browseoffrm.ui
+++ b/rbutil/rbutilqt/browseoffrm.ui
@@ -54,7 +54,7 @@
         <string>&amp;Ok</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+        <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset>
        </property>
       </widget>
      </item>
@@ -64,7 +64,7 @@
         <string>&amp;Cancel</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+        <iconset resource="rbutilqt.qrc" >:/icons/process-stop.png</iconset>
        </property>
       </widget>
      </item>
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index 25fc675ca..aad6f3202 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -320,12 +320,12 @@ void Config::updateTtsState(int index)
     if(tts->configOk())
     {
         ui.configTTSstatus->setText("Configuration OK");
-        ui.configTTSstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/icons/go-next.png")));
+        ui.configTTSstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/go-next.png")));
     }
     else
     {
         ui.configTTSstatus->setText("Configuration INVALID");
-        ui.configTTSstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/icons/dialog-error.png")));
+        ui.configTTSstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/dialog-error.png")));
     }
 }
 
@@ -338,12 +338,12 @@ void Config::updateEncState(int index)
     if(enc->configOk())
     {
         ui.configEncstatus->setText("Configuration OK");
-        ui.configEncstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/icons/go-next.png")));
+        ui.configEncstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/go-next.png")));
     }
     else
     {
         ui.configEncstatus->setText("Configuration INVALID");
-        ui.configEncstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/icons/dialog-error.png")));
+        ui.configEncstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/dialog-error.png")));
     }        
 }
 
diff --git a/rbutil/rbutilqt/configurefrm.ui b/rbutil/rbutilqt/configurefrm.ui
index d6d13f6d6..4c2d3c9b6 100644
--- a/rbutil/rbutilqt/configurefrm.ui
+++ b/rbutil/rbutilqt/configurefrm.ui
@@ -30,7 +30,7 @@
        <string>&amp;Device</string>
       </attribute>
       <attribute name="icon" >
-       <iconset resource="rbutilqt.qrc" >:/icons/icons/rbutil.png</iconset>
+       <iconset resource="rbutilqt.qrc" >:/icons/rbutil.png</iconset>
       </attribute>
       <layout class="QGridLayout" >
        <item row="0" column="0" >
@@ -54,7 +54,7 @@
             <string>&amp;Browse</string>
            </property>
            <property name="icon" >
-            <iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset>
+            <iconset resource="rbutilqt.qrc" >:/icons/system-search.png</iconset>
            </property>
           </widget>
          </item>
@@ -98,7 +98,7 @@
           <string>&amp;Autodetect</string>
          </property>
          <property name="icon" >
-          <iconset resource="rbutilqt.qrc" >:/icons/icons/edit-find.png</iconset>
+          <iconset resource="rbutilqt.qrc" >:/icons/edit-find.png</iconset>
          </property>
         </widget>
        </item>
@@ -109,7 +109,7 @@
        <string>&amp;Proxy</string>
       </attribute>
       <attribute name="icon" >
-       <iconset resource="rbutilqt.qrc" >:/icons/icons/network-idle.png</iconset>
+       <iconset resource="rbutilqt.qrc" >:/icons/network-idle.png</iconset>
       </attribute>
       <layout class="QGridLayout" >
        <item row="0" column="0" >
@@ -225,7 +225,7 @@
        <string>&amp;Language</string>
       </attribute>
       <attribute name="icon" >
-       <iconset resource="rbutilqt.qrc" >:/icons/icons/preferences-desktop-locale.png</iconset>
+       <iconset resource="rbutilqt.qrc" >:/icons/preferences-desktop-locale.png</iconset>
       </attribute>
       <layout class="QGridLayout" >
        <item row="0" column="0" >
@@ -238,7 +238,7 @@
        <string>Cac&amp;he</string>
       </attribute>
       <attribute name="icon" >
-       <iconset resource="rbutilqt.qrc" >:/icons/icons/package-x-generic.png</iconset>
+       <iconset resource="rbutilqt.qrc" >:/icons/package-x-generic.png</iconset>
       </attribute>
       <attribute name="toolTip" >
        <string>Download cache settings</string>
@@ -286,7 +286,7 @@
             <string>&amp;Browse</string>
            </property>
            <property name="icon" >
-            <iconset resource="rbutilqt.qrc" >:/icons/icons/edit-find.png</iconset>
+            <iconset resource="rbutilqt.qrc" >:/icons/edit-find.png</iconset>
            </property>
           </widget>
          </item>
@@ -345,7 +345,7 @@
           <string>Clean cache &amp;now</string>
          </property>
          <property name="icon" >
-          <iconset resource="rbutilqt.qrc" >:/icons/icons/user-trash-full.png</iconset>
+          <iconset resource="rbutilqt.qrc" >:/icons/user-trash-full.png</iconset>
          </property>
         </widget>
        </item>
@@ -356,7 +356,7 @@
        <string>&amp;TTS &amp;&amp; Encoder</string>
       </attribute>
       <attribute name="icon" >
-       <iconset resource="rbutilqt.qrc" >:/icons/icons/audio-input-microphone.png</iconset>
+       <iconset resource="rbutilqt.qrc" >:/icons/audio-input-microphone.png</iconset>
       </attribute>
       <layout class="QVBoxLayout" >
        <item>
@@ -398,7 +398,7 @@
              <string/>
             </property>
             <property name="pixmap" >
-             <pixmap resource="rbutilqt.qrc" >:/icons/icons/dialog-error.png</pixmap>
+             <pixmap resource="rbutilqt.qrc" >:/icons/dialog-error.png</pixmap>
             </property>
            </widget>
           </item>
@@ -408,7 +408,7 @@
              <string>Configure &amp;TTS</string>
             </property>
             <property name="icon" >
-             <iconset resource="rbutilqt.qrc" >:/icons/icons/edit-find.png</iconset>
+             <iconset resource="rbutilqt.qrc" >:/icons/edit-find.png</iconset>
             </property>
            </widget>
           </item>
@@ -454,7 +454,7 @@
              <string/>
             </property>
             <property name="pixmap" >
-             <pixmap resource="rbutilqt.qrc" >:/icons/icons/dialog-error.png</pixmap>
+             <pixmap resource="rbutilqt.qrc" >:/icons/dialog-error.png</pixmap>
             </property>
            </widget>
           </item>
@@ -464,7 +464,7 @@
              <string> Configure &amp;Enc</string>
             </property>
             <property name="icon" >
-             <iconset resource="rbutilqt.qrc" >:/icons/icons/edit-find.png</iconset>
+             <iconset resource="rbutilqt.qrc" >:/icons/edit-find.png</iconset>
             </property>
            </widget>
           </item>
@@ -507,7 +507,7 @@
       <string>&amp;Ok</string>
      </property>
      <property name="icon" >
-      <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+      <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset>
      </property>
     </widget>
    </item>
@@ -517,7 +517,7 @@
       <string>&amp;Cancel</string>
      </property>
      <property name="icon" >
-      <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+      <iconset resource="rbutilqt.qrc" >:/icons/process-stop.png</iconset>
      </property>
     </widget>
    </item>
diff --git a/rbutil/rbutilqt/createvoicefrm.ui b/rbutil/rbutilqt/createvoicefrm.ui
index c79478f1a..17926eda9 100644
--- a/rbutil/rbutilqt/createvoicefrm.ui
+++ b/rbutil/rbutilqt/createvoicefrm.ui
@@ -22,7 +22,7 @@
       <string/>
      </property>
      <property name="pixmap" >
-      <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap>
+      <pixmap resource="rbutilqt.qrc" >:/icons/wizard.xpm</pixmap>
      </property>
      <property name="alignment" >
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -128,7 +128,7 @@
         <string>&amp;Install</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+        <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset>
        </property>
       </widget>
      </item>
@@ -138,7 +138,7 @@
         <string>&amp;Cancel</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+        <iconset resource="rbutilqt.qrc" >:/icons/process-stop.png</iconset>
        </property>
       </widget>
      </item>
diff --git a/rbutil/rbutilqt/encexescfgfrm.ui b/rbutil/rbutilqt/encexescfgfrm.ui
index 22c61e15f..c1b8e3142 100644
--- a/rbutil/rbutilqt/encexescfgfrm.ui
+++ b/rbutil/rbutilqt/encexescfgfrm.ui
@@ -97,7 +97,7 @@
            <string>&amp;Ok</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset>
           </property>
          </widget>
         </item>
@@ -107,7 +107,7 @@
            <string>&amp;Cancel</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/process-stop.png</iconset>
           </property>
          </widget>
         </item>
diff --git a/rbutil/rbutilqt/installfrm.ui b/rbutil/rbutilqt/installfrm.ui
index 26ce449ed..f46e8ae69 100644
--- a/rbutil/rbutilqt/installfrm.ui
+++ b/rbutil/rbutilqt/installfrm.ui
@@ -22,7 +22,7 @@
       <string/>
      </property>
      <property name="pixmap" >
-      <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap>
+      <pixmap resource="rbutilqt.qrc" >:/icons/wizard.xpm</pixmap>
      </property>
      <property name="alignment" >
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -142,7 +142,7 @@
         <string>&amp;Install</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+        <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset>
        </property>
       </widget>
      </item>
@@ -152,7 +152,7 @@
         <string>&amp;Cancel</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+        <iconset resource="rbutilqt.qrc" >:/icons/process-stop.png</iconset>
        </property>
       </widget>
      </item>
diff --git a/rbutil/rbutilqt/installprogressfrm.ui b/rbutil/rbutilqt/installprogressfrm.ui
index 6ad7f9f9f..92b9a33ed 100644
--- a/rbutil/rbutilqt/installprogressfrm.ui
+++ b/rbutil/rbutilqt/installprogressfrm.ui
@@ -56,7 +56,7 @@
       <string>&amp;Abort</string>
      </property>
      <property name="icon" >
-      <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+      <iconset resource="rbutilqt.qrc" >:/icons/process-stop.png</iconset>
      </property>
     </widget>
    </item>
diff --git a/rbutil/rbutilqt/installtalkfrm.ui b/rbutil/rbutilqt/installtalkfrm.ui
index 970bcb21b..5a899f8c7 100644
--- a/rbutil/rbutilqt/installtalkfrm.ui
+++ b/rbutil/rbutilqt/installtalkfrm.ui
@@ -22,7 +22,7 @@
       <string/>
      </property>
      <property name="pixmap" >
-      <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap>
+      <pixmap resource="rbutilqt.qrc" >:/icons/wizard.xpm</pixmap>
      </property>
      <property name="alignment" >
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -45,7 +45,7 @@
       <string>&amp;Browse</string>
      </property>
      <property name="icon" >
-      <iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset>
+      <iconset resource="rbutilqt.qrc" >:/icons/system-search.png</iconset>
      </property>
     </widget>
    </item>
@@ -214,7 +214,7 @@
         <string>&amp;Install</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+        <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset>
        </property>
       </widget>
      </item>
@@ -224,7 +224,7 @@
         <string>&amp;Cancel</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+        <iconset resource="rbutilqt.qrc" >:/icons/process-stop.png</iconset>
        </property>
       </widget>
      </item>
diff --git a/rbutil/rbutilqt/installthemesfrm.ui b/rbutil/rbutilqt/installthemesfrm.ui
index c11f4f10f..c67f2c6ca 100644
--- a/rbutil/rbutilqt/installthemesfrm.ui
+++ b/rbutil/rbutilqt/installthemesfrm.ui
@@ -19,7 +19,7 @@
       <string/>
      </property>
      <property name="pixmap" >
-      <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap>
+      <pixmap resource="rbutilqt.qrc" >:/icons/wizard.xpm</pixmap>
      </property>
      <property name="alignment" >
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -108,7 +108,7 @@
         <string>&amp;Install</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+        <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset>
        </property>
       </widget>
      </item>
@@ -118,7 +118,7 @@
         <string>Install &amp;All</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+        <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset>
        </property>
       </widget>
      </item>
@@ -128,7 +128,7 @@
         <string>&amp;Cancel</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+        <iconset resource="rbutilqt.qrc" >:/icons/process-stop.png</iconset>
        </property>
       </widget>
      </item>
diff --git a/rbutil/rbutilqt/progressloggergui.cpp b/rbutil/rbutilqt/progressloggergui.cpp
index 0d3fcb418..b66ec89a2 100644
--- a/rbutil/rbutilqt/progressloggergui.cpp
+++ b/rbutil/rbutilqt/progressloggergui.cpp
@@ -42,16 +42,16 @@ void ProgressLoggerGui::addItem(const QString &text, int flag)
         case LOGNOICON:
             break;
         case LOGOK:
-            item->setIcon(QIcon(":/icons/icons/go-next.png"));
+            item->setIcon(QIcon(":/icons/go-next.png"));
             break;
         case LOGINFO:
-            item->setIcon(QIcon(":/icons/icons/dialog-information.png"));
+            item->setIcon(QIcon(":/icons/dialog-information.png"));
             break;
         case LOGWARNING:
-            item->setIcon(QIcon(":/icons/icons/dialog-warning.png"));
+            item->setIcon(QIcon(":/icons/dialog-warning.png"));
             break;
         case LOGERROR:
-            item->setIcon(QIcon(":/icons/icons/dialog-error.png"));
+            item->setIcon(QIcon(":/icons/dialog-error.png"));
             break;
     }
 
@@ -77,7 +77,7 @@ int ProgressLoggerGui::getProgressMax()
 void ProgressLoggerGui::abort()
 {
     dp.buttonAbort->setText(tr("&Ok"));
-    dp.buttonAbort->setIcon(QIcon(QString::fromUtf8(":/icons/icons/go-next.png")));
+    dp.buttonAbort->setIcon(QIcon(QString::fromUtf8(":/icons/go-next.png")));
     disconnect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(abort()));
     connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close()));
     connect(dp.buttonAbort, SIGNAL(clicked()), this, SIGNAL(closed()));
@@ -87,7 +87,7 @@ void ProgressLoggerGui::abort()
 void ProgressLoggerGui::undoAbort()
 {
     dp.buttonAbort->setText(tr("&Abort"));
-    dp.buttonAbort->setIcon(QIcon(QString::fromUtf8(":/icons/icons/process-stop.png")));
+    dp.buttonAbort->setIcon(QIcon(QString::fromUtf8(":/icons/process-stop.png")));
     connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(abort()));
 }
 
diff --git a/rbutil/rbutilqt/rbspeexcfgfrm.ui b/rbutil/rbutilqt/rbspeexcfgfrm.ui
index d7f6c4801..0134817fe 100644
--- a/rbutil/rbutilqt/rbspeexcfgfrm.ui
+++ b/rbutil/rbutilqt/rbspeexcfgfrm.ui
@@ -115,7 +115,7 @@
       <string>&amp;Ok</string>
      </property>
      <property name="icon" >
-      <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+      <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset>
      </property>
     </widget>
    </item>
@@ -125,7 +125,7 @@
       <string>&amp;Cancel</string>
      </property>
      <property name="icon" >
-      <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+      <iconset resource="rbutilqt.qrc" >:/icons/process-stop.png</iconset>
      </property>
     </widget>
    </item>
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc
index 3f544291f..694836c78 100644
--- a/rbutil/rbutilqt/rbutilqt.qrc
+++ b/rbutil/rbutilqt/rbutilqt.qrc
@@ -6,7 +6,7 @@
      <qresource>
         <file alias="builtin/VOICE_PAUSE.wav">../../tools/VOICE_PAUSE.wav</file>
     </qresource>
-    <qresource prefix="/icons" >
+    <qresource prefix="/" >
         <file>icons/audio-input-microphone.png</file>
         <file>icons/bootloader_btn.png</file>
         <file>icons/dialog-error.png</file>
diff --git a/rbutil/rbutilqt/rbutilqtfrm.ui b/rbutil/rbutilqt/rbutilqtfrm.ui
index de7106281..158b5773f 100644
--- a/rbutil/rbutilqt/rbutilqtfrm.ui
+++ b/rbutil/rbutilqt/rbutilqtfrm.ui
@@ -13,7 +13,7 @@
    <string>Rockbox Utility</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="rbutilqt.qrc" >:/icons/icons/rockbox-1.png</iconset>
+   <iconset resource="rbutilqt.qrc" >:/icons/rockbox-1.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget" >
    <layout class="QGridLayout" >
@@ -53,7 +53,7 @@
          <string comment="Welcome to Rockbox Utility, the installation and housekeeping tool for Rockbox." />
         </property>
         <property name="pixmap" >
-         <pixmap resource="rbutilqt.qrc" >:/icons/icons/rblogo.png</pixmap>
+         <pixmap resource="rbutilqt.qrc" >:/icons/rblogo.png</pixmap>
         </property>
        </widget>
       </item>
@@ -120,7 +120,7 @@ p, li { white-space: pre-wrap; }
           <string>&amp;Change</string>
          </property>
          <property name="icon" >
-          <iconset resource="rbutilqt.qrc" >:/icons/icons/edit-find.png</iconset>
+          <iconset resource="rbutilqt.qrc" >:/icons/edit-find.png</iconset>
          </property>
         </widget>
        </item>
@@ -146,7 +146,7 @@ p, li { white-space: pre-wrap; }
            <string>Complete Installation</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/bootloader_btn.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/bootloader_btn.png</iconset>
           </property>
           <property name="iconSize" >
            <size>
@@ -176,7 +176,7 @@ p, li { white-space: pre-wrap; }
            <string>Small Installation</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/rbinstall_btn.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/rbinstall_btn.png</iconset>
           </property>
           <property name="iconSize" >
            <size>
@@ -245,7 +245,7 @@ p, li { white-space: pre-wrap; }
            <string>Install Bootloader</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/bootloader_btn.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/bootloader_btn.png</iconset>
           </property>
           <property name="iconSize" >
            <size>
@@ -278,7 +278,7 @@ p, li { white-space: pre-wrap; }
            <string>Install Rockbox</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/rbinstall_btn.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/rbinstall_btn.png</iconset>
           </property>
           <property name="iconSize" >
            <size>
@@ -349,7 +349,7 @@ p, li { white-space: pre-wrap; }
            <string>Install Fonts package</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/font_btn.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/font_btn.png</iconset>
           </property>
           <property name="iconSize" >
            <size>
@@ -379,7 +379,7 @@ p, li { white-space: pre-wrap; }
            <string>Install themes</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/themes_btn.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/themes_btn.png</iconset>
           </property>
           <property name="iconSize" >
            <size>
@@ -409,7 +409,7 @@ p, li { white-space: pre-wrap; }
            <string>Install game files</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/doom_btn.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/doom_btn.png</iconset>
           </property>
           <property name="iconSize" >
            <size>
@@ -475,7 +475,7 @@ p, li { white-space: pre-wrap; }
            <string>Install Voice files</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/talkfile_btn.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/talkfile_btn.png</iconset>
           </property>
           <property name="iconSize" >
            <size>
@@ -505,7 +505,7 @@ p, li { white-space: pre-wrap; }
            <string>Install Talk files</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/talkfile_btn.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/talkfile_btn.png</iconset>
           </property>
           <property name="iconSize" >
            <size>
@@ -558,7 +558,7 @@ p, li { white-space: pre-wrap; }
            <string>Create Voice files</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/talkfile_btn.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/talkfile_btn.png</iconset>
           </property>
           <property name="iconSize" >
            <size>
@@ -596,7 +596,7 @@ p, li { white-space: pre-wrap; }
            <string>Uninstall Bootloader</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/rembootloader_btn.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/rembootloader_btn.png</iconset>
           </property>
           <property name="iconSize" >
            <size>
@@ -626,7 +626,7 @@ p, li { white-space: pre-wrap; }
            <string>Uninstall Rockbox</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/remrb_btn.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/remrb_btn.png</iconset>
           </property>
           <property name="iconSize" >
            <size>
@@ -947,7 +947,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionComplete_Installation" >
    <property name="icon" >
-    <iconset resource="rbutilqt.qrc" >:/icons/icons/bootloader_btn.png</iconset>
+    <iconset resource="rbutilqt.qrc" >:/icons/bootloader_btn.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Complete Installation</string>
@@ -955,7 +955,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionSmall_Installation" >
    <property name="icon" >
-    <iconset resource="rbutilqt.qrc" >:/icons/icons/rbinstall_btn.png</iconset>
+    <iconset resource="rbutilqt.qrc" >:/icons/rbinstall_btn.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Small Installation</string>
@@ -963,7 +963,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionInstall_Bootloader" >
    <property name="icon" >
-    <iconset resource="rbutilqt.qrc" >:/icons/icons/bootloader_btn.png</iconset>
+    <iconset resource="rbutilqt.qrc" >:/icons/bootloader_btn.png</iconset>
    </property>
    <property name="text" >
     <string>Install &amp;Bootloader</string>
@@ -971,7 +971,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionInstall_Rockbox" >
    <property name="icon" >
-    <iconset resource="rbutilqt.qrc" >:/icons/icons/rbinstall_btn.png</iconset>
+    <iconset resource="rbutilqt.qrc" >:/icons/rbinstall_btn.png</iconset>
    </property>
    <property name="text" >
     <string>Install &amp;Rockbox</string>
@@ -979,7 +979,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionFonts_Package" >
    <property name="icon" >
-    <iconset resource="rbutilqt.qrc" >:/icons/icons/font_btn.png</iconset>
+    <iconset resource="rbutilqt.qrc" >:/icons/font_btn.png</iconset>
    </property>
    <property name="text" >
     <string>Install &amp;Fonts Package</string>
@@ -987,7 +987,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionInstall_Themes" >
    <property name="icon" >
-    <iconset resource="rbutilqt.qrc" >:/icons/icons/themes_btn.png</iconset>
+    <iconset resource="rbutilqt.qrc" >:/icons/themes_btn.png</iconset>
    </property>
    <property name="text" >
     <string>Install &amp;Themes</string>
@@ -995,7 +995,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionInstall_Game_Files" >
    <property name="icon" >
-    <iconset resource="rbutilqt.qrc" >:/icons/icons/doom_btn.png</iconset>
+    <iconset resource="rbutilqt.qrc" >:/icons/doom_btn.png</iconset>
    </property>
    <property name="text" >
     <string>Install &amp;Game Files</string>
@@ -1003,7 +1003,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionInstall_Voice_File" >
    <property name="icon" >
-    <iconset resource="rbutilqt.qrc" >:/icons/icons/talkfile_btn.png</iconset>
+    <iconset resource="rbutilqt.qrc" >:/icons/talkfile_btn.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Install Voice File</string>
@@ -1011,7 +1011,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionCreate_Talk_Files" >
    <property name="icon" >
-    <iconset resource="rbutilqt.qrc" >:/icons/icons/talkfile_btn.png</iconset>
+    <iconset resource="rbutilqt.qrc" >:/icons/talkfile_btn.png</iconset>
    </property>
    <property name="text" >
     <string>Create &amp;Talk Files</string>
@@ -1019,7 +1019,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionRemove_bootloader" >
    <property name="icon" >
-    <iconset resource="rbutilqt.qrc" >:/icons/icons/rembootloader_btn.png</iconset>
+    <iconset resource="rbutilqt.qrc" >:/icons/rembootloader_btn.png</iconset>
    </property>
    <property name="text" >
     <string>Remove &amp;bootloader</string>
@@ -1027,7 +1027,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionUninstall_Rockbox" >
    <property name="icon" >
-    <iconset resource="rbutilqt.qrc" >:/icons/icons/remrb_btn.png</iconset>
+    <iconset resource="rbutilqt.qrc" >:/icons/remrb_btn.png</iconset>
    </property>
    <property name="text" >
     <string>Uninstall &amp;Rockbox</string>
@@ -1055,7 +1055,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionCreate_Voice_File" >
    <property name="icon" >
-    <iconset resource="rbutilqt.qrc" >:/icons/icons/talkfile_btn.png</iconset>
+    <iconset resource="rbutilqt.qrc" >:/icons/talkfile_btn.png</iconset>
    </property>
    <property name="text" >
     <string>Create &amp;Voice File</string>
diff --git a/rbutil/rbutilqt/sapicfgfrm.ui b/rbutil/rbutilqt/sapicfgfrm.ui
index 955fcdd73..4d77c51ea 100644
--- a/rbutil/rbutilqt/sapicfgfrm.ui
+++ b/rbutil/rbutilqt/sapicfgfrm.ui
@@ -107,7 +107,7 @@
            <string>&amp;Ok</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset>
           </property>
          </widget>
         </item>
@@ -117,7 +117,7 @@
            <string>&amp;Cancel</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/process-stop.png</iconset>
           </property>
          </widget>
         </item>
diff --git a/rbutil/rbutilqt/ttsexescfgfrm.ui b/rbutil/rbutilqt/ttsexescfgfrm.ui
index 8893d9ccf..a8df51c84 100644
--- a/rbutil/rbutilqt/ttsexescfgfrm.ui
+++ b/rbutil/rbutilqt/ttsexescfgfrm.ui
@@ -97,7 +97,7 @@
            <string>&amp;Ok</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset>
           </property>
          </widget>
         </item>
@@ -107,7 +107,7 @@
            <string>&amp;Cancel</string>
           </property>
           <property name="icon" >
-           <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+           <iconset resource="rbutilqt.qrc" >:/icons/process-stop.png</iconset>
           </property>
          </widget>
         </item>
diff --git a/rbutil/rbutilqt/uninstallfrm.ui b/rbutil/rbutilqt/uninstallfrm.ui
index ac7860945..0189778c1 100644
--- a/rbutil/rbutilqt/uninstallfrm.ui
+++ b/rbutil/rbutilqt/uninstallfrm.ui
@@ -22,7 +22,7 @@
       <string/>
      </property>
      <property name="pixmap" >
-      <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap>
+      <pixmap resource="rbutilqt.qrc" >:/icons/wizard.xpm</pixmap>
      </property>
      <property name="alignment" >
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -128,7 +128,7 @@
         <string>&amp;Uninstall</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+        <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset>
        </property>
       </widget>
      </item>
@@ -138,7 +138,7 @@
         <string>&amp;Cancel</string>
        </property>
        <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+        <iconset resource="rbutilqt.qrc" >:/icons/process-stop.png</iconset>
        </property>
       </widget>
      </item>
-- 
2.11.4.GIT