From b62583f9e6d000b011e84b9c06eb16fcfec3a8d5 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Sat, 23 Apr 2005 00:37:51 +0000 Subject: [PATCH] contacts from transports now use their protocol state images --- data/iconsets/transports/gadugadu/closed.xpm | 13 +++ data/iconsets/transports/gadugadu/dnd.png | Bin 0 -> 517 bytes data/iconsets/transports/gadugadu/opened.xpm | 11 +++ data/iconsets/transports/gadugadu/xa.png | Bin 0 -> 517 bytes data/iconsets/transports/icq/closed.xpm | 13 +++ data/iconsets/transports/icq/connecting.png | Bin 0 -> 505 bytes data/iconsets/transports/icq/error.png | Bin 0 -> 505 bytes data/iconsets/transports/icq/message.gif | Bin 0 -> 2133 bytes data/iconsets/transports/icq/opened.xpm | 11 +++ data/iconsets/transports/msn/chat.png | Bin 0 -> 554 bytes data/iconsets/transports/msn/closed.xpm | 13 +++ data/iconsets/transports/msn/connecting.png | Bin 0 -> 387 bytes data/iconsets/transports/msn/error.png | Bin 0 -> 387 bytes data/iconsets/transports/msn/invisible.png | Bin 0 -> 387 bytes data/iconsets/transports/msn/message.gif | Bin 0 -> 2133 bytes data/iconsets/transports/msn/opened.xpm | 11 +++ data/iconsets/transports/msn/requested.png | Bin 0 -> 387 bytes data/iconsets/transports/msn/xa.png | Bin 0 -> 512 bytes data/iconsets/transports/yahoo/chat.png | Bin 0 -> 210 bytes data/iconsets/transports/yahoo/closed.xpm | 13 +++ data/iconsets/transports/yahoo/connecting.png | Bin 0 -> 206 bytes data/iconsets/transports/yahoo/error.png | Bin 0 -> 206 bytes data/iconsets/transports/yahoo/invisible.png | Bin 0 -> 206 bytes data/iconsets/transports/yahoo/message.gif | Bin 0 -> 2133 bytes data/iconsets/transports/yahoo/opened.xpm | 11 +++ data/iconsets/transports/yahoo/requested.png | Bin 0 -> 206 bytes data/pixmaps/transport/away.png | Bin 176 -> 0 bytes data/pixmaps/transport/dnd.png | Bin 180 -> 0 bytes data/pixmaps/transport/icondef.xml | 47 --------- data/pixmaps/transport/offline.png | Bin 128 -> 0 bytes data/pixmaps/transport/online.png | Bin 172 -> 0 bytes data/pixmaps/transport/xa.png | Bin 191 -> 0 bytes src/gajim.py | 6 +- src/roster_window.py | 89 +++++++++++++----- src/tabbed_chat_window.py | 2 +- 35 files changed, 164 insertions(+), 76 deletions(-) create mode 100644 data/iconsets/transports/gadugadu/closed.xpm create mode 100644 data/iconsets/transports/gadugadu/dnd.png create mode 100644 data/iconsets/transports/gadugadu/opened.xpm create mode 100644 data/iconsets/transports/gadugadu/xa.png create mode 100644 data/iconsets/transports/icq/closed.xpm create mode 100644 data/iconsets/transports/icq/connecting.png create mode 100644 data/iconsets/transports/icq/error.png create mode 100644 data/iconsets/transports/icq/message.gif create mode 100644 data/iconsets/transports/icq/opened.xpm create mode 100644 data/iconsets/transports/msn/chat.png create mode 100644 data/iconsets/transports/msn/closed.xpm create mode 100644 data/iconsets/transports/msn/connecting.png create mode 100644 data/iconsets/transports/msn/error.png create mode 100644 data/iconsets/transports/msn/invisible.png create mode 100644 data/iconsets/transports/msn/message.gif create mode 100644 data/iconsets/transports/msn/opened.xpm create mode 100644 data/iconsets/transports/msn/requested.png create mode 100644 data/iconsets/transports/msn/xa.png create mode 100644 data/iconsets/transports/yahoo/chat.png create mode 100644 data/iconsets/transports/yahoo/closed.xpm create mode 100644 data/iconsets/transports/yahoo/connecting.png create mode 100644 data/iconsets/transports/yahoo/error.png create mode 100644 data/iconsets/transports/yahoo/invisible.png create mode 100644 data/iconsets/transports/yahoo/message.gif create mode 100644 data/iconsets/transports/yahoo/opened.xpm create mode 100644 data/iconsets/transports/yahoo/requested.png delete mode 100644 data/pixmaps/transport/away.png delete mode 100644 data/pixmaps/transport/dnd.png delete mode 100644 data/pixmaps/transport/icondef.xml delete mode 100644 data/pixmaps/transport/offline.png delete mode 100644 data/pixmaps/transport/online.png delete mode 100644 data/pixmaps/transport/xa.png diff --git a/data/iconsets/transports/gadugadu/closed.xpm b/data/iconsets/transports/gadugadu/closed.xpm new file mode 100644 index 000000000..0ae3c97ea --- /dev/null +++ b/data/iconsets/transports/gadugadu/closed.xpm @@ -0,0 +1,13 @@ +/* XPM */ +static char * closed_xpm[] = { +"6 8 2 1", +" c None", +". c #000000", +". ", +".. ", +"... ", +".... ", +"... ", +".. ", +". ", +" "}; diff --git a/data/iconsets/transports/gadugadu/dnd.png b/data/iconsets/transports/gadugadu/dnd.png new file mode 100644 index 0000000000000000000000000000000000000000..d10d41d808b7de970de017bd629d39e7601183d8 GIT binary patch literal 517 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfZWLeJ|V6^ zn&I~Mr9BMauQ4$6EcpNbKSNsDe+Gt@mKFwv>M1~C=OqRPr+dd37=n@+7>pUJdl;7Q zVqnl@IQJZ=_S{+qhVMY-Jq!#{|GzUZ%-FbhDFZ`p_5bG#46pxhodYy|Cd09N3~P_Q zKL=!cF|O>_%)r1c1j3A$?$-SQ3W}AuMwB=gr6!hS=I1GdWag$a7#ivunCKfA ziRMTd0#zu2R0QXzm6RtIr84*?CKu)Brlw>jD!649rIzOxWfv=$=o!3HQ!fQ7Ug7ED z7$Py%weO}_lL3!Qb5PT^Q+!QJmAE{PKK;M{+zq93-bUZgJYkt3dT#PT{vY)X+y^Wh zc{aLixe#LDd;0s)Z3n7WB<|7Y^f`Sz_e`Id!q@Jqy{G+FtG~VPa+znAP0rV}PqhhW z4S2kmE3bZLW_~>NQk1oAe;iMjO}O9u3Fr2_TEf7kwkLP7*{VAMY$YX+wv?%8?%m5c qQJPC}$#d4i9J$?Gj{K7DzZh;X@V8ET`Q91mW(H4JKbLh*2~7Y$W5mJ$ literal 0 HcmV?d00001 diff --git a/data/iconsets/transports/gadugadu/opened.xpm b/data/iconsets/transports/gadugadu/opened.xpm new file mode 100644 index 000000000..44e9298f6 --- /dev/null +++ b/data/iconsets/transports/gadugadu/opened.xpm @@ -0,0 +1,11 @@ +/* XPM */ +static char * opened_xpm[] = { +"7 6 2 1", +" c None", +". c #000000", +".......", +" ..... ", +" ... ", +" . ", +" ", +" "}; diff --git a/data/iconsets/transports/gadugadu/xa.png b/data/iconsets/transports/gadugadu/xa.png new file mode 100644 index 0000000000000000000000000000000000000000..d10d41d808b7de970de017bd629d39e7601183d8 GIT binary patch literal 517 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfZWLeJ|V6^ zn&I~Mr9BMauQ4$6EcpNbKSNsDe+Gt@mKFwv>M1~C=OqRPr+dd37=n@+7>pUJdl;7Q zVqnl@IQJZ=_S{+qhVMY-Jq!#{|GzUZ%-FbhDFZ`p_5bG#46pxhodYy|Cd09N3~P_Q zKL=!cF|O>_%)r1c1j3A$?$-SQ3W}AuMwB=gr6!hS=I1GdWag$a7#ivunCKfA ziRMTd0#zu2R0QXzm6RtIr84*?CKu)Brlw>jD!649rIzOxWfv=$=o!3HQ!fQ7Ug7ED z7$Py%weO}_lL3!Qb5PT^Q+!QJmAE{PKK;M{+zq93-bUZgJYkt3dT#PT{vY)X+y^Wh zc{aLixe#LDd;0s)Z3n7WB<|7Y^f`Sz_e`Id!q@Jqy{G+FtG~VPa+znAP0rV}PqhhW z4S2kmE3bZLW_~>NQk1oAe;iMjO}O9u3Fr2_TEf7kwkLP7*{VAMY$YX+wv?%8?%m5c qQJPC}$#d4i9J$?Gj{K7DzZh;X@V8ET`Q91mW(H4JKbLh*2~7Y$W5mJ$ literal 0 HcmV?d00001 diff --git a/data/iconsets/transports/icq/closed.xpm b/data/iconsets/transports/icq/closed.xpm new file mode 100644 index 000000000..0ae3c97ea --- /dev/null +++ b/data/iconsets/transports/icq/closed.xpm @@ -0,0 +1,13 @@ +/* XPM */ +static char * closed_xpm[] = { +"6 8 2 1", +" c None", +". c #000000", +". ", +".. ", +"... ", +".... ", +"... ", +".. ", +". ", +" "}; diff --git a/data/iconsets/transports/icq/connecting.png b/data/iconsets/transports/icq/connecting.png new file mode 100644 index 0000000000000000000000000000000000000000..c432f25fd598322d6f4264b0fb33e59573123862 GIT binary patch literal 505 zcmVtSa045YYYPb005lfL-@w4$gg`gylz+{ zLxuzZKzI0Y)hG7a?Xq>3Y~Bs)t^dLXWdOL`-lQp$#^fu5@Nvi)tLDu6%vBrqnzd}vg01ozvi$AvoF#8q zbkZTyCQMmyz^J@|nGR>Y?Sf^y%zMNU&wJE1qq569ydU$Svrd_C(5fjZitV;pv}oG6SqD5}*rx>0&f8$vtSa045YYYPb005lfL-@w4$gg`gylz+{ zLxuzZKzI0Y)hG7a?Xq>3Y~Bs)t^dLXWdOL`-lQp$#^fu5@Nvi)tLDu6%vBrqnzd}vg01ozvi$AvoF#8q zbkZTyCQMmyz^J@|nGR>Y?Sf^y%zMNU&wJE1qq569ydU$Svrd_C(5fjZitV;pv}oG6SqD5}*rx>0&f8$vWHnN+5 zB!QGm(6OT^7OG&VBoZhg3Zn=lTm%t>7H~UN>!@7SI;ZDsaB4ewu#erzOkO|p`~JSa z^YJGi?acks1WcggL!f_z(7#qdtU#-Y(=HgbdQtPzpHXWNwM&B5C}@`jt%=u~1TDa8 z&Air%v>?*jkaiVm9h`REpk3#*PJ?#CpmiCvZi5zqS}!CWMsiIg*NmjoNN$LvOCVh$ z=@vBEvknjmQWh zqlnz$$Q?w+I5LLFI7j}spP4NE?BL-;2ljt)aJwa&gER>9QxvxhNMH-ghQ$QLW8X?x zmeQ>XPL|W;HL6Woxi>{xttR3(l0VqBFC|~fur6D^_1*V(=I!2}zRF+#a$;8Yj+`Ir z>Hx&?8#iTb1(%y36pe4KTc5dwyVBl_mzdXX+{}gRJNmHEyl!|nFe(e;o8}3Creq$A zag%5^pb9gybIPOebCkX->1t6hc;I59V2CADVhb^)NH3M;3isV<|Ls#MIoB%}QJiR2QWDYMTEFqR8PT`~n(B^s=% z0$5N8oGw_xTwG~6)MMpN+A2KO#B=A0YYXBx)&X=eRc5Ao)KTPGbhft=UyC%xor82WjJa8P_~2o zqpHo0xxymov?oejiBjs!uvb<(O4C=lP66cDlj8D}Ag`LYo0?9010eTOYFcqkAj`7t zz1$TAUh}#Qo8GZ(Pj&&eTv6G84CsE{rt`wT;>kr=odkHaFo#&*w0d5-ky}=YUERMDe#Qj7X&#?&1q6=aB~zW z*CD!IQDTAgH*pjL)`1CT{9OWAkOpY1p7{sJoI3S+U(0@R$Jd84H^p4HB0W|Xsx3J` zA3$l14HO=OaJ7xj?>m^nh+L&o3RzW8S5;O+inLw;s0ijT=6N6T!ySQ^)HF|9$gj^) zzJV5z*3c_Ry{A#5N{M>F#rQrp#ox=x>Ob-+zx=BuDApYR)d+S^sF&T7k`e&vHIad* z5<=>;a;K`8PvL6aXCULr4GqT|bNo$(EdaIZy5?FGIZi{iH+MvO+3F2Sw<2*g>;#ij zioAq5B$n^=3>Ig=b2WA&zKJ&Cb?zMXt}4sQuB`=7jR)Qa2=!8M{w7F~w5VL@#{kS- zp>%cq6t?%@M1z*3TbRF%Mxe=wCniS{)X+U-lpk2Z}!*j66a#L6IE!dWm>+^w^uK~Dn6~e{mpeNENvqEsg{@zi&4-*sZ kcQNb21Arc?g7gP^(XKpRn4O-_9NA}Z2*U>!GEE@wFUP`G(f|Me literal 0 HcmV?d00001 diff --git a/data/iconsets/transports/icq/opened.xpm b/data/iconsets/transports/icq/opened.xpm new file mode 100644 index 000000000..44e9298f6 --- /dev/null +++ b/data/iconsets/transports/icq/opened.xpm @@ -0,0 +1,11 @@ +/* XPM */ +static char * opened_xpm[] = { +"7 6 2 1", +" c None", +". c #000000", +".......", +" ..... ", +" ... ", +" . ", +" ", +" "}; diff --git a/data/iconsets/transports/msn/chat.png b/data/iconsets/transports/msn/chat.png new file mode 100644 index 0000000000000000000000000000000000000000..676d275c67dce8f818b5363f9ab368d4c107308a GIT binary patch literal 554 zcmV+_0@eMAP)0m6vq1#=A|c}B8ZxZ1|mvo#z>_ix`!fVGtgx+p)|-SyPeb`D4U|mf+iec)GlNf zhbfFCkSL-HT^}L{0-qwNf8d+e3W7-C^zd;GYwz#3_CD)7F#uws$?7)4I8qHwV=Osj4_T1Z)C8q4 z4Vl3QsqPTT+7rYoC&U3r3RMN-vTKo;W5vfpCnU08@0$XtZn7Sx2?NSoYcOE%e;>ed zV*OEY)6t0o0uUltu!m`qmhbk~a!@gMjaI*PIUq(447Aq4}aO sLcOhnMPHukB>I^o=>`@}gVt#Of0SRsFu9D#HUIzs07*qoM6N<$f+Gz12><{9 literal 0 HcmV?d00001 diff --git a/data/iconsets/transports/msn/closed.xpm b/data/iconsets/transports/msn/closed.xpm new file mode 100644 index 000000000..0ae3c97ea --- /dev/null +++ b/data/iconsets/transports/msn/closed.xpm @@ -0,0 +1,13 @@ +/* XPM */ +static char * closed_xpm[] = { +"6 8 2 1", +" c None", +". c #000000", +". ", +".. ", +"... ", +".... ", +"... ", +".. ", +". ", +" "}; diff --git a/data/iconsets/transports/msn/connecting.png b/data/iconsets/transports/msn/connecting.png new file mode 100644 index 0000000000000000000000000000000000000000..fff3fc906961270d6083585e2eead85478f96c58 GIT binary patch literal 387 zcmV-}0et?6P)Nklh;egZcKaS0rBF$??xcXM$H+;nLR0;ju$C`}FOkc$mQ6a)o#s0I<5BHE(C z@9@O$h4&(OmE-Vm4(FWbciw+FNx5BmZnrhAAM3na)}R$B>&;&C=WwXkPRAfe`MiOG z0FP0m--mnsC5hfHFLc{zD6Ui#6$;^ipZQ#0lZldUSBqvdO(h6$Rjpd+2$+lWV8B_i zXulFZ5uo4*5cwiZ0JF?{0my%*fc?{x!vM=T*7s~CR$59*S&%K`$J4@EhnZG7fO?Qp zuT;`b!28|QdXI^fRyu%UQioBkX3=B8m9`UoMvI+2MBprr~y_sKbuG5i4z$hZ&Zvwmy{LVS^VE_&g#UVs~LPWzO h?l5xi1I9UT{{h08tcJwAHDCY$002ovPDHLkV1k&|rI`Q# literal 0 HcmV?d00001 diff --git a/data/iconsets/transports/msn/error.png b/data/iconsets/transports/msn/error.png new file mode 100644 index 0000000000000000000000000000000000000000..fff3fc906961270d6083585e2eead85478f96c58 GIT binary patch literal 387 zcmV-}0et?6P)Nklh;egZcKaS0rBF$??xcXM$H+;nLR0;ju$C`}FOkc$mQ6a)o#s0I<5BHE(C z@9@O$h4&(OmE-Vm4(FWbciw+FNx5BmZnrhAAM3na)}R$B>&;&C=WwXkPRAfe`MiOG z0FP0m--mnsC5hfHFLc{zD6Ui#6$;^ipZQ#0lZldUSBqvdO(h6$Rjpd+2$+lWV8B_i zXulFZ5uo4*5cwiZ0JF?{0my%*fc?{x!vM=T*7s~CR$59*S&%K`$J4@EhnZG7fO?Qp zuT;`b!28|QdXI^fRyu%UQioBkX3=B8m9`UoMvI+2MBprr~y_sKbuG5i4z$hZ&Zvwmy{LVS^VE_&g#UVs~LPWzO h?l5xi1I9UT{{h08tcJwAHDCY$002ovPDHLkV1k&|rI`Q# literal 0 HcmV?d00001 diff --git a/data/iconsets/transports/msn/invisible.png b/data/iconsets/transports/msn/invisible.png new file mode 100644 index 0000000000000000000000000000000000000000..fff3fc906961270d6083585e2eead85478f96c58 GIT binary patch literal 387 zcmV-}0et?6P)Nklh;egZcKaS0rBF$??xcXM$H+;nLR0;ju$C`}FOkc$mQ6a)o#s0I<5BHE(C z@9@O$h4&(OmE-Vm4(FWbciw+FNx5BmZnrhAAM3na)}R$B>&;&C=WwXkPRAfe`MiOG z0FP0m--mnsC5hfHFLc{zD6Ui#6$;^ipZQ#0lZldUSBqvdO(h6$Rjpd+2$+lWV8B_i zXulFZ5uo4*5cwiZ0JF?{0my%*fc?{x!vM=T*7s~CR$59*S&%K`$J4@EhnZG7fO?Qp zuT;`b!28|QdXI^fRyu%UQioBkX3=B8m9`UoMvI+2MBprr~y_sKbuG5i4z$hZ&Zvwmy{LVS^VE_&g#UVs~LPWzO h?l5xi1I9UT{{h08tcJwAHDCY$002ovPDHLkV1k&|rI`Q# literal 0 HcmV?d00001 diff --git a/data/iconsets/transports/msn/message.gif b/data/iconsets/transports/msn/message.gif new file mode 100644 index 0000000000000000000000000000000000000000..fea7551cf8423fb811a2a4e566caa1ff1fb90617 GIT binary patch literal 2133 zcmdVb+fx%)90%}ovS)XL0!E5*QEcO_XeFYxMT*xtw$qtT+Zp`_`qKZPPkq>WHnN+5 zB!QGm(6OT^7OG&VBoZhg3Zn=lTm%t>7H~UN>!@7SI;ZDsaB4ewu#erzOkO|p`~JSa z^YJGi?acks1WcggL!f_z(7#qdtU#-Y(=HgbdQtPzpHXWNwM&B5C}@`jt%=u~1TDa8 z&Air%v>?*jkaiVm9h`REpk3#*PJ?#CpmiCvZi5zqS}!CWMsiIg*NmjoNN$LvOCVh$ z=@vBEvknjmQWh zqlnz$$Q?w+I5LLFI7j}spP4NE?BL-;2ljt)aJwa&gER>9QxvxhNMH-ghQ$QLW8X?x zmeQ>XPL|W;HL6Woxi>{xttR3(l0VqBFC|~fur6D^_1*V(=I!2}zRF+#a$;8Yj+`Ir z>Hx&?8#iTb1(%y36pe4KTc5dwyVBl_mzdXX+{}gRJNmHEyl!|nFe(e;o8}3Creq$A zag%5^pb9gybIPOebCkX->1t6hc;I59V2CADVhb^)NH3M;3isV<|Ls#MIoB%}QJiR2QWDYMTEFqR8PT`~n(B^s=% z0$5N8oGw_xTwG~6)MMpN+A2KO#B=A0YYXBx)&X=eRc5Ao)KTPGbhft=UyC%xor82WjJa8P_~2o zqpHo0xxymov?oejiBjs!uvb<(O4C=lP66cDlj8D}Ag`LYo0?9010eTOYFcqkAj`7t zz1$TAUh}#Qo8GZ(Pj&&eTv6G84CsE{rt`wT;>kr=odkHaFo#&*w0d5-ky}=YUERMDe#Qj7X&#?&1q6=aB~zW z*CD!IQDTAgH*pjL)`1CT{9OWAkOpY1p7{sJoI3S+U(0@R$Jd84H^p4HB0W|Xsx3J` zA3$l14HO=OaJ7xj?>m^nh+L&o3RzW8S5;O+inLw;s0ijT=6N6T!ySQ^)HF|9$gj^) zzJV5z*3c_Ry{A#5N{M>F#rQrp#ox=x>Ob-+zx=BuDApYR)d+S^sF&T7k`e&vHIad* z5<=>;a;K`8PvL6aXCULr4GqT|bNo$(EdaIZy5?FGIZi{iH+MvO+3F2Sw<2*g>;#ij zioAq5B$n^=3>Ig=b2WA&zKJ&Cb?zMXt}4sQuB`=7jR)Qa2=!8M{w7F~w5VL@#{kS- zp>%cq6t?%@M1z*3TbRF%Mxe=wCniS{)X+U-lpk2Z}!*j66a#L6IE!dWm>+^w^uK~Dn6~e{mpeNENvqEsg{@zi&4-*sZ kcQNb21Arc?g7gP^(XKpRn4O-_9NA}Z2*U>!GEE@wFUP`G(f|Me literal 0 HcmV?d00001 diff --git a/data/iconsets/transports/msn/opened.xpm b/data/iconsets/transports/msn/opened.xpm new file mode 100644 index 000000000..44e9298f6 --- /dev/null +++ b/data/iconsets/transports/msn/opened.xpm @@ -0,0 +1,11 @@ +/* XPM */ +static char * opened_xpm[] = { +"7 6 2 1", +" c None", +". c #000000", +".......", +" ..... ", +" ... ", +" . ", +" ", +" "}; diff --git a/data/iconsets/transports/msn/requested.png b/data/iconsets/transports/msn/requested.png new file mode 100644 index 0000000000000000000000000000000000000000..fff3fc906961270d6083585e2eead85478f96c58 GIT binary patch literal 387 zcmV-}0et?6P)Nklh;egZcKaS0rBF$??xcXM$H+;nLR0;ju$C`}FOkc$mQ6a)o#s0I<5BHE(C z@9@O$h4&(OmE-Vm4(FWbciw+FNx5BmZnrhAAM3na)}R$B>&;&C=WwXkPRAfe`MiOG z0FP0m--mnsC5hfHFLc{zD6Ui#6$;^ipZQ#0lZldUSBqvdO(h6$Rjpd+2$+lWV8B_i zXulFZ5uo4*5cwiZ0JF?{0my%*fc?{x!vM=T*7s~CR$59*S&%K`$J4@EhnZG7fO?Qp zuT;`b!28|QdXI^fRyu%UQioBkX3=B8m9`UoMvI+2MBprr~y_sKbuG5i4z$hZ&Zvwmy{LVS^VE_&g#UVs~LPWzO h?l5xi1I9UT{{h08tcJwAHDCY$002ovPDHLkV1k&|rI`Q# literal 0 HcmV?d00001 diff --git a/data/iconsets/transports/msn/xa.png b/data/iconsets/transports/msn/xa.png new file mode 100644 index 0000000000000000000000000000000000000000..d9a615e6e2a43332de00ff37936cbf788014ec3b GIT binary patch literal 512 zcmV+b0{{JqP)lVVr4^WUM6WuYDvjU zT)2=@Zl$?`VhXK zf^WwPy;To^C@>TR>g(>RbMtmX%3*q?*{`5fN6TlDxt zD6xbf)@>uL)Xfi2?6klf3NUlUco>q7d#2R#06&0XY#15s?NHb}kQxJ!=r1AE-5^;p z!w*1`tE-Sw(1`RRJ2I6k5J;E)?!uLbL#(LQG}jFCj1iSxbr^9DB?gco5{WQzTy#ve z)0Y(lucttHDAcOrLcW<}0bh{y<3%{UZm4@~$dYM6SNj)$axm;&Wm(9tG()DJheXqe zUjQ2BR0pkRxq zi(`nz>9v#Z@-`^&wBJEnBZ{knr=NA6{39<>;SmfydaAKWls!*RNyhIg62q`_ki z2f-T;GvssUGbwq@bX{X&u*TbYm11-$2kVOy_tq#L&ffA&X5DGYS^t=KtoGClU1%)9 zuy$MEufsewoLf5c8TbWFPNoPyPK)~dCH)is%j@?mm@;$f(iErs69Kx1!PC{xWt~$( F69AO{OuhgB literal 0 HcmV?d00001 diff --git a/data/iconsets/transports/yahoo/closed.xpm b/data/iconsets/transports/yahoo/closed.xpm new file mode 100644 index 000000000..0ae3c97ea --- /dev/null +++ b/data/iconsets/transports/yahoo/closed.xpm @@ -0,0 +1,13 @@ +/* XPM */ +static char * closed_xpm[] = { +"6 8 2 1", +" c None", +". c #000000", +". ", +".. ", +"... ", +".... ", +"... ", +".. ", +". ", +" "}; diff --git a/data/iconsets/transports/yahoo/connecting.png b/data/iconsets/transports/yahoo/connecting.png new file mode 100644 index 0000000000000000000000000000000000000000..2fe2c4b79678558bd7b1216571264fecdf8c0e08 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGLLkg|>2BR0pkRZi zi(`nz>9vysxeh4sI2V7GJKNn;`%cR0sFQ?mVeuvf?Pt2FV%IAZ+;6a5`5jm_)j@JI ze~F`P->Vs=oB;yHA!5vj_eosfT{`8~^!I!d8QNXa+Lr7$G&XiQCU5v$vF&3u$ALF* zi<$BijZd?1C8as%#La5e=$t*h{bl9Ey1B>L?wp&wN6O>R37}gTJYD@<);T3K0RW|& BN)!M9 literal 0 HcmV?d00001 diff --git a/data/iconsets/transports/yahoo/error.png b/data/iconsets/transports/yahoo/error.png new file mode 100644 index 0000000000000000000000000000000000000000..2fe2c4b79678558bd7b1216571264fecdf8c0e08 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGLLkg|>2BR0pkRZi zi(`nz>9vysxeh4sI2V7GJKNn;`%cR0sFQ?mVeuvf?Pt2FV%IAZ+;6a5`5jm_)j@JI ze~F`P->Vs=oB;yHA!5vj_eosfT{`8~^!I!d8QNXa+Lr7$G&XiQCU5v$vF&3u$ALF* zi<$BijZd?1C8as%#La5e=$t*h{bl9Ey1B>L?wp&wN6O>R37}gTJYD@<);T3K0RW|& BN)!M9 literal 0 HcmV?d00001 diff --git a/data/iconsets/transports/yahoo/invisible.png b/data/iconsets/transports/yahoo/invisible.png new file mode 100644 index 0000000000000000000000000000000000000000..2fe2c4b79678558bd7b1216571264fecdf8c0e08 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGLLkg|>2BR0pkRZi zi(`nz>9vysxeh4sI2V7GJKNn;`%cR0sFQ?mVeuvf?Pt2FV%IAZ+;6a5`5jm_)j@JI ze~F`P->Vs=oB;yHA!5vj_eosfT{`8~^!I!d8QNXa+Lr7$G&XiQCU5v$vF&3u$ALF* zi<$BijZd?1C8as%#La5e=$t*h{bl9Ey1B>L?wp&wN6O>R37}gTJYD@<);T3K0RW|& BN)!M9 literal 0 HcmV?d00001 diff --git a/data/iconsets/transports/yahoo/message.gif b/data/iconsets/transports/yahoo/message.gif new file mode 100644 index 0000000000000000000000000000000000000000..fea7551cf8423fb811a2a4e566caa1ff1fb90617 GIT binary patch literal 2133 zcmdVb+fx%)90%}ovS)XL0!E5*QEcO_XeFYxMT*xtw$qtT+Zp`_`qKZPPkq>WHnN+5 zB!QGm(6OT^7OG&VBoZhg3Zn=lTm%t>7H~UN>!@7SI;ZDsaB4ewu#erzOkO|p`~JSa z^YJGi?acks1WcggL!f_z(7#qdtU#-Y(=HgbdQtPzpHXWNwM&B5C}@`jt%=u~1TDa8 z&Air%v>?*jkaiVm9h`REpk3#*PJ?#CpmiCvZi5zqS}!CWMsiIg*NmjoNN$LvOCVh$ z=@vBEvknjmQWh zqlnz$$Q?w+I5LLFI7j}spP4NE?BL-;2ljt)aJwa&gER>9QxvxhNMH-ghQ$QLW8X?x zmeQ>XPL|W;HL6Woxi>{xttR3(l0VqBFC|~fur6D^_1*V(=I!2}zRF+#a$;8Yj+`Ir z>Hx&?8#iTb1(%y36pe4KTc5dwyVBl_mzdXX+{}gRJNmHEyl!|nFe(e;o8}3Creq$A zag%5^pb9gybIPOebCkX->1t6hc;I59V2CADVhb^)NH3M;3isV<|Ls#MIoB%}QJiR2QWDYMTEFqR8PT`~n(B^s=% z0$5N8oGw_xTwG~6)MMpN+A2KO#B=A0YYXBx)&X=eRc5Ao)KTPGbhft=UyC%xor82WjJa8P_~2o zqpHo0xxymov?oejiBjs!uvb<(O4C=lP66cDlj8D}Ag`LYo0?9010eTOYFcqkAj`7t zz1$TAUh}#Qo8GZ(Pj&&eTv6G84CsE{rt`wT;>kr=odkHaFo#&*w0d5-ky}=YUERMDe#Qj7X&#?&1q6=aB~zW z*CD!IQDTAgH*pjL)`1CT{9OWAkOpY1p7{sJoI3S+U(0@R$Jd84H^p4HB0W|Xsx3J` zA3$l14HO=OaJ7xj?>m^nh+L&o3RzW8S5;O+inLw;s0ijT=6N6T!ySQ^)HF|9$gj^) zzJV5z*3c_Ry{A#5N{M>F#rQrp#ox=x>Ob-+zx=BuDApYR)d+S^sF&T7k`e&vHIad* z5<=>;a;K`8PvL6aXCULr4GqT|bNo$(EdaIZy5?FGIZi{iH+MvO+3F2Sw<2*g>;#ij zioAq5B$n^=3>Ig=b2WA&zKJ&Cb?zMXt}4sQuB`=7jR)Qa2=!8M{w7F~w5VL@#{kS- zp>%cq6t?%@M1z*3TbRF%Mxe=wCniS{)X+U-lpk2Z}!*j66a#L6IE!dWm>+^w^uK~Dn6~e{mpeNENvqEsg{@zi&4-*sZ kcQNb21Arc?g7gP^(XKpRn4O-_9NA}Z2*U>!GEE@wFUP`G(f|Me literal 0 HcmV?d00001 diff --git a/data/iconsets/transports/yahoo/opened.xpm b/data/iconsets/transports/yahoo/opened.xpm new file mode 100644 index 000000000..44e9298f6 --- /dev/null +++ b/data/iconsets/transports/yahoo/opened.xpm @@ -0,0 +1,11 @@ +/* XPM */ +static char * opened_xpm[] = { +"7 6 2 1", +" c None", +". c #000000", +".......", +" ..... ", +" ... ", +" . ", +" ", +" "}; diff --git a/data/iconsets/transports/yahoo/requested.png b/data/iconsets/transports/yahoo/requested.png new file mode 100644 index 0000000000000000000000000000000000000000..2fe2c4b79678558bd7b1216571264fecdf8c0e08 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGLLkg|>2BR0pkRZi zi(`nz>9vysxeh4sI2V7GJKNn;`%cR0sFQ?mVeuvf?Pt2FV%IAZ+;6a5`5jm_)j@JI ze~F`P->Vs=oB;yHA!5vj_eosfT{`8~^!I!d8QNXa+Lr7$G&XiQCU5v$vF&3u$ALF* zi<$BijZd?1C8as%#La5e=$t*h{bl9Ey1B>L?wp&wN6O>R37}gTJYD@<);T3K0RW|& BN)!M9 literal 0 HcmV?d00001 diff --git a/data/pixmaps/transport/away.png b/data/pixmaps/transport/away.png deleted file mode 100644 index 88b75b6caf44b226207f7086f1fbc20b20015d7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`<(@8%Ar`%FC!FRzV8G#QT=ngh zD)*OLr5S>bn|`pcWvFN$+<3q7tK9v!|A_Gcy^D@A3EEmNhx{bh aePMcaQ>3`)Z$dWE2@IaDelF{r5}E)@w@0Y} diff --git a/data/pixmaps/transport/dnd.png b/data/pixmaps/transport/dnd.png deleted file mode 100644 index 2366f16c6d3f925a44203959808e8c64dbb961c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`)t)YnAr`&KJIcz;nFao^Cko7# z=vgCoCbJ - - - Stellar-Transport (default) - 1.0 - Default Psi 0.9.3 iconset - 2003-07-17 - http://psi.affinix.com - Jason Kim - Michail Pishchagin (icondef.xml) - - - - status/online - online.png - - - - status/chat - online.png - - - - status/invisible - online.png - - - - status/offline - offline.png - - - - status/away - away.png - - - - status/xa - xa.png - - - - status/dnd - dnd.png - - diff --git a/data/pixmaps/transport/offline.png b/data/pixmaps/transport/offline.png deleted file mode 100644 index 1cf5b53a62dac02f1db8c720c6830dce8029355e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`?w&4=Ar`&K6=m=Fm<9f@Cko7# z=vgCoCNm?0AvuZ1F`Qp)NAYt$3E^ypO;sBXJUra)`Hjiv{0hd!Y&=TLC(iaJ_^eTj akzmlD;&U_Mn_LsnNCr<=KbLh*2~7Zv{U==j diff --git a/data/pixmaps/transport/online.png b/data/pixmaps/transport/online.png deleted file mode 100644 index 75511dc8fb276226609f40ffcde24c455f0cfd51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`#hxyXAr`%FCtT!hFyL^J+*@tg zynkJ@lF-Y>R>qtnPs?}r*h}6>$M(B^dVk`1sf6>@hJ-lYv{3N}pZXommN0x-_?hpF z;H0124E~AQ>2+KamhwkS{#8BDzP9I|I)ma(!TcljN2D6uUF?}On8H5IHHvx3vj4lV UX{y;rKA`msp00i_>zopr05m>6N&o-= diff --git a/data/pixmaps/transport/xa.png b/data/pixmaps/transport/xa.png deleted file mode 100644 index 53e8cb0741f260fd0f84661a7ea9e118885c733f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`ZJsWUAr`%JgB|%A6nGxL{BxRH z{==*C3#n(WC~YqE+#I;eO>Ii@{ZpcM6Sgv4`MoHtJ>gK5dR6%fwgu&jw$77nu6)&a z^n~`u<&CUe$@xe9*|v2)%9!`#48zfjXa3|UJTgmUR=uRichor8ce}sAf-~Qr{^f{a qZ#!7j@k;!Ovk318(|`ZCJA^yh9TR6ac6$I_#Ng@b=d#Wzp$PyUZcl#z diff --git a/src/gajim.py b/src/gajim.py index 10cab944d..8ca97d42c 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -208,7 +208,7 @@ class Interface: self.roster.to_be_removed[account].append(user1.jid) if user1.jid in self.roster.newly_added[account]: self.roster.newly_added[account].remove(user1.jid) - self.roster.redraw_jid(user1.jid, account) + self.roster.draw_contact(user1.jid, account) if not self.queues[account].has_key(jid): gobject.timeout_add(5000, self.roster.really_remove_user, \ user1, account) @@ -220,7 +220,7 @@ class Interface: #It must be an agent if self.roster.contacts[account].has_key(ji): #Update existing iter - self.roster.redraw_jid(ji, account) + self.roster.draw_contact(ji, account) elif self.roster.contacts[account].has_key(ji): #It isn't an agent self.roster.chg_user_status(user1, array[1], array[2], account) @@ -463,7 +463,7 @@ class Interface: user.ask = array[3] if array[4]: user.groups = array[4] - self.roster.redraw_jid(jid, account) + self.roster.draw_contact(jid, account) def read_sleepy(self): '''Check if we are idle''' diff --git a/src/roster_window.py b/src/roster_window.py index ba4173633..9d8e20135 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -100,7 +100,7 @@ class Roster_window: def remove_newly_added(self, jid, account): if jid in self.newly_added[account]: self.newly_added[account].remove(jid) - self.redraw_jid(jid, account) + self.draw_contact(jid, account) def add_user_to_roster(self, jid, account): '''Add a user to the roster and add groups if they aren't in roster''' @@ -109,7 +109,7 @@ class Roster_window: return users = self.contacts[account][jid] user = users[0] - if user.jid.find('@') <= 0: + if user.jid.find('@') == -1: # if not '@' it's an agent user.groups = ['Agents'] elif user.groups == []: user.groups.append('General') @@ -146,7 +146,7 @@ class Roster_window: if self.groups[account][g]['expand']: self.tree.expand_row(model.get_path(iterG), False) - self.redraw_jid(jid, account) + self.draw_contact(jid, account) def really_remove_user(self, user, account): if user.jid in self.to_be_removed[account]: @@ -173,8 +173,8 @@ class Roster_window: if group_empty: del self.groups[account][group] - def redraw_jid(self, jid, account): - '''draw the correct pixbuf and name''' + def draw_contact(self, jid, account): + '''draw the correct state image and name''' model = self.tree.get_model() iters = self.get_user_iter(jid, account) if len(iters) == 0: @@ -189,19 +189,46 @@ class Roster_window: if u.priority > prio: prio = u.priority user = u + jabber_state_images = self.pixbufs for iter in iters: - if jid.find('@') <= 0: # It's an agent - img = self.pixbufs[user.show] + if jid.find('@aim.') != -1: + state_images = self.transports_state_images['aim'] + elif jid.find('@gadugadu.') != -1: + state_images = self.transports_state_images['gadugadu'] + elif jid.find('@icq.') != -1: + state_images = self.transports_state_images['icq'] + elif jid.find('@msn.') != -1: + state_images = self.transports_state_images['msn'] + elif jid.find('@yahoo.') != -1: + state_images = self.transports_state_images['yahoo'] + else: + state_images = jabber_state_images + + if jid.find('@') == -1: # if not '@' it's an agent + if name.find('aim.') != -1: + state_images = self.transports_state_images['aim'] + elif name.find('gadugadu.') != -1: + state_images = self.transports_state_images['gadugadu'] + elif name.find('icq.') != -1: + state_images = self.transports_state_images['icq'] + elif name.find('msn.') != -1: + state_images = self.transports_state_images['msn'] + elif name.find('yahoo.') != -1: + state_images = self.transports_state_images['yahoo'] + else: + state_images = jabber_state_images + + img = state_images[user.show] elif self.plugin.queues[account].has_key(jid): - img = self.pixbufs['message'] + img = state_images['message'] else: if user.sub != 'both': if user.ask == 'subscribe': - img = self.pixbufs['requested'] + img = state_images['requested'] else: - img = self.pixbufs['not in the roster'] + img = state_images['not in the roster'] else: - img = self.pixbufs[user.show] + img = state_images[user.show] model.set_value(iter, 0, img) model.set_value(iter, 1, name) @@ -368,15 +395,15 @@ class Roster_window: not self.plugin.queues[account].has_key(user.jid): if len(luser) > 1: luser.remove(user) - self.redraw_jid(user.jid, account) + self.draw_contact(user.jid, account) elif not showOffline: self.remove_user(user, account) else: - self.redraw_jid(user.jid, account) + self.draw_contact(user.jid, account) else: if not self.get_user_iter(user.jid, account): self.add_user_to_roster(user.jid, account) - self.redraw_jid(user.jid, account) + self.draw_contact(user.jid, account) #Print status in chat window if self.plugin.windows[account]['chats'].has_key(user.jid): self.plugin.windows[account]['chats'][user.jid].set_image(user.jid) @@ -877,7 +904,7 @@ class Roster_window: if not self.plugin.queues[account].has_key(jid): model = self.tree.get_model() self.plugin.queues[account][jid] = Queue.Queue(50) - self.redraw_jid(jid, account) + self.draw_contact(jid, account) if self.plugin.systray_enabled: self.plugin.systray.add_jid(jid, account) self.plugin.queues[account][jid].put((msg, tim)) @@ -1102,7 +1129,7 @@ class Roster_window: for u in self.contacts[account][jid]: u.name = new_text gajim.connections[account].update_user(jid, new_text, u.groups) - self.redraw_jid(jid, account) + self.draw_contact(jid, account) elif type == 'group': old_name = model.get_value(iter, 1) #get all users in that group @@ -1153,14 +1180,18 @@ class Roster_window: image.set_from_file(file) break - def init_transports_pixbufs(self, arg, dirname, fnames): + def init_transports_state_images(self, dirname, fnames): name_only = os.path.basename(dirname) - if name_only == 'transports' or name_only == '.svn': - return - for fname in fnames: - transport_kind = name_only - return - self.transports_pixbufs[transport_kind][fname] = 'be' + for fname in fnames: # fname is abs + if fname == '.svn': + continue + state = unicode(fname[:-4]) # without extension + state = state.replace('_', ' ') # make '_' a space for dict key + path_to_fname = os.path.join(dirname, fname) + image = gtk.Image() + image.set_from_file(path_to_fname) + image.show() + self.transports_state_images[name_only][state] = image def reload_pixbufs(self): self.mkpixbufs() @@ -1387,8 +1418,16 @@ class Roster_window: model.set_sort_column_id(1, gtk.SORT_ASCENDING) self.tree.set_model(model) self.mkpixbufs() - self.transports_pixbufs = { 'aim': {}, 'gadugadu': {}, 'icq': {}, 'msn': {}, 'yahoo': {} } - os.path.walk('../data/iconsets/transports', self.init_transports_pixbufs, None) # arg is None + self.transports_state_images = { 'aim': {}, 'gadugadu': {}, 'icq': {}, 'msn': {}, 'yahoo': {} } + + path = '../data/iconsets/transports' + folders = os.listdir('../data/iconsets/transports') + for folder in folders: + if folder == '.svn': + continue + folder = os.path.join(path, folder) + image_files = os.listdir(folder) + self.init_transports_state_images(folder, image_files) liststore = gtk.ListStore(gobject.TYPE_STRING, gtk.Image, gobject.TYPE_STRING) diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py index 0cd5907d2..60790c255 100644 --- a/src/tabbed_chat_window.py +++ b/src/tabbed_chat_window.py @@ -211,7 +211,7 @@ class Tabbed_chat_window(chat.Chat): self.plugin.roster.nb_unread -= 1 self.plugin.roster.show_title() del self.plugin.queues[self.account][jid] - self.plugin.roster.redraw_jid(jid, self.account) + self.plugin.roster.draw_contact(jid, self.account) if self.plugin.systray_enabled: self.plugin.systray.remove_jid(jid, self.account) showOffline = gajim.config.get('showoffline')