Source

nbandroid_patches / logcat_colors.patch

Full commit
# HG changeset patch
# Parent b4e3b94823a341acc7bde9bc5b1644e4cc399a1b
LogCat: more eye-friendly colors, nice buttons

diff --git a/logcat/resources/device_status_icons.xcf b/logcat/resources/device_status_icons.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..d0f89f5b1927e0bdc4d652e113d59ece2b302201
GIT binary patch
literal 5203
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

diff --git a/logcat/src/org/nyerel/nbandroid/logcat/logtable/LogTableCellRenderer.java b/logcat/src/org/nyerel/nbandroid/logcat/logtable/LogTableCellRenderer.java
--- a/logcat/src/org/nyerel/nbandroid/logcat/logtable/LogTableCellRenderer.java
+++ b/logcat/src/org/nyerel/nbandroid/logcat/logtable/LogTableCellRenderer.java
@@ -29,6 +29,13 @@
  * @author NYEREL
  */
 public class LogTableCellRenderer extends DefaultTableCellRenderer {
+    
+    public final static Color COLOR_ASSERT      = new Color(0x880000);
+    public final static Color COLOR_ERROR       = new Color(0xee0000);
+    public final static Color COLOR_WARN        = new Color(0xee8000);
+    public final static Color COLOR_INFO        = new Color(0x00bb00);
+    public final static Color COLOR_DEBUG       = new Color(0x0000cc);
+    public final static Color COLOR_VERBOSE     = new Color(0x4d4d4d);
 
     @Override
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
@@ -88,22 +95,22 @@
         
         switch (level) {
             case ASSERT:
-                color = Color.LIGHT_GRAY;
+                color = COLOR_ASSERT;
                 break;
             case DEBUG:
-                color = Color.BLUE;
+                color = COLOR_DEBUG;
                 break;
             case ERROR:
-                color = Color.RED;
+                color = COLOR_ERROR;
                 break;
-            case VERBOSE:
-                color = Color.GREEN;
+            case INFO:
+                color = COLOR_INFO;
                 break;
             case WARN:
-                color = Color.MAGENTA;
+                color = COLOR_WARN;
                 break;
             default:
-                color = Color.DARK_GRAY;
+                color = COLOR_VERBOSE;
         }
         c.setForeground(color);
         return c;
diff --git a/logcat/src/org/nyerel/nbandroid/logcat/resources/log_level_assert.png b/logcat/src/org/nyerel/nbandroid/logcat/resources/log_level_assert.png
index aeaba03130c2af556f48fb5299e9f00a12ac7df0..0648dafe78875621fb566a2e63747f507d49dd75
GIT binary patch
literal 410
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^PXN
zr}OT5AjMhW5n0T@z%2~Ij105pNB{-dOFVsD*>AIRFqmuqXL@}cXo{4li(`nz>Doz-
zen$*=T<1?d*Y=R<ar7o_10g9E4lx~p@`U4_ZcLp!ox|oZG@WAF{V76p+MQ#)|G%I2
zZx#7&@X^0VVdFH_2kZfjq6QJ`8hGn{g$oiRIv><B=m`G!b;M(x1Ka#v<^daPvfg?;
z@)O<o%UbT>^8L~qn9g&)c^!Q<^62zh{kmrwcOS=0UHd9#`h?}nQVz%onR#wyVdDJx
z_;2B_<ZO<Dm0nxln=ebsd3$2HE32Hd!B#a<)ftuv;Vw!$%#@3#JP1C|rDA#BN!E8B
zr`dt@th#`?Ps1LZ+4FH;^IxA-mYGcx?Y62FZ=S@rr-9>utj}Galh?y1<usV@J`}Fb
ya6{6Q{Tic;x_r)l>57xe#}=sVtDYeHyPnZg-Ys9L*me&nR6Sk&T-G@yGywq5HkzLR

diff --git a/logcat/src/org/nyerel/nbandroid/logcat/resources/log_level_debug.png b/logcat/src/org/nyerel/nbandroid/logcat/resources/log_level_debug.png
index 7ba91d2464f5cf2789ea1e62daf86b0a9788b343..cf328bf381043dde0c35c215b8acb5740cc89815
GIT binary patch
literal 434
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^PXN
zr}OT5AjMhW5n0T@z%2~Ij105pNB{-dOFVsD*>AIRFfxg}nx0n;G{wl%#WBR<bnRqA
zzas_$uJdKpZ|Y`DxRJ!A@zR2am;FJ^g$s%nOzsO7MZ0Wn<!5j@$+dCW35%H($~wIw
z(f{)QRjBnXo+|WT?|Itp)Q8F!n6wkt-p_u(<#B+K;~c}LAAYWD8Fh}XZ1RhlvFRQ&
zuVI{Yavsk_-3O)jd$sIS^BdE4S}7d!W(|>&-QZmpSKNK#w1!xv>yxt%=R)5!@?Kcj
z5E@ur7QoCnk^k{hqmAl549nXO-pDt}Di$+oGZJG6Wn5vpX?4P+FWwCKdeIJT*SHq2
zR4~u9?kEi2!>xS4H@Ak}#xPDqcTSp<ie&rw1NwC{-lkXu@&$?|A8{_*adL9Sg^zCp
zf9gbu`kbw_Ww1~7|8o3?SM%ij2RRFs8T=2#9o_z}B98IK(t~l!r(18m-M{VaTYK>=
VS6>U$iY=hf_H^}gS?83{1OQOnpE&>k

diff --git a/logcat/src/org/nyerel/nbandroid/logcat/resources/log_level_error.png b/logcat/src/org/nyerel/nbandroid/logcat/resources/log_level_error.png
index 9660cfb25fcaa131324d9f8045c592cfd2366973..cadf28365b302cfdc42657f730a1769d34f4af22
GIT binary patch
literal 420
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^PXN
zr}OT5AjMhW5n0T@z%2~Ij105pNB{-dOFVsD*>AIRFj%mAIn90zG)2YJ#WBR<bnRqo
zzrzj!ZTn-_zZG({tj!bX>@zBVAhu=YPA+x^&43Rcj*hO=r2}SYA7MKxawe)itZic0
z=H0XY8_p|T&`~b&Q+=Ai7nx@b{tmob_DP-RuIuJIurs;2DSz*VvVdTLC%c8!cQs7d
z^lC2i`d#l%%zDO<bN0p3))`l&)qil$S<Ixgf!)kN?X9Kf$KIP)y0%@hI4Jqy<&2j`
zT|u8hJ=ZPKV~U@-K(zYi!PM)%zuh-?I-LCWN<oBg%l{CIQ%=sF3;5*D^fi<^wg_!8
zTDB&t`>6>t+l$YYj5QV9GgDOWI~?C(%>3YJd`gUyM5;^TF<#@}j1kYLSA2MWlQ}=l
zMKUt<2HOtyecqSCCD_$1MK`Rn`~8OfK~%k3Z?C}Fr=^WQ881cKncS?M`wSGmp00i_
I>zopr00cp#c>n+a

diff --git a/logcat/src/org/nyerel/nbandroid/logcat/resources/log_level_info.png b/logcat/src/org/nyerel/nbandroid/logcat/resources/log_level_info.png
index 1ce8991cea1ab0dde7e5254c35423ffc8bdb4aff..da02fa28225b19aa61471996c907b67ae2236b1e
GIT binary patch
literal 419
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^PXN
zr}OT5AjMhW5n0T@z%2~Ij105pNB{-dOFVsD*>AIRFj&Y(>M`#HnxgFK;uvCax^}Xm
z-w^`=*ZUUtmbe7$dd{Yu+kPZ<$Kh)+Ey_AUD;nCw&P_DVVY(Gip(Z(-!+T<K_P^Qr
z=Ob1e7dQUjYx`*WCe0ewGKb~yt3T@+FpEE!ur;W|Uus8iU^HXSdoRawkC;t%t2Zzz
z@$fr8H2lihwC?y<j>MDqv=q`js=QYJm|_%R;>d8$;k-<jvGfrKGoO@VhP+Lacck#^
zX;?L^S;ytTuupeQ@k}Z9jZ#Om?*BV~uhD}2Y+G|gC+m!?hW#sU9bCuskZ~@XcWGiY
z-=C*_mL}y9yDz#tJ23smw|kqL56C6{yIpzs?=6qRi6<H!Z1O*F(dy%(x0dTvz2>jf
zSzYg>f589m47(XKMT*|OJIH;%=<Un~_y05gypYYvwwpF9zGtp=_3e+nJ3ztf>FVdQ
I&MBb@0FaKS3jhEB

diff --git a/logcat/src/org/nyerel/nbandroid/logcat/resources/log_level_verbose.png b/logcat/src/org/nyerel/nbandroid/logcat/resources/log_level_verbose.png
index acfa088e2b9e6718badec20aca7b4997b9db85b3..fd2668f1bd4e1c5bd29cdbf751fd8f7b4da01369
GIT binary patch
literal 433
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^PXN
zr}OT5AjMhW5n0T@z%2~Ij105pNB{-dOFVsD*>AIRFj(>&=`L0Rnquhb;uvCax;5Ck
zuh~GL)|hXKr6{lKswo|J_!YG#c<@bB3Rjrq@9_Gg*qff7!)flD4piJrmvcDrs%WQ6
z&B{U<&AXQcFI4lVu^At>Ouzp5XOG18ZJD!9aER>D>1GTr@Cy-PWk{Hpo)j88jn$>)
z_~XXkfBBSdtxc4;@ZFX{p`}59iJ>7hc527Am0#kfpZ&92Treb5)N;OM{-5pzI^Hb;
z1zuM#{W{;c%i`(T%w(w-f{m61=WZ^XR(#H5pXCD+hqPl~tF~Sdy;Ca7upsyL+{Nqp
zKIQa%5)hoQ?^tPUIq#}f38B}E-~UxJ>Qg={VZU$Jvdo?jWxH!r6qPFM=9gSzcMWuK
zDJ#3ZZL7lNs{QxB`Aek6UN>xE5Oj>3)^1$=UQtOva8I26Ey0Y?&{UV7p}EWd+8f`Q
Vx+V3__f}9~d%F6$taD0e0syPUsPzB<

diff --git a/logcat/src/org/nyerel/nbandroid/logcat/resources/log_level_warn.png b/logcat/src/org/nyerel/nbandroid/logcat/resources/log_level_warn.png
index 5c661f0497b377f21b8eef39ff2a344833d39df3..45d5f025e9610108d37622bdd0f3097d23dad811
GIT binary patch
literal 533
zc$@(h0_y#VP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipe-
z05=srWA<zS00EUrL_t(I%YBnUYZO5cg}>_RnaQ#zg8`X?<er=0zwwr<2ss8JY&OW^
z#b1z{UIam0|Hpz$6oi}vmw+JTlo@x{_E6n3y-Tp5C}yem>b>e(VJCi12>d7ZCrJJ+
z_W?g%LFFw+9?Dpc9zh83H^9Nvu#$t{E@00?sRO~@POUsV7#Y#y8RFB_cMAhPyIcYA
z`FV{Bh=3D#I$I&Y_w$-&Jy>vQdgY<e!B?T+ouy{3)mh$kusk8S<hfL+l-^ho8-1)j
zK~!`whGq>O%%2l*&cFhA-Byu^)mg6!{Mkf;%9~e};aN(xEMoS=nX0>7L0VRtRB2S<
zEG654ch=u__b5n{3WX=H>_x6G>S4Lghyj{zM}cG(DnF2w`EqqwXxo7UyRdXDQ3OZR
zRZn*Ka@CVb{Bi!x6uA8f62fq0*B5oK<masB=5^hJZ{O5g(~mzyzF%jAri+r|GBqBM
z&pfAi{{_|?crot<!H-iy+nKC~V*{%r>wr&R?d{vnz+3;u6w8xHw1#$LHK}W&?7aUU
X=528=1?*8K00000NkvXXu0mjf*hT2w