From c2690b82110671f68121866ed02bf5fe1a536b16 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 27 Apr 2017 18:58:11 +0100
Subject: [PATCH] Remove some cases where resources were being loaded and
 parsed @ runtime

---
 qrenderdoc/Windows/Dialogs/RemoteManager.cpp |  3 +--
 qrenderdoc/Windows/EventBrowser.cpp          | 11 ++++-------
 qrenderdoc/Windows/EventBrowser.h            |  4 ----
 qrenderdoc/Windows/TextureViewer.cpp         | 14 +++++---------
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/qrenderdoc/Windows/Dialogs/RemoteManager.cpp b/qrenderdoc/Windows/Dialogs/RemoteManager.cpp
index 46fc59e82..604c1bcbb 100644
--- a/qrenderdoc/Windows/Dialogs/RemoteManager.cpp
+++ b/qrenderdoc/Windows/Dialogs/RemoteManager.cpp
@@ -150,8 +150,7 @@ void RemoteManager::setRemoteServerLive(RDTreeWidgetItem *node, bool live, bool
 
     node->setText(1, text);
 
-    node->setIcon(0,
-                  QIcon(QPixmap(QString::fromUtf8(live ? ":/connect.png" : ":/disconnect.png"))));
+    node->setIcon(0, live ? Icons::connect() : Icons::disconnect());
   }
 }
 
diff --git a/qrenderdoc/Windows/EventBrowser.cpp b/qrenderdoc/Windows/EventBrowser.cpp
index c92ad2858..c544af312 100644
--- a/qrenderdoc/Windows/EventBrowser.cpp
+++ b/qrenderdoc/Windows/EventBrowser.cpp
@@ -29,6 +29,7 @@
 #include "3rdparty/flowlayout/FlowLayout.h"
 #include "Code/CaptureContext.h"
 #include "Code/QRDUtils.h"
+#include "Code/Resources.h"
 #include "ui_EventBrowser.h"
 
 struct EventItemTag
@@ -102,10 +103,6 @@ EventBrowser::EventBrowser(ICaptureContext &ctx, QWidget *parent)
   m_BookmarkStripLayout->addWidget(ui->bookmarkStripHeader);
   m_BookmarkStripLayout->addItem(m_BookmarkSpacer);
 
-  m_CurrentIcon.addFile(QStringLiteral(":/flag_green.png"), QSize(), QIcon::Normal, QIcon::Off);
-  m_FindIcon.addFile(QStringLiteral(":/find.png"), QSize(), QIcon::Normal, QIcon::Off);
-  m_BookmarkIcon.addFile(QStringLiteral(":/asterisk_orange.png"), QSize(), QIcon::Normal, QIcon::Off);
-
   Qt::Key keys[] = {
       Qt::Key_1, Qt::Key_2, Qt::Key_3, Qt::Key_4, Qt::Key_5,
       Qt::Key_6, Qt::Key_7, Qt::Key_8, Qt::Key_9, Qt::Key_0,
@@ -747,11 +744,11 @@ bool EventBrowser::hasBookmark(uint32_t EID)
 void EventBrowser::RefreshIcon(RDTreeWidgetItem *item, EventItemTag tag)
 {
   if(tag.current)
-    item->setIcon(COL_NAME, m_CurrentIcon);
+    item->setIcon(COL_NAME, Icons::flag_green());
   else if(tag.bookmark)
-    item->setIcon(COL_NAME, m_BookmarkIcon);
+    item->setIcon(COL_NAME, Icons::asterisk_orange());
   else if(tag.find)
-    item->setIcon(COL_NAME, m_FindIcon);
+    item->setIcon(COL_NAME, Icons::find());
   else
     item->setIcon(COL_NAME, QIcon());
 }
diff --git a/qrenderdoc/Windows/EventBrowser.h b/qrenderdoc/Windows/EventBrowser.h
index ce3138e1b..124170b10 100644
--- a/qrenderdoc/Windows/EventBrowser.h
+++ b/qrenderdoc/Windows/EventBrowser.h
@@ -122,10 +122,6 @@ private:
 
   rdctype::array<CounterResult> m_Times;
 
-  QIcon m_CurrentIcon;
-  QIcon m_FindIcon;
-  QIcon m_BookmarkIcon;
-
   SizeDelegate *m_SizeDelegate;
   QTimer *m_FindHighlight;
 
diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp
index 76c508e82..bb6657c2f 100644
--- a/qrenderdoc/Windows/TextureViewer.cpp
+++ b/qrenderdoc/Windows/TextureViewer.cpp
@@ -38,6 +38,7 @@
 #include "3rdparty/toolwindowmanager/ToolWindowManagerArea.h"
 #include "Code/CaptureContext.h"
 #include "Code/QRDUtils.h"
+#include "Code/Resources.h"
 #include "Dialogs/TextureSaveDialog.h"
 #include "Widgets/ResourcePreview.h"
 #include "Widgets/TextureGoto.h"
@@ -402,8 +403,8 @@ public:
       if(role == Qt::DecorationRole)
       {
         QIcon goArrow;
-        goArrow.addFile(QStringLiteral(":/action.png"), QSize(), QIcon::Normal, QIcon::Off);
-        goArrow.addFile(QStringLiteral(":/action_hover.png"), QSize(), QIcon::Active, QIcon::Off);
+        goArrow.addPixmap(Pixmaps::action(), QIcon::Normal, QIcon::Off);
+        goArrow.addPixmap(Pixmaps::action_hover(), QIcon::Normal, QIcon::Off);
         return QVariant(goArrow);
       }
     }
@@ -1683,13 +1684,10 @@ void TextureViewer::ViewTexture(ResourceId ID, bool focus)
 
     lockedContainer->setLayout(ui->renderLayout);
 
-    QIcon lockedIcon;
-    lockedIcon.addFile(QStringLiteral(":/page_white_link.png"), QSize(), QIcon::Normal, QIcon::Off);
-
     int idx = textureTabs->indexOf(lockedContainer);
 
     if(idx >= 0)
-      textureTabs->setTabIcon(idx, lockedIcon);
+      textureTabs->setTabIcon(idx, Icons::page_white_link());
     else
       qCritical() << "Couldn't get tab index of new tab to set icon";
 
@@ -1777,9 +1775,7 @@ void TextureViewer::OpenResourceContextMenu(ResourceId id, const rdctype::array<
   QAction usageTitle(tr("Used:"), this);
   QAction imageLayout(this);
 
-  QIcon goArrow;
-  goArrow.addFile(QStringLiteral(":/action_hover.png"), QSize(), QIcon::Normal, QIcon::Off);
-  openLockedTab.setIcon(goArrow);
+  openLockedTab.setIcon(Icons::action_hover());
 
   showDisabled.setChecked(m_ShowDisabled);
   showDisabled.setChecked(m_ShowEmpty);