Use the icon sizing solution from ticket #6839 for all dialogs.

History manager’s icon was 16px in Unity launcher. Fixes #7290
This commit is contained in:
Daniel Aleksandersen 2013-01-14 20:18:55 +01:00
parent 479a9cb8ba
commit 8939396244
2 changed files with 16 additions and 5 deletions

View File

@ -384,8 +384,14 @@ if pid_alive():
if (show_remote_gajim_roster()): if (show_remote_gajim_roster()):
print("Gajim is already running, bringing the roster to front...") print("Gajim is already running, bringing the roster to front...")
sys.exit(0) sys.exit(0)
pix = gtkgui_helpers.get_icon_pixmap('gajim', 48) pixs = []
gtk.window_set_default_icon(pix) # set the icon to all newly opened wind for size in (16, 32, 48, 64, 128):
pix = gtkgui_helpers.get_icon_pixmap('gajim', size)
if pix:
pixs.append(pix)
if pixs:
# set the icon to all windows
gtk.window_set_default_icon_list(*pixs)
pritext = _('Gajim is already running') pritext = _('Gajim is already running')
sectext = _('Another instance of Gajim seems to be running\nRun anyway?') sectext = _('Another instance of Gajim seems to be running\nRun anyway?')
dialog = dialogs.YesNoDialog(pritext, sectext) dialog = dialogs.YesNoDialog(pritext, sectext)

View File

@ -108,9 +108,14 @@ import sqlite3 as sqlite
class HistoryManager: class HistoryManager:
def __init__(self): def __init__(self):
pix = gtkgui_helpers.get_icon_pixmap('gajim') pixs = []
# set the icon to all newly opened windows for size in (16, 32, 48, 64, 128):
gtk.window_set_default_icon(pix) pix = gtkgui_helpers.get_icon_pixmap('gajim', size)
if pix:
pixs.append(pix)
if pixs:
# set the icon to all windows
gtk.window_set_default_icon_list(*pixs)
if not os.path.exists(LOG_DB_PATH): if not os.path.exists(LOG_DB_PATH):
dialogs.ErrorDialog(_('Cannot find history logs database'), dialogs.ErrorDialog(_('Cannot find history logs database'),