diff --git a/data/iconsets/crystal/16x16/icos/away.ico b/data/iconsets/crystal/16x16/icos/away.ico new file mode 100644 index 000000000..5ea5be646 Binary files /dev/null and b/data/iconsets/crystal/16x16/icos/away.ico differ diff --git a/data/iconsets/crystal/16x16/icos/chat.ico b/data/iconsets/crystal/16x16/icos/chat.ico new file mode 100644 index 000000000..a240fc503 Binary files /dev/null and b/data/iconsets/crystal/16x16/icos/chat.ico differ diff --git a/data/iconsets/crystal/16x16/icos/connecting.ico b/data/iconsets/crystal/16x16/icos/connecting.ico new file mode 100644 index 000000000..fca655838 Binary files /dev/null and b/data/iconsets/crystal/16x16/icos/connecting.ico differ diff --git a/data/iconsets/crystal/16x16/icos/dnd.ico b/data/iconsets/crystal/16x16/icos/dnd.ico new file mode 100644 index 000000000..ccf2b3ca0 Binary files /dev/null and b/data/iconsets/crystal/16x16/icos/dnd.ico differ diff --git a/data/iconsets/crystal/16x16/icos/invisible.ico b/data/iconsets/crystal/16x16/icos/invisible.ico new file mode 100644 index 000000000..ab55976c7 Binary files /dev/null and b/data/iconsets/crystal/16x16/icos/invisible.ico differ diff --git a/data/iconsets/crystal/16x16/icos/message.ico b/data/iconsets/crystal/16x16/icos/message.ico new file mode 100644 index 000000000..0aa66eac7 Binary files /dev/null and b/data/iconsets/crystal/16x16/icos/message.ico differ diff --git a/data/iconsets/crystal/16x16/icos/offline.ico b/data/iconsets/crystal/16x16/icos/offline.ico new file mode 100644 index 000000000..f72b089cd Binary files /dev/null and b/data/iconsets/crystal/16x16/icos/offline.ico differ diff --git a/data/iconsets/crystal/16x16/icos/online.ico b/data/iconsets/crystal/16x16/icos/online.ico new file mode 100644 index 000000000..8b652c301 Binary files /dev/null and b/data/iconsets/crystal/16x16/icos/online.ico differ diff --git a/data/iconsets/crystal/16x16/icos/xa.ico b/data/iconsets/crystal/16x16/icos/xa.ico new file mode 100644 index 000000000..aa8780598 Binary files /dev/null and b/data/iconsets/crystal/16x16/icos/xa.ico differ diff --git a/data/iconsets/dcraven/16x16/icos/away.ico b/data/iconsets/dcraven/16x16/icos/away.ico new file mode 100644 index 000000000..cac5f324c Binary files /dev/null and b/data/iconsets/dcraven/16x16/icos/away.ico differ diff --git a/data/iconsets/dcraven/16x16/icos/chat.ico b/data/iconsets/dcraven/16x16/icos/chat.ico new file mode 100644 index 000000000..cdb1cfdf9 Binary files /dev/null and b/data/iconsets/dcraven/16x16/icos/chat.ico differ diff --git a/data/iconsets/dcraven/16x16/icos/connecting.ico b/data/iconsets/dcraven/16x16/icos/connecting.ico new file mode 100644 index 000000000..82e69da21 Binary files /dev/null and b/data/iconsets/dcraven/16x16/icos/connecting.ico differ diff --git a/data/iconsets/dcraven/16x16/icos/dnd.ico b/data/iconsets/dcraven/16x16/icos/dnd.ico new file mode 100644 index 000000000..cc90dbd64 Binary files /dev/null and b/data/iconsets/dcraven/16x16/icos/dnd.ico differ diff --git a/data/iconsets/dcraven/16x16/icos/invisible.ico b/data/iconsets/dcraven/16x16/icos/invisible.ico new file mode 100644 index 000000000..60ffa2f5a Binary files /dev/null and b/data/iconsets/dcraven/16x16/icos/invisible.ico differ diff --git a/data/iconsets/dcraven/16x16/icos/message.ico b/data/iconsets/dcraven/16x16/icos/message.ico new file mode 100644 index 000000000..b828a62df Binary files /dev/null and b/data/iconsets/dcraven/16x16/icos/message.ico differ diff --git a/data/iconsets/dcraven/16x16/icos/offline.ico b/data/iconsets/dcraven/16x16/icos/offline.ico new file mode 100644 index 000000000..b7ca19f26 Binary files /dev/null and b/data/iconsets/dcraven/16x16/icos/offline.ico differ diff --git a/data/iconsets/dcraven/16x16/icos/online.ico b/data/iconsets/dcraven/16x16/icos/online.ico new file mode 100644 index 000000000..0bf58bf0c Binary files /dev/null and b/data/iconsets/dcraven/16x16/icos/online.ico differ diff --git a/data/iconsets/dcraven/16x16/icos/xa.ico b/data/iconsets/dcraven/16x16/icos/xa.ico new file mode 100644 index 000000000..51997fa86 Binary files /dev/null and b/data/iconsets/dcraven/16x16/icos/xa.ico differ diff --git a/data/iconsets/gnome/16x16/icos/away.ico b/data/iconsets/gnome/16x16/icos/away.ico index 1ceea21c7..c57920e8c 100644 Binary files a/data/iconsets/gnome/16x16/icos/away.ico and b/data/iconsets/gnome/16x16/icos/away.ico differ diff --git a/data/iconsets/gnome/16x16/icos/chat.ico b/data/iconsets/gnome/16x16/icos/chat.ico index 1f731c059..6f03cf174 100644 Binary files a/data/iconsets/gnome/16x16/icos/chat.ico and b/data/iconsets/gnome/16x16/icos/chat.ico differ diff --git a/data/iconsets/gnome/16x16/icos/connecting.ico b/data/iconsets/gnome/16x16/icos/connecting.ico index 8c4c92f31..625854066 100644 Binary files a/data/iconsets/gnome/16x16/icos/connecting.ico and b/data/iconsets/gnome/16x16/icos/connecting.ico differ diff --git a/data/iconsets/gnome/16x16/icos/dnd.ico b/data/iconsets/gnome/16x16/icos/dnd.ico index 20e4b34b7..0113c8c93 100644 Binary files a/data/iconsets/gnome/16x16/icos/dnd.ico and b/data/iconsets/gnome/16x16/icos/dnd.ico differ diff --git a/data/iconsets/gnome/16x16/icos/invisible.ico b/data/iconsets/gnome/16x16/icos/invisible.ico index 5834d7ee5..c58a32886 100644 Binary files a/data/iconsets/gnome/16x16/icos/invisible.ico and b/data/iconsets/gnome/16x16/icos/invisible.ico differ diff --git a/data/iconsets/gnome/16x16/icos/message.ico b/data/iconsets/gnome/16x16/icos/message.ico index 725af150a..77daa4266 100644 Binary files a/data/iconsets/gnome/16x16/icos/message.ico and b/data/iconsets/gnome/16x16/icos/message.ico differ diff --git a/data/iconsets/gnome/16x16/icos/offline.ico b/data/iconsets/gnome/16x16/icos/offline.ico index b3874cd0e..e997b3d17 100644 Binary files a/data/iconsets/gnome/16x16/icos/offline.ico and b/data/iconsets/gnome/16x16/icos/offline.ico differ diff --git a/data/iconsets/gnome/16x16/icos/online.ico b/data/iconsets/gnome/16x16/icos/online.ico index 2dfb2f927..3ec0590c8 100644 Binary files a/data/iconsets/gnome/16x16/icos/online.ico and b/data/iconsets/gnome/16x16/icos/online.ico differ diff --git a/data/iconsets/gnome/16x16/icos/xa.ico b/data/iconsets/gnome/16x16/icos/xa.ico index bc6eb3696..79857f176 100644 Binary files a/data/iconsets/gnome/16x16/icos/xa.ico and b/data/iconsets/gnome/16x16/icos/xa.ico differ diff --git a/data/iconsets/gossip/16x16/icos/away.ico b/data/iconsets/gossip/16x16/icos/away.ico new file mode 100644 index 000000000..5ea274765 Binary files /dev/null and b/data/iconsets/gossip/16x16/icos/away.ico differ diff --git a/data/iconsets/gossip/16x16/icos/chat.ico b/data/iconsets/gossip/16x16/icos/chat.ico new file mode 100644 index 000000000..2aa5ca4a7 Binary files /dev/null and b/data/iconsets/gossip/16x16/icos/chat.ico differ diff --git a/data/iconsets/gossip/16x16/icos/connecting.ico b/data/iconsets/gossip/16x16/icos/connecting.ico new file mode 100644 index 000000000..e9e5cad6e Binary files /dev/null and b/data/iconsets/gossip/16x16/icos/connecting.ico differ diff --git a/data/iconsets/gossip/16x16/icos/dnd.ico b/data/iconsets/gossip/16x16/icos/dnd.ico new file mode 100644 index 000000000..b6e118854 Binary files /dev/null and b/data/iconsets/gossip/16x16/icos/dnd.ico differ diff --git a/data/iconsets/gossip/16x16/icos/invisible.ico b/data/iconsets/gossip/16x16/icos/invisible.ico new file mode 100644 index 000000000..de2991be1 Binary files /dev/null and b/data/iconsets/gossip/16x16/icos/invisible.ico differ diff --git a/data/iconsets/gossip/16x16/icos/message.ico b/data/iconsets/gossip/16x16/icos/message.ico new file mode 100644 index 000000000..35af62cd7 Binary files /dev/null and b/data/iconsets/gossip/16x16/icos/message.ico differ diff --git a/data/iconsets/gossip/16x16/icos/offline.ico b/data/iconsets/gossip/16x16/icos/offline.ico new file mode 100644 index 000000000..5d0f38ac7 Binary files /dev/null and b/data/iconsets/gossip/16x16/icos/offline.ico differ diff --git a/data/iconsets/gossip/16x16/icos/online.ico b/data/iconsets/gossip/16x16/icos/online.ico new file mode 100644 index 000000000..09260cb2e Binary files /dev/null and b/data/iconsets/gossip/16x16/icos/online.ico differ diff --git a/data/iconsets/gossip/16x16/icos/xa.ico b/data/iconsets/gossip/16x16/icos/xa.ico new file mode 100644 index 000000000..eb4ceb849 Binary files /dev/null and b/data/iconsets/gossip/16x16/icos/xa.ico differ diff --git a/data/iconsets/gota/16x16/icos/away.ico b/data/iconsets/gota/16x16/icos/away.ico new file mode 100644 index 000000000..3ff5babe6 Binary files /dev/null and b/data/iconsets/gota/16x16/icos/away.ico differ diff --git a/data/iconsets/gota/16x16/icos/chat.ico b/data/iconsets/gota/16x16/icos/chat.ico new file mode 100644 index 000000000..11d48d152 Binary files /dev/null and b/data/iconsets/gota/16x16/icos/chat.ico differ diff --git a/data/iconsets/gota/16x16/icos/connecting.ico b/data/iconsets/gota/16x16/icos/connecting.ico new file mode 100644 index 000000000..f901c7a6d Binary files /dev/null and b/data/iconsets/gota/16x16/icos/connecting.ico differ diff --git a/data/iconsets/gota/16x16/icos/dnd.ico b/data/iconsets/gota/16x16/icos/dnd.ico new file mode 100644 index 000000000..9a1c48053 Binary files /dev/null and b/data/iconsets/gota/16x16/icos/dnd.ico differ diff --git a/data/iconsets/gota/16x16/icos/invisible.ico b/data/iconsets/gota/16x16/icos/invisible.ico new file mode 100644 index 000000000..37e0ba4a0 Binary files /dev/null and b/data/iconsets/gota/16x16/icos/invisible.ico differ diff --git a/data/iconsets/gota/16x16/icos/message.ico b/data/iconsets/gota/16x16/icos/message.ico new file mode 100644 index 000000000..8196b3bef Binary files /dev/null and b/data/iconsets/gota/16x16/icos/message.ico differ diff --git a/data/iconsets/gota/16x16/icos/offline.ico b/data/iconsets/gota/16x16/icos/offline.ico new file mode 100644 index 000000000..8c0049199 Binary files /dev/null and b/data/iconsets/gota/16x16/icos/offline.ico differ diff --git a/data/iconsets/gota/16x16/icos/online.ico b/data/iconsets/gota/16x16/icos/online.ico new file mode 100644 index 000000000..251993daf Binary files /dev/null and b/data/iconsets/gota/16x16/icos/online.ico differ diff --git a/data/iconsets/gota/16x16/icos/xa.ico b/data/iconsets/gota/16x16/icos/xa.ico new file mode 100644 index 000000000..b428f4f9a Binary files /dev/null and b/data/iconsets/gota/16x16/icos/xa.ico differ diff --git a/data/iconsets/nuvola/16x16/icos/away.ico b/data/iconsets/nuvola/16x16/icos/away.ico new file mode 100644 index 000000000..41260e03a Binary files /dev/null and b/data/iconsets/nuvola/16x16/icos/away.ico differ diff --git a/data/iconsets/nuvola/16x16/icos/chat.ico b/data/iconsets/nuvola/16x16/icos/chat.ico new file mode 100644 index 000000000..6075627ba Binary files /dev/null and b/data/iconsets/nuvola/16x16/icos/chat.ico differ diff --git a/data/iconsets/nuvola/16x16/icos/connecting.ico b/data/iconsets/nuvola/16x16/icos/connecting.ico new file mode 100644 index 000000000..625854066 Binary files /dev/null and b/data/iconsets/nuvola/16x16/icos/connecting.ico differ diff --git a/data/iconsets/nuvola/16x16/icos/dnd.ico b/data/iconsets/nuvola/16x16/icos/dnd.ico new file mode 100644 index 000000000..5064f0064 Binary files /dev/null and b/data/iconsets/nuvola/16x16/icos/dnd.ico differ diff --git a/data/iconsets/nuvola/16x16/icos/invisible.ico b/data/iconsets/nuvola/16x16/icos/invisible.ico new file mode 100644 index 000000000..b5e7a90be Binary files /dev/null and b/data/iconsets/nuvola/16x16/icos/invisible.ico differ diff --git a/data/iconsets/nuvola/16x16/icos/message.ico b/data/iconsets/nuvola/16x16/icos/message.ico new file mode 100644 index 000000000..77daa4266 Binary files /dev/null and b/data/iconsets/nuvola/16x16/icos/message.ico differ diff --git a/data/iconsets/nuvola/16x16/icos/offline.ico b/data/iconsets/nuvola/16x16/icos/offline.ico new file mode 100644 index 000000000..675c0e835 Binary files /dev/null and b/data/iconsets/nuvola/16x16/icos/offline.ico differ diff --git a/data/iconsets/nuvola/16x16/icos/online.ico b/data/iconsets/nuvola/16x16/icos/online.ico new file mode 100644 index 000000000..d5a659d5a Binary files /dev/null and b/data/iconsets/nuvola/16x16/icos/online.ico differ diff --git a/data/iconsets/nuvola/16x16/icos/xa.ico b/data/iconsets/nuvola/16x16/icos/xa.ico new file mode 100644 index 000000000..c2802fd2c Binary files /dev/null and b/data/iconsets/nuvola/16x16/icos/xa.ico differ diff --git a/data/iconsets/simplebulb/16x16/icos/away.ico b/data/iconsets/simplebulb/16x16/icos/away.ico new file mode 100644 index 000000000..4711bdaf6 Binary files /dev/null and b/data/iconsets/simplebulb/16x16/icos/away.ico differ diff --git a/data/iconsets/simplebulb/16x16/icos/chat.ico b/data/iconsets/simplebulb/16x16/icos/chat.ico new file mode 100644 index 000000000..97c264284 Binary files /dev/null and b/data/iconsets/simplebulb/16x16/icos/chat.ico differ diff --git a/data/iconsets/simplebulb/16x16/icos/connecting.ico b/data/iconsets/simplebulb/16x16/icos/connecting.ico new file mode 100644 index 000000000..140276cc4 Binary files /dev/null and b/data/iconsets/simplebulb/16x16/icos/connecting.ico differ diff --git a/data/iconsets/simplebulb/16x16/icos/dnd.ico b/data/iconsets/simplebulb/16x16/icos/dnd.ico new file mode 100644 index 000000000..e45cc638f Binary files /dev/null and b/data/iconsets/simplebulb/16x16/icos/dnd.ico differ diff --git a/data/iconsets/simplebulb/16x16/icos/invisible.ico b/data/iconsets/simplebulb/16x16/icos/invisible.ico new file mode 100644 index 000000000..21be37ff6 Binary files /dev/null and b/data/iconsets/simplebulb/16x16/icos/invisible.ico differ diff --git a/data/iconsets/simplebulb/16x16/icos/message.ico b/data/iconsets/simplebulb/16x16/icos/message.ico new file mode 100644 index 000000000..b3d772c2c Binary files /dev/null and b/data/iconsets/simplebulb/16x16/icos/message.ico differ diff --git a/data/iconsets/simplebulb/16x16/icos/offline.ico b/data/iconsets/simplebulb/16x16/icos/offline.ico new file mode 100644 index 000000000..47e860488 Binary files /dev/null and b/data/iconsets/simplebulb/16x16/icos/offline.ico differ diff --git a/data/iconsets/simplebulb/16x16/icos/online.ico b/data/iconsets/simplebulb/16x16/icos/online.ico new file mode 100644 index 000000000..12fb41b34 Binary files /dev/null and b/data/iconsets/simplebulb/16x16/icos/online.ico differ diff --git a/data/iconsets/simplebulb/16x16/icos/xa.ico b/data/iconsets/simplebulb/16x16/icos/xa.ico new file mode 100644 index 000000000..fcbf691e9 Binary files /dev/null and b/data/iconsets/simplebulb/16x16/icos/xa.ico differ diff --git a/data/iconsets/stellar/16x16/icos/away.ico b/data/iconsets/stellar/16x16/icos/away.ico new file mode 100644 index 000000000..ec367418d Binary files /dev/null and b/data/iconsets/stellar/16x16/icos/away.ico differ diff --git a/data/iconsets/stellar/16x16/icos/chat.ico b/data/iconsets/stellar/16x16/icos/chat.ico new file mode 100644 index 000000000..2cf24ea39 Binary files /dev/null and b/data/iconsets/stellar/16x16/icos/chat.ico differ diff --git a/data/iconsets/stellar/16x16/icos/connecting.ico b/data/iconsets/stellar/16x16/icos/connecting.ico new file mode 100644 index 000000000..5eb9f0b64 Binary files /dev/null and b/data/iconsets/stellar/16x16/icos/connecting.ico differ diff --git a/data/iconsets/stellar/16x16/icos/dnd.ico b/data/iconsets/stellar/16x16/icos/dnd.ico new file mode 100644 index 000000000..d3a725c86 Binary files /dev/null and b/data/iconsets/stellar/16x16/icos/dnd.ico differ diff --git a/data/iconsets/stellar/16x16/icos/invisible.ico b/data/iconsets/stellar/16x16/icos/invisible.ico new file mode 100644 index 000000000..c1b02bc63 Binary files /dev/null and b/data/iconsets/stellar/16x16/icos/invisible.ico differ diff --git a/data/iconsets/stellar/16x16/icos/message.ico b/data/iconsets/stellar/16x16/icos/message.ico new file mode 100644 index 000000000..05e3e8602 Binary files /dev/null and b/data/iconsets/stellar/16x16/icos/message.ico differ diff --git a/data/iconsets/stellar/16x16/icos/offline.ico b/data/iconsets/stellar/16x16/icos/offline.ico new file mode 100644 index 000000000..a2bd678ad Binary files /dev/null and b/data/iconsets/stellar/16x16/icos/offline.ico differ diff --git a/data/iconsets/stellar/16x16/icos/online.ico b/data/iconsets/stellar/16x16/icos/online.ico new file mode 100644 index 000000000..d50fee30e Binary files /dev/null and b/data/iconsets/stellar/16x16/icos/online.ico differ diff --git a/data/iconsets/stellar/16x16/icos/xa.ico b/data/iconsets/stellar/16x16/icos/xa.ico new file mode 100644 index 000000000..92f2532cf Binary files /dev/null and b/data/iconsets/stellar/16x16/icos/xa.ico differ diff --git a/src/systraywin32.py b/src/systraywin32.py index 2e87dbf96..752f1da28 100644 --- a/src/systraywin32.py +++ b/src/systraywin32.py @@ -223,7 +223,7 @@ class SystrayWin32(systray.Systray): self.systray_context_menu = self.xml.get_widget('systray_context_menu') self.added_hide_menuitem = False - self.tray_ico_imgs = self.load_icos() +# self.tray_ico_imgs = self.load_icos() #gajim.interface.roster.window.realize() #gajim.interface.roster.window.show_all() @@ -302,6 +302,7 @@ class SystrayWin32(systray.Systray): self.systray_winapi.notify_icon.set_tooltip(text) def set_img(self): + self.tray_ico_imgs = self.load_icos() self.systray_winapi.remove_notify_icon() if len(self.jids) > 0: state = 'message' @@ -315,18 +316,21 @@ class SystrayWin32(systray.Systray): def load_icos(self): '''load .ico files and return them to a dic of SHOW --> img_obj''' - #iconset = gajim.config.get('iconset') - #if not iconset: - # iconset = 'sun' - iconset = 'gnome' + iconset = str(gajim.config.get('iconset')) + if not iconset: + iconset = 'sun' imgs = {} - path = os.path.join(gajim.DATA_DIR, 'iconsets/' + iconset + '/16x16/icos/') + path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16', 'icos') + # icon folder for missing icons + path_sun_iconset = os.path.join(gajim.DATA_DIR, 'iconsets', 'sun', '16x16', 'icos') states_list = gajim.SHOW_LIST # trayicon apart from show holds message state too states_list.append('message') for state in states_list: - path_to_ico = path + state + '.ico' + path_to_ico = os.path.join(path, state + '.ico') + if not os.path.isfile(path_to_ico): + path_to_ico = os.path.join(path_sun_iconset, state + '.ico') if os.path.exists(path_to_ico): hinst = win32gui.GetModuleHandle(None) img_flags = win32con.LR_LOADFROMFILE | win32con.LR_DEFAULTSIZE