From dc10c83e78b00a8c0f01917361137f1d856f1a2a Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Thu, 12 Jan 2023 09:01:26 -0500 Subject: [PATCH] GP-3008: Fixing search limit option message and help --- .../topics/Search/Query_Results_Dialog.htm | 7 +++-- .../topics/Search/Search_Program_Text.htm | 24 ++++++++---------- .../Search/images/SearchLimitExceeded.png | Bin 12807 -> 7302 bytes .../help/topics/Tool/ToolOptions_Dialog.htm | 17 ++----------- .../core/searchmem/MemSearchPlugin.java | 2 +- .../core/searchtext/SearchTextPlugin.java | 2 +- .../ghidra/app/util/navigation/GoToQuery.java | 2 +- .../help/screenshot/SearchScreenShots.java | 13 +++++++--- 8 files changed, 27 insertions(+), 40 deletions(-) diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/Query_Results_Dialog.htm b/Ghidra/Features/Base/src/main/help/help/topics/Search/Query_Results_Dialog.htm index 6d2872436c..b7253dc0f9 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Search/Query_Results_Dialog.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Search/Query_Results_Dialog.htm @@ -36,10 +36,9 @@ see an entry for each in the Search Results window. The title bar shows the number of entries being displayed.

-

The tool has an option for the maximum number of - search results. The search will stop after this number has been exceeded. To see more search - results, increase your search +

The tool has an option for the maximum number of search results. The search will stop after + this number has been exceeded. To see more search results, + increase your search limit.

diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Program_Text.htm b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Program_Text.htm index f91253bf16..b2781cc519 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Program_Text.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Program_Text.htm @@ -279,19 +279,20 @@ "Query_Results_Dialog.htm">Query Results display, your cursor in the Code Browser is moved to that location where the match was found. So, if the match was found in an operand, then the location is moved to the matching string within the operand.

- -

The tool has an option for the number of search - results. The search will stop after this number has been exceeded. A dialog as shown - below warns you of the partial results. To see more search results, increase your search limit.

+ + +

Search Limit Option

+ +
+

The tool has an option to limit the number of search results. The search will stop after + this number has been exceeded. The below dialog warns you of the partial results. To see more + search results, select EditTool + Options... from the menu bar, then select the Search node in the tree. Edit the + Search Limit field to increase your search limit.

-
- -

 

@@ -412,11 +413,6 @@

Query Results

