From 2686296cf61eefd76b85558a64e8232b0e7a39b9 Mon Sep 17 00:00:00 2001 From: Stephen Boddy Date: Mon, 3 Aug 2015 20:22:15 +0200 Subject: [PATCH] (trunk-1585) Adds high contast icons, and makes the main window icon loading work better, and respect the theme changes. Note: wmclass_name no longer readable under GTK3, so -c option is a bit dubious now. Also, in HighContrast, there are issues with titlebar background colours that are not present in GTK2. --- .../terminator_active_broadcast_all.png | Bin 0 -> 285 bytes .../terminator_active_broadcast_group.png | Bin 0 -> 283 bytes .../terminator_active_broadcast_off.png | Bin 0 -> 266 bytes .../16x16/actions/terminator_horiz.png | Bin 0 -> 185 bytes .../16x16/actions/terminator_receive_off.png | Bin 0 -> 267 bytes .../16x16/actions/terminator_receive_on.png | Bin 0 -> 290 bytes .../16x16/actions/terminator_vert.png | Bin 0 -> 180 bytes .../16x16/apps/terminator-custom-commands.png | Bin 0 -> 398 bytes .../16x16/apps/terminator-layout.png | Bin 0 -> 493 bytes .../16x16/apps/terminator-preferences.png | Bin 0 -> 399 bytes .../HighContrast/16x16/apps/terminator.png | Bin 0 -> 298 bytes .../16x16/status/terminal-bell.png | Bin 0 -> 700 bytes .../22x22/apps/terminator-custom-commands.png | Bin 0 -> 753 bytes .../22x22/apps/terminator-layout.png | Bin 0 -> 929 bytes .../22x22/apps/terminator-preferences.png | Bin 0 -> 765 bytes .../HighContrast/22x22/apps/terminator.png | Bin 0 -> 690 bytes .../24x24/apps/terminator-custom-commands.png | Bin 0 -> 714 bytes .../24x24/apps/terminator-layout.png | Bin 0 -> 811 bytes .../24x24/apps/terminator-preferences.png | Bin 0 -> 716 bytes .../HighContrast/24x24/apps/terminator.png | Bin 0 -> 589 bytes .../32x32/apps/terminator-custom-commands.png | Bin 0 -> 706 bytes .../32x32/apps/terminator-layout.png | Bin 0 -> 888 bytes .../32x32/apps/terminator-preferences.png | Bin 0 -> 762 bytes .../HighContrast/32x32/apps/terminator.png | Bin 0 -> 516 bytes .../48x48/apps/terminator-custom-commands.png | Bin 0 -> 1061 bytes .../48x48/apps/terminator-layout.png | Bin 0 -> 1329 bytes .../48x48/apps/terminator-preferences.png | Bin 0 -> 1158 bytes .../HighContrast/48x48/apps/terminator.png | Bin 0 -> 793 bytes .../terminator_active_broadcast_all.svg | 127 ++++++ .../terminator_active_broadcast_group.svg | 130 ++++++ .../terminator_active_broadcast_off.svg | 131 ++++++ .../scalable/actions/terminator_horiz.svg | 98 ++++ .../actions/terminator_receive_off.svg | 138 ++++++ .../actions/terminator_receive_on.svg | 136 ++++++ .../scalable/actions/terminator_vert.svg | 99 ++++ .../apps/terminator-custom-commands.svg | 193 ++++++++ .../scalable/apps/terminator-layout.svg | 168 +++++++ .../scalable/apps/terminator-preferences.svg | 430 ++++++++++++++++++ .../HighContrast/scalable/apps/terminator.svg | 154 +++++++ .../scalable/status/terminal_bell.svg | 159 +++++++ setup.py | 27 +- terminatorlib/notebook.py | 8 +- terminatorlib/prefseditor.py | 2 + terminatorlib/window.py | 40 +- 44 files changed, 2002 insertions(+), 38 deletions(-) create mode 100644 data/icons/HighContrast/16x16/actions/terminator_active_broadcast_all.png create mode 100644 data/icons/HighContrast/16x16/actions/terminator_active_broadcast_group.png create mode 100644 data/icons/HighContrast/16x16/actions/terminator_active_broadcast_off.png create mode 100644 data/icons/HighContrast/16x16/actions/terminator_horiz.png create mode 100644 data/icons/HighContrast/16x16/actions/terminator_receive_off.png create mode 100644 data/icons/HighContrast/16x16/actions/terminator_receive_on.png create mode 100644 data/icons/HighContrast/16x16/actions/terminator_vert.png create mode 100644 data/icons/HighContrast/16x16/apps/terminator-custom-commands.png create mode 100644 data/icons/HighContrast/16x16/apps/terminator-layout.png create mode 100644 data/icons/HighContrast/16x16/apps/terminator-preferences.png create mode 100644 data/icons/HighContrast/16x16/apps/terminator.png create mode 100644 data/icons/HighContrast/16x16/status/terminal-bell.png create mode 100644 data/icons/HighContrast/22x22/apps/terminator-custom-commands.png create mode 100644 data/icons/HighContrast/22x22/apps/terminator-layout.png create mode 100644 data/icons/HighContrast/22x22/apps/terminator-preferences.png create mode 100644 data/icons/HighContrast/22x22/apps/terminator.png create mode 100644 data/icons/HighContrast/24x24/apps/terminator-custom-commands.png create mode 100644 data/icons/HighContrast/24x24/apps/terminator-layout.png create mode 100644 data/icons/HighContrast/24x24/apps/terminator-preferences.png create mode 100644 data/icons/HighContrast/24x24/apps/terminator.png create mode 100644 data/icons/HighContrast/32x32/apps/terminator-custom-commands.png create mode 100644 data/icons/HighContrast/32x32/apps/terminator-layout.png create mode 100644 data/icons/HighContrast/32x32/apps/terminator-preferences.png create mode 100644 data/icons/HighContrast/32x32/apps/terminator.png create mode 100644 data/icons/HighContrast/48x48/apps/terminator-custom-commands.png create mode 100644 data/icons/HighContrast/48x48/apps/terminator-layout.png create mode 100644 data/icons/HighContrast/48x48/apps/terminator-preferences.png create mode 100644 data/icons/HighContrast/48x48/apps/terminator.png create mode 100644 data/icons/HighContrast/scalable/actions/terminator_active_broadcast_all.svg create mode 100644 data/icons/HighContrast/scalable/actions/terminator_active_broadcast_group.svg create mode 100644 data/icons/HighContrast/scalable/actions/terminator_active_broadcast_off.svg create mode 100644 data/icons/HighContrast/scalable/actions/terminator_horiz.svg create mode 100644 data/icons/HighContrast/scalable/actions/terminator_receive_off.svg create mode 100644 data/icons/HighContrast/scalable/actions/terminator_receive_on.svg create mode 100644 data/icons/HighContrast/scalable/actions/terminator_vert.svg create mode 100644 data/icons/HighContrast/scalable/apps/terminator-custom-commands.svg create mode 100644 data/icons/HighContrast/scalable/apps/terminator-layout.svg create mode 100644 data/icons/HighContrast/scalable/apps/terminator-preferences.svg create mode 100644 data/icons/HighContrast/scalable/apps/terminator.svg create mode 100644 data/icons/HighContrast/scalable/status/terminal_bell.svg diff --git a/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_all.png b/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_all.png new file mode 100644 index 0000000000000000000000000000000000000000..04752c3df1b1b9d4aa047938018bc4f3d0e8566a GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4iLp3nSyDXv`gsMU<&gyr*a1_lpJ zTeHbW(zh1$1)Zwf&N3r3`>%X~nLSg*vs8zaI5wAO+zPY4S=v9^*1UULdT!h$2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR49eZ5!9V|Pj%UtPEZ|jW5s+hKa7nrO z=G~q&?$%oFU(-7YjSuWn_tb?$y|ySZCt z{qta0b<2MC%%6r!zK1*yy~-FKT3)Wd^ojlfjdPErV!TeKrCsNHXU01r=#=KtJJ0S* XI`^8`>23Q8bR&bOtDnm{r-UW|>eXmd literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_off.png b/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_off.png new file mode 100644 index 0000000000000000000000000000000000000000..771d35f20daca8d30aa3f56000f987322231f16e GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4oTU%M-7?<)+FbjKr`t_Cd&ZMLV<-KIyJWn! zb`o2{q-}4{2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4`eF0(do0gM=Lb-e!RNT|1UfjZL-{8AYu`>PO|AUVkez9}g XTMEdjywZvVn!w=c>gTe~DWM4fq~SI( literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/16x16/actions/terminator_receive_off.png b/data/icons/HighContrast/16x16/actions/terminator_receive_off.png new file mode 100644 index 0000000000000000000000000000000000000000..eba128f3a237cc12bba5721e3ca3bec2a790fa40 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4y4%E>`7%w;Pi*eFAHAmJ@OsyJyH0)`gBymEjh;FNPUT{WE<_87k(~ZF|hd)-IGjIl}kFb4`3N2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4%C33VS$lX7_(j?$PSC*!H#7AKji_p+L7Z@4tRsRP%?A*?` z2A(xlhr>7$Urb&zlPy6sc}>IAwua>o6%*8JnBTN9Zf0e;{2|Mk_kiE^HurxkUy99p z_2Yig-6hxGDz8;hdc1j+R(<~yk89$BOba?DsCaAcWIXdKXWN4yudvXy#u2_!3_)I& eOQ%%-=MG?>qjfFe{v@DN89ZJ6T-G@yGywo7sA|Ok literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/16x16/actions/terminator_vert.png b/data/icons/HighContrast/16x16/actions/terminator_vert.png new file mode 100644 index 0000000000000000000000000000000000000000..be44d088e34ed2b095abd34742b5a7ea13f98f60 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4e>mBTz|-2CxmrpCs(jg5&{8UmT!cpI49yfzy%n27O7ZkH2b Q25M&TboFyt=akR{0A^M(c>n+a literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/16x16/apps/terminator-custom-commands.png b/data/icons/HighContrast/16x16/apps/terminator-custom-commands.png new file mode 100644 index 0000000000000000000000000000000000000000..75a9445d04712e4fb22e4cc9c04675e9048293aa GIT binary patch literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4=$=Le#U)d6_q0wIQWWPn5vJK15_dppX~)tHw_gA8+VA%H zrzhLCiv0U$4!yC-SgU_*MqBO9U;$x;*U$j+GX-17YM&#TM} zJw7cxFzJWRE)fA0&6We|3Y!pfIT_&l_-W}VxEqCD*r^sn1Hu1z> zPn2N0lV^UVbgx{Tl+&cg7DgOQObezIC9li9{d@n0BVVhQ3M8q?_PZY|^f_Kw*ICcG zB-4vwi%z#|;F-Vs-mjcer5g|`YJ2|i!vX~cx4{p3ZF3-2x o`q1-^zf{;&KK?bT-F?npxAS=TmZRs2fMLhr>FVdQ&MBb@06MCnN&o-= literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/16x16/apps/terminator-layout.png b/data/icons/HighContrast/16x16/apps/terminator-layout.png new file mode 100644 index 0000000000000000000000000000000000000000..f648594848a235573544389a3ad04218b8d0f5bd GIT binary patch literal 493 zcmV;u@^3wDB)r7yCLD1y!Q zf{mS6Soj7mc5AZkZZ=6VR~&llt$KI^De@&V`F=78g20zjhWrpx$}k85A5zND^E?9h zXnCGTDP;(fPcPiC*=*S9bRJ?i4oSWgC=!2*76k-J3L)?xkVK`pDK29S4u=D-*K6tQ zJAof!DLs-@O0nH;GfmT{Qz-S|H%_M$0q}S{z7@EaV2nYY=g9LM&N(cXO8~%pK8Ljy zS(YKoGNfq=V@$b(D2mwac1zQ!R4T03>#SC*Y_(cEpU*VLJTD=RV@{`23L#2DqtS?Q z9RJ;eBuO}#OdiO?;gCs^yzjvc&N=LMI{-kV(EtGK_j_1tUw(#%43tu=)oL6J2Gm+} zJRVaB!6=HJkFjW`Ua!a1YDM4ox!rErY&N-Guen$(IGfGb@Au1QD%x2oMduu~)(@{~ jt!b_0<#M^lZg&0xQmAAHQ8;fP00000NkvXXu0mjfq@>B4 literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/16x16/apps/terminator-preferences.png b/data/icons/HighContrast/16x16/apps/terminator-preferences.png new file mode 100644 index 0000000000000000000000000000000000000000..41103fd6c9149aaaccdc4a38a422a11551685c09 GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4^m+G}=ms*<1r1CM}6wlPSe>*kM}g`s@qeZGnaeI);X-cs5ne+qmxa nVWoGyE&RV27;5c(?)QBbRneDcJ@7Le6yyw^u6{1-oD!M2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4@{xP83j`<(k(a@yC|^UK=-oy_3r>gTe~DWM4f87XjH literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/16x16/status/terminal-bell.png b/data/icons/HighContrast/16x16/status/terminal-bell.png new file mode 100644 index 0000000000000000000000000000000000000000..877095b632667906db91d56e805e4dc7ce4ce755 GIT binary patch literal 700 zcmV;t0z>_YP)QEGh|NBykgC#B{bg?f&ODCZnT*aXV5kWz4 zFmz17wYX^C;*%@^M+fIX5rj@cRS<%7NRf)fE*%U`LKnG9ON+O@DXrEN-anno{m;jL z4u@1Kl?v8G2*LUJ`I#t+$2`v;005fJSr&r9pqKRvKq;L^A`zITiEucK zd_IqUzYm|!_t|WkCL)mtD5di)fa5q%#bObqQVEn&RI61C1_Mkclg}lVN+lGFML3T0 zb^%c+0&q$}!P!t7{B+Z)5=IvI3)oO)S zt97F&%FHkfq*5sef`G+hfmA95!!V#I%B{n#@PFR18mzi+wFFg iSSnwzjywzWxpu!!WRIo7>yl z-&!)6T-e;)#Bm%ZCnsAb4-5>TY1-$VA*Dpub)wOz?^h}n01Ab|0!k@mS(cicn^S;4 zMn^{#pghl09}+?+%d*t`{Ja9x)zy`1Rwk2CmSriWl!_8UmzS61^LeJHr`g-vt>SqeudlDn&d!q0=iAQv68!Y^gi?yZ!9f6A z*QHo20X7AlL=%} zN~u;>R{UJ|_xA^K-aKYzX2R#Vr>DnnAK>NXrE6!Qk3!Ql4i66*9v=3+L?S_{R6+f8?w^%PrNV(nMn*6UBjEM+_I3m}|2n&Z9mm0O zoQ|N+(sjKRETw!f3?p8tR04PXUvz$cPCA`NO8KA(A!@d5F9Y9xn$qbswrwMXsA;b2 jo@KLH3WdUdeN6uV${;pi4Xz!000000NkvXXu0mjf{$f@2 literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/22x22/apps/terminator-layout.png b/data/icons/HighContrast/22x22/apps/terminator-layout.png new file mode 100644 index 0000000000000000000000000000000000000000..ed221dc42b551354be230c49f2d1737c45f20516 GIT binary patch literal 929 zcmV;S177@zP)-RvHlmvG6s5b_y1zu&@a33K4?5r$VsN;CCS_n8<>i5+b-CX6F@;>@zn;y&r!# zu*{kH%{gcG%#fv}rN83w__shH5O%xWUi^l1T`#Jtn%mpkJ0=$w7k_tlc79)8UPhr% z_#H0%em^8hf~INzaDhM|ytufCm6a8Ab#>KDZfa@*$8kSK23^duaQ&S&8f7GYo*Vk91(`jV0Sv);G{W&lI$g&LEwxK8r zEX(>iaDRV4EX#srSujl#rfE8m-Q8UPz|PJNIF5s^>o5$X%1qNlUtgaCb`FnaSv)*E zV19lchGBqV7!X46{QT_v37Jd=6B83vk+rwCBaujeVHjwdhUVtx{~VRh8yOj)rfJfv zt1H^w-Cfm%^(-Eb)5ph0Y8XcS&MTEl;CUXwU=Zi$=NKIwty@2qWwEfZfJ`O>uh$Eg z%T>R|74bZehK2^DQYlPNPuDCUgy7)d0Et8bgpjIB=tFR2v1yv%dA`O+DMe#rW6h2C zB`^R8f`IMqZD*smC%(0{1;a3Y4O}P`aD9D^mX;Qz(`j5@USf837K9MUvixZma=NY; z{eHh!Q52`w*Vfh`%QC{@FjA=$Y}>~A`a0(3<}f%oh_SITsH%#?!$WLtZaT2Dvok~@ z5$L*J!>qk$R7*ZQFHEyj(7WW!akXw~y(+Oi`O+o%-@D00000NkvXXu0mjf Dt96~` literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/22x22/apps/terminator-preferences.png b/data/icons/HighContrast/22x22/apps/terminator-preferences.png new file mode 100644 index 0000000000000000000000000000000000000000..9993383ce374fbe83d57826cbf142bf9e9382bd0 GIT binary patch literal 765 zcmV=g)ZlEhFjg6Ib=0#PgcCk%QK zf!nueBV;WKnvGBtQ9E0;a^b?2%mi)4h$lqw0xKfg7zCn^uF$<3-o?LN1rfTQp7k?sB>2cXxNWySwX#i`(r+ zRaG7y9)3tZpKp3+XNSGLJv<&yL$KX$N0Ow!E5k4hWLd^)wVLahOa_2>JU)#OLMVzN zCMG5XV2+`oApwZ9vorBax~>aFQN+~LlmJAjR1$wG91aUbQG^geSm{7FH#aOVFXQ+7 zIXOAu?d`2?j(J9l#X=|)`t6V;yk0MKhNeP~fr z@a^qw!_LjtTKOCfMFMd|4t#KMz~kd1 z0HdR$Y;JD0&FSbKKR-X4^QWgL>h-#5r_*UxS69CVE|p5=T+=ib78b~6v&_!Uvb3~B ze}8{NPTN)-A0MM>nrYYTb$37%y(Odmxj^e0b|$(dFeO!C(->FkU2G*9)qu&I4V4 vO~GIgRaMb-y&&asxqKuNAs&za*U$7Pqc9Zpi4aQV00000NkvXXu0mjf8rxMc literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/22x22/apps/terminator.png b/data/icons/HighContrast/22x22/apps/terminator.png new file mode 100644 index 0000000000000000000000000000000000000000..147e7391705df7756f6643185e583c1286f289a0 GIT binary patch literal 690 zcmV;j0!{siP)}s|Kkx#os%{7&iY&`L&2Ttu+U@qwVzG$nboz=HEXzU^Ma<{(7UT7L!})w3 zrBVq_r}JvE!C(NxFqb=ns;V#=jnHbfr?@0Z0Dx>Z8wRD63W7j`!5{^2dTcfu1wh;F zHvNJSLIpvfp-_kdpyTnF{!J_vqk)Mzx| zIPT8?!@%S5pi-$|Hk;viJR%Z_004A49XO6dxm<=`uRkl%P4Q$hx%%?0*uTas7R$BR zXf#4ml)LFYA|8*Q-mhw$PN$K{WX{rh2IewA2tmK!$6~R7BuQsA{0>(;uGMOAI-RK3 z>qsV(*zI=j5wk3dPNxHx%LQ4MpO)Y3V~4|mPNxI6+l@w}fkYyK?RNXR82H^KX0sUp zuv{+RBVMo9;CUXsUJri1AFWmkR;%?};;XJ$tybW99*UwM5D1{zY@Rj#)8bSr1w~O1 z3wFCaS5ZU z>V{?64@r{F&iXS91_MN+QK+iAVF)3LD2kr|UcQ>5(I`Yw1R+FWWLfU@~07*qoM6N<$g4>lYt^fc4 literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/24x24/apps/terminator-custom-commands.png b/data/icons/HighContrast/24x24/apps/terminator-custom-commands.png new file mode 100644 index 0000000000000000000000000000000000000000..33fa537da22e0d946c1367e9670b76b17bbfff6a GIT binary patch literal 714 zcmV;*0yX`KP)QEH^V#Nlkp-=}icc~ORHQ1$%9b6)g4&6F9 z=s(dYK5%w&3J9XBOX$#{?d>G!R0u`?fEqd!5)yxaL@`s;U$~s6$m%Y8b|QgyT3qsB%#h0RWUz&v<%za$~YAZ^Qv$G#Y{9I6nFl>Cey4 zsMTs9glxTLD}r5sU89szS(Zcp2C^(uN-6aykY)Mj75Z4cUU#281hrZ%bb`n(0E(g@ z9*=`%S?ulY;p5{YFn240x3@RU=W}ZD_mb+L)UdE zih^#p>&dyhyTi-N3v^xI1o*p){izn+Zim&26hd@FtpKVQ2Mpg+%Ec7!RO~E zY}OU+=l=5_SUyb05~`}Ksue?PQm{EzAwnh$w?pq03?&i4WF+9p67kfCCjpq zNF)LYwthuNM@KuIOUK8@n*^q5&ICc=fv+wJ%LGAyX_~XBrfFkIl8UOThI#2jk|Yd= w!*P@l@(KW#mzU>-LLs!@mf>(XCWO5H2CQvQB#a&Z;{X5v07*qoM6N<$f_u|L00000 literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/24x24/apps/terminator-layout.png b/data/icons/HighContrast/24x24/apps/terminator-layout.png new file mode 100644 index 0000000000000000000000000000000000000000..718233814afb3e41f314b8cea095ca96501b4678 GIT binary patch literal 811 zcmV+`1JwM9P)kx6$B&#WofixDfvV zOS^P}FL0A-M&Q_hQZ?EB1$P9A0KHn8ebN@ zwYAm1gYV?<@KC}q{MPS%2eBcak$Sz({{B8%>tRA78494=?UKvosMTsbJUomZKx>WX zc>tW9ozZT${|=ztZbupf0YMPZ>2zqdTGVPa0M5_P85dA?xMBs%dk&F)>>m2277yZ1hguLbPn-6ySQQm)BegWG>7P6u;7MK74002ovPDHLkV1j6offWD% literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/24x24/apps/terminator-preferences.png b/data/icons/HighContrast/24x24/apps/terminator-preferences.png new file mode 100644 index 0000000000000000000000000000000000000000..0e9d5e1f6c9f90c629abecc457d3ea0c32277342 GIT binary patch literal 716 zcmV;-0yF)IP)rfbmpV%VRAxo!1L9iCVQb91#MY1`>3Of25 zI*B+qrG*RCNw_z6vVMZ9qiIjND$g{2e|>!YAU%e95~70eV^}~ zkB}pk%jG|+s;*};nN3-i6NDhgabCLJZp*T)c2rf>^;|BudvkL`v)K$IA4O3Tnx^dn zFdPp1rfCWw)M1*Y7!HU1Ia!ty(<)b06#yZ`hw>w4%t&~;r1A;gCr=(;|8gEWG#T?Cgw2 zqw#yd>+7pO@AY~d9v&iu;Ogp%jg1XXPfuB1UjF0@bVP<>@bvWLKfA6=wOZx&_LhFX z&uBDadwZLem6h26uIqAfae?c)pWZ(|KLe0TrMSMn{?h*=;OOYc5BjHtg$3gAIFcl> zwzfvCRwEvd&kisQgL=L0H&l`&(&;qE$HyET91x4eh(sda7C05q>2w&4MidGKzv^^4 zO+KGzet!Pj&_IA}HcK{}4IDHT;5g2Uq9_S?KZ3BNC<>0_yhOX*ZcEd&UDGtf{OO}< y8n$h>qLyW~0k*cbHg|S*Lc6xuw%xKUtNjQEGhzYNxCw6XBo3R6wMMz(dtM-Y7ugC=Uw z$FT4fg01dO&`L-hFEBP*m>1Yn927ie&KZaO!-Bxd`oFaj_DYP&Wa0}U-Yb>LhiRHw zG$@YaQy7LDDdjdLgm|x3tIhd*&U(Gp;g4lmS=+Xo09>!v&magCpf!RZP}l4A^UXBP z?020DAplTHJ;Y+MxaVBgeaZu@*K17E%%)x$eYsrXc^*>AAJ_Z{@Eha1lv2udUG49{ zbzP;DQV$cjuKRk22^tIr_v;6M=Xu%zZ+|B}&%-bbZLlXmsZ_dm(eL;51KRC2!{HEs z(P%`k*V79C==FN|z7K%!`#6rH7XaWm4&(6{fbn=tx7*bV0BE&Zq|<2tX0sXR^I0F@ zcswG6;BvW;%jH-umt-=TmjQ{Z;&3=nuh)s9=x$yvmtQuAgbDWhJwgbgC?cQFBc=Sc zc_LssowD2QC=?1vDevdvCc`kkjikf*^oZ*9Islzchhnk#RPe8Tb*ud^AnC@NUR@!n zIF3)2Wo6;d__}0S7I7S(QehZwY};-IL7?-ak8RtmR;x`)O1TB7)oLG&Mnl_g%WAdS bNGZ2pSD*ZDmfhDA00000NkvXXu0mjfbd3uN literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/32x32/apps/terminator-custom-commands.png b/data/icons/HighContrast/32x32/apps/terminator-custom-commands.png new file mode 100644 index 0000000000000000000000000000000000000000..c8ae92ba4727acc8353619ea824cdd48ec9b5c87 GIT binary patch literal 706 zcmV;z0zLhSP)Y<<%(D+g3$#NLVT{+^=>trnDy^HkRtPD=K1B#Wab@8 z5CkC<3i*n~Vj&O+{PcJ{FXWEWH0^D*TK(>Jy8~I46(Wk_tFG%R9xPqgRZ$dQi7d-w z02qx%NT<^vgxvK?r_&gXMgRa=md8X@)h&RBn16-<0994DZ6fR6h$7X4_iV%)b$H7rws?Pd+9XOPtU;301}A=@%em& zWm!VgG|6N#j{2EC!KGR*mt?cq{Jr09w~qRKI|Hp&i_~g0vfuBI+E4ElMR7Ku)&KdG zI-L$&E*A(PD3{Avuh$R+0l8cb6h$4a0~AG}P$-~YuR~S;ZMLUAjsg1pK3JALGVyx7 zjutP!-+vu|uIq?IB3JEzS7$(yBm{%OvqlWV+y?-7FIs4tHVqz&#n5avF`Z6f7zQSj z2^x(C!r}030eGG_nOCdTqe=EzilU%WsoVxY*LBk*%x1GN48ss{u%z^hTSozqlgf5rMG8T`=?YbU`Wm(IZ zEr8qYwv5f^bH@O7GF3!)P(6VEr6PL%!Q|;jvu7Vpf22~W>})n0a~${LcDua{!&p!K o8%Wc%x5Z-dtKDw5WLZ}J0I#(suSY$vSpWb407*qoM6N<$g3Jsr%m4rY literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/32x32/apps/terminator-layout.png b/data/icons/HighContrast/32x32/apps/terminator-layout.png new file mode 100644 index 0000000000000000000000000000000000000000..7ecef06144ad6baa96e35ad8d446ab4953c9310c GIT binary patch literal 888 zcmV-;1Bd*HP)rfQNZ_?zpUMwBNSa5iwIJgw)@Q^CJ#l^os zTpaWd5Cp-gi*r|@gRWJuRYWLHhl1U7u!CBtz9FJg2Z@nfuIcxNXM?THYm#a|2sHQH zoA1ZDr#CrLI-O3Bj*iA=XJ>y64GsMWhr@&98^t+)d3t*Kb98j{Ti5kxlFeo_LI?|e zmJq_qX0sWh>v{zMN~IE#$s`CN-+CpJNt8+@0D!LR6=GSI0iZADA0Yt1vMhr%Q{r{8 zn@&znFg-opbzXbCXMlF&z5%!ye>*@oW4{2>`yi1diS$$NwnXl$YX>Rq15L7SYBU<8 zUau2P(|j4WXF6~O%H=ZI+1UxYymx>?p+NTc_j?BT^e^zLv9U3P!(kYP;dxCbpFkP7 zzP=_`S675{PKw21PYDPFP$(2S{tl!dTQD^><;))*9)@k(fw!O|0OuS+h>j0_czA#; z%Ppr~xm^BQfUT`9FvgrQS(c$F3Mi$ZlzuvPRaHeK68Us7#;~!mfkva@4*&ovl?ukk z#{<9fHBCdYSOkDz003Z`Cg$hoeVeCJDcs%N1>b_En&g|Cn}|drU5zD4!rIyz-rn9i zn)?R$2yuRX4o%Zs%?AbsaCmswvgS(wnzAel(P-2aAQTFrUaz~Zck}Ul5FH;M6T>iE z6^t=#Z*K$m zSCGrg%UD=gfN7clfLtzzXf%q&#YF%>CX;b3*p|lRf34Zs*%<&}Zf*`27Z(74TCIje zBH_%Ln3zDdS_J@HUS48mW(Kxx(-nKA$)ywn5OAzezQ3ZO-@e!yt%ol zjEsy7Qc9VkDD-2I%CbyURrUPYuBs}bl)A<_=P!?skJa7X-JGuL&wl|G+(0kZq84KS O0000rfcRPi~S%+Cqf1CaHxk(n&B#$#4Z7E{JPC zf}0;9T{9`TIBO@D!X>-QB}h7VsZMv08nOfw{8LB_=DCY4wly@3ZF(QbkaN!aK0nSm zFXtRe*L8h;eVsozIQS(9LWSeFJXxT8-+z60c<5bSUHx$!=ZQ3%&9fi~Jfy532)t&q zc}5(^xd8ynvY@Ie2q6poR8@s#SpWdXac+p`c`pD`G5-t!0G{W)kinG14UUp&n%LXh zn>ud1|JwlL#;E~B87~}Qn(?dv)JG$sD2k-14_ophRo5@Xj5iF(7Nzl-{{LoRR=KWA zj*pLtVHkvES(43Wi71L>Yio;~o}Nxm5VbqwNYgZkq6nI%hw&6eVRdyCnx-Wy!?@~p zyC@cmBc&$@0`~X!VcT|O+}r>ZMH$9$9EWPPitFp^sc~}w==FLKMR6FzvMgGyR;<`@ zpF~yg`1nY|FdY5|K|tE=cI5c``}@eg!~kz^ZzFA%WlfB0x7%cMbCc}u?nWm|vIHk5 zCtw(6WCQX%k4B?`Fbr{fdyAc&9SDK|nx>)adgKz!3=oDPDwWEY2T(qrN2ydAsSa6| z;kxep04^>r!1H{plT#1`TwY#|#D5FGwrxm~6wAC&DB$SmXd*{qfcN)zY;SKz8m_Ia zL6RiMvW$(54Vb3+WuC+U^?DsED=QPmJkLW>6m&WrJU>69-|r&~!^k{|01giik;~;q zj2VVOxm?Ei`FW&S9Ds=%5mLGj41AV;A6WjwWa&?{Wj{{oTCMi;?(XhJ6vccdlgTm+ slbQE2f0pn2udeI-4FCWD07*qoM6N<$f)Myg3;+NC literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/32x32/apps/terminator.png b/data/icons/HighContrast/32x32/apps/terminator.png new file mode 100644 index 0000000000000000000000000000000000000000..ddd43e063589f0184c380fb68e1b70b1b37a4a5a GIT binary patch literal 516 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 nUY(qrIA>>P|MC0%AtIt*Xye>kw zz+HP)Jskl(MNrc`A45=9sm7EEE?&7|_c&{@$ddFX1 zIGb~3p7Z_8^El^th6snlVE_PvAYgWO_S@*_=%04G{SSs=IOrkCvYgLmv#(E2Psy{h zv%e4#002k;0GG>U3kHMV9S(=5t1jz^VHnQobb6gmr`PNCP6&cvCW0WK*UkS| z4u``N3pKRZX1p%| z>KX5806oTg5}+C5Jq6H;aU%eTUxNVf&wi*MRAm`VUG!my`W}GP8mLZFFG#Dr`#uAG z51?5>M(XP73XYDB;Q06$-rnAzTrLA5!qCtVOifL}4zvv*l}e$_W~*zQWmy~?9K>ieisf>-cL4JFJdTZxAxV;| z#wm(IilT6Jbro~DT;qV92H4!(M2p2zW1Jueq-h!hfdHmbsitCf44_mhq1)|NEfjTW80mBx9v&X_O{gbL%_tg;qRnPgef!w$cKrJK(!BTM;{(^$){vqo^m@JB zE1`0^tU9JB3aqTG)bz`;3>zC8Fg!dATU%QI0I;yIpl?E>GcYqVg9JfnE?zWEu2tXo{K#t?;{%9>03;O;3ngz*d0L`Pts_veUmbbn?R_S|yzW>N)%4V~#6_}-^ zrFJ|cLsjiDo6WxV|A+2KBoY=y@uwm0x(-Sd#h;N#By2)N5Cq{+lBDN0W!-Q|lJqPH z!XYAp+3)xJ3x$GmcXxNsFif7NX@Vq4h9pV#qlGR>mgT%8NzaKyBEGk`caqQN6##(0 Y0W(5jve#m80{{R307*qoM6N<$f;rwK4gdfE literal 0 HcmV?d00001 diff --git a/data/icons/HighContrast/48x48/apps/terminator.png b/data/icons/HighContrast/48x48/apps/terminator.png new file mode 100644 index 0000000000000000000000000000000000000000..8aa6c7131fcaa4993e48fcd2b51730cb1f8cc952 GIT binary patch literal 793 zcmV+!1LpjRP)QJ_7GAiS1lH9b=6@n7S^)hr?3-6 zQ563K5fQ&adLf|276%r#Ddgb5%Eq;l6b6C{Nt*YHTNhcz%|w$m!5>VM%!KF3Br}r< z>2x|B002S=WHOmw@p$|x5{dladHw->6w@^Kx~^|ltJQKko&G^Y007_s0AjJ&_gpUb zEC|BmO({PK&+`w_XfzRxMiYrd;-@UjV^vjmAwmfF9sXkkL3qsNa?gYi07X$=@GX{Q zp(II|OePTkd{vUkBubKmmSr7rQBjl^P*rt#JRnKZ%|Y#oBuVcAs;Vx*FpS;tfFJKX zttXB#3}Xj)l4~x^n%QiIsZ`2w+jI55On?R+2!YSQeJ#KO?n?nD;Jy;L1l$b)@^%sc z{;!9EkP~DG-H^kT1YUqUcjC00{E%~xci?;AJ_HCM@1@mhd5q*ROq0cjal6rIFpb@A z<}4diCCcPeuh+e&W?^Hg)NZ$_617^*dvY5#CILi5Q52~X)oRsSavL^g0Yt=Zw@a0% zR4U$)+pswjKt$~IdQ^#Wx$F(O4Vz;DM8tl-Pn9T@O74@}uw5j8h&UJws1n6u(Oq&I zwu=Q25r@MeRiaQRxJPcoc9j4kVm6zlN=zmbcgStn?zaa5{SE|r6bke_5a^jW&}*T< zuSRL`tltB)wyec70ViK%z7uFRo6PWEA#iqI=rnl69?>;zS#lrSD!xw8fAWQNUEdsK z^7*_M_sG?pGU~d%3I306Q4~Ad?e^8t*yw|7x7$}y6gweA1X-5Hnx?Hi>UGznY1&$r z4ik>!c#h-3w+20pX_|XY)7Fc{LK%%lzxVsS1px35 XQuNKV3J- + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/data/icons/HighContrast/scalable/actions/terminator_active_broadcast_group.svg b/data/icons/HighContrast/scalable/actions/terminator_active_broadcast_group.svg new file mode 100644 index 00000000..51f158ed --- /dev/null +++ b/data/icons/HighContrast/scalable/actions/terminator_active_broadcast_group.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/data/icons/HighContrast/scalable/actions/terminator_active_broadcast_off.svg b/data/icons/HighContrast/scalable/actions/terminator_active_broadcast_off.svg new file mode 100644 index 00000000..19358fbc --- /dev/null +++ b/data/icons/HighContrast/scalable/actions/terminator_active_broadcast_off.svg @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/data/icons/HighContrast/scalable/actions/terminator_horiz.svg b/data/icons/HighContrast/scalable/actions/terminator_horiz.svg new file mode 100644 index 00000000..1c75798d --- /dev/null +++ b/data/icons/HighContrast/scalable/actions/terminator_horiz.svg @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/data/icons/HighContrast/scalable/actions/terminator_receive_off.svg b/data/icons/HighContrast/scalable/actions/terminator_receive_off.svg new file mode 100644 index 00000000..ac0cb3ba --- /dev/null +++ b/data/icons/HighContrast/scalable/actions/terminator_receive_off.svg @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/data/icons/HighContrast/scalable/actions/terminator_receive_on.svg b/data/icons/HighContrast/scalable/actions/terminator_receive_on.svg new file mode 100644 index 00000000..ca42e189 --- /dev/null +++ b/data/icons/HighContrast/scalable/actions/terminator_receive_on.svg @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/data/icons/HighContrast/scalable/actions/terminator_vert.svg b/data/icons/HighContrast/scalable/actions/terminator_vert.svg new file mode 100644 index 00000000..1cf4f763 --- /dev/null +++ b/data/icons/HighContrast/scalable/actions/terminator_vert.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/data/icons/HighContrast/scalable/apps/terminator-custom-commands.svg b/data/icons/HighContrast/scalable/apps/terminator-custom-commands.svg new file mode 100644 index 00000000..a7982554 --- /dev/null +++ b/data/icons/HighContrast/scalable/apps/terminator-custom-commands.svg @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/HighContrast/scalable/apps/terminator-layout.svg b/data/icons/HighContrast/scalable/apps/terminator-layout.svg new file mode 100644 index 00000000..10a91065 --- /dev/null +++ b/data/icons/HighContrast/scalable/apps/terminator-layout.svg @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/data/icons/HighContrast/scalable/apps/terminator-preferences.svg b/data/icons/HighContrast/scalable/apps/terminator-preferences.svg new file mode 100644 index 00000000..e7820921 --- /dev/null +++ b/data/icons/HighContrast/scalable/apps/terminator-preferences.svg @@ -0,0 +1,430 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/data/icons/HighContrast/scalable/apps/terminator.svg b/data/icons/HighContrast/scalable/apps/terminator.svg new file mode 100644 index 00000000..03f27fc0 --- /dev/null +++ b/data/icons/HighContrast/scalable/apps/terminator.svg @@ -0,0 +1,154 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/data/icons/HighContrast/scalable/status/terminal_bell.svg b/data/icons/HighContrast/scalable/status/terminal_bell.svg new file mode 100644 index 00000000..a6079f8f --- /dev/null +++ b/data/icons/HighContrast/scalable/status/terminal_bell.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/setup.py b/setup.py index c2d5e989..a08d1c01 100755 --- a/setup.py +++ b/setup.py @@ -181,16 +181,23 @@ setup(name=APP_NAME.capitalize(), ('share/applications', ['data/terminator.desktop']), (os.path.join(man_dir, 'man1'), ['doc/terminator.1']), (os.path.join(man_dir, 'man5'), ['doc/terminator_config.5']), - ('share/pixmaps', ['data/icons/48x48/apps/terminator.png']), - ('share/icons/hicolor/scalable/apps', glob.glob('data/icons/scalable/apps/*.svg')), - ('share/icons/hicolor/16x16/apps', glob.glob('data/icons/16x16/apps/*.png')), - ('share/icons/hicolor/22x22/apps', glob.glob('data/icons/22x22/apps/*.png')), - ('share/icons/hicolor/24x24/apps', glob.glob('data/icons/24x24/apps/*.png')), - ('share/icons/hicolor/32x32/apps', glob.glob('data/icons/32x32/apps/*.png')), - ('share/icons/hicolor/48x48/apps', glob.glob('data/icons/48x48/apps/*.png')), - ('share/icons/hicolor/16x16/actions', glob.glob('data/icons/16x16/actions/*.png')), - ('share/icons/hicolor/16x16/status', - glob.glob('data/icons/16x16/status/*.png')), + ('share/pixmaps', ['data/icons/hicolor/48x48/apps/terminator.png']), + ('share/icons/hicolor/scalable/apps', glob.glob('data/icons/hicolor/scalable/apps/*.svg')), + ('share/icons/hicolor/16x16/apps', glob.glob('data/icons/hicolor/16x16/apps/*.png')), + ('share/icons/hicolor/22x22/apps', glob.glob('data/icons/hicolor/22x22/apps/*.png')), + ('share/icons/hicolor/24x24/apps', glob.glob('data/icons/hicolor/24x24/apps/*.png')), + ('share/icons/hicolor/32x32/apps', glob.glob('data/icons/hicolor/32x32/apps/*.png')), + ('share/icons/hicolor/48x48/apps', glob.glob('data/icons/hicolor/48x48/apps/*.png')), + ('share/icons/hicolor/16x16/actions', glob.glob('data/icons/hicolor/16x16/actions/*.png')), + ('share/icons/hicolor/16x16/status', glob.glob('data/icons/hicolor/16x16/status/*.png')), + ('share/icons/HighContrast/scalable/apps', glob.glob('data/icons/HighContrast/scalable/apps/*.svg')), + ('share/icons/HighContrast/16x16/apps', glob.glob('data/icons/HighContrast/16x16/apps/*.png')), + ('share/icons/HighContrast/22x22/apps', glob.glob('data/icons/HighContrast/22x22/apps/*.png')), + ('share/icons/HighContrast/24x24/apps', glob.glob('data/icons/HighContrast/24x24/apps/*.png')), + ('share/icons/HighContrast/32x32/apps', glob.glob('data/icons/HighContrast/32x32/apps/*.png')), + ('share/icons/HighContrast/48x48/apps', glob.glob('data/icons/HighContrast/48x48/apps/*.png')), + ('share/icons/HighContrast/16x16/actions', glob.glob('data/icons/HighContrast/16x16/actions/*.png')), + ('share/icons/HighContrast/16x16/status', glob.glob('data/icons/HighContrast/16x16/status/*.png')), ], packages=['terminatorlib', 'terminatorlib.configobj', 'terminatorlib.plugins'], diff --git a/terminatorlib/notebook.py b/terminatorlib/notebook.py index 24573d61..a44a3e6a 100755 --- a/terminatorlib/notebook.py +++ b/terminatorlib/notebook.py @@ -5,6 +5,7 @@ from gi.repository import GObject from gi.repository import Gtk +from gi.repository import Gio from terminator import Terminator from config import Config @@ -547,10 +548,9 @@ class TabLabel(Gtk.HBox): if not self.button: self.button = Gtk.Button() if not self.icon: - self.icon = Gtk.Image() - self.icon.set_from_stock(Gtk.STOCK_CLOSE, - Gtk.IconSize.MENU) - + self.icon = Gio.ThemedIcon.new_with_default_fallbacks("window-close-symbolic") + self.icon = Gtk.Image.new_from_gicon(self.icon, Gtk.IconSize.MENU) + self.button.set_focus_on_click(False) self.button.set_relief(Gtk.ReliefStyle.NONE) # style = Gtk.RcStyle() # FIXME FOR GTK3 how to do it there? actually do we really want to override the theme? diff --git a/terminatorlib/prefseditor.py b/terminatorlib/prefseditor.py index c655ba11..b178505a 100755 --- a/terminatorlib/prefseditor.py +++ b/terminatorlib/prefseditor.py @@ -17,6 +17,7 @@ from translation import _ from encoding import TerminatorEncoding from terminator import Terminator from plugin import PluginRegistry +from version import APP_NAME def color2hex(widget): """Pull the colour values out of a Gtk ColorPicker widget and return them @@ -156,6 +157,7 @@ class PrefsEditor: self.config.base.reload() self.term = term self.builder = Gtk.Builder() + self.builder.set_translation_domain(APP_NAME) self.keybindings = Keybindings() try: # Figure out where our library is on-disk so we can open our diff --git a/terminatorlib/window.py b/terminatorlib/window.py index fc153d62..53c67952 100755 --- a/terminatorlib/window.py +++ b/terminatorlib/window.py @@ -168,35 +168,27 @@ class Window(Container, Gtk.Window): def apply_icon(self, requested_icon): """Set the window icon""" - icon_theme = Gtk.IconTheme() - icon = None - + icon_theme = Gtk.IconTheme.get_default() + icon_name_list = [APP_NAME] # disable self.wmclass_name, n/a in GTK3 + if requested_icon: try: self.set_icon_from_file(requested_icon) - icon = self.get_icon() + return except (NameError, GObject.GError): - dbg('Unable to load 48px %s icon as file' % (repr(requested_icon))) - - if requested_icon and icon is None: - try: - icon = icon_theme.load_icon(requested_icon, 48, 0) - except (NameError, GObject.GError): - dbg('Unable to load 48px %s icon' % (repr(requested_icon))) - -# if icon is None: -# try: -# icon = icon_theme.load_icon(self.wmclass_name, 48, 0) # FIXME FOR GTK3 -# except (NameError, GObject.GError): -# dbg('Unable to load 48px %s icon' % (self.wmclass_name)) - - if icon is None: - try: - icon = icon_theme.load_icon(APP_NAME, 48, 0) - except (NameError, GObject.GError): - dbg('Unable to load 48px Terminator icon') - icon = self.render_icon(Gtk.STOCK_DIALOG_INFO, Gtk.IconSize.BUTTON) + dbg('Unable to load %s icon as file' % (repr(requested_icon))) + icon_name_list.insert(0, requested_icon) + + for icon_name in icon_name_list: + # Test if the icon is available first + if icon_theme.lookup_icon(icon_name, 48, 0): + self.set_icon_name(icon_name) + return # Success! We're done. + else: + dbg('Unable to load %s icon' % (icon_name)) + + icon = self.render_icon(Gtk.STOCK_DIALOG_INFO, Gtk.ICON_SIZE_BUTTON) self.set_icon(icon) def on_key_press(self, window, event):