changeset ee5927e53dc8 in /home/hg/repos/gajim
author: Yann Leboulanger <aste...@lagaule.org>
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=ee5927e53dc8
description: some cleanup in icons folder. Fixes #7455
diffstat:
icons/hicolor/128x128/apps/gajim-about.png | Bin
icons/hicolor/128x128/apps/gajim.png | Bin
icons/hicolor/16x16/actions/gajim-earth.png | Bin
icons/hicolor/16x16/actions/gajim-message_corrected.png | Bin
icons/hicolor/16x16/actions/gajim-muc_separator.png | Bin
icons/hicolor/16x16/actions/gajim-receipt_missing.png | Bin
icons/hicolor/16x16/actions/gajim-receipt_received.png | Bin
icons/hicolor/16x16/actions/gajim-security_high.png | Bin
icons/hicolor/16x16/actions/gajim-security_low.png | Bin
icons/hicolor/16x16/status/gajim-earth.png | Bin
icons/hicolor/16x16/status/gajim-muc_separator.png | Bin
icons/hicolor/16x16/status/gajim-plugins.png | Bin
icons/hicolor/16x16/status/gajim-security_high.png | Bin
icons/hicolor/16x16/status/gajim-security_low.png | Bin
icons/hicolor/32x32/categories/gajim-agent-error.png | Bin
icons/hicolor/48x48/actions/gajim-chat_msg_recv.png | Bin
icons/hicolor/48x48/actions/gajim-connection_lost.png | Bin
icons/hicolor/48x48/actions/gajim-ft_done.png | Bin
icons/hicolor/48x48/actions/gajim-ft_error.png | Bin
icons/hicolor/48x48/actions/gajim-ft_request.png | Bin
icons/hicolor/48x48/actions/gajim-ft_stopped.png | Bin
icons/hicolor/48x48/actions/gajim-gc_invitation.png | Bin
icons/hicolor/48x48/actions/gajim-new_email_recv.png | Bin
icons/hicolor/48x48/actions/gajim-priv_msg_recv.png | Bin
icons/hicolor/48x48/actions/gajim-single_msg_recv.png | Bin
icons/hicolor/48x48/actions/gajim-subscription_request.png | Bin
icons/hicolor/48x48/actions/gajim-unsubscribed.png | Bin
icons/hicolor/48x48/actions/gajim-warning.png | Bin
icons/hicolor/48x48/status/gajim-chat_msg_recv.png | Bin
icons/hicolor/48x48/status/gajim-connection_lost.png | Bin
icons/hicolor/48x48/status/gajim-ft_done.png | Bin
icons/hicolor/48x48/status/gajim-ft_error.png | Bin
icons/hicolor/48x48/status/gajim-ft_request.png | Bin
icons/hicolor/48x48/status/gajim-ft_stopped.png | Bin
icons/hicolor/48x48/status/gajim-gc_invitation.png | Bin
icons/hicolor/48x48/status/gajim-new_email_recv.png | Bin
icons/hicolor/48x48/status/gajim-priv_msg_recv.png | Bin
icons/hicolor/48x48/status/gajim-single_msg_recv.png | Bin
icons/hicolor/48x48/status/gajim-subscription_request.png | Bin
icons/hicolor/48x48/status/gajim-unsubscribed.png | Bin
src/conversation_textview.py | 18 ++----------
src/dialogs.py | 2 +-
src/gui_interface.py | 2 +-
src/htmltextview.py | 2 +-
src/roster_window.py | 5 +++
45 files changed, 11 insertions(+), 18 deletions(-)
diffs (159 lines):
diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/128x128/apps/gajim-about.png
Binary file icons/hicolor/128x128/apps/gajim-about.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/128x128/apps/gajim.png
Binary file icons/hicolor/128x128/apps/gajim.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/16x16/actions/gajim-earth.png
Binary file icons/hicolor/16x16/actions/gajim-earth.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/16x16/actions/gajim-message_corrected.png
Binary file icons/hicolor/16x16/actions/gajim-message_corrected.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/16x16/actions/gajim-muc_separator.png
Binary file icons/hicolor/16x16/actions/gajim-muc_separator.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/16x16/actions/gajim-receipt_missing.png
Binary file icons/hicolor/16x16/actions/gajim-receipt_missing.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/16x16/actions/gajim-receipt_received.png
Binary file icons/hicolor/16x16/actions/gajim-receipt_received.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/16x16/actions/gajim-security_high.png
Binary file icons/hicolor/16x16/actions/gajim-security_high.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/16x16/actions/gajim-security_low.png
Binary file icons/hicolor/16x16/actions/gajim-security_low.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/16x16/status/gajim-earth.png
Binary file icons/hicolor/16x16/status/gajim-earth.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/16x16/status/gajim-muc_separator.png
Binary file icons/hicolor/16x16/status/gajim-muc_separator.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/16x16/status/gajim-plugins.png
Binary file icons/hicolor/16x16/status/gajim-plugins.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/16x16/status/gajim-security_high.png
Binary file icons/hicolor/16x16/status/gajim-security_high.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/16x16/status/gajim-security_low.png
Binary file icons/hicolor/16x16/status/gajim-security_low.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/32x32/categories/gajim-agent-error.png
Binary file icons/hicolor/32x32/categories/gajim-agent-error.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/actions/gajim-chat_msg_recv.png
Binary file icons/hicolor/48x48/actions/gajim-chat_msg_recv.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/actions/gajim-connection_lost.png
Binary file icons/hicolor/48x48/actions/gajim-connection_lost.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/actions/gajim-ft_done.png
Binary file icons/hicolor/48x48/actions/gajim-ft_done.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/actions/gajim-ft_error.png
Binary file icons/hicolor/48x48/actions/gajim-ft_error.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/actions/gajim-ft_request.png
Binary file icons/hicolor/48x48/actions/gajim-ft_request.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/actions/gajim-ft_stopped.png
Binary file icons/hicolor/48x48/actions/gajim-ft_stopped.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/actions/gajim-gc_invitation.png
Binary file icons/hicolor/48x48/actions/gajim-gc_invitation.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/actions/gajim-new_email_recv.png
Binary file icons/hicolor/48x48/actions/gajim-new_email_recv.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/actions/gajim-priv_msg_recv.png
Binary file icons/hicolor/48x48/actions/gajim-priv_msg_recv.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/actions/gajim-single_msg_recv.png
Binary file icons/hicolor/48x48/actions/gajim-single_msg_recv.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/actions/gajim-subscription_request.png
Binary file icons/hicolor/48x48/actions/gajim-subscription_request.png has
changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/actions/gajim-unsubscribed.png
Binary file icons/hicolor/48x48/actions/gajim-unsubscribed.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/actions/gajim-warning.png
Binary file icons/hicolor/48x48/actions/gajim-warning.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/status/gajim-chat_msg_recv.png
Binary file icons/hicolor/48x48/status/gajim-chat_msg_recv.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/status/gajim-connection_lost.png
Binary file icons/hicolor/48x48/status/gajim-connection_lost.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/status/gajim-ft_done.png
Binary file icons/hicolor/48x48/status/gajim-ft_done.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/status/gajim-ft_error.png
Binary file icons/hicolor/48x48/status/gajim-ft_error.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/status/gajim-ft_request.png
Binary file icons/hicolor/48x48/status/gajim-ft_request.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/status/gajim-ft_stopped.png
Binary file icons/hicolor/48x48/status/gajim-ft_stopped.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/status/gajim-gc_invitation.png
Binary file icons/hicolor/48x48/status/gajim-gc_invitation.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/status/gajim-new_email_recv.png
Binary file icons/hicolor/48x48/status/gajim-new_email_recv.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/status/gajim-priv_msg_recv.png
Binary file icons/hicolor/48x48/status/gajim-priv_msg_recv.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/status/gajim-single_msg_recv.png
Binary file icons/hicolor/48x48/status/gajim-single_msg_recv.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/status/gajim-subscription_request.png
Binary file icons/hicolor/48x48/status/gajim-subscription_request.png has
changed
diff -r acac9619a3b0 -r ee5927e53dc8
icons/hicolor/48x48/status/gajim-unsubscribed.png
Binary file icons/hicolor/48x48/status/gajim-unsubscribed.png has changed
diff -r acac9619a3b0 -r ee5927e53dc8 src/conversation_textview.py
--- a/src/conversation_textview.py Sun Sep 08 18:18:23 2013 +0200
+++ b/src/conversation_textview.py Sun Sep 08 18:58:27 2013 +0200
@@ -171,21 +171,9 @@
FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap(
'gajim-muc_separator')
- XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no',
- quiet=True)
- if not XEP0184_WARNING_PIXBUF:
- MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
- 'gajim-receipt_missing')
- XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes',
- quiet=True)
- if not XEP0184_RECEIVED_PIXBUF:
- MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
- 'gajim-receipt_received')
- MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
- 'gtk-spell-check', quiet=True)
- if not MESSAGE_CORRECTED_PIXBUF:
- MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
- 'gajim-message_corrected')
+ XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no')
+ XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes')
+ MESSAGE_CORRECTED_PIXBUF =
gtkgui_helpers.get_icon_pixmap('gtk-spell-check')
# smooth scroll constants
MAX_SCROLL_TIME = 0.4 # seconds
diff -r acac9619a3b0 -r ee5927e53dc8 src/dialogs.py
--- a/src/dialogs.py Sun Sep 08 18:18:23 2013 +0200
+++ b/src/dialogs.py Sun Sep 08 18:58:27 2013 +0200
@@ -1311,7 +1311,7 @@
dlg.props.wrap_license = True
- pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-about', 128)
+ pixbuf = gtkgui_helpers.get_icon_pixmap('gajim', 128)
dlg.set_logo(pixbuf)
#here you write your name in the form Name FamilyName
<someone@somewhere>
diff -r acac9619a3b0 -r ee5927e53dc8 src/gui_interface.py
--- a/src/gui_interface.py Sun Sep 08 18:18:23 2013 +0200
+++ b/src/gui_interface.py Sun Sep 08 18:58:27 2013 +0200
@@ -662,7 +662,7 @@
'key.')
dialogs.WarningDialog(_('Your passphrase is incorrect'), sectext)
else:
- path = gtkgui_helpers.get_icon_path('gajim-warning', 48)
+ path = gtkgui_helpers.get_icon_path('gtk-dialog-warning', 48)
account = obj.conn.name
notify.popup('warning', account, account, 'warning', path,
_('OpenPGP Passphrase Incorrect'),
diff -r acac9619a3b0 -r ee5927e53dc8 src/htmltextview.py
--- a/src/htmltextview.py Sun Sep 08 18:18:23 2013 +0200
+++ b/src/htmltextview.py Sun Sep 08 18:58:27 2013 +0200
@@ -521,7 +521,7 @@
if alt:
alt += '\n'
alt += _('Loading')
- pixbuf = get_icon_pixmap('gajim-receipt_missing')
+ pixbuf = get_icon_pixmap('gtk-no')
if mem:
# Caveat: GdkPixbuf is known not to be safe to load
# images from network... this program is now potentially
diff -r acac9619a3b0 -r ee5927e53dc8 src/roster_window.py
--- a/src/roster_window.py Sun Sep 08 18:18:23 2013 +0200
+++ b/src/roster_window.py Sun Sep 08 18:58:27 2013 +0200
@@ -6476,6 +6476,11 @@
# Add a Separator (self._iter_is_separator() checks on string
SEPARATOR)
liststore.append(['SEPARATOR', None, '', True])
+ path = gtkgui_helpers.get_icon_path('gajim-plugins')
+ img = gtk.Image()
+ img.set_from_file(path)
+ self.xml.get_object('plugins_menuitem').set_image(img)
+
path = gtkgui_helpers.get_icon_path('gajim-kbd_input')
img = gtk.Image()
img.set_from_file(path)
_______________________________________________
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
