From f6ccd537b6089dfc321e5dac3918c45fbb360e81 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 9 Feb 2018 17:19:29 +0000 Subject: [PATCH] Change shader edit controls from Ctrl-S / save to F5 / Refresh * This is a bit less ambiguous and less confusing in the case where someone is expecting a "compile" type button instead of "save changes" type button. --- qrenderdoc/Code/Resources.h | 1 + qrenderdoc/Resources/arrow_refresh.png | Bin 0 -> 674 bytes qrenderdoc/Resources/arrow_refresh@2x.png | Bin 0 -> 1664 bytes qrenderdoc/Resources/resources.qrc | 2 + qrenderdoc/Windows/ShaderViewer.cpp | 17 +++++- qrenderdoc/Windows/ShaderViewer.h | 2 +- qrenderdoc/Windows/ShaderViewer.ui | 67 +++++++++++++++++----- qrenderdoc/qrenderdoc_local.vcxproj | 2 + 8 files changed, 73 insertions(+), 18 deletions(-) create mode 100644 qrenderdoc/Resources/arrow_refresh.png create mode 100644 qrenderdoc/Resources/arrow_refresh@2x.png diff --git a/qrenderdoc/Code/Resources.h b/qrenderdoc/Code/Resources.h index b957a9c87..d8e0f8a27 100644 --- a/qrenderdoc/Code/Resources.h +++ b/qrenderdoc/Code/Resources.h @@ -33,6 +33,7 @@ RESOURCE_DEF(arrow_in, "arrow_in.png") \ RESOURCE_DEF(arrow_join, "arrow_join.png") \ RESOURCE_DEF(arrow_left, "arrow_left.png") \ + RESOURCE_DEF(arrow_refresh, "arrow_refresh.png") \ RESOURCE_DEF(arrow_right, "arrow_right.png") \ RESOURCE_DEF(arrow_undo, "arrow_undo.png") \ RESOURCE_DEF(asterisk_orange, "asterisk_orange.png") \ diff --git a/qrenderdoc/Resources/arrow_refresh.png b/qrenderdoc/Resources/arrow_refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..257cfee396d5cbebd839de85ce07de888f4ea206 GIT binary patch literal 674 zcmV;T0$u%yP)c5r#tc9wCFE4rIa-!1q-0q!CnXT4+IPh@KIlp_)|DJ;of^@6O&$Qb|%0Qj}Sozsbo8Q|>Mbn=U zP2E7#wB?O`Ep!GZny!_X7GPuz^XAJUAIBgXg^BNwVUi{61V^rojQRaE_qNj4NLdoVFk+|dMdJ*; zhruC&vq5gXzRrV0P}bF)f!c~)+<0;`kvy2BK~0+`3U)UG7hM{IuyBhaR6s z^E4C0gyZR%rDXZ6T~Z#euCIvb`VE|rHoo@?;#gG;J%Lwr*M*c6rP9`TeALEboY+=M z_9iFvJX#TP`AWOxTOW5H#;`tQNBIm9*+5DUdmdObp`;j!>}EcEvauMR>P~t_*#n}! zx{k1Mn;#1yWC@t0h{~O4*tM2I<{~!k28MaoAd1baJIiXe5uVjC=3!%jS3*P_5Qj*e zMuH)F`}<^aT#vEUo#>M7I&k@5J6}Uhj82Wy|5@Hbx@RKrQvzahya-(6+;Z6|hDkxh z+p$h@q{FG4u2oi&6#bWJbgAj{v=B}^Y5y2!b=uZ+`M(4h0H#Ie$NWKnJpcdz07*qo IM6N<$g2$IKwEzGB literal 0 HcmV?d00001 diff --git a/qrenderdoc/Resources/arrow_refresh@2x.png b/qrenderdoc/Resources/arrow_refresh@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fdf20e26cd11305fd5cb59a633da930067ee30eb GIT binary patch literal 1664 zcmV-`27md9P)+8^?#X=0li+or^58?{(eDn76k ztkFc+79S{&738tJ7FhN<({pF;D&j7?HKdbVc9%PI&v(9a&UelLV|#_HJqRWDOO(=g zDVPUzV+GQ%;I0Lfez_kY^IIXzM9Q2n1!pk3H zJt5yvkhu|dT|G=~-%vbh!$2PC1cV!6U=WQIei1so4!!m|)xgM0Ci>k@emJ3Sd#mf*8;X$3{2SToS7#f?=a7u1dQeG_W}r^ zWHL;e+Cv#{rDV_m%#O;$u`7qr--eT9`~ltfhQrY^(;DGYC{Ovr}0=NjtFN7V#p zeWk~yGU8zR6U;myvf+Xa86GW1!UIvidM9Sh-Gm#Pm*v427KtWH8Ec@>k-OwP9#SE@ z2k=KQ^MJ^P3N~D@A*13!5q#-6Gn%s>%bYfNNV*Hj$h(`Cufft;FXB$?kFa^H5cO&V zRJ!kX0d2Q%m@z4hYMlD`OLLH)k+ek}GT5;3%09IF>H%!FnmuzeVxuFmDj^fb&@kL> zFM-8&NA;XN!+L|Mg+O@V{QDHDnWjj7X(!_;^N^pFRDfH}N3c5KD}4RtT8g1WnJPTh z`(#IwT6walz~!-_YoHGITPomK82%}J@=$_OzGwNN;ct060zd?1~jmsB`@D|--_Qyb&K-tcQ2sTWxS-@*l z4wNv%lY$;nv!00=sY&@wqTYorGR`Erla>R1CRStIa;%UdI%bZa;L!wM&|<7(U_?L5 zJEVx}$OtM~$n;ztb&xAHlx+j3Dc^(Fx#zuJe|!Ou8Y)pO$724(7ce7wqDCz{n6+7I z#gGg>R)|(o?6Z@OzemzmRZH1!fy-Ql&#oQ9L2kTz_*^LX=?{@io>OPzaCR4R z0!XvM&tQF|kFS0nb0ygK0?%*|o*Ii5um=_Np)EO0000< KMNUMnLSTZocMvN8 literal 0 HcmV?d00001 diff --git a/qrenderdoc/Resources/resources.qrc b/qrenderdoc/Resources/resources.qrc index 9abe31949..7ed62cf9d 100644 --- a/qrenderdoc/Resources/resources.qrc +++ b/qrenderdoc/Resources/resources.qrc @@ -25,6 +25,8 @@ arrow_join@2x.png arrow_left.png arrow_left@2x.png + arrow_refresh.png + arrow_refresh@2x.png arrow_out.png arrow_out@2x.png arrow_right.png diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp index 511a51f73..dc25732ef 100644 --- a/qrenderdoc/Windows/ShaderViewer.cpp +++ b/qrenderdoc/Windows/ShaderViewer.cpp @@ -210,6 +210,9 @@ void ShaderViewer::editShader(bool customShader, const QString &entryPoint, cons ui->snippets->setVisible(customShader); // hide debugging toolbar buttons + ui->debugSep->hide(); + ui->runBack->hide(); + ui->run->hide(); ui->stepBack->hide(); ui->stepNext->hide(); ui->runToCursor->hide(); @@ -242,8 +245,10 @@ void ShaderViewer::editShader(bool customShader, const QString &entryPoint, cons m_FindState = FindState(); }); - m_Ctx.GetMainWindow()->RegisterShortcut(QKeySequence(QKeySequence::Save).toString(), this, - [this]() { on_save_clicked(); }); + m_Ctx.GetMainWindow()->RegisterShortcut(QKeySequence(QKeySequence::Refresh).toString(), this, + [this]() { on_refresh_clicked(); }); + ui->refresh->setToolTip(ui->refresh->toolTip() + + lit(" (%1)").arg(QKeySequence(QKeySequence::Refresh).toString())); QWidget *w = (QWidget *)scintilla; w->setProperty("filename", kv.first); @@ -408,6 +413,9 @@ void ShaderViewer::debugShader(const ShaderBindpointMapping *bind, const ShaderR ToolWindowManager::raiseToolWindow(sel); } + // hide edit buttons + ui->editSep->hide(); + ui->refresh->hide(); ui->snippets->hide(); if(trace) @@ -506,6 +514,9 @@ void ShaderViewer::debugShader(const ShaderBindpointMapping *bind, const ShaderR ui->constants->hide(); // hide debugging toolbar buttons + ui->debugSep->hide(); + ui->runBack->hide(); + ui->run->hide(); ui->stepBack->hide(); ui->stepNext->hide(); ui->runToCursor->hide(); @@ -2106,7 +2117,7 @@ void ShaderViewer::on_findReplace_clicked() m_FindReplace->takeFocus(); } -void ShaderViewer::on_save_clicked() +void ShaderViewer::on_refresh_clicked() { if(m_Trace) { diff --git a/qrenderdoc/Windows/ShaderViewer.h b/qrenderdoc/Windows/ShaderViewer.h index 97511f4f5..58aa5fd00 100644 --- a/qrenderdoc/Windows/ShaderViewer.h +++ b/qrenderdoc/Windows/ShaderViewer.h @@ -108,7 +108,7 @@ public: private slots: // automatic slots void on_findReplace_clicked(); - void on_save_clicked(); + void on_refresh_clicked(); void on_intView_clicked(); void on_floatView_clicked(); diff --git a/qrenderdoc/Windows/ShaderViewer.ui b/qrenderdoc/Windows/ShaderViewer.ui index e3d2ddf04..cb78c3a29 100644 --- a/qrenderdoc/Windows/ShaderViewer.ui +++ b/qrenderdoc/Windows/ShaderViewer.ui @@ -153,9 +153,9 @@ - 40 + 20 10 - 388 + 1132 28 @@ -199,12 +199,15 @@ Find & Replace - + Find :/find.png:/find.png + + Qt::ToolButtonTextBesideIcon + true @@ -218,16 +221,19 @@ - + - Compile & Save changes + Compile Shader & Refresh changes - + Refresh - :/save.png:/save.png + :/arrow_refresh.png:/arrow_refresh.png + + + Qt::ToolButtonTextBesideIcon true @@ -240,7 +246,7 @@ Insert built-in snippets - + Insert... @@ -249,6 +255,9 @@ QToolButton::InstantPopup + + Qt::ToolButtonTextBesideIcon + true @@ -267,12 +276,15 @@ Run backwards (Shift-F5) - + Run backwards :/control_start_blue.png:/control_start_blue.png + + Qt::ToolButtonTextBesideIcon + true @@ -284,12 +296,15 @@ Step Back (Shift-F10) - + Step Back :/control_reverse_blue.png:/control_reverse_blue.png + + Qt::ToolButtonTextBesideIcon + true @@ -301,12 +316,15 @@ Step Next (F10) - + Step Next :/control_play_blue.png:/control_play_blue.png + + Qt::ToolButtonTextBesideIcon + true @@ -318,12 +336,15 @@ Run forwards (F5) - + Run forwards :/control_end_blue.png:/control_end_blue.png + + Qt::ToolButtonTextBesideIcon + true @@ -347,10 +368,16 @@ Run to Cursor (Ctrl-F10) + + Run to Cursor + :/control_cursor_blue.png:/control_cursor_blue.png + + Qt::ToolButtonTextBesideIcon + true @@ -367,10 +394,16 @@ Run to Sample/Load/Gather + + Run to Sample + :/control_sample_blue.png:/control_sample_blue.png + + Qt::ToolButtonTextBesideIcon + true @@ -387,10 +420,16 @@ Run to NaN or Inf + + Run to NaN/Inf + :/control_nan_blue.png:/control_nan_blue.png + + Qt::ToolButtonTextBesideIcon + true @@ -453,8 +492,8 @@ - 710 - 20 + 390 + 90 151 131 diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj index 51a01c05c..699804be9 100644 --- a/qrenderdoc/qrenderdoc_local.vcxproj +++ b/qrenderdoc/qrenderdoc_local.vcxproj @@ -1756,6 +1756,8 @@ IF %ERRORLEVEL% NEQ 0 (echo ==================================================== + +