-
  • -

    Search Limit tool option

    -
    • -

  • Data

    • diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/images/SearchLimitExceeded.png b/Ghidra/Features/Base/src/main/help/help/topics/Search/images/SearchLimitExceeded.png index 9974b6c9543a92510a700734cd969576db1f524c..391bd7c03056a5a61085e28a60fa509a988d18c6 100644 GIT binary patch literal 7302 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 literal 12807 zcmaKTWmFtWlXh?&91`4JLvVNZ!3ho_K(GXtA-KCH1b26L1_-Xf-QC@H$i2H~_ni0p z=Et0Aud1%Ds;;LeL`6v&fJ}h==FJ;`tc--(n>Wy+kl)FO(2(yheMKB^-n<`?l@L{T zoj*!N&<4&t{4V#JfA+RYr7H+tHz;+|@PC6>UssFvr%rRMX@9v|_hxw=8n-s$zCZ?o>7L4DgP2fw0=*yul zk}py!Qk}@8Q`N^6j)4eUZqV8V5`~NxA{S{CX%CK%k5`9in}e?iVQX9g)cQy)2wj!do1i&FyVxJy?lVjPRmOz$$_*;PyuP zw?orRljz@GNTNa{UGFjpWU(v27@JSf_mWiXarQSX-qR&oV34bY*+)KGCfMK(@^@?M zS!xX*%bJ_{cN3$clrs?jR>q&V)TgcBA6x==nwOe9u1+q@F#hdMan4J5+U{brGQxaN z_l4JUP4n}mM0_v@FBvB*yxDc6BLT`kfJfG8Ws`RoFR9>Hc+w^2=D} zlV8v^Iu=~8KN=k6FJD-PJ`35F(-9%ySV%k9iJ-%+VQ@IdN02Z>+wy^%Yp>__dpl~R ztQMsRj(f$t{o9>oTCSr8><(Zi`FPpeYoexg>hP$rvwB}mf$$J56*!~I1t#Q;80%5N zd$y&IrWd)7o{qLTYo5EIu4(){Zi^SZ2Kldyn2S`npffe*z=qS9{zKx;O%U~4I?ZSz zBY$A@clwiFX+7h94QeChz)N%@Ir!jUGgKu}U+v9ms$SE=%<=0KD2*V@k&5Iw&kqgz zzMKB{ZXO=O$m`?P5>>L<^}^CB=BxfeQphHhU{b&LvFtq#PyG_0O(e`TyzLLl_hKPN z*B(SHCo(xF_@>jIqkTL&{6P$27$nHJ$YM{VAy1h8;)@GW;NpR<>{w*iXO}1fLc)dH z00#;;(1(Ni>Vo`;1_Yok8;o~N=>$|rHE}fp+ z<3X|5YobwovEr1uMCANq{K3qtf^{YP$m6@eK&PnXz#LK0XCVdhNBYUWC=7ZiLS+;R ze7{#2louBlM@6C6LZjq}miDgVP#Fz8WP@jq4W8(s4t9jqvFKj=i3EElN-U>anAP;p z15JY0rR=l&`mpmUdriWJq8`G+$sMyhb?fszjSnv_F0?ghz&f^z+T;sPahWkxbDern z(c=eQCL2F4sCpZvKi*D6+P97pR6n18Kb$xo=3p1v@5Gd9@=cddBGlY6^xB>MG+D%B z{o_N5;|9)P-)^5**^aR+^9N=30j)J^;QJjGb>o_YGAf}Pf7*CwuW~mh-i0zLMEnPd zqSnCbl2)Fa_t%9}crYOj!(YX#v?oYFUMG&SLxVfn9<|N`iKBGOr3ES~EgQ>O4rQ^)#1XFLL zpP1HZv`Hs!&X^LmuGMSoH#G+64sRoCNYR!3#`Wj>q8#;1KD$l`{t6wMy(is7_j0ui z%#0bAD^?*%f0%_|mp%>Iyw**bND+0L2tYkF2Ho4I5bd_GM(}LD9NnBVy$r{X3yo(2zd+QjVXrU z$!*6V7<>@(J75YPLR&yjbbq=a;1cctW(Qjybtq~nDl()Z+1ki`7o=fHq?PP^!|$(2 zEG2pSfFKkW0?@*tw-reQL$iDot zFm~F&D6OvPA3%S=MupKRdJk5|G3RFg`Mw_cbgczJLni(R>O<90iCaCioBii%)fM{y zr+6My?F{d}YPue;E(bUZJks_J#wtGDGC#3jlxgw_7#D|KAN}xupTtqy&2Y2xuU;dn zdAPb61ho{ixW`fZfk%sp&?*;<%_{sa4JSNdEoCrNQBP@GG(9jeb551}+Al7ULqSn-c-p}1BJH`}R4E~Z6UG3K*eNX3 z-F<$sBRo8KwIR70Re1$HiGKd7J3S9!sd#dCv~_TM96OqmV93c_-U2(pd5F4(PmDWO zKu~CDHQJhP3D6@cdx#nO^VlQs%Os9G%bgHvAbYW%#3;)OEm2Yr)6WD>u;cvn!y!hM zKX8hg=Ojgri&Tz_JA;;sn^WKW8cOFpSmUNAQc^%bZ%g>M7j>A^JT(!kBE$?yuw&G2 z7;cR^ia@-{AJa>@w7u_;b2j5{qyDUbKou+@B;7^&QJ2Rf-y^yE^swZI&mPoHewnmU zpc8Vr(mT9orr4v;z3hu$d!pnlYh_k0gRRZXX6Zlp@tR3U_+L;Yt~C{dG=h{#=jRrY zJn{Cvde-gv>~nm&-&Ru26>xKZ@z3;Wly9iliH!1zehB9N`1_#>?} z=+*i%rVKkfI2gOvk^FV8H|g%-O&@&r=G=MUkQyLfGx*67FRb=4BRi-(Jw57Z&c?px z?w*om!8ElE%KGj-ce)7a4I?9}c8SgP;%W0I_>ur=+uPf_MWJRSH5P%xuC2f{j>&X! zsiKM}7v#Z?%b`*PP@Ao^R;1CMjcec9GC!BcJ;;H8&ceUZv>=``^Z0lF$2z5vND5nC zAylJp;68#Vo*;GUg2PxI?#o?{Cm6Gqc|hHc<>^uIuweRk6?2WnwxdIQ)N2GyYwi2( zkuPN%o%AJ`j7wsTnJm9E{c*=8M1+fSX_vZiZjh2ptHq-@P0pxKXGS-M?lD!MYq)1E zNjG&}pyf_0c^gC)wTy%nu21p#+eL(b4=xnRp}A1Y>)DUpWuEvg;2HTtr;0ZctuV6j zF)}Tl{WaS`KPp2_wn%=85ucmcYvqtPS|NBvhUfvcD-BS@xxSd zh#pNs;Eo!7ZzQYz?bf}bkK}Q6pS{v+em{;R(+H*g+b7e6y;1KQyC3H}edsz=I{nZ@*je^ldm`FAa0!Mqas{O@ zGJ3B6)|giHQD-cq@ctpySB85!bSc=i!Fx@8;>ZhapqLE%c0s|kl1s-eRL*$;mf;Hh zPU>5G6)^V80&kFguaJ+yS?#QXb@>DKfbNnO3YC}S`qvoE^Sz?j^agF_9Jy)kg;opt z_zj##rau=NCYn7-Y~vM&Tkt-f8f+oq#CA=);6_4u5}UbJHML!NR*x6UM%~!cH3D zA4%3=U;uOWd~si&X0aJQVaij;4f#2*m_H>XWbVsH>Xdp7%aySyQ2)l)ioq&>18WX) z+p&t*n&?1)eqC@iq%-0%_1)b@ zrbCk`$>VpvFtI8^nHm^?zI4B^f9hhsJp%4-hg1@(?V!GEHf1V_)MP;p#v#Z`R z<|A`Ac$RyDwW@wU7@m_u761Nqa^q64zgTCpORjlGar>ZXy@4Y(oW3iyIg_=4&KzE`}b(d+7Hx};3h=Bt6HTE zecjUEGi=&g5HYB$Yqkwm(#el8$?u8BqeS`TSS8chLTtUK%&*v3=th;^S4N@=jRi=`3knKq zO0qV$=GBZ3CK{B~=`i8$$?-AkSo*cmLda46k!Dn$afZkyw;t<l4tjls?4FTM`3P9tGMfM4wJ|$ z-EZ5NX~l(J6c4G`G*h=MaW2~ELy2`iMyrv#kC24Ad$YsaxiT^`0)dlTgGq+%pr;MA zq5e2py}B=VszoF`_N%^dC{{7=d3oLXqREN*oxjYKrPkNG5HCg3A3fe(Kulxpfr!%u zd*`R>`bm2ShnQc;0Lan&@&ocwkW{#a7m7#pC7`KA92_2IW-et?Skc0f#gVLI4$TrP z_O!ie`PJv!bq*ccb>1?ge9@@C7SE%o*Qb`;L|nDAz1cPs#2<)Gy4>t?GF7YtuV8D0GhN|7V0)jMATO)V&SEYWAfdjVVWa%u83o} z`}Tp=@S(wBs3Qi9Fl__dYxzhA%o|3BDlW6c0+xVA38g+fIyihALJl9W9# zu6}O`QXnpnGuTy-T@FBb+ZFoJ3E;O3(;puWCyH@%vZ7^@FMjvI<@n>ffHXmm`}_Oj zm3C4VTw>zXi=ELAS9M*Cz^hDk9z0}LW?0J>g2c2mv}!dgD~3kuS;iY^r32sK7hL+*ILhXQNaOa zi#1CpCMM!%jjL|=^3yZOA!jLOF%2CT69)$e4=*o2KVJoGMB^(UJ0gPnm1 z@JX4Qo7>*wa(7(#`8K;-IT<;L)e!9)^(DC(WDm1*bE$EzPS?a`e?l}^DP3r3auWL! zA6{6leF7!WRZI+;3FZFg1l=nkIhk(72{|?XOj@l?!IE7bnFjp_pGratjAX}GqC7ho z7?^-mbb{#`%gHrxkl&`vC$|P&kzYhaL{$B4&-d01I>uFltO={npT@H!*)qlqRLWJe zrS5KT6;k;$va-)xODjAyNaX@dGfyYPqNR$APnEuR>|BI}h9V<>UFi;|H^R2-N|}H` zoI>#)PAbd{2W6$=)~3? zJ>1~7#qC051{XBjvq`l?if<+tH%{(`p5SN{;U?NdcGCE5C*Gw^h0gKo*ZCSt?8V<5 zPSA4n{qlxJopPT~mRl8^@0Qcp&5?0~$Q1k5Xt3LMz_~s_)MjrL^T*)Dx?#fU`|wukgkQo=V94Szso}! zy8^@?F=Qxi4u|^qdpi#v4Sv5jIwQCgNbQRmKL8&g3U|7lIq|`2%|pF?qkQtE=PU;=1hmk*At$vPyGbT;BFm(1XhfrmTXaBAxdeyzQn(aE5hq zHz@<<(;D9$$HUD@kW)?zAu@_qma&2o!(EqDV_?5WK@N=dkjKTgq6VKK^rEB>S*KOF zF1wfkoev+}!55yEuUp7*`m%N@DJgz@YG;shD9@o_Y&Ymq9xC3?fp?yS=gXl6$WF^g z0MId)_Kk*&?p%%n$j`+?KI(o4b7x9431j}|)l|`@FbHZ5+aOZ(W{PFp>;7X5k|=+i zd7P+1rh9x6v_O|Ulw8Usl^ zOfm*|tU)ZHN^w0wzADDZbg3TL_su%8{KeH(K!4x-Ji$7|jc67at4lT1YH5L!ksvY63i}Eo+Pk&&q&xbDrZWme6mgB!@~f+pjdI5W?h2bKMUte z#p^2U5dn|60b~(c;H<1HgVqrirlP(G{iFx~J^+nKZxJ-}^Z9#nRDBJVTcs8>4_ZWh zsNVhf&WXkhy0xl$$*sA$xt4+g_djf`tgH<&`5@e8h*wDFe1xbt+NA&HUc=?(CB)K2 zk_hV3;dF`FZ}!F5yC~efv0Np=3(qJSOk}p6D#FcCH3=$2R#Hu0=6Sc(b^ zh|ca$m!@=C;v63Ufxt|)0(WpAAYQeN!^6YlvzUm;o1sI~-f&f(6kt$OQWdIfPeQsGiW`Z=Z%6VJc+aV<7tV8|7xUdTS=N1aefvb3ptX`S+1<(vd zNUp21hbPWuN z4UB(&-&3yAG_3-AUV_nuJ@2-XUIUoPJiwJtPHyfN_lhTsRB||%?P7rnxC6feJlv3$ zMsigF1GHqqL!l7`007BWqWpyxP-Yx{!=L=%jt4S_u8$Ug>12iHI$2#^=IYXU2RM8> z?GUx_DcXd)5qU9E7#@W@xMj2il(rZos4+STMjmwi%CjKN;gc#=Dn&FJ|o~@`i@%OlgW3ieCma2XpxVD z)5gr?`M_`hw<1p(e%Y-?9zAsalb>E#nA9qx?Q1csQLo$MZRKOW;2&7gw}X(F=|@pv zKQs-ejI1Fs`y9QAsi`@MNg&}G0jV`!XmtHx5 zxE2hlc%LQe=w#MoXJ$aKE7=yB@OQ3)cSc@Ps4Ln0@2ErebP6ubR6!C-6A3OSeWg9C z%rh9zlth#6(B5YEg%u_}p>x$1qyny|`RO2ET(_rZWdP*%0R@N?P&QOK<=SzQa-JRg zVn}g-iC<;zYpAh#MM*L8Dlm%(a4n!BsDYc`;#2+{`EN zF4&JQO;)n|`U@$=ctmhilYxkpwk*?)ToymQYHYO*yQo?QcMNfL?x_v02EFazD`rHX zNed;fsECUkAW5BD&d&1#r27M1HrGds-E|WB2m_0%8SAlPX)`+{;N+HkVU2B2kFQl> zIY=XhseQV90vswg00&KeC4h@Y3z^MI+Xgn=GcE1+;K0DZFyn})ZQ9*;*F7Cvc1fSm z7Ef)Pd?xxbiJ=X*JGdUVJ3CX7lulzO6G?KQ+6WBA2NO+$<%J>C^Wwvsn-CN6Wq(=R z6`@AOoc)=#sD;OynuxgvYnp4eL$~nQZWe$bQ8uhM)tn(o=ZnZBWV1d4waD=Q| zKPwdTA&hjnZA&hLA}p16vbKtmNhH6sZ| zBj&5o$5i=Jnm%~@hA_5polr2MiQjT+W<>95xgbj8XA|3#W@{v|-hq^kw)PmSor{YL zHClVrco6qqAuxYvXbAN3zmH)G}%;h|5H<=!GAl&@NV0LaD@5g=iurG;D& z4#UYzqjSR_7!bI956+hclloZ=X&m(7%^C{h;S45^Q@Kbzd?cN`^=sfKR>emYfnXvIAD_I72P-pmk( zr6DgLHo5~0ipKh+3iGFWk@QsjDW^1O^BOS_yZ-&ur&7-NzArb z&V=t!X17?Y@8_OHn%E7$xD9AA+s`};b^z~&NU!Gd*u$uj2RHo>Zcq+d&_(iB$MHW% z0B8~ycNxY`kDB4KVD&}+5YPfeJGsvG@7aSe5dGjuPOj$;gRJ`+=GNMowx&9>9 z!S(s^j={D`Gn-IBKPS;cp*d{Ios>tTjw6n2<*v4w<_AYfuh&d`lo0V}nTPA6H8lP6 zbRjAUX=(4PDXqzT<$OX&RIG&I4?#C+z@I$MH71*t`avM%X7y6R35d^JB^K?uIh=#h z&uOvGvsJg=5unD#1e*RhMCLq*(V=(I?io+& zTv;LYjMidDKtQ;M=f){3E4%cLW)?n1USQedqkg!fKP0WamN}TOEjIfJUk-8FW&cM2 z368!kfnHy;PeGihO(X&s$N_M6auadTYKy@*($HoKrEdmsT*6LUxc*%1M>i}`*kI3* z>XUxPgYGnCp~u{9}+m#@C{c`a54xjIrwK72v+R~=xzR(#87`6=@C5s2(~VK&)P=0mqnQ=(Nrnlu ziv^lBEoCyG_#f;H17jyCv(xx(4Zmhsq{Kbdk^rXNKa^SwRh?uVhVV$QulJ(a`Z>;0 z);vxRnF@!M41$RV+R=+0uxSETGUT|Z9_T#0=*KGvUKUCqIMt?JM1)$;nnG?$S>ZZF z35uFul|cX62e`F@QGDx_tUHtQXc5A2+$`ln#=>G-!GU~Z<+FuYqO&GNvdzllpYUG2 z#_PfPN7Q1c%+rEN9)$DxvUL#X@;@;?#m$*>yD7EyWTnj{`_UF8%dnCdpUy8)#nX}j zH?c0Fg0wj)vra$JxH|`9Q^RV=7U1zKAx`l(r(OHz4t+M@{%CKU%R&7nNdD^a8bfQF zOMgy$P~MQ%cm=CmT(5)q{04tqbuq=lv{88_D3E@|UlzVU(2NvRUXGq&jO+!>RW0Hv z@tmwBSTZV7W&ZEoJ`o42H_~izD)e~G{JEDS#iOq1o*5g{uKR*to5U0iN$%m9nwq-H zVYEXM2;e6W%>|98f{m7gu<#v=hC>v`SOp{jp?U_ntTD{6<=K|>jJP4wQsng(%_3n5 zHLAKA642=Qo13>PDJy%N*&9_6$9z$yTERnb|0py&i8YHIQXl+w#O%9FJZ>j%aZm03 z&7;C-hUrqvO+A254mOR9gp^hjeecmCNQscoQJ>$khsH^ zemO3X9^yWp6_dLF{X&lhhF7`9?1Y-*s=Kd8WSwn@_+O8~S+qqmd2CXwT)KQtC)=E zDN7-OJ1;Y62NAQNH^{82`OvpX0ZjL$oLojse+DNL6wA?aJgVMi5Wtthg~0cFCB&ut zd=$7d81zq(@MXrwDm0>voYkDe&OxWP*s#N5r9jKIz{}0clZNDC50^*UsyH_3I)&sB z%VLpQ>akE9YtbX|w}rn&FJLe~H;_lspn9{*zs$|rwFWuX-D_Igc@MWcE-d4hByf~r z-$>icWTuj$PJwu8z9pwQpZbfkv`0jtqPdp8$f@=RYQLJ24iB#>N{Eo?Zxnl^`XSl; z*tj^2701$PeRckuO_#UDOG5Tn3wKsdF#-&HC0Q_>N@S;P-+w6O(QTz1(HH81goUa5 zPGX#2p1lI}z5tcW3$C1j6A@Rn-$;O_Q~Un#JjkTF;EtuuoXw#UZdv7R>RF7O!1n=! zsJ(;|>i~-0NEx|cB_&xuUdH$2^jneyM82xA6AnFEi5o$JkBy_lAzt2-$F4=d<{+;H zNy5)_Xk&Nc%`-zvD}bqeuFREHC%>je&b^~2Kh0fx#dge8maFj!{EYsz%cTv=-kVS1 zIIs_&C}fB`mU@KVkRHtJ7HgH)RaSOBzcgf@u5qAB@X*sEU2@UZv+10YJ>y~8i6g5$ zMlhIXNf)hiP2_h6VT3d+tG~mRlhdjSj^_|{{M>z24ta|5iIi$2`O^N~+)Y#ecN-WE z1k0L~+{y8(bZ0ZeVU4Bcr#Xk)zUx*+4)>pXyTeC(izVgHhTsV9r;=(<^%r5lCDZFG zw(wDH+EHsh$ZiU($JI#|&QL z>K0@cdJ^sByH>nRO|VKj4DwoJf`Z#0@(|_KmR)}b^Y?l=qa7a!=go9>E`j!PdCSAL zhYg4|ooAdM$~F?y1Qm6!4p+nm8#L#HY7C z^!V8nkBt5g@4J>j2HF)i+7+oOPlon%6*RLRNRgINgYZq7Qi8L+g3L6I7M9ktX#1N} z(iaM>!yX&W>F;Li^?(t}%(a1>Cy&;}ZG`;zzX+zNA8~ZDPgG5=zIZh=N{^&9?Yj?$ z(#|KsNfSW8sY+{YcXz(4H|Cnoq9&^=4$~AmO$>Mp?vF)TWG={5v=gDHJTi-mitxb_ zI+!2?#QNG530{#oq2toUMp&BN@BOy@|@;ql? z?X-q2G}h|&bqv4=T^Fki2>-77RSu^-@?$927_x$0*)I-hl-O7V| zIfehUM9c5Kp%MXmT%tD6TKg$&CeJJc@`}&}L(;|~SdfGgyJ4#=qBdEJOp%gCh32J| zBEPkwyuv7jW&_V&b&NFPfvEnC=ggdiYf#_#&-y&85{|=`o{9xw7=GJ#IY*quhJA;m zbx*v%9Zz=^mlV;ip6A?4ErW3}o#XBATfxIff?ykO1lrE2=nk@jR9ZMyPoggn2(7ow zI0IQ!RCI364$HJ9fEy_jm%M=~k#3I+qaAtodT=V=KPgvj!2kC`h?i6<*Uhn`MTOL+ zvJLQM3QO1f#3Sb=roBm-@Q*`8W#o?b(WQ)l7kIn?36`$uibXaOZWcB$qQhWQGmkH-g2=E3Xrh`5v+k6B(dewSCs z7P1lS2A`;?sRR7|7h65J$;rtX`B^zRsY7;tVK^|5AId=MVWDZX28K|m<>!dc#z^RX zB;uuFSqpxMaiblkUHU2Tt93W1`yh`V#OSX)eeUNX%Mg0@ByIE%1cuM1tX7<{B-ATg z*xB9R+qj_O;+meD!~X~ubk-;Vfo}h>VOa@t7#bS#>+!orgsvl*#;HwyV>j5&ZTF-^ zcB>()Gux6~*h4yx52``c9boF&!_EeGm9w_m&cE#UMi36q%+K-8&cz)26gMEgV&8yb zgV5ZZ9K--Iu9Tzo^{?6FYo8i}n`L%7YC_N=l~zf3kjmEo;_RFXa=mImAS8ge^At)N zj0g^X(}`&P<~v~~+RLI2ClnFPjS*ZRbl_`ZBTuAvVscWH$|y6AilP!q#0~3702R_f zr31303fKyx8vdRAM+g%CAJF#y53&v!{C|=8|Ik;}@GpSB8Rz$>0s@0VfLac6d(lt` zRi0THf#i@K{0qTCh%BOgq zy*}cQ&B&?zmXzwThFNIPtdAm;@MhU}bd?v4^mXnC-HwsFZPt2^hl4vTKX9(!O(I}f zOR9})^$p0ke)WTEBzquaK^aPFGCo4h4`lGY(()0JiHbaWTt_Bzs0UT}NrYw?yj)Le zbKT#zq<%9EDslmS&{UOHgc9XF<-1j-B1HceW^dLz@`mN}r zoj3h0dTB?d1Y}oo#zh5xpB=StZHy)=3rNGA$2H0B5SnCoWE}_YE zy8dvi*!;H;WgSXEbt&J~5!WY5+!^BLwt!FEV3_i$Qs2wyZ7P3|9wTH%$g>U0KLpbj z-{1~D=hDegsDF$YGwv(-WW%?6G?Ik|Kx?s_%T!)4pezI@rrtXfS7TCmz0};bZ`%ag z2CLV5@~-sBqz^Zs{iV*qTDu&83q}v=>KvF4AbdY5BXB@+y|h8&B5gV%zF3yS+kT zFtXWu=E2^RndynkT@d12NSd=FoyK8YBMJVhNcMEaaWNzOVF^)1vD&^y>R8Vo_|2l3 zSbO@1NEeAXn$+H-AlD1DCtXL9#mz9*=8-C`di%l(Ady7S(o9w$`Ktmna4NWHNS@dv zw7%d5*sPzH6NtL30mmxPOwq?9mbAKkDlZfeg1IO6XO``O9@!CwTsF(*$ELN&^Zcx_l{*P|D9`ohlU*`o06<335(3tN@eG&1%+)PP-LS z`zlvs?lnD0!@6EeRU0#b^Rh68%HFRH-rXTlG2vgE=dF zd|j4Ocbf{Ib8P5a)U@n>L@mR+b`|JZ2eOnrXlG0j)n)?aQUE>#d%>hPGgGJUegB^` z*?_NbO!}$eLVrOrLGh*R(Zq*`DW``}3B&DbON{+{z0F%q-Tool panel defines the options for the Tool. The table below lists the basic options. Plugins may add their own options to the Tool options. If a tool does not have a plugin that uses an option, the option will not show up on the Tool panel. - For example, the Ghidra Project Window does not have plugins that use the Max Go to Entries, - Search Limit, or Subroutine Model so these options will not appear on the Tool panel. + For example, the Ghidra Project Window does not have plugins that use the Max Go to Entries + or Subroutine Model, so these options will not appear on the Tool panel. If an option has a description, it will show up in the description panel below the tree when you pass the mouse pointer over the component in the options panel.

    -

    -
    @@ -318,17 +316,6 @@ Label dialog - - - - - - diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/MemSearchPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/MemSearchPlugin.java index a083af743c..dbca8c83a7 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/MemSearchPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/MemSearchPlugin.java @@ -593,7 +593,7 @@ public class MemSearchPlugin extends Plugin implements OptionsChangeListener, JComponent resultsTable = provider.getComponent(); Msg.showInfo(getClass(), resultsTable, "Search Limit Exceeded!", "Stopped search after finding " + matchCount + " matches.\n" + - "The Search limit can be changed in the Edit->Options, under Tool Options"); + "The search limit can be changed at Edit->Tool Options, under Search."); } // suggestion to not close search dialog. TODO remove next line in future versions. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin.java index 0981bab88b..f7676357e2 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin.java @@ -562,7 +562,7 @@ public class SearchTextPlugin extends ProgramPlugin implements OptionsChangeList Msg.showWarn(getClass(), getParentComponent(), "Search Limit Exceeded!", "Stopped search after finding " + matchCount + " matches.\n" + - "The Search limit can be changed in the Edit->Options, under Tool Options"); + "The search limit can be changed at Edit->Tool Options, under Search."); } // there was a suggestion that the dialog should not go way after a search all // searchDialog.close(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/navigation/GoToQuery.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/navigation/GoToQuery.java index 133aaad0a8..dee311d524 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/navigation/GoToQuery.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/navigation/GoToQuery.java @@ -651,7 +651,7 @@ public class GoToQuery { SwingUtilities.invokeLater(() -> Msg.showWarn(getClass(), parent, "Search Limit Exceeded!", "Stopped search after finding " + matchCount + " matches.\n" + - "The Search limit can be changed in the Edit->Options, under Tool Options")); + "The search limit can be changed at Edit->Tool Options, under Search.")); } } diff --git a/Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/SearchScreenShots.java b/Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/SearchScreenShots.java index 2935c686ee..15d76fced7 100644 --- a/Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/SearchScreenShots.java +++ b/Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/SearchScreenShots.java @@ -25,6 +25,7 @@ import org.junit.Test; import docking.ComponentProvider; import docking.DialogComponentProvider; +import docking.widgets.combobox.GhidraComboBox; import docking.widgets.table.threaded.ThreadedTableModel; import ghidra.GhidraOptions; import ghidra.app.plugin.core.searchtext.SearchTextPlugin; @@ -105,8 +106,10 @@ public class SearchScreenShots extends AbstractSearchScreenShots { JRadioButton rbAll = (JRadioButton) getInstanceField("searchAllRB", dialog); rbAll.setSelected(true); - JTextField textField = (JTextField) getInstanceField("valueField", dialog); - setText(textField, "LAB"); + @SuppressWarnings("unchecked") + GhidraComboBox comboBox = + (GhidraComboBox) getInstanceField("valueComboBox", dialog); + setComboBoxSelection(comboBox, "LAB"); final JButton allButton = (JButton) getInstanceField("allButton", dialog); pressButton(allButton); @@ -167,8 +170,10 @@ public class SearchScreenShots extends AbstractSearchScreenShots { JRadioButton rbAll = (JRadioButton) getInstanceField("searchAllRB", dialog); rbAll.setSelected(true); - JTextField textField = (JTextField) getInstanceField("valueField", dialog); - setText(textField, "0"); + @SuppressWarnings("unchecked") + GhidraComboBox comboBox = + (GhidraComboBox) getInstanceField("valueComboBox", dialog); + setComboBoxSelection(comboBox, "0"); final JButton allButton = (JButton) getInstanceField("allButton", dialog); pressButton(allButton);
    Search LimitNumeric: The maximum number of search hits to allow; - for example, when you search - for text in the Program, the search is stopped when the number of matches - exceeds this limit, or the max number of addresses displayed while doing a Go To for an entry - that has multiple matches.
    Subroutine Model