From e37647fcebbd566be422dc794f8211b44209bc90 Mon Sep 17 00:00:00 2001 From: d-millar <33498836+d-millar@users.noreply.github.com> Date: Thu, 15 Jul 2021 14:01:26 -0400 Subject: [PATCH] GP-1139: first pass at alt color set --- Ghidra/Debug/Debugger/certification.manifest | 13 +++++++++++++ ...ggerBreakpointEnablementTableCellRenderer.java | 1 + ...ggerBreakpointLocEnabledTableCellRenderer.java | 1 + .../resources/images/alt-breakpoint-clear.png | Bin 0 -> 365 bytes .../resources/images/alt-breakpoint-disable.png | Bin 0 -> 295 bytes .../resources/images/alt-breakpoint-enable.png | Bin 0 -> 269 bytes .../images/alt-breakpoint-ineffective-d.png | Bin 0 -> 353 bytes .../images/alt-breakpoint-ineffective-e.png | Bin 0 -> 302 bytes .../resources/images/alt-breakpoint-mixed-de.png | Bin 0 -> 368 bytes .../resources/images/alt-breakpoint-mixed-ed.png | Bin 0 -> 373 bytes .../main/resources/images/alt-breakpoint-set.png | Bin 0 -> 383 bytes .../images/alt-breakpoints-clear-all.png | Bin 0 -> 504 bytes .../images/alt-breakpoints-disable-all.png | Bin 0 -> 420 bytes .../images/alt-breakpoints-enable-all.png | Bin 0 -> 329 bytes .../images/alt-breakpoints-make-effective.png | Bin 0 -> 381 bytes .../src/main/resources/images/alt-breakpoints.png | Bin 0 -> 356 bytes 16 files changed, 15 insertions(+) create mode 100644 Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-clear.png create mode 100644 Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-disable.png create mode 100644 Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-enable.png create mode 100644 Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-ineffective-d.png create mode 100644 Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-ineffective-e.png create mode 100644 Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-mixed-de.png create mode 100644 Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-mixed-ed.png create mode 100644 Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-set.png create mode 100644 Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-clear-all.png create mode 100644 Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-disable-all.png create mode 100644 Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-enable-all.png create mode 100644 Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-make-effective.png create mode 100644 Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints.png diff --git a/Ghidra/Debug/Debugger/certification.manifest b/Ghidra/Debug/Debugger/certification.manifest index 3ac7ff87b8..e0ef58ee77 100644 --- a/Ghidra/Debug/Debugger/certification.manifest +++ b/Ghidra/Debug/Debugger/certification.manifest @@ -118,6 +118,19 @@ src/main/help/help/topics/DebuggerWatchesPlugin/DebuggerWatchesPlugin.html||GHID src/main/help/help/topics/DebuggerWatchesPlugin/images/DebuggerWatchesPlugin.png||GHIDRA||||END| src/main/resources/defaultTools/Debugger.tool||GHIDRA||||END| src/main/resources/images/add.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| +src/main/resources/images/alt-breakpoint-clear.png||GHIDRA||||END| +src/main/resources/images/alt-breakpoint-disable.png||GHIDRA||||END| +src/main/resources/images/alt-breakpoint-enable.png||GHIDRA||||END| +src/main/resources/images/alt-breakpoint-ineffective-d.png||GHIDRA||||END| +src/main/resources/images/alt-breakpoint-ineffective-e.png||GHIDRA||||END| +src/main/resources/images/alt-breakpoint-mixed-de.png||GHIDRA||||END| +src/main/resources/images/alt-breakpoint-mixed-ed.png||GHIDRA||||END| +src/main/resources/images/alt-breakpoint-set.png||GHIDRA||||END| +src/main/resources/images/alt-breakpoints-clear-all.png||GHIDRA||||END| +src/main/resources/images/alt-breakpoints-disable-all.png||GHIDRA||||END| +src/main/resources/images/alt-breakpoints-enable-all.png||GHIDRA||||END| +src/main/resources/images/alt-breakpoints-make-effective.png||GHIDRA||||END| +src/main/resources/images/alt-breakpoints.png||GHIDRA||||END| src/main/resources/images/attach.png||GHIDRA||||END| src/main/resources/images/autoread.png||GHIDRA||||END| src/main/resources/images/blank.png||GHIDRA||||END| diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/breakpoint/DebuggerBreakpointEnablementTableCellRenderer.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/breakpoint/DebuggerBreakpointEnablementTableCellRenderer.java index d6fe68dcdb..a8a09b7050 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/breakpoint/DebuggerBreakpointEnablementTableCellRenderer.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/breakpoint/DebuggerBreakpointEnablementTableCellRenderer.java @@ -61,6 +61,7 @@ public class DebuggerBreakpointEnablementTableCellRenderer setIcon(iconForEnablement(en)); setHorizontalAlignment(SwingConstants.CENTER); setText(""); + setToolTipText(en.name()); return this; } diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/breakpoint/DebuggerBreakpointLocEnabledTableCellRenderer.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/breakpoint/DebuggerBreakpointLocEnabledTableCellRenderer.java index d153114c5f..ed04b0b6da 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/breakpoint/DebuggerBreakpointLocEnabledTableCellRenderer.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/breakpoint/DebuggerBreakpointLocEnabledTableCellRenderer.java @@ -46,6 +46,7 @@ public class DebuggerBreakpointLocEnabledTableCellRenderer setIcon(iconForEnabled(en)); setHorizontalAlignment(SwingConstants.CENTER); setText(""); + setToolTipText(en ? "ENABLED" : "DISABLED"); return this; } diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-clear.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-clear.png new file mode 100644 index 0000000000000000000000000000000000000000..e031698377c6ec00774e3c0ffca07964f0c2ce07 GIT binary patch literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1TEdAc}; zSoGe#w9)G@gGlQ`eYYi|F)?$NtbcGrU7)3@>A`~+4^&D&tIB9a%y9{r;Pm3cK@PpS zzZja3Y5PV*UEKhx#{*&pciyaV~74?KEerh}Q77-Dj4r zdD^YVZT90(O}Fce1>J&KG4`ALrZ>%BdE(~DvmcdvW!aQX3XlERyE918)1}NyxqsHx zj_MRa|I~lMO-g06m2(!?pNP9x_U&;K=V85LIafOSEh8SWFy)=9*?FX((a~#lXRZ9Z zKLVRJo%~zQsTUMgy6)B&XCW2Fz^OaEqL&>F{de5{s`QRc7Qtq>wrBx;&EV4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1T+c)B=- zSoFTVV93W9DAM|{KfF6&cGO9&90#M$xi?x~~kyk2X~7>@~G&WRc#&G})_( zRZ^-k<;2t8S1meAe@4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1ULJY5_^ zEPCIb+sNCLAmaLve}+SK`T@-n24SJ+8xlDmOQ=~jvRdB=%Fgz9!D%M)M7$*~zcTJ! z<@EYRiWO;73l1%FX8qJt6m((g`v|t>s}%2kesS1Bq-6eKBOReW#XkaH()d%Y-9PBQ zm2ot@*0KeV42Xr9oJ4vGm}+_ytzO}WkSYk!OGg(iv1i-vy81-gpC)78&q Iol`;+01eGvkN^Mx literal 0 HcmV?d00001 diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-ineffective-d.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-ineffective-d.png new file mode 100644 index 0000000000000000000000000000000000000000..cb1d3782358eedf419204ceae8ff7336febee233 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1U#L=PLN^!uU@$m4`C0EXW}5@iOSYPsAFE+_!Pu~BT~g2HO*-al*{4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1T6d%8G= zSoFT_Q{+43AmWmK;~nFQW$6zXzCPH=wd~}qt}vmzMt7yGDkdGNoM7KsXA=|}moBZS z`1JJoU&enM{H>k~Wxo|Wz{H>udhhodjjqcX2P~(%1eUM}?3bC8d%g7YCY|%=>x9_e z&3}BsdsbAo`NDc`o3!tWnLm9K1SU!GdaSb3vFKsj^Ih`fw&&H(MY2`GUAxxJHt{V# sHbb(3<$&mcc~7*?e?EO-SNt=!bRLtK9d{-z13H_*)78&qol`;+09f;Jj{pDw literal 0 HcmV?d00001 diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-mixed-de.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-mixed-de.png new file mode 100644 index 0000000000000000000000000000000000000000..201d4a298d5ecc34411ce89b499e360ee0786b17 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1Uvdb&7< zSoB`KxX|x#g2>U2@wYj7(wY>_nDrY{`44cLG|2cV%+(}}4wt#8Kg-p;s{M@7^Tg4jNgveDKi8Tb)Z0{dtl~(V z>;p+7HsxDOe=jh)d}?P@rPHCh6B5?hlMZ~DaW|f`%14QhJI^4V`Nk@1N1rOE{SVgV zSwGk)wjrRoc+dKZUmTWqIXXOxcd>eM&SK?J<`awmWB!FVyVhK3LY_+|(BllAu6{1- HoD!M4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1S(dAc}; zSoB`Kr0d5VD8usM{yQZD36{_q^B7#6RGYYSm_)yN@C7h3^&dB%qE_nA#K=C4`GOXY zib7V`i+9c&e9cZzi<0>M?ChEPd+h(^0;ldsFn-8W{o_ci-}bW^nGT6{hpJq^&${3x z8P5FZ)1nzMrq0TbQ!<+wh1Xo=H0*wHTxR<0Bcc~e8YRP+=JvEJo^@sXzMtjJ1FqgV zmv1%9(Yu#*M&9C-MazM_T!-0#hx`__M>@to&w2m3XUT&waaqSxKN|cVY+B%y5M}ex z(&f&%ul9DAWSnP7_TN~MvsXQ5>7FZQ8s;Z6S%2+&pDJXiG5bH;K897tZS`DN`^o}+ O&*16m=d#Wzp$Pz)7?1A& literal 0 HcmV?d00001 diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-set.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-set.png new file mode 100644 index 0000000000000000000000000000000000000000..e12b41d30654c654651c93e19924ee49b9093c21 GIT binary patch literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1V4c)B=- zSoFS~XzRu7DA6|m{q2OcnxejnVtFF7BW`udIfUJq5~tWZU10qNUx7Q^84J}tCMs!X zWnR)aVdms9QF3kQY;y09A$Num~|KHb{NmX8p=HYJLCf-u~w+56pFX&f~UjfmnxR zbd$`R^XuHcYTvfbEMl^VOS|ayz{JeqouI?%pq#n37e${s~dN ZZ)awE>+o)DkeBC~zVQ8?bI&~| zRgDxca1x)(4r;@p&DoSDF2HYkw>YuS#VGW$OduH{f5J56Xki-fkqR(a| zcfK=wlZ|aO@SKBj9ugc zl_@$8xiiBfNO)huOR~pDsmAH-g8n}`07-yoLy(M5IxXnGWo%`HP9amE+5ZG(s8w+*1PiUSlGJ!rZoH0me_%L9;q@9p5ca@J- u4%P#Zh(&7AAlTY!3K2xG6xX%LL}Jivz*7zLpL^!qd-~dTs)OB> z`$B_Qe24M~f6Z9h=J79s62za&I72m1!v$sodxZ&FykR;}tJ51w^?nI^A)#6YC46RY*KV_+icf O00004nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1T!dAc}; zSoAKvXq(04C~@rL{WtRtd|9dcRfO#l7q_Lm!=9EW5{I(pFWKNX`xSvR6FoOu z$WK^4bLRKQ|IeK{Y%luHEc#t^+=h;Y%-3X(D=C=OKgye8A3xLf<5VUS0rmdbiI+B= zyt|4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1TkdAc}; zSoAKPXzO>_L7;WN>2CIp%#0$oV&+{>7$)iz@=1B$zP0qItx%Q6Ly?oL8L{nVo2Fcg z;_Vfju)$tv{mrZAUR4`^elR~MUOfBl9f{98It(sLiqD0X#(ocM*jl!3YaRQic-N(E zg)-gCGW+Zt*bFS6Pj?lZDVcmLfc<8PUX8p<%1ovYUYe?b4IL$oeA^To*b2^tM!jYi zoEf`g{-?kDVh?lQPcCx^b>hEnxXnJTZnv$>t=)IuO?}PE&)4N{p~W<7PWZe}%UX=K zx#U|N5E2UF@CahKS0a)V%phv;=VRTe2bx?O3(Er-q#y9i5nYr2ppI2u@UuxR(;VqQ VafRAfuYjSz;OXk;vd$@?2>|(+jFbQX literal 0 HcmV?d00001 diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints.png new file mode 100644 index 0000000000000000000000000000000000000000..4d27be0a40c28562b20157800df12c292902c9b0 GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1SZdb&7< zSoAKvWaxc3K!o*y{#l(%=gz)~sCVUF*V?e(dBVTWNB8U%mRNbco^bQ(*44YFIeimo zS5r9ngtcnf_jeEHR==~J&Mj!#o<3=Y`kB{3eW9lmH3IDa9a(a8zE|4!nsUyb1@CMQ zN-s0yER#6CrkT%(E9R(*ciq1oznmr(-F>alu&O_YrAXuE9;3Cp^Rv3&JG<>T$bL-s zUx&5LE05)}kEOb2-3WjF+t1%>qFl!$BCr8*}Z!u_Al@;V-wP_m