From 407c7e09fff343d3dab45911704e1607e74bec73 Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Thu, 21 May 2009 00:06:47 +0100 Subject: [PATCH] Switch to using PNG images Signed-off-by: Pat Thoyts --- bin/bf_xmpp.tcl | 3 +++ bin/bullfrog.tcl | 23 ++++++++++++++++------- bin/images/chat.gif | Bin 174 -> 0 bytes bin/images/chat.png | Bin 0 -> 422 bytes bin/images/guy-alert.png | Bin 0 -> 690 bytes bin/images/guy-away.png | Bin 0 -> 487 bytes bin/images/guy-chat.png | Bin 0 -> 550 bytes bin/images/guy-dnd.png | Bin 0 -> 687 bytes bin/images/guy-grey.png | Bin 0 -> 497 bytes bin/images/guy-normal.png | Bin 0 -> 491 bytes bin/images/guy-sleep.png | Bin 0 -> 568 bytes bin/images/mail-new.png | Bin 0 -> 619 bytes bin/images/mail-read.png | Bin 0 -> 550 bytes bin/images/network-offline.png | Bin 0 -> 470 bytes bin/images/network-transmit-receive.png | Bin 0 -> 408 bytes bin/images/usr_avail.gif | Bin 72 -> 0 bytes bin/images/usr_away.gif | Bin 72 -> 0 bytes bin/images/usr_dnd.gif | Bin 68 -> 0 bytes bin/images/usr_unavail.gif | Bin 68 -> 0 bytes bin/message.tcl | 14 ++++++++++---- bin/tab.tcl | 7 +++---- 21 files changed, 32 insertions(+), 15 deletions(-) delete mode 100644 bin/images/chat.gif create mode 100644 bin/images/chat.png create mode 100644 bin/images/guy-alert.png create mode 100644 bin/images/guy-away.png create mode 100644 bin/images/guy-chat.png create mode 100644 bin/images/guy-dnd.png create mode 100644 bin/images/guy-grey.png create mode 100644 bin/images/guy-normal.png create mode 100644 bin/images/guy-sleep.png create mode 100644 bin/images/mail-new.png create mode 100644 bin/images/mail-read.png create mode 100644 bin/images/network-offline.png create mode 100644 bin/images/network-transmit-receive.png delete mode 100644 bin/images/usr_avail.gif delete mode 100644 bin/images/usr_away.gif delete mode 100644 bin/images/usr_dnd.gif delete mode 100644 bin/images/usr_unavail.gif diff --git a/bin/bf_xmpp.tcl b/bin/bf_xmpp.tcl index d27dca8..e6e23e9 100644 --- a/bin/bf_xmpp.tcl +++ b/bin/bf_xmpp.tcl @@ -1153,16 +1153,19 @@ proc XmppAddTab {Session window jid} { if {[$xmpp(jlib) muc isroom $node@$domain]} { set title $resource set image ::img::msgchat + Debug $Session "AddTab for $jid title:$title image:$image" $session(app).nb add $window -text $title -image $image -compound left } elseif {$node ne {}} { set title $node set rs [dict create {*}[$xmpp(jlib) roster getpresence\ $node@$domain -resource $resource]] set image [XmppGetPresenceImage $Session $jid] + Debug $Session "AddTab for $jid title:$title image:$image" $session(app).nb add $window -text $title -image $image -compound left } else { set title $domain $session(app).nb add $window -text $title -compound none + Debug $Session "AddTab for $jid title:$title image:none" } } diff --git a/bin/bullfrog.tcl b/bin/bullfrog.tcl index 373fa27..2d6e5d4 100644 --- a/bin/bullfrog.tcl +++ b/bin/bullfrog.tcl @@ -17,6 +17,9 @@ package require chatwidget 1.1; # tklib package require tooltip 1.4; # tklib package require msgcat; # tcl core namespace import ::msgcat::mc +if {![package vsatisfies [package provide Tk] 8.6]} { + package require img::png +} if {![catch {package require autoproxy}]} { autoproxy::init @@ -35,12 +38,14 @@ source [file join $root bf_xmpp.tcl] # Load images namespace eval ::img { set imgdir [file join $root images] - image create photo ::img::presence::available -file $imgdir/usr_avail.gif - image create photo ::img::presence::chat -file $imgdir/usr_avail.gif - image create photo ::img::presence::away -file $imgdir/usr_away.gif - image create photo ::img::presence::xa -file $imgdir/usr_away.gif - image create photo ::img::presence::dnd -file $imgdir/usr_dnd.gif - image create photo ::img::presence::unavailable -file $imgdir/usr_unavail.gif + image create photo ::img::presence::available -file $imgdir/guy-normal.png + image create photo ::img::presence::chat -file $imgdir/guy-chat.png + image create photo ::img::presence::away -file $imgdir/guy-away.png + image create photo ::img::presence::xa -file $imgdir/guy-sleep.png + image create photo ::img::presence::dnd -file $imgdir/guy-dnd.png + image create photo ::img::presence::unavailable -file $imgdir/guy-grey.png + image create photo ::img::network::connected -file $imgdir/network-transmit-receive.png + image create photo ::img::network::disconnected -file $imgdir/network-offline.png } proc Main {args} { @@ -182,7 +187,11 @@ proc Status {Chat message} { proc State {Chat message} { upvar #0 $Chat chat - $chat(app).status.pane1 configure -text $message + set w $chat(app).status.pane1 + $w configure -text $message -compound text + if {[info command ::img::network::$message] ne ""} { + $w configure -image ::img::network::$message -compound image + } } proc Debug {Chat message {type debug}} { diff --git a/bin/images/chat.gif b/bin/images/chat.gif deleted file mode 100644 index 0b5d67f955339cba7ae16327148e11995c83a41b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmZ?wbhEHb6kyUIPdmIB?)UQ2al`e=r54fh;nB;!hSvE(SgZ z9iU+hAUhdYwHGM&rDS$FaLq~nwa34TsX%u6me}=c_dVV>o3r4?$ABlxa< J6k%ep1_0~ST`~Xw diff --git a/bin/images/chat.png b/bin/images/chat.png new file mode 100644 index 0000000000000000000000000000000000000000..f6e83254b638a2b939e71f07b182dae793009080 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE9PK^lLGYXua=0dqb|0 z(0Aed#4mEkrXFFQVIkRU)!iwO@P)-K`H`TB-dCnMEei~^#gkV`ducIu)E`>3<^AjG zztK&BfkHBj6^DMzTFe^of29Ve$ooUjD*2X*ObOZ>y?Y%u!-GJf7{-VfofVRNRrl^& zA4u7ByT`KOXwIvCK3V<4ybKHqr#Hn33O05;u<$d!$H2qsdoZIxGtYU;WIu=L8{Rt1 zcMa9-|9(@J`Qv$g`5*Dqb~CuG?wq}|YY~H>BZuJ)ub;a966xg(BCQv{ZcM%SH|N!2 z9dFH+1n23Q)!EOlecrSASW_MIFQcQU1?I~ieR%rw>)mljBv$9#p2l!3b58*Q7;IDui+ui&r$;~AC~$Nu>2&ag&oQO39^^U1?CtL{?c0W)LVG#`x_hBL0zM4>=n6HAr!be-6%ojYDn^}9S6y4Y&0XPlN^ zqA+i49BE8Wl9S1_Cx{LrkDP!A%2YB}mq-Ck5Nb`c?_*n=)_&OZwsH==$4Bh16;UNaVGc(gXdwqb%luE?`gP9?-B6naPtja)6+&G(r z+XAY>XK-L)0g=ccs;c~`=sJ(L(WpDU`2GTbet{ym(#vRkc@GWO`anX!wr#{>G1#^Z zk`keTekG*rO%QpC3YuppP#&s-6$~Q%ZV|iP6}S_Lz~eAh=I3DrgK*W>NTKUjiJ2jU zwpv!*pj+M$31b_2Uf+j*X|b4l3$nCyntm*iI!VYIzNT)kUhdB|tSx^+>e;O?>}0x` zd9s*9Z2m-oq@HrtR<=AkYbzkBr+zn_6J%j9{#5@}@Gtzg;OA9IH3fhRBcz%tyukc? Y2VwUCV%0)6b^rhX07*qoM6N<$f~|Kj^Z)<= literal 0 HcmV?d00001 diff --git a/bin/images/guy-away.png b/bin/images/guy-away.png new file mode 100644 index 0000000000000000000000000000000000000000..5331ef821b72ce4cdc140189a674948ab3b2f4ca GIT binary patch literal 487 zcmV8$l67 z#0Rjm@g;101Ruak5Q*u;m_n@t!9)TQD}NGLWHDj$zk6-W;!oU&IdI?(XYR*LF_2QC zZvbgs*H48ICg*$?K=^Y$$n^0ML}aL{T3T6M))R?1ouB2~DE=n^09{puS1XDF#s~oTP=F%z{hmvUmls#8P$#$#LBmmcU0x8|C+EdXaEd+JK z@Jw0=_3FLp_S)M+0P=visJI>bOXzlN5Em6G<&iI-F9`|1dMMyO8X4f7CF6P)fc$R8 d^{n4HzXKnjvvz6qn??Wt002ovPDHLkV1k(~$p8QV literal 0 HcmV?d00001 diff --git a/bin/images/guy-chat.png b/bin/images/guy-chat.png new file mode 100644 index 0000000000000000000000000000000000000000..2ad888eba8dc88eafe7f8bb5ec18cdeade4d0981 GIT binary patch literal 550 zcmV+>0@?kEP)8g;cJoTFizsLLFUErQ>Eo%csqXe7seZ@AgLBRvj6}907*qoM6N<$f{IA(0RR91 literal 0 HcmV?d00001 diff --git a/bin/images/guy-dnd.png b/bin/images/guy-dnd.png new file mode 100644 index 0000000000000000000000000000000000000000..21cfbd94d842d0fb48ead6180fd78cda3b64352e GIT binary patch literal 687 zcmV;g0#N;lP)@Ba;DYMys4TE-jC@|pD#Sw-MMpJO)^>EHZ|=o&uB=Lc`?@9m`Qp( z6S~dTQ2@A|>cFvGo6q%~-l77)_pE`?kzskXF`PR!KH)-*&d^nsA z!SmTBI245|+udGQd3P69YR}A!_m-3=1OO_O z>1MLS|Et@o8wO1U%In;oQ&!LrcQ^FpgOF`4YhU z*d&G_UlvyI2V3B(2(B9S+s7#^&yFF{bD`w?(YCgXQ4zQ+RyEd;ZWFZZv@^e^A>sAn zaZ^Z(`+cuX&inrgU=XsmJKIw^Au3fVzgUdjG=%6IiA2r(A7smF8&y|T1LJmYp=jx8 zXrG=@CjK^V8rhnIhxhZ5NYpBZa{wT+PNo*7mzX^On=e=}vj>p={AS6L`dI*2SuO(5 zJtoveE2ouQS~(3&sEb7O;8*MM;y@t$F8>kmFZyo)hzLXkE*zr(Xr;MujOO30M3EqYk#9q1Rn!^8J^K0Lg< z4>;#&8bGwqE8lvVt0+st4uFByyq#NzN8GabwHKQ)?+%yv;&f2&_sKU-0E&h@%oST- zm=IRyLnIU!#QxTtT>mzsgb+V$WB~{Pb2HJZT_Odg1OP-w0AuXP;B@x*GE1)?Uh!7= z#P-2GD5a*yNxTGd{(GctH@-s9Dr%NfngXM z>2#*3C<^@kVatl5AeVb7>bkyZ3*eleOOlk=H0@WYX&NL+%5%;yYynL*zI4ah5zvi# n23S|c7>fhof6W+++g;-iaYM|7&79m100000NkvXXu0mjf*2d1( literal 0 HcmV?d00001 diff --git a/bin/images/guy-normal.png b/bin/images/guy-normal.png new file mode 100644 index 0000000000000000000000000000000000000000..8d864e6d7edb5faafa78bf1c21d69407d5224d99 GIT binary patch literal 491 zcmVSmzYok%PPa(M~6e08V_UV zC<8FAxb8mFba`I0%bTqLjEKOwW)H-dM72~v^(70d@Csl57~F%Cu&pirT@wK1xB-z`D?DUP zCIis>A`LScK=Jv`RMql&8vq?L;mWIu^&?aj3rx83M0DZ^sEa^ws@noOQP+U)s}e>E h0R1)>M#||LKLO<@$*bGgNWTC8002ovPDHLkV1l>~#XbN4 literal 0 HcmV?d00001 diff --git a/bin/images/guy-sleep.png b/bin/images/guy-sleep.png new file mode 100644 index 0000000000000000000000000000000000000000..7362f4fd3241e5af6dae3539293bbc959558fe58 GIT binary patch literal 568 zcmV-80>}M{P)X8es%5pQO$%);xDq5N2?`gv@h=bq5hOPe{V;n-I`*O&-@MbJndfUtr8;mH z_nzNvqB5KH#yXIZ01!X1S90-OGE|Pn~@+ za%tbWlfAdgo&H2-VI5d&`Z90@07*!q5O^auE*`I~Ob=;gdPr}c-&8U1z5$0?Gfmn- zU6YtP+p8{0_IBrw_jZ~rj+S85S7KFmJtDC|FC ztY1pQq_#oy@s)sNy8`VxOQuo0!Di72EeWyHd)I=0(SH}DCuv(x<&Q;|ae0000x~Vjlni0r*Ko zK~y-)t&>e?6Hyd}zey&^WXPmVQ`0OWh3ZNaOEGCg5G|%+ih>mde-K@XNWqN=?gepU z5em|cx~cn8LG8-6__Ii2P>g6PSZu1`B4f&%Op?jC5Tip9Q1tHJdFLG7z4tu$$CCb( zXqVkl@b5#C`>|~SW=7H~&*XOG8#k{H0=b`Ox2w+lVxGOpY}V%sM4?;-F>jaoCU+8F zy>jgrXyu?*L>TcQTTTm!k5y`SQ&7#woy6}8c}luYrDB5hl7apLvCVNTX_xAU7sXzby1-Ub)&hq5(9Lvie7#$rW z)YF6CucE4Ps0S&2x`(^;imp(M*+(No$H(r!akLN)_acPJx$_rLRn;+@ucd8lR3|XS zI$eDUR#vBxG|P4vD2l@HaDs<(v+N%^0Duqz!!R%mgTmX_96oXs#jiCrEnCvXp#Z6asU|jc`xahV!Zb}30!`f28abPV zg{Pc2dAbQTtU4DjO|ZDMgkcB=y~QA#$#5v0rd~C%8x5>l6$y!k)nMn2?G)EPcWyz~ zbrQ)vKQ3gSgXjSiRin2rhOX;v4JPkQPhI|tk2uNysP7V2y6Y6gd4d1{002ovPDHLk FV1h5`60`sS literal 0 HcmV?d00001 diff --git a/bin/images/mail-read.png b/bin/images/mail-read.png new file mode 100644 index 0000000000000000000000000000000000000000..859251fe0fcdbdf20de5040a802825ce977c1a24 GIT binary patch literal 550 zcmV+>0@?kEP)R4zO-SE_shK7L#K^bOYL`2|4i#%^^+d&Zo zk&sSy=pcw4>ZZxwY}*bA=G8Pha*v|J@tT}?%W zfngW`WV2bOr`~d}ruX2F47l3KjU|BXjcOQ7B-6|9cn5Kyc>qH_^Pxk?Y5HvP6 z@NQ%F=Lf9UupKV(UBp_bq(9L5mb75XrJ44nVXyC#?3BIa!Q*#eDs))^YbWW z`NsDFJ}oTJ+SbPAhK=hul>Tj?q2ZJq>dv3z`|8@kUyxGLkZ9U&=waVr86b=ZH79G4 oQU(Hs$Hqtd{^O2@kK`J+0Q~)|WKOu)r~m)}07*qoM6N<$g3M6(EC2ui literal 0 HcmV?d00001 diff --git a/bin/images/network-offline.png b/bin/images/network-offline.png new file mode 100644 index 0000000000000000000000000000000000000000..1f210fc3e99c84148bef3e4f10d7fc779ae27c7c GIT binary patch literal 470 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE%y{W;-5;PJdx@v7EBiGj0Wl`lin$Vt7#J9nJzX3_EKc`M+UU(xD019>dAMSu z_l+x)3X}u|w^+HhIL=P~$7tmma6!Q1QNaxn7tXa@oR3zSn(X8f6l!u5si>SH=vHZZ z$8^TCrR6`DeSiG>ckTV(d%g>A=%`Sd#_V*%-D``W^J;BJm6PTnA)!-a?4&muJ4~us zlPkk>RqtFG;|5a!7RCmL1V)2~b2~$Jxn2L-*C_k?;zz~Tjhy>frv84WBLCL^-aXUH zvV|^T^Wv?q&V3}o(3bc|sprtG5Gm)N{3~+`8(`+tXjmq}xxY{>%C3a^}XZJ8qY^EM$8w$6uGQ@#-T* zDb@tDxyy7oLUwa>E&322v-9rWKdO@r%M-pA>{(|}T$H7Hd>^B8SMNu^-KW|>(c|gr K=d#Wzp$Pzzw7-x5 literal 0 HcmV?d00001 diff --git a/bin/images/network-transmit-receive.png b/bin/images/network-transmit-receive.png new file mode 100644 index 0000000000000000000000000000000000000000..271d37d0f32d08f275b69a6f6ecaae69ae39a2d3 GIT binary patch literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE%y{W;-5;PJdx@v7EBiGj0WoF~ZZl3n1_nk|PZ!4!i_>!_*?J!i5NVq~JLZ%9 z61}@jkKQRfQVaUuEXbu~;dMmo#ghR0OYsUU$*lj|n)CFUEM|zUYP`1UVUQ3zuhgf+ z53=Vg&!4V5x3`ID>$h#T3mkV^ZCY|OVn+OuF!SQs&CA*MtjnIt8nAk{j=8=;&lca6 zoZ;uV7?v_Raqu`No%3ThRAAV#cb|IKKATNFU$^W%e@A4+bh-Ydw(tB$Ut9Q8rnrVx zozK57D%)VuS1+(?gWKZ7RsX7+z1F;Y7?ig8j9_W(Vta|_o2=Z~D_hF69z0vezwtzB zY;^82HB;ZmM>4mkBn4$P8Oo&QP0-+Ix}$u$<@u)_fj_ty-u;YBbU6Nc*ERY2d)u~` zm31?%>HX?^$l%OepNPgo3^n(k@1K-f6Z(bobP0l+XkK`cOU}s;oTcYh YHQTN*p|t0TxmM;i({SeF-i!>^02B5RvH$=8 diff --git a/bin/images/usr_away.gif b/bin/images/usr_away.gif deleted file mode 100644 index f40151142de073f22d728483c5b6be7cfbb75d88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmZ?wbhEHb6krfwXkcJqR|6r%pDc`A42%pq3_t*qVPKN)>0f!8{lcBuxlt?Lot?F4 XpXYhQb9*&VTuCtJQcrNzo%4FKou64C$w diff --git a/bin/images/usr_unavail.gif b/bin/images/usr_unavail.gif deleted file mode 100644 index 7b30547533da88511e602ff9a84b2f4b1f3056fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmZ?wbhEHb6krfwXkcWpwY6neV^I9b!pOzI$e_aj1Rxm(Ch4C3m8Z`#BzKFfi4t8_ Vb@*N5?2g#SlPzDJ(qd(>1_0={64?L% diff --git a/bin/message.tcl b/bin/message.tcl index 405533c..1352c8c 100644 --- a/bin/message.tcl +++ b/bin/message.tcl @@ -21,7 +21,9 @@ # ------------------------------------------------------------------------- package require Tk 8.5 - +if {![package vsatisfies [package provide Tk] 8.6]} { + package require img::png +} namespace eval messagewidget { variable version 1.0.0 @@ -51,8 +53,9 @@ namespace eval messagewidget { } set imgdir [file join [file dirname [info script]] images] - image create photo ::img::msgnorm -file [file join $imgdir mail.gif] - image create photo ::img::msgchat -file [file join $imgdir chat.gif] + image create photo ::img::msgnorm -file [file join $imgdir mail-read.png] + image create photo ::img::msgnew -file [file join $imgdir mail-new.png] + image create photo ::img::msgchat -file [file join $imgdir chat.png] #ImageSetTransparency ::img::msgchat } @@ -180,13 +183,16 @@ proc messagewidget::Add {self args} { lappend values [DisplayTime [dict get $msg -date]] lappend values [dict get $msg -from] lappend values [dict get $msg -subject] - set img ::img::msgnorm + set img ::img::msgnew set item [$state(summary) insert {} end -image $img -tags item -values $values] } proc messagewidget::OnSummaryClick {self w x y} { upvar #0 [namespace current]::$self state set item [$w identify row $x $y] + if {[$state(summary) item $item -image] eq "::img::msgnew"} { + $state(summary) item $item -image ::img::msgnorm + } set M [lindex $state(messages) [$w index $item]] # ? dict set $M -state R $state(summary) item $item -text " " diff --git a/bin/tab.tcl b/bin/tab.tcl index ec9a8d9..6368950 100644 --- a/bin/tab.tcl +++ b/bin/tab.tcl @@ -85,10 +85,9 @@ proc ::ButtonNotebook::Init {{pertab 0}} { } } } - if {$::ttk::currentTheme eq "xpnative"} { - ttk::style configure ButtonNotebook.Tab -width -8 - ttk::style configure ButtonNotebook.Tab -padding {8 0 0 0} - } + #if {$::tcl_platform(platform) eq "windows"} {} ?? + ttk::style configure ButtonNotebook.Tab -width -8 + ttk::style configure ButtonNotebook.Tab -padding {8 0 0 0} } bind TNotebook {+::ButtonNotebook::Press %W %x %y} -- 2.23.0