Skip to content
Snippets Groups Projects
Commit d9def4d2 authored by nkour's avatar nkour
Browse files

[grenshad] add FT-related icons. thank him as artist

parent 995590a0
No related branches found
No related tags found
No related merge requests found
......@@ -3,6 +3,7 @@ Alexey Nezhdanov
Alfredo Junix
Andrew Sayman
Christian Bjälevik
Christophe Got
Christoph Neuroth
Denis Craven
Dennis Craven
......
data/pixmaps/events/ft_done.png

1.22 KiB

data/pixmaps/events/ft_error.png

1.6 KiB

data/pixmaps/events/ft_stopped.png

1.18 KiB

......@@ -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()
......
......@@ -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()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment