From 31023d7c91bdd03027410ff3c6864ce88558c5db Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 24 Nov 2016 17:18:55 +0100 Subject: [PATCH] Rename the RightArrow icons to action/action_hover --- .../{RightArrow_Gray_16x16.png => action.png} | Bin ...{RightArrow_Green_16x16.png => action_hover.png} | Bin qrenderdoc/Windows/TextureViewer.cpp | 10 ++++------ qrenderdoc/qrenderdoc_local.vcxproj | 4 ++-- qrenderdoc/qrenderdoc_local.vcxproj.filters | 12 ++++++------ qrenderdoc/resources.qrc | 4 ++-- 6 files changed, 14 insertions(+), 16 deletions(-) rename qrenderdoc/Resources/{RightArrow_Gray_16x16.png => action.png} (100%) rename qrenderdoc/Resources/{RightArrow_Green_16x16.png => action_hover.png} (100%) diff --git a/qrenderdoc/Resources/RightArrow_Gray_16x16.png b/qrenderdoc/Resources/action.png similarity index 100% rename from qrenderdoc/Resources/RightArrow_Gray_16x16.png rename to qrenderdoc/Resources/action.png diff --git a/qrenderdoc/Resources/RightArrow_Green_16x16.png b/qrenderdoc/Resources/action_hover.png similarity index 100% rename from qrenderdoc/Resources/RightArrow_Green_16x16.png rename to qrenderdoc/Resources/action_hover.png diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp index c6ca60f05..8b5fb7f62 100644 --- a/qrenderdoc/Windows/TextureViewer.cpp +++ b/qrenderdoc/Windows/TextureViewer.cpp @@ -399,10 +399,9 @@ public: if(role == Qt::DecorationRole) { QIcon goArrow; - goArrow.addFile(QStringLiteral(":/Resources/RightArrow_Gray_16x16.png"), QSize(), - QIcon::Normal, QIcon::Off); - goArrow.addFile(QStringLiteral(":/Resources/RightArrow_Green_16x16.png"), QSize(), - QIcon::Active, QIcon::Off); + goArrow.addFile(QStringLiteral(":/Resources/action.png"), QSize(), QIcon::Normal, QIcon::Off); + goArrow.addFile(QStringLiteral(":/Resources/action_hover.png"), QSize(), QIcon::Active, + QIcon::Off); return QVariant(goArrow); } } @@ -1776,8 +1775,7 @@ void TextureViewer::OpenResourceContextMenu(ResourceId id, const rdctype::array< QAction imageLayout(this); QIcon goArrow; - goArrow.addFile(QStringLiteral(":/Resources/RightArrow_Green_16x16.png"), QSize(), QIcon::Normal, - QIcon::Off); + goArrow.addFile(QStringLiteral(":/Resources/action_hover.png"), QSize(), QIcon::Normal, QIcon::Off); openLockedTab.setIcon(goArrow); showDisabled.setChecked(m_ShowDisabled); diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj index eea4aa3a0..32777bd0c 100644 --- a/qrenderdoc/qrenderdoc_local.vcxproj +++ b/qrenderdoc/qrenderdoc_local.vcxproj @@ -399,8 +399,6 @@ - - @@ -457,6 +455,8 @@ + + diff --git a/qrenderdoc/qrenderdoc_local.vcxproj.filters b/qrenderdoc/qrenderdoc_local.vcxproj.filters index 430d1eefd..acc233404 100644 --- a/qrenderdoc/qrenderdoc_local.vcxproj.filters +++ b/qrenderdoc/qrenderdoc_local.vcxproj.filters @@ -419,12 +419,6 @@ Resources\Files - - Resources\Files - - - Resources\Files - Resources\Files @@ -524,6 +518,12 @@ Windows + + Resources\Files + + + Resources\Files + diff --git a/qrenderdoc/resources.qrc b/qrenderdoc/resources.qrc index de196dbdc..557f934df 100644 --- a/qrenderdoc/resources.qrc +++ b/qrenderdoc/resources.qrc @@ -38,8 +38,6 @@ Resources/page_white_link.png Resources/plugin_add.png Resources/red_x_16.png - Resources/RightArrow_Gray_16x16.png - Resources/RightArrow_Green_16x16.png Resources/runback.png Resources/runcursor.png Resources/runfwd.png @@ -65,5 +63,7 @@ Resources/topologies/topo_trilist_adj.png Resources/topologies/topo_tristrip.png Resources/topologies/topo_tristrip_adj.png + Resources/action.png + Resources/action_hover.png