diff --git a/data/iconsets/transports/aim/16x16/error.png b/data/iconsets/transports/aim/16x16/error.png deleted file mode 100644 index d99d62a84..000000000 Binary files a/data/iconsets/transports/aim/16x16/error.png and /dev/null differ diff --git a/data/iconsets/transports/aim/16x16/invisible.png b/data/iconsets/transports/aim/16x16/invisible.png deleted file mode 100644 index 65b3c327c..000000000 Binary files a/data/iconsets/transports/aim/16x16/invisible.png and /dev/null differ diff --git a/data/iconsets/transports/aim/16x16/message.gif b/data/iconsets/transports/aim/16x16/message.gif deleted file mode 100644 index 6d161752e..000000000 Binary files a/data/iconsets/transports/aim/16x16/message.gif and /dev/null differ diff --git a/data/iconsets/transports/aim/16x16/not_in_roster.png b/data/iconsets/transports/aim/16x16/not_in_roster.png deleted file mode 100644 index 5abdbccfc..000000000 Binary files a/data/iconsets/transports/aim/16x16/not_in_roster.png and /dev/null differ diff --git a/data/iconsets/transports/aim/16x16/requested.png b/data/iconsets/transports/aim/16x16/requested.png deleted file mode 100644 index 65b3c327c..000000000 Binary files a/data/iconsets/transports/aim/16x16/requested.png and /dev/null differ diff --git a/data/iconsets/transports/aim/32x32/invisible.png b/data/iconsets/transports/aim/32x32/invisible.png deleted file mode 100644 index e0f45fd9c..000000000 Binary files a/data/iconsets/transports/aim/32x32/invisible.png and /dev/null differ diff --git a/data/iconsets/transports/aim/32x32/not_in_roster.png b/data/iconsets/transports/aim/32x32/not_in_roster.png deleted file mode 100644 index 40d43078f..000000000 Binary files a/data/iconsets/transports/aim/32x32/not_in_roster.png and /dev/null differ diff --git a/data/iconsets/transports/aim/32x32/requested.png b/data/iconsets/transports/aim/32x32/requested.png deleted file mode 100644 index e0f45fd9c..000000000 Binary files a/data/iconsets/transports/aim/32x32/requested.png and /dev/null differ diff --git a/data/iconsets/transports/gadugadu/16x16/error.png b/data/iconsets/transports/gadugadu/16x16/error.png deleted file mode 100644 index 0ecf3a82c..000000000 Binary files a/data/iconsets/transports/gadugadu/16x16/error.png and /dev/null differ diff --git a/data/iconsets/transports/gadugadu/16x16/invisible.png b/data/iconsets/transports/gadugadu/16x16/invisible.png deleted file mode 100644 index cab1e86f5..000000000 Binary files a/data/iconsets/transports/gadugadu/16x16/invisible.png and /dev/null differ diff --git a/data/iconsets/transports/gadugadu/16x16/message.gif b/data/iconsets/transports/gadugadu/16x16/message.gif deleted file mode 100644 index 6d161752e..000000000 Binary files a/data/iconsets/transports/gadugadu/16x16/message.gif and /dev/null differ diff --git a/data/iconsets/transports/gadugadu/16x16/not_in_roster.png b/data/iconsets/transports/gadugadu/16x16/not_in_roster.png deleted file mode 100644 index 14516876d..000000000 Binary files a/data/iconsets/transports/gadugadu/16x16/not_in_roster.png and /dev/null differ diff --git a/data/iconsets/transports/gadugadu/16x16/requested.png b/data/iconsets/transports/gadugadu/16x16/requested.png deleted file mode 100644 index b8623f4b5..000000000 Binary files a/data/iconsets/transports/gadugadu/16x16/requested.png and /dev/null differ diff --git a/data/iconsets/transports/gadugadu/32x32/invisible.png b/data/iconsets/transports/gadugadu/32x32/invisible.png deleted file mode 100644 index 6997d7730..000000000 Binary files a/data/iconsets/transports/gadugadu/32x32/invisible.png and /dev/null differ diff --git a/data/iconsets/transports/gadugadu/32x32/not_in_roster.png b/data/iconsets/transports/gadugadu/32x32/not_in_roster.png deleted file mode 100644 index 8bccc888d..000000000 Binary files a/data/iconsets/transports/gadugadu/32x32/not_in_roster.png and /dev/null differ diff --git a/data/iconsets/transports/gadugadu/32x32/requested.png b/data/iconsets/transports/gadugadu/32x32/requested.png deleted file mode 100644 index ef8d3a246..000000000 Binary files a/data/iconsets/transports/gadugadu/32x32/requested.png and /dev/null differ diff --git a/data/iconsets/transports/icq/16x16/error.png b/data/iconsets/transports/icq/16x16/error.png deleted file mode 100644 index d99d62a84..000000000 Binary files a/data/iconsets/transports/icq/16x16/error.png and /dev/null differ diff --git a/data/iconsets/transports/icq/16x16/invisible.png b/data/iconsets/transports/icq/16x16/invisible.png deleted file mode 100644 index 78823b82b..000000000 Binary files a/data/iconsets/transports/icq/16x16/invisible.png and /dev/null differ diff --git a/data/iconsets/transports/icq/16x16/message.gif b/data/iconsets/transports/icq/16x16/message.gif deleted file mode 100644 index 6d161752e..000000000 Binary files a/data/iconsets/transports/icq/16x16/message.gif and /dev/null differ diff --git a/data/iconsets/transports/icq/16x16/not_in_roster.png b/data/iconsets/transports/icq/16x16/not_in_roster.png deleted file mode 100644 index 3d6b94243..000000000 Binary files a/data/iconsets/transports/icq/16x16/not_in_roster.png and /dev/null differ diff --git a/data/iconsets/transports/icq/16x16/requested.png b/data/iconsets/transports/icq/16x16/requested.png deleted file mode 100644 index c1b06a5e2..000000000 Binary files a/data/iconsets/transports/icq/16x16/requested.png and /dev/null differ diff --git a/data/iconsets/transports/icq/32x32/invisible.png b/data/iconsets/transports/icq/32x32/invisible.png deleted file mode 100644 index be981db38..000000000 Binary files a/data/iconsets/transports/icq/32x32/invisible.png and /dev/null differ diff --git a/data/iconsets/transports/icq/32x32/not_in_roster.png b/data/iconsets/transports/icq/32x32/not_in_roster.png deleted file mode 100644 index fc8617426..000000000 Binary files a/data/iconsets/transports/icq/32x32/not_in_roster.png and /dev/null differ diff --git a/data/iconsets/transports/icq/32x32/requested.png b/data/iconsets/transports/icq/32x32/requested.png deleted file mode 100644 index e25c3f348..000000000 Binary files a/data/iconsets/transports/icq/32x32/requested.png and /dev/null differ diff --git a/data/iconsets/transports/irc/16x16/error.png b/data/iconsets/transports/irc/16x16/error.png deleted file mode 100644 index d99d62a84..000000000 Binary files a/data/iconsets/transports/irc/16x16/error.png and /dev/null differ diff --git a/data/iconsets/transports/irc/16x16/invisible.png b/data/iconsets/transports/irc/16x16/invisible.png deleted file mode 100644 index 1738fd794..000000000 Binary files a/data/iconsets/transports/irc/16x16/invisible.png and /dev/null differ diff --git a/data/iconsets/transports/irc/16x16/message.gif b/data/iconsets/transports/irc/16x16/message.gif deleted file mode 100644 index 6d161752e..000000000 Binary files a/data/iconsets/transports/irc/16x16/message.gif and /dev/null differ diff --git a/data/iconsets/transports/irc/16x16/not_in_roster.png b/data/iconsets/transports/irc/16x16/not_in_roster.png deleted file mode 100644 index 842bb8fc9..000000000 Binary files a/data/iconsets/transports/irc/16x16/not_in_roster.png and /dev/null differ diff --git a/data/iconsets/transports/irc/16x16/requested.png b/data/iconsets/transports/irc/16x16/requested.png deleted file mode 100644 index 1738fd794..000000000 Binary files a/data/iconsets/transports/irc/16x16/requested.png and /dev/null differ diff --git a/data/iconsets/transports/msn/16x16/error.png b/data/iconsets/transports/msn/16x16/error.png deleted file mode 100644 index d99d62a84..000000000 Binary files a/data/iconsets/transports/msn/16x16/error.png and /dev/null differ diff --git a/data/iconsets/transports/msn/16x16/invisible.png b/data/iconsets/transports/msn/16x16/invisible.png deleted file mode 100644 index fa0ab6854..000000000 Binary files a/data/iconsets/transports/msn/16x16/invisible.png and /dev/null differ diff --git a/data/iconsets/transports/msn/16x16/message.gif b/data/iconsets/transports/msn/16x16/message.gif deleted file mode 100644 index 6d161752e..000000000 Binary files a/data/iconsets/transports/msn/16x16/message.gif and /dev/null differ diff --git a/data/iconsets/transports/msn/16x16/not_in_roster.png b/data/iconsets/transports/msn/16x16/not_in_roster.png deleted file mode 100644 index adff44465..000000000 Binary files a/data/iconsets/transports/msn/16x16/not_in_roster.png and /dev/null differ diff --git a/data/iconsets/transports/msn/16x16/requested.png b/data/iconsets/transports/msn/16x16/requested.png deleted file mode 100644 index fa0ab6854..000000000 Binary files a/data/iconsets/transports/msn/16x16/requested.png and /dev/null differ diff --git a/data/iconsets/transports/msn/32x32/invisible.png b/data/iconsets/transports/msn/32x32/invisible.png deleted file mode 100644 index 1c44c21ba..000000000 Binary files a/data/iconsets/transports/msn/32x32/invisible.png and /dev/null differ diff --git a/data/iconsets/transports/msn/32x32/message.png b/data/iconsets/transports/msn/32x32/message.png deleted file mode 100644 index bc451cbb0..000000000 Binary files a/data/iconsets/transports/msn/32x32/message.png and /dev/null differ diff --git a/data/iconsets/transports/msn/32x32/not_in_roster.png b/data/iconsets/transports/msn/32x32/not_in_roster.png deleted file mode 100644 index cd411a43b..000000000 Binary files a/data/iconsets/transports/msn/32x32/not_in_roster.png and /dev/null differ diff --git a/data/iconsets/transports/msn/32x32/requested.png b/data/iconsets/transports/msn/32x32/requested.png deleted file mode 100644 index 1c44c21ba..000000000 Binary files a/data/iconsets/transports/msn/32x32/requested.png and /dev/null differ diff --git a/data/iconsets/transports/sms/16x16/error.png b/data/iconsets/transports/sms/16x16/error.png deleted file mode 100644 index d99d62a84..000000000 Binary files a/data/iconsets/transports/sms/16x16/error.png and /dev/null differ diff --git a/data/iconsets/transports/sms/16x16/invisible.png b/data/iconsets/transports/sms/16x16/invisible.png deleted file mode 100644 index 4b5754373..000000000 Binary files a/data/iconsets/transports/sms/16x16/invisible.png and /dev/null differ diff --git a/data/iconsets/transports/sms/16x16/message.gif b/data/iconsets/transports/sms/16x16/message.gif deleted file mode 100644 index 6d161752e..000000000 Binary files a/data/iconsets/transports/sms/16x16/message.gif and /dev/null differ diff --git a/data/iconsets/transports/sms/16x16/requested.png b/data/iconsets/transports/sms/16x16/requested.png deleted file mode 100644 index dcadfcf01..000000000 Binary files a/data/iconsets/transports/sms/16x16/requested.png and /dev/null differ diff --git a/data/iconsets/transports/tlen/16x16/error.png b/data/iconsets/transports/tlen/16x16/error.png deleted file mode 100644 index 9152973b9..000000000 Binary files a/data/iconsets/transports/tlen/16x16/error.png and /dev/null differ diff --git a/data/iconsets/transports/tlen/16x16/invisible.png b/data/iconsets/transports/tlen/16x16/invisible.png deleted file mode 100644 index 7373d7087..000000000 Binary files a/data/iconsets/transports/tlen/16x16/invisible.png and /dev/null differ diff --git a/data/iconsets/transports/tlen/16x16/message.gif b/data/iconsets/transports/tlen/16x16/message.gif deleted file mode 100644 index 6d161752e..000000000 Binary files a/data/iconsets/transports/tlen/16x16/message.gif and /dev/null differ diff --git a/data/iconsets/transports/tlen/16x16/not_in_roster.png b/data/iconsets/transports/tlen/16x16/not_in_roster.png deleted file mode 100644 index 649aa1001..000000000 Binary files a/data/iconsets/transports/tlen/16x16/not_in_roster.png and /dev/null differ diff --git a/data/iconsets/transports/tlen/16x16/requested.png b/data/iconsets/transports/tlen/16x16/requested.png deleted file mode 100644 index f922cbd68..000000000 Binary files a/data/iconsets/transports/tlen/16x16/requested.png and /dev/null differ diff --git a/data/iconsets/transports/tlen/32x32/invisible.png b/data/iconsets/transports/tlen/32x32/invisible.png deleted file mode 100644 index e012b3a60..000000000 Binary files a/data/iconsets/transports/tlen/32x32/invisible.png and /dev/null differ diff --git a/data/iconsets/transports/tlen/32x32/not_in_roster.png b/data/iconsets/transports/tlen/32x32/not_in_roster.png deleted file mode 100644 index 66c2eff8e..000000000 Binary files a/data/iconsets/transports/tlen/32x32/not_in_roster.png and /dev/null differ diff --git a/data/iconsets/transports/tlen/32x32/requested.png b/data/iconsets/transports/tlen/32x32/requested.png deleted file mode 100644 index 7cd24aef4..000000000 Binary files a/data/iconsets/transports/tlen/32x32/requested.png and /dev/null differ diff --git a/data/iconsets/transports/weather/16x16/error.png b/data/iconsets/transports/weather/16x16/error.png deleted file mode 100644 index d99d62a84..000000000 Binary files a/data/iconsets/transports/weather/16x16/error.png and /dev/null differ diff --git a/data/iconsets/transports/weather/16x16/invisible.png b/data/iconsets/transports/weather/16x16/invisible.png deleted file mode 100644 index b8bb1b870..000000000 Binary files a/data/iconsets/transports/weather/16x16/invisible.png and /dev/null differ diff --git a/data/iconsets/transports/weather/16x16/message.gif b/data/iconsets/transports/weather/16x16/message.gif deleted file mode 100644 index 6d161752e..000000000 Binary files a/data/iconsets/transports/weather/16x16/message.gif and /dev/null differ diff --git a/data/iconsets/transports/weather/16x16/not_in_roster.png b/data/iconsets/transports/weather/16x16/not_in_roster.png deleted file mode 100644 index bdf776ea7..000000000 Binary files a/data/iconsets/transports/weather/16x16/not_in_roster.png and /dev/null differ diff --git a/data/iconsets/transports/yahoo/16x16/error.png b/data/iconsets/transports/yahoo/16x16/error.png deleted file mode 100644 index d99d62a84..000000000 Binary files a/data/iconsets/transports/yahoo/16x16/error.png and /dev/null differ diff --git a/data/iconsets/transports/yahoo/16x16/invisible.png b/data/iconsets/transports/yahoo/16x16/invisible.png deleted file mode 100644 index e792dfeb8..000000000 Binary files a/data/iconsets/transports/yahoo/16x16/invisible.png and /dev/null differ diff --git a/data/iconsets/transports/yahoo/16x16/message.gif b/data/iconsets/transports/yahoo/16x16/message.gif deleted file mode 100644 index 6d161752e..000000000 Binary files a/data/iconsets/transports/yahoo/16x16/message.gif and /dev/null differ diff --git a/data/iconsets/transports/yahoo/16x16/not_in_roster.png b/data/iconsets/transports/yahoo/16x16/not_in_roster.png deleted file mode 100644 index 43c91fdd3..000000000 Binary files a/data/iconsets/transports/yahoo/16x16/not_in_roster.png and /dev/null differ diff --git a/data/iconsets/transports/yahoo/16x16/requested.png b/data/iconsets/transports/yahoo/16x16/requested.png deleted file mode 100644 index e792dfeb8..000000000 Binary files a/data/iconsets/transports/yahoo/16x16/requested.png and /dev/null differ diff --git a/data/iconsets/transports/yahoo/32x32/invisible.png b/data/iconsets/transports/yahoo/32x32/invisible.png deleted file mode 100644 index d283f7992..000000000 Binary files a/data/iconsets/transports/yahoo/32x32/invisible.png and /dev/null differ diff --git a/data/iconsets/transports/yahoo/32x32/not_in_roster.png b/data/iconsets/transports/yahoo/32x32/not_in_roster.png deleted file mode 100644 index b0b1855a4..000000000 Binary files a/data/iconsets/transports/yahoo/32x32/not_in_roster.png and /dev/null differ diff --git a/data/iconsets/transports/yahoo/32x32/requested.png b/data/iconsets/transports/yahoo/32x32/requested.png deleted file mode 100644 index d283f7992..000000000 Binary files a/data/iconsets/transports/yahoo/32x32/requested.png and /dev/null differ diff --git a/src/chat_control.py b/src/chat_control.py index d3076a1cd..bfda65bf4 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -803,8 +803,9 @@ class ChatControl(ChatControlBase): # Set banner image img_32 = gajim.interface.roster.get_appropriate_state_images(jid, - size = '32') - img_16 = gajim.interface.roster.get_appropriate_state_images(jid) + size = '32', icon_name = show) + img_16 = gajim.interface.roster.get_appropriate_state_images(jid, + icon_name = show) if img_32.has_key(show) and img_32[show].get_pixbuf(): # we have 32x32! use it! banner_image = img_32[show] @@ -1088,10 +1089,11 @@ class ChatControl(ChatControlBase): def get_tab_image(self): num_unread = self.nb_unread # Set tab image (always 16x16); unread messages show the 'message' image - img_16 = gajim.interface.roster.get_appropriate_state_images(self.contact.jid) tab_img = None if num_unread and gajim.config.get('show_unread_tab_icon'): + img_16 = gajim.interface.roster.get_appropriate_state_images( + self.contact.jid, icon_name = 'message') tab_img = img_16['message'] else: contact = gajim.contacts.get_contact_with_highest_priority(self.account, @@ -1099,6 +1101,8 @@ class ChatControl(ChatControlBase): if not contact: # For transient contacts contact = self.contact + img_16 = gajim.interface.roster.get_appropriate_state_images( + self.contact.jid, icon_name = contact.show) tab_img = img_16[contact.show] return tab_img diff --git a/src/groupchat_control.py b/src/groupchat_control.py index dc373cd5a..d23d0ab55 100644 --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -274,7 +274,8 @@ class GroupchatControl(ChatControlBase): def get_tab_image(self): # Set tab image (always 16x16); unread messages show the 'message' image - img_16 = gajim.interface.roster.get_appropriate_state_images(self.room_jid) + img_16 = gajim.interface.roster.get_appropriate_state_images( + self.room_jid, icon_name = 'message') tab_image = None if self.attention_flag and gajim.config.get('show_unread_tab_icon'): @@ -337,7 +338,8 @@ class GroupchatControl(ChatControlBase): if no_queue: # We didn't have a queue: we change icons model = self.list_treeview.get_model() state_images =\ - gajim.interface.roster.get_appropriate_state_images(self.room_jid) + gajim.interface.roster.get_appropriate_state_images( + self.room_jid, icon_name = 'message') image = state_images['message'] model[iter][C_IMG] = image if gajim.interface.systray_enabled: diff --git a/src/roster_window.py b/src/roster_window.py index 68a0c4d02..2a37d3016 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -316,11 +316,15 @@ class RosterWindow: if gajim.groups[account].has_key(group): del gajim.groups[account][group] - def get_appropriate_state_images(self, jid, size = '16'): + def get_appropriate_state_images(self, jid, size = '16', + icon_name = 'online'): '''check jid and return the appropriate state images dict for - the demanded size''' + the demanded size. icon_name is taken into account when jis is from + transport: transport iconset doesn't contain all icons, so we fall back + to jabber one''' transport = gajim.get_transport_name_from_jid(jid) - if transport: + if transport and icon_name in \ + self.transports_state_images[size][transport]: return self.transports_state_images[size][transport] return self.jabber_state_images[size] @@ -391,12 +395,13 @@ class RosterWindow: child_iter = model.iter_next(child_iter) if self.tree.row_expanded(path): state_images = self.get_appropriate_state_images(jid, - size = 'opened') + size = 'opened', icon_name = icon_name) else: state_images = self.get_appropriate_state_images(jid, - size = 'closed') + size = 'closed', icon_name = icon_name) else: - state_images = self.get_appropriate_state_images(jid, size = '16') + state_images = self.get_appropriate_state_images(jid, + icon_name = icon_name) img = state_images[icon_name] @@ -2350,18 +2355,20 @@ _('If "%s" accepts this request you will know his or her status.') % jid) except RuntimeError: pass - def load_iconset(self, path, pixbuf2 = None): + def load_iconset(self, path, pixbuf2 = None, transport = False): '''load an iconset from the given path, and add pixbuf2 on top left of each static images''' imgs = {} path += '/' - list = ('connecting', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible', - 'offline', 'error', 'requested', 'message', 'opened', 'closed', - 'not in roster', 'muc_active', 'muc_inactive') - if pixbuf2: + if transport: + list = ('online', 'chat', 'away', 'xa', 'dnd', 'offline') + else: list = ('connecting', 'online', 'chat', 'away', 'xa', 'dnd', - 'invisible','offline', 'error', 'requested', 'message', - 'not in roster') + 'invisible', 'offline', 'error', 'requested', 'message', 'opened', + 'closed', 'not in roster', 'muc_active', 'muc_inactive') + if pixbuf2: + list = ('connecting', 'online', 'chat', 'away', 'xa', 'dnd', + 'offline', 'error', 'requested', 'message') for state in list: # try to open a pixfile with the correct method state_file = state.replace(' ', '_') @@ -2408,9 +2415,9 @@ _('If "%s" accepts this request you will know his or her status.') % jid) continue folder = os.path.join(t_path, transport, '16x16') self.transports_state_images['opened'][transport] = self.load_iconset( - folder, pixo) + folder, pixo, transport = True) self.transports_state_images['closed'][transport] = self.load_iconset( - folder, pixc) + folder, pixc, transport = True) def reload_jabber_state_images(self): self.make_jabber_state_images() @@ -2957,10 +2964,10 @@ _('If "%s" accepts this request you will know his or her status.') % jid) continue folder = os.path.join(path, transport, '32x32') self.transports_state_images['32'][transport] = self.load_iconset( - folder) + folder, transport = True) folder = os.path.join(path, transport, '16x16') self.transports_state_images['16'][transport] = self.load_iconset( - folder) + folder, transport = True) # uf_show, img, show, sensitive liststore = gtk.ListStore(str, gtk.Image, str, bool)