From d9def4d2a421578ce505744ef3d11731e91fe768 Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Sat, 10 Dec 2005 22:00:06 +0000
Subject: [PATCH] [grenshad] add FT-related icons. thank him as artist
---
THANKS | 1 +
data/pixmaps/events/ft_done.png | Bin 0 -> 1251 bytes
data/pixmaps/events/ft_error.png | Bin 0 -> 1636 bytes
data/pixmaps/events/ft_stopped.png | Bin 0 -> 1207 bytes
src/dialogs.py | 3 ++-
src/notify.py | 22 +++++++++++++++-------
6 files changed, 18 insertions(+), 8 deletions(-)
create mode 100644 data/pixmaps/events/ft_done.png
create mode 100644 data/pixmaps/events/ft_error.png
create mode 100644 data/pixmaps/events/ft_stopped.png
diff --git a/THANKS b/THANKS
index 4247154daf..c885955e77 100644
--- a/THANKS
+++ b/THANKS
@@ -3,6 +3,7 @@ Alexey Nezhdanov
Alfredo Junix
Andrew Sayman
Christian Bjälevik
+Christophe Got
Christoph Neuroth
Denis Craven
Dennis Craven
diff --git a/data/pixmaps/events/ft_done.png b/data/pixmaps/events/ft_done.png
new file mode 100644
index 0000000000000000000000000000000000000000..191947ce53221bbc57945bf439506e67c068fb8a
GIT binary patch
literal 1251
zcmV<91RVQ`P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$UbxA})RA}Dq
znrmznRTRg6XJ@C+-9jl)q=ooE#l+I4P#dHwDk@^4i7_!6{3a$Qn5ZP6Bt}Tkgz!ZY
zA0LPb#>A*W0b__%Lga%444}5<AqbI3ThcANrQLQP^EiIk2ivj*s&u#DZgMl{o;fpf
zezX5Mb2Imfs&XU$<fa7>kqJYls`CE@P*ohdQ{G`shV?JsKlYg6`$gpX0L0jzabi#M
zf}RmRPuk9GGGd!(M$(tL&9uGa0YExw$w-`Gb|zf5#4ja18bo4ijt{_@)92|t*Ncb;
zkwiis@gQO(FKFON`cpANV!sUYXNxyzXsA!#fN=u&<iqW3-?kT3NFA226%bT)gg^Zd
zrfo)zSC0Jp%lHC-H;W{$XI}~cR|MFwek&W+Z9(MH$wkPp<v-XSPM<kW)s(97{|8is
z#5p~np0uqhkYTGzmUtN@9x5s(B_Ha7gbETWNGK-~O37y|t#!{gELhN(-}gXD5~`OZ
zk(S9-`hK4u!!QdkvO*OqRH2Dfg)-%kO(LWDzWe@b9%xyV|0<LznQRitCLvY9=kw#u
zs7Qq>Q~)Rd++Y9)4<4a)_g*^MkI~lFL1$+dbLZYoUEMtD>grgvYSqL92n2$xS-qam
zwtjJ~Ul&bPwI>9?j&FDI%8EA$217`ZP`cblQBw)#y+s(c2KFBoR(qV-o(R$1L#cGy
zf#+29WL^P|9X&;J)8j-UQHmcbrDEe0itnn%Yt|s1B0zAReq3h&#|aT_4RP`93pi(O
zfHt66Rik+Uh(;}%o0f94;{;_d`k1_V2E}EKc+Fcdq!^DHh$^nzkLC6ex4LnhAWnZD
zy^nQa|7ihyq^c|P0`TrTn|N=-2YBb0Ox-h+vg!vh%~_b@$5byKCx+_|;ph+!F>D<q
zYMsTldx^D$xUjSvjVnNls{WjFfJF<R=HP+DRDM1k|1<TJ`W9kRPPyyDYung5fbE8{
zbpXc=V-v%XIFa~YIPOLI*9I8e(hsmsRoCYfz_MH>`|l(ck5heOHvU_m#58A7P9^1b
zNjmXi0PX;eIK<rxSauJQogqRm2LN`d>QgxdIDDv`=B8zM=a@{}UqeOJOBkL~Cc85*
z9UT?GCWg%*ajP5q??HMR&jIwR>a?5!bhMwOVcw${v%O3|RQs<0tW#kE_jdwxscKD5
zCpcUeswUMF4i8a%d=~!OmyKCMLth2yTiFY+T~(jW`4rQVhhJddPY0;nG7bOp4P$<Y
z`(8ayWZNLXTdKM-=aYP!H-F3<udl|KZZLK4Ov>+Ae9dJv@<V{&@*V&SXjIjXyiT(g
zwUkixWep{j^RN0Mv(5(TUDAacbS}I5d7UTr-eyv<X$obJ)MOt@SRuln_Au~%A3ERy
z{0KauBNEQ}QUejW57-La15muU6mx!YVlY=@V4qA5=JrLgPsCG)?F3e+YG6XFl@O64
zU=6SqD7ixDIp8%_-7z5-dx%Ia&;ry04L~h$9QY0R9oVO;;hTE3%0C*}mfcnHY_b3V
N002ovPDHLkV1lXuH*x>~
literal 0
HcmV?d00001
diff --git a/data/pixmaps/events/ft_error.png b/data/pixmaps/events/ft_error.png
new file mode 100644
index 0000000000000000000000000000000000000000..a950bb853110230da487c93a80716287eff29a1d
GIT binary patch
literal 1636
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
literal 0
HcmV?d00001
diff --git a/data/pixmaps/events/ft_stopped.png b/data/pixmaps/events/ft_stopped.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f55cd0813c3253a72e0d0a458d4e841f5f4d38c
GIT binary patch
literal 1207
zcmV;o1W5adP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$UNl8RORA}Dq
znoVp}RTRg6=gmw%hR(E7>PM`hmNc!Bex|h=su3|t(6}JFaG@>?tTa)pU`&iOsSD#m
zn<y;UR2L)?rD#kI)u1Fws1dO3v=EvWsVyQc1={I+wsTy(ndwZO0!2DA;7oFJ&pr3N
z_s;Lm|K0cU?iE$#X8y@73m_tCL#C?o{{>K0=J+e(jVlt@{&)Y<W8(Wo<i-H_IUI9h
zBYZ()fzOEAu|*ctX0e2Qv30C%T@C=ENlQ%P#M!ZMi4vbrdNByIwk;39@X$HNMkf$4
z5HS-n#6ZLnzMuso?2p6<X1~Pw6UAGosi_VRz%l{s`lN%7FAt&$k;6<|0YOz4_@g&r
z)Mn9m<=F9Gmlpu62_$hN+mZpeB0y_PJFPo*BQk$-5n^ol54OS3@Cgc67B2rkpemT>
zG(e50ttt>>t4e}+StK5u&iwFAosm#RLKz7qMM4qzETwe)@D=s-b*X(0L?od)FNvs3
zuF`hoIj~r4nFm>B7Rt;*=`;()${~?N7V~}c?Oq;kT9^7+C{{9wB$7x%szP3#18dBT
zl$nJx02zRr44}LF7+nVr;_4fqx7Wqk*jXwn%BifZqO!7*=H}+~1Q;KmWc#)jK5O4|
ztzQ>ysydq%0Q>iKvUSTFOio@TTMS;Zt>Qsz9#s}Q_eeGaAum01Gjz>frZadcl1?A+
ztg4<$DZoJgAdL-A;Pv`=%<AN$+|{hf$wBV~a>8M55H~Od2LhLQ(|d-~AwNJb(5R}u
zlmPgAK^hx2((gLSi&?AKnR_o<3RDQ{2!|`kl)@x11~Lva-Vjaheg;E6fKOHRm6QOy
z_wI+h-}*6SMh-vct;Jq$pbY{}5F6kzN1qu5pV^i(z<KEPdU(`5KmY}3Qq^CQ4zTW_
zXXrk1l)d&cHWd{RdRibKxDCW(N``4*TFu%GG7F5DeQ$Y2*cJF2V27%<Bo!bS3{l`H
zBj67(;;f~h&WhFx++}{)mgxilQy_leA}|ge{z+c&3;}ei>QhMtIQm;3jSZV9GjcfY
zs6;mkx*8|}d{+Q)1AgEfj06JQKivZ`p{hkm1#tD9qNZvCB}O(bN7Z!!3<iAEPWJ(v
zRn@zby1)?%L1BJ1ZnuX&oV65QhlKX{CfMpd4bY*go0Go8^!WPcIrP&JKDV!7bJ5Br
z-^4G^4D&_s0>Im<`a#kc`P$lc^7?DrxWlk<IBzYtm)ov+8vV|5iRWep0fIoCs=89T
z%=(Dc$-Wh3WS1IOeUSa>3DD&3=Yshv6gT=QT_-LzvT4gLVZGg%@Kqu-1-pIcY4MFR
zrE>t^15fILgp<D2Ktvt@+JXB3Hdym%u&kiUVyD>1;^dr{o{)zhXQvpL^F|K)8rY($
z<7u&1LPWBF?Z7+Xv0v;r3cRYS`_po>hlmsdO+YnJ0~7-%fZu^0;E<}iZ|U7C{{RRq
V4c!!_iGlzC002ovPDHLkV1j!hC0YOg
literal 0
HcmV?d00001
diff --git a/src/dialogs.py b/src/dialogs.py
index e3eb3a1297..f8efe49ece 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -473,7 +473,8 @@ def __init__(self):
#here you write your name in the form Name FamilyName <someone@somewhere>
dlg.set_translator_credits(_('translator-credits'))
- artists = ['Dennis Craven', 'Membris Khan', 'Guillaume Morin']
+ artists = ['Dennis Craven', 'Membris Khan', 'Guillaume Morin',
+ 'Christophe Got']
dlg.set_artists(artists)
rep = dlg.run()
diff --git a/src/notify.py b/src/notify.py
index 9c806774c2..3adddde44d 100644
--- a/src/notify.py
+++ b/src/notify.py
@@ -140,10 +140,9 @@ def __init__(self, event_type, jid, account, msg_type = '', file_props = None):
#we talk about a name here
txt = _('%s wants to send you a file.') % actor
elif event_type == _('File Transfer Error'):
- img = 'error.png' # FIXME: better img
+ img = 'ft_stopped.png'
ntype = 'transfer.error'
elif event_type in (_('File Transfer Completed'), _('File Transfer Stopped')):
- img = 'closed.png' # # FIXME: better img and split events
ntype = 'transfer.complete'
if file_props is not None:
if file_props['type'] == 'r':
@@ -155,9 +154,11 @@ def __init__(self, event_type, jid, account, msg_type = '', file_props = None):
if event_type == _('File Transfer Completed'):
txt = _('You successfully received %(filename)s from %(name)s.')\
% {'filename': filename, 'name': name}
+ img = 'ft_done.png'
else: # ft stopped
txt = _('File transfer of %(filename)s from %(name)s stopped.')\
% {'filename': filename, 'name': name}
+ img = 'ft_stopped.png'
else:
receiver = file_props['receiver']
if hasattr(receiver, 'jid'):
@@ -170,18 +171,25 @@ def __init__(self, event_type, jid, account, msg_type = '', file_props = None):
if event_type == _('File Transfer Completed'):
txt = _('You successfully sent %(filename)s to %(name)s.')\
% {'filename': filename, 'name': name}
+ img = 'ft_done.png'
else: # ft stopped
txt = _('File transfer of %(filename)s to %(name)s stopped.')\
% {'filename': filename, 'name': name}
+ img = 'ft_stopped.png'
else:
txt = ''
- iconset = gajim.config.get('iconset')
- if not iconset:
- iconset = 'sun'
- # FIXME: use 32x32 or 48x48 someday
- path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16', img)
+ path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events', img)
path = os.path.abspath(path)
+
+ if not os.path.exists(path): # we may use img from iconset
+ iconset = gajim.config.get('iconset')
+ iconset = gajim.config.get('iconset')
+ if not iconset:
+ iconset = 'sun'
+ path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16', img)
+ path = os.path.abspath(path)
+
self.notif = dbus_support.get_notifications_interface()
if self.notif is None:
raise dbus.DBusException()
--
GitLab