Bug 1190080 - Update the Jumplist icons for Windows 10. r=squib, a=rkent
authorRichard Marti <richard.marti@gmail.com>
Sat, 01 Aug 2015 18:36:19 +0200
changeset 22889 0681e92bad2e320308672c8700622536af538f84
parent 22888 11097c52b2716277c3e61d67f4eaa5da6ba47333
child 22890 48e8ee8813e377fbf9a35a76de0701ed64b47322
push id1465
push userkent@caspia.com
push dateMon, 14 Sep 2015 21:51:35 +0000
treeherdercomm-beta@48e8ee8813e3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssquib, rkent
bugs1190080
Bug 1190080 - Update the Jumplist icons for Windows 10. r=squib, a=rkent
mail/app/Makefile.in
mail/themes/windows/mail/icons/jumplist.png
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -1,13 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-AB_CD = $(MOZ_UI_LOCALE) 
+AB_CD = $(MOZ_UI_LOCALE)
 
 GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
 GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
 
 MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
 ifdef MOZ_SOURCE_STAMP
 DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)"
 endif
@@ -40,29 +40,29 @@ endif
 # This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that
 # shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
 NSDISTMODE = copy
 
 include $(topsrcdir)/config/config.mk
 
 ifeq ($(OS_ARCH),WINNT)
 # Extract the icons we care about embedding into the EXE
-mailtoolbar = $(topsrcdir)/mail/themes/windows/mail/icons/mail-toolbar-aero.png
+mailtoolbar = $(topsrcdir)/mail/themes/windows/mail/icons/jumplist.png
 
 # png to ico converter. The function takes 5 arguments, in order: source png
 # file, left, top, size, output ico file.
 png2ico = $(PYTHON) $(srcdir)/png2ico.py $(1) $(2) $(3) $(4) $(5)
 
 # Each icon is 18x18 in the toolbar, and we want a 16x16 icon here, so we cut
 # off a pixel at each end.
 write-message.ico: $(mailtoolbar) $(srcdir)/png2ico.py
-	$(call png2ico,$(mailtoolbar),19,1,16,write-message.ico)
+	$(call png2ico,$(mailtoolbar),0,0,16,write-message.ico)
 
 address-book.ico: $(mailtoolbar) $(srcdir)/png2ico.py
-	$(call png2ico,$(mailtoolbar),37,1,16,address-book.ico)
+	$(call png2ico,$(mailtoolbar),16,0,16,address-book.ico)
 
 embedded-icons:: write-message.ico address-book.ico
 GARBAGE += write-message.ico address-book.ico
 
 # Rebuild thunderbird.exe if the manifest changes - it's included by splash.rc.
 # (this dependency should really be just for thunderbird.exe, not other targets)
 # Note the manifest file exists in the tree, so we use the explicit filename
 # here.
@@ -88,17 +88,17 @@ endif # LIBXUL_SDK
 
 ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
 ICON_SUFFIX=.ico
 
 DESKTOP_ICONS = \
 	abcardWindow \
 	addressbookWindow \
 	msgcomposeWindow \
-	$(NULL) 
+	$(NULL)
 
 BRANDED_ICONS = \
 	messengerWindow \
 	$(NULL)
 
 
 DESKTOP_ICON_FILES = $(addsuffix $(ICON_SUFFIX), $(DESKTOP_ICONS) $(DESKTOP_ICONS_SMALL))
 BRANDED_ICON_FILES = $(addsuffix $(ICON_SUFFIX), $(BRANDED_ICONS) $(BRANDED_ICONS_SMALL))
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d070cd167120a0ab799d54a0a32e9ecc91db63a1
GIT binary patch
literal 601
zc$@)Q0;c_mP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0006YNkl<Zc-qZX
z&r2IY6b>S2rFazlC;TT09=v!cN);<u6}2fE6Mw`XC9PJCBD&bpgEk;W#av2I)SC*T
zmk34hpwQAD3I#!ErMok`sXM+mW|!S$c9J56KKPh<yYs&9d%VoX=lci27%KuasH%F7
zfPG!Qf`Xzz@u!69x<-h3{`sqU@#UL|dw53iou`4p2}KIa04(L1t{w__Dh(rTu72ER
zVMi_Q*OR-9QsV~BlnD)lUe8LAiHe`Uu9>P4hHJJ7$j7l;FAjVMXF7!jx?e`6z(CQH
z(=*l*7-6BYS)OO{Y#kh@JUNb1pO7XYH1Iq;?uo%SbKJoGQHqNrP@GVD>Ewa@kFpr|
z<XMQVF+!*zG|=7`5dy_gY<KUF=ax97`gbTRb@Keyh^{QfJ-Ox=SD302Dl}kq=ETtC
zJQv$Y?zlTA^a4tX1w09yvxp0k`3)=!4K(=&To{>BxLD8VB+qfZ6W5O=SMU*tu+D*3
zIeh-`7}IqFrK*Gmo^%9lL}uRF;+W%#kxt)idI*=m)m&0F?Gmpcng~XsHeV<*jom|i
z+JrMdU<@&+dEheexV75`%$JMe-V&F6h+rh|LE!3HVA#bYLR&8%#T6QM8K`aUvSH<x
z_{_TxQUgfX{G#8*Aw!eDkDG8AsA+7sVFg?(HX2pzXEFoM`a+Onpt`<AihKt0)n_Be
nz<vIVOw*+7F9T|H-~SM|fwkY_m>bc000000NkvXXu0mjfqYx9x