From 100c3f8da40658161255f9307db6cd4332caff11 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 11 Apr 2014 11:59:23 -0700
Subject: [PATCH] Modify UIs that were using the qrc

---
 interface/CMakeLists.txt                  |  5 -----
 interface/src/ui/RunningScriptsWidget.cpp |  2 +-
 interface/ui/chatWindow.ui                |  8 +++-----
 interface/ui/runningScriptsWidget.ui      | 16 +++++++---------
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 29943eb4cb..4e58d898af 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -74,11 +74,6 @@ file (GLOB_RECURSE QT_UI_FILES ui/*.ui)
 # have qt5 wrap them and generate the appropriate header files
 qt5_wrap_ui(QT_UI_HEADERS "${QT_UI_FILES}")
 
-# grab the resource files in resources
-file (GLOB_RECURSE QT_RESOURCE_FILES resources/*.qrc)
-# have qt5 wrap them and generate the appropriate source files
-qt5_add_resources(QT_RESOURCES "${QT_RESOURCE_FILES}")
-
 # add them to the interface source files
 set(INTERFACE_SRCS ${INTERFACE_SRCS} "${QT_UI_HEADERS}" "${QT_RESOURCES}")
 
diff --git a/interface/src/ui/RunningScriptsWidget.cpp b/interface/src/ui/RunningScriptsWidget.cpp
index dc9ae7c5f8..9a9a1c7486 100644
--- a/interface/src/ui/RunningScriptsWidget.cpp
+++ b/interface/src/ui/RunningScriptsWidget.cpp
@@ -77,7 +77,7 @@ void RunningScriptsWidget::setRunningScripts(const QStringList& list)
         scriptName->setToolTip(list.at(i));
         scriptName->setTextAlignment(Qt::AlignCenter);
         QTableWidgetItem *closeIcon = new QTableWidgetItem;
-        closeIcon->setIcon(QIcon(":/images/kill-script.svg"));
+        closeIcon->setIcon(QIcon(Application::resourcesPath() + "/images/kill-script.svg"));
 
         ui->runningScriptsTableWidget->setItem(i, 0, scriptName);
         ui->runningScriptsTableWidget->setItem(i, 1, closeIcon);
diff --git a/interface/ui/chatWindow.ui b/interface/ui/chatWindow.ui
index 60a0c6badd..3c0fe4cd80 100644
--- a/interface/ui/chatWindow.ui
+++ b/interface/ui/chatWindow.ui
@@ -100,8 +100,8 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../resources/resources.qrc">
-          <normaloff>:/images/close.svg</normaloff>:/images/close.svg</iconset>
+         <iconset>
+          <normaloff>../resources/images/close.svg</normaloff>../resources/images/close.svg</iconset>
         </property>
         <property name="flat">
          <bool>true</bool>
@@ -200,9 +200,7 @@
   <tabstop>messagePlainTextEdit</tabstop>
   <tabstop>messagesScrollArea</tabstop>
  </tabstops>
- <resources>
-  <include location="../resources/resources.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>closeButton</sender>
diff --git a/interface/ui/runningScriptsWidget.ui b/interface/ui/runningScriptsWidget.ui
index 9494d4ed09..c7fc9e43e8 100644
--- a/interface/ui/runningScriptsWidget.ui
+++ b/interface/ui/runningScriptsWidget.ui
@@ -70,8 +70,8 @@ border-radius: 6px;</string>
     <string>Reload All</string>
    </property>
    <property name="icon">
-    <iconset resource="../resources/resources.qrc">
-     <normaloff>:/images/reload.svg</normaloff>:/images/reload.svg</iconset>
+    <iconset>
+     <normaloff>../resources/images/reload.svg</normaloff>../resources/images/reload.svg</iconset>
    </property>
   </widget>
   <widget class="QPushButton" name="stopAllButton">
@@ -95,8 +95,8 @@ border-radius: 6px;</string>
     <string>Stop All</string>
    </property>
    <property name="icon">
-    <iconset resource="../resources/resources.qrc">
-     <normaloff>:/images/stop.svg</normaloff>:/images/stop.svg</iconset>
+    <iconset>
+     <normaloff>../resources/images/stop.svg</normaloff>../resources/images/stop.svg</iconset>
    </property>
   </widget>
   <widget class="QLabel" name="recentlyLoadedLabel">
@@ -166,8 +166,8 @@ border-radius: 6px;</string>
     <string/>
    </property>
    <property name="icon">
-    <iconset resource="../resources/resources.qrc">
-     <normaloff>:/images/close.svg</normaloff>:/images/close.svg</iconset>
+    <iconset>
+     <normaloff>../resources/images/close.svg</normaloff>../resources/images/close.svg</iconset>
    </property>
    <property name="iconSize">
     <size>
@@ -241,8 +241,6 @@ border-radius: 6px;</string>
    </property>
   </widget>
  </widget>
- <resources>
-  <include location="../resources/resources.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>