From c6c133bdd0bec8fb5d9ee1febdeb0d4c4b4245bf Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 10 May 2021 11:24:11 +0100 Subject: [PATCH] Add icons for texture viewer pixel history/debug buttons --- qrenderdoc/Code/Resources.h | 2 ++ qrenderdoc/Resources/pixel_history.png | Bin 0 -> 803 bytes qrenderdoc/Resources/pixel_history@2x.png | Bin 0 -> 2085 bytes qrenderdoc/Resources/resources.qrc | 4 +++ qrenderdoc/Resources/text_add.png | Bin 0 -> 1501 bytes qrenderdoc/Resources/text_add@2x.png | Bin 0 -> 2630 bytes qrenderdoc/Windows/PixelHistoryView.cpp | 5 +++ qrenderdoc/Windows/TextureViewer.ui | 8 +++++ qrenderdoc/qrenderdoc_local.vcxproj | 12 +++++++ qrenderdoc/qrenderdoc_local.vcxproj.filters | 36 ++++++++++++++++++++ 10 files changed, 67 insertions(+) create mode 100644 qrenderdoc/Resources/pixel_history.png create mode 100644 qrenderdoc/Resources/pixel_history@2x.png create mode 100644 qrenderdoc/Resources/text_add.png create mode 100644 qrenderdoc/Resources/text_add@2x.png diff --git a/qrenderdoc/Code/Resources.h b/qrenderdoc/Code/Resources.h index 918b258f5..d6581e52d 100644 --- a/qrenderdoc/Code/Resources.h +++ b/qrenderdoc/Code/Resources.h @@ -74,9 +74,11 @@ RESOURCE_DEF(page_white_link, "page_white_link.png") \ RESOURCE_DEF(page_white_stack, "page_white_stack.png") \ RESOURCE_DEF(paste, "paste.png") \ + RESOURCE_DEF(pixel_history, "pixel_history.png") \ RESOURCE_DEF(plugin, "plugin.png") \ RESOURCE_DEF(plugin_add, "plugin_add.png") \ RESOURCE_DEF(save, "save.png") \ + RESOURCE_DEF(text_add, "text_add.png") \ RESOURCE_DEF(tick, "tick.png") \ RESOURCE_DEF(time, "time.png") \ RESOURCE_DEF(timeline_marker, "timeline_marker.png") \ diff --git a/qrenderdoc/Resources/pixel_history.png b/qrenderdoc/Resources/pixel_history.png new file mode 100644 index 0000000000000000000000000000000000000000..f40e399723d239121c5bfcf99b976faec5792a24 GIT binary patch literal 803 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.png paste.png paste@2x.png + pixel_history.png + pixel_history@2x.png plugin.png plugin@2x.png plugin_add.png plugin_add@2x.png save.png save@2x.png + text_add.png + text_add@2x.png tick.png tick@2x.png time.png diff --git a/qrenderdoc/Resources/text_add.png b/qrenderdoc/Resources/text_add.png new file mode 100644 index 0000000000000000000000000000000000000000..2a397b42f3769fe336f68d0ffad58d4c4a367545 GIT binary patch literal 1501 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh*)icxGNo zet9uiy|1s8XI^nhVqS8pr;Du;&;-5A%oHn27ZU?>S2IUL14Cm&Lsw%9M{{#m7gq}l zXA?IUS5p_5UYGpj(%jU%5}4i;gkC3{dO=Acw*Y9fOKMSOS!#+~QGTuh*vnR#xZPrb z(>$o&6x?pH#Hm*w=oo!a#3DsBObD2IKumbD1#;jCKQ#}S+KYh6x} zo61W~8#`y@n0-~?Xc7=zb#1aM3xA-XN=B{f%e2XNW!3+y<*pI6e)DJZ=Kp85-?vdw zYEtp!@O#vjsE{JS!1-Z~d`tOZ39Vn{5+SaCH}^ia2$TErn>oWvcELQGS&VmQF`qr# zfBEe71;LsDMc+(xr#mflcF)F09eC{->w$Ii=6Wo>Y~U+= z+|BLPQ+`f{uhLKcMDgsr-LU*;u|eqr-OYBdI1fEE+2B{?a5?119=nBW|4x<)e!+93 zp!94Si;3U5O>z&PJl;E*BX;t|yI0xfN}ImA-#)`g+l!B#-#JW#d#U0bw+i`t^_shK zSGbsN_1d-Tz&4#NL3$ITv@SV)oZj&;a{{mTr-@&uX4QzE>%0-`a`}9LrYZBuyu&9W zru`M)P*|+DeBR@Jt0>oV8rKe-m6A6#`noE>NH_b1l%#2{E1Q^t&VdI)hY| z*s?|X{lp)_E$^TFJG-FoSG=KbVvyuanbVRV)*?y}vd$@?2>?7sFeLy0 literal 0 HcmV?d00001 diff --git a/qrenderdoc/Resources/text_add@2x.png b/qrenderdoc/Resources/text_add@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a44c97ae89086fb41db55463ae189570b57926c9 GIT binary patch literal 2630 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 aE(S*KhjE #include #include +#include "Code/Resources.h" #include "toolwindowmanager/ToolWindowManager.h" #include "ui_PixelHistoryView.h" @@ -838,6 +839,8 @@ void PixelHistoryView::on_events_customContextMenuRequested(const QPoint &pos) QAction jumpAction(tr("&Go to primitive %1 at Event %2").arg(tag.primitive).arg(tag.eventId), this); + jumpAction.setIcon(Icons::find()); + QString debugText; if(tag.primitive == ~0U) @@ -858,6 +861,8 @@ void PixelHistoryView::on_events_customContextMenuRequested(const QPoint &pos) QAction debugAction(debugText, this); + debugAction.setIcon(Icons::wrench()); + contextMenu.addAction(&debugAction); if(!m_Ctx.APIProps().shaderDebugging) diff --git a/qrenderdoc/Windows/TextureViewer.ui b/qrenderdoc/Windows/TextureViewer.ui index be08fc2fb..ab7ad2f44 100644 --- a/qrenderdoc/Windows/TextureViewer.ui +++ b/qrenderdoc/Windows/TextureViewer.ui @@ -1212,6 +1212,10 @@ See FAQ on "Gamma display of linear data" History + + + :/pixel_history.png:/pixel_history.png + @@ -1219,6 +1223,10 @@ See FAQ on "Gamma display of linear data" Debug + + + :/wrench.png:/wrench.png + diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj index e904cfbd8..87a05af5c 100644 --- a/qrenderdoc/qrenderdoc_local.vcxproj +++ b/qrenderdoc/qrenderdoc_local.vcxproj @@ -1930,8 +1930,12 @@ IF %ERRORLEVEL% NEQ 0 (echo ==================================================== + + + + @@ -1969,10 +1973,18 @@ IF %ERRORLEVEL% NEQ 0 (echo ==================================================== + + + + + + + + diff --git a/qrenderdoc/qrenderdoc_local.vcxproj.filters b/qrenderdoc/qrenderdoc_local.vcxproj.filters index 1a9856098..4e828851d 100644 --- a/qrenderdoc/qrenderdoc_local.vcxproj.filters +++ b/qrenderdoc/qrenderdoc_local.vcxproj.filters @@ -1846,6 +1846,42 @@ Resources\Files + + Resources\Files + + + Resources\Files + + + Resources\Files + + + Resources\Files + + + Resources\Files + + + Resources\Files + + + Resources\Files + + + Resources\Files + + + Resources\Files + + + Resources\Files + + + Resources\Files + + + Resources\Files +