copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set the Window icon correctly 

Set the default list after the first window has been initialized. Only
set icons on Windows that are different from the default.
This commit is contained in:
Philipp Hörist 2018-10-28 23:01:09 +01:00
parent e958755a24
commit a6d9b2c193
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gajim/gui_interface.py
View File

@ -2739,15 +2739,6 @@ class Interface:
from gajim.gtk import statusicon from gajim.gtk import statusicon
self.systray = statusicon.StatusIcon() self.systray = statusicon.StatusIcon()
pixs = []
for size in (16, 32, 48, 64, 128):
pix = gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', size)
if pix:
pixs.append(pix)
if pixs:
# set the icon to all windows
Gtk.Window.set_default_icon_list(pixs)
# Init emoji_chooser # Init emoji_chooser
from gajim.gtk.emoji_chooser import emoji_chooser from gajim.gtk.emoji_chooser import emoji_chooser
emoji_chooser.load() emoji_chooser.load()

7
gajim/message_window.py
View File

@ -44,6 +44,7 @@ from gajim.gtk.dialogs import YesNoDialog
from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_icon_name
from gajim.gtk.util import resize_window from gajim.gtk.util import resize_window
from gajim.gtk.util import move_window from gajim.gtk.util import move_window
from gajim.gtk.util import get_app_icon_list
#################### ####################
@ -469,13 +470,11 @@ class MessageWindow:
def show_icon(self): def show_icon(self):
window_mode = app.interface.msg_win_mgr.mode window_mode = app.interface.msg_win_mgr.mode
icon = 'org.gajim.Gajim'
if window_mode in (MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE, if window_mode in (MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE,
MessageWindowMgr.ONE_MSG_WINDOW_NEVER): MessageWindowMgr.ONE_MSG_WINDOW_NEVER):
if self.type_ == 'gc': if self.type_ == 'gc':
icon = get_icon_name('muc-active') icon = get_icon_name('muc-active')
self.window.set_icon_name(icon)
self.window.set_icon_name(icon)
def show_title(self, urgent=True, control=None): def show_title(self, urgent=True, control=None):
""" """
@ -963,6 +962,8 @@ class MessageWindowMgr(GObject.GObject):
self.parent_win = parent_window self.parent_win = parent_window
self.parent_paned = parent_paned self.parent_paned = parent_paned
Gtk.Window.set_default_icon_list(get_app_icon_list(parent_window))
def change_account_name(self, old_name, new_name): def change_account_name(self, old_name, new_name):
for win in self.windows(): for win in self.windows():
win.change_account_name(old_name, new_name) win.change_account_name(old_name, new_name)