bug 309293 - build Sunbird using non-trademarked branding (Calendar) by default. r=ctalbert,sr=jminta,r(configure.in)=bsmedberg

This commit is contained in:
mattwillis%gmail.com 2006-07-19 00:29:25 +00:00
Родитель 29bf58a380
Коммит 98a4135e5b
23 изменённых файлов: 914 добавлений и 1754 удалений

Просмотреть файл

@ -20,6 +20,7 @@
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Matthew Willis <mattwillis@gmail.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
@ -98,13 +99,14 @@ ifdef MOZ_BRANDING_DIRECTORY
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
endif
# Re-enable when using split branding
#ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
#MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
#MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
#MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
#MOZ_PKG_MAC_RSRC=$(_ABS_DIST)/branding/license.r
#endif
ifdef MOZ_BRANDING_DIRECTORY
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
MOZ_PKG_MAC_RSRC=$(_ABS_DIST)/branding/license.r
endif
endif
PACKAGER_NO_LIBS = 1
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk

Просмотреть файл

@ -1,3 +1,3 @@
<!ENTITY brandShortName "Sunbird">
<!ENTITY brandFullName "Mozilla Sunbird">
<!ENTITY brandShortName "Calendar">
<!ENTITY brandFullName "Calendar">
<!ENTITY vendorShortName "Mozilla">

Просмотреть файл

@ -1,5 +1,5 @@
brandShortName=Sunbird
brandFullName=Mozilla Sunbird
brandShortName=Calendar
brandFullName=Calendar
vendorShortName=Mozilla
# LOCALIZATION NOTE (releaseNotesURL):

Просмотреть файл

@ -6,11 +6,13 @@
# all Calendar products.
#ifdef MOZ_SUNBIRD
#ifdef MOZ_USE_GENERIC_BRANDING
@AB_CD@.jar:
% locale branding @AB_CD@ %locale/branding/
+ locale/branding/brand.dtd (%chrome/branding/brand.dtd)
+ locale/branding/brand.properties (%chrome/branding/brand.properties)
#endif
#endif
calendar-@AB_CD@.jar:
% locale calendar @AB_CD@ %locale/@AB_CD@/calendar/

Просмотреть файл

@ -19,7 +19,8 @@
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Brian Ryner <bryner@brianryner.com>
# Brian Ryner <bryner@brianryner.com>
# Matthew Willis <mattwillis@gmail.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
@ -47,7 +48,13 @@ DIRS = base themes app
ifeq ($(OS_ARCH),WINNT)
ifdef MOZ_INSTALLER
DIRS += ../installer/windows
ifdef MOZ_BRANDING_DIRECTORY
DEFINES += -DOFFICIAL_BRANDING=1
endif
endif
endif
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -19,10 +19,10 @@
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Brian Ryner <bryner@brianryner.com>
# Jonathan Wilson <jonwil@tpgi.com.au>
# Dan Mosedale <dmose@mozilla.org>
# Matthew Willis <mattwillis@gmail.com>
# Brian Ryner <bryner@brianryner.com>
# Jonathan Wilson <jonwil@tpgi.com.au>
# Dan Mosedale <dmose@mozilla.org>
# Matthew Willis <mattwillis@gmail.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
@ -270,6 +270,21 @@ GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, sunbird.js)
endif
ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
ICON_FILES = \
$(DIST)/branding/mozicon128.png \
$(DIST)/branding/mozicon50.xpm \
$(DIST)/branding/mozicon16.xpm \
$(DIST)/branding/document.png \
$(NULL)
libs:: $(ICON_FILES)
$(INSTALL) $^ $(DIST)/bin/icons
install::
$(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/icons
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
libs::
$(INSTALL) $(DIST)/branding/default.xpm $(DIST)/bin/chrome/icons/default
@ -279,18 +294,18 @@ install::
endif
export::
ifndef MOZ_USE_OFFICIAL_BRANDING
ifndef MOZ_BRANDING_DIRECTORY
$(NSINSTALL) -D $(DIST)/branding
ifeq ($(OS_ARCH),WINNT)
cp $(srcdir)/sunbird.ico $(DIST)/branding/sunbird.ico
cp $(srcdir)/sunbird.ico $(DIST)/branding/app.ico
cp $(srcdir)/sunbird.ico $(DIST)/branding/sunbird.ico
cp $(srcdir)/sunbird.ico $(DIST)/branding/app.ico
cp $(srcdir)/sunbird.ico $(DIST)/branding/document.ico
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
cp $(srcdir)/macbuild/sunbird.icns $(DIST)/branding/sunbird.icns
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm
cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm
endif
ifeq ($(OS_ARCH),OS2)
cp $(srcdir)/sunbird-os2.ico $(DIST)/branding/sunbird.ico
@ -325,6 +340,14 @@ libs repackage:: $(PROGRAM)
mkdir -p $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
rsync -a --exclude CVS $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
sed -e "s/@APP_VERSION@/$(APP_VERSION)/" -e "s/@APP_NAME@/$(APP_NAME)/" -e "s/@MAC_CREATOR_CODE@/$(MAC_CREATOR_CODE)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist
# The application name shown in the upper left is found in the UTF-16 file:
# MyApp.app/Contents/Resources/English.lproj/InfoPlist.strings
# We use iconv to do the charset conversion to UTF-8, pipe it through sed for the
# find and replace, and then use iconv once more to convert it back to UTF-16.
# Since all future Macs are Intel-based, we make the file UTF-16LE with a BOM.
iconv -f UTF-16LE -t UTF-8 $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \
sed -e "s/@APP_NAME@/$(APP_NAME)/" | \
iconv -f UTF-8 -t UTF-16LE > $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj/InfoPlist.strings
rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/MacOS
rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS/mangle $(DIST)/$(APP_NAME).app/Contents/MacOS/shlibsign
rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -10,7 +10,7 @@
<key>CFBundleExecutable</key>
<string>sunbird-bin</string>
<key>CFBundleGetInfoString</key>
<string>Sunbird @APP_VERSION@, © 1998-2006 Contributors</string>
<string>@APP_NAME@ @APP_VERSION@, © 1998-2006 Contributors</string>
<key>CFBundleIconFile</key>
<string>sunbird</string>
<key>CFBundleIdentifier</key>

Двоичный файл не отображается.

Двоичные данные
calendar/sunbird/app/macbuild/sunbird.icns

Двоичный файл не отображается.

Двоичные данные
calendar/sunbird/app/mozicon128.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 22 KiB

Просмотреть файл

@ -0,0 +1,207 @@
/* XPM */
static char * mozicon16[] = {
/* columns rows colors chars-per-pixel */
"16 16 185 2",
" c #9D382F",
". c #A73D14",
"X c #B8291A",
"o c #B17648",
"O c #DF2800",
"+ c #DF2900",
"@ c #DD3D31",
"# c #E02700",
"$ c #E12900",
"% c #E02B00",
"& c #E12B00",
"* c #E12D00",
"= c #E02E00",
"- c #E22F00",
"; c #EE2C00",
": c #E53700",
"> c #F62700",
", c #C24337",
"< c #CF483E",
"1 c #D04B41",
"2 c #D14F45",
"3 c #D15248",
"4 c #D2554B",
"5 c #D2574D",
"6 c #D2594F",
"7 c #D35C52",
"8 c #D45C52",
"9 c #C2785E",
"0 c #8C8A70",
"q c #8E8A79",
"w c #8F8B78",
"e c #918D6C",
"r c #F38C3F",
"t c #E99758",
"y c #E89C5F",
"u c #E7A268",
"i c #E7AF77",
"p c #E8A970",
"a c #E5B17D",
"s c #8D8B85",
"d c #8F8D84",
"f c #969486",
"g c #9B9781",
"h c #9B998E",
"j c #969591",
"k c #9D9896",
"l c #9E9D98",
"z c #9BA6AD",
"x c #96AFB6",
"c c #A29E82",
"v c #A09E8D",
"b c #A29F9C",
"n c #A6A186",
"m c #A6A39F",
"M c #B1AC90",
"N c #B3AE92",
"B c #B5B198",
"V c #BFBA98",
"C c #A4A4A8",
"Z c #A8A7A4",
"A c #ABA9A2",
"S c gray68",
"D c #AEB9B5",
"F c #B1AEA4",
"G c #B1AEA5",
"H c #B5B2A6",
"J c #BEBCA6",
"K c #B3B3B6",
"L c #BCBCBF",
"P c #ABC0C6",
"I c #C2BF9E",
"U c #DCB0AB",
"Y c #E6B988",
"T c #E5BF8F",
"R c #CEC99E",
"E c #C4C2B7",
"W c #C1C0B9",
"Q c #C1C7BF",
"! c #C7C4B8",
"~ c #C9C5B2",
"^ c #CAC7B5",
"/ c #CBC8BC",
"( c #D1CCA2",
") c #D2CEB1",
"_ c #D7D3A2",
"` c #D5D2B6",
"' c #DCD3BF",
"] c #E5C597",
"[ c #E6CB9E",
"{ c #E8D1A0",
"} c #F2EEB8",
"| c #C7C7CC",
" . c #CAC5C5",
".. c #C9C9D0",
"X. c #CECFD4",
"o. c #D1CEC1",
"O. c #D1CFC0",
"+. c #D3D0C3",
"@. c #DAD4C2",
"#. c #D3D3D6",
"$. c #D5D4D9",
"%. c #DAD6D8",
"&. c #D9DADF",
"*. c #E0DBC4",
"=. c #E1DDC1",
"-. c #E7E2CF",
";. c #E8E3C3",
":. c #EAE5C2",
">. c #EAE7CF",
",. c #ECE8C8",
"<. c #EFEBCA",
"1. c #E6E2D2",
"2. c #E6E7D9",
"3. c #EBE7D0",
"4. c #E8E5D6",
"5. c #E9E6DC",
"6. c #EBE8D6",
"7. c #ECE8D0",
"8. c #EEEAD2",
"9. c #EEEBD2",
"0. c #EEEBD3",
"q. c #ECE8D4",
"w. c #EDEAD4",
"e. c #EEEBD4",
"r. c #EEEBD5",
"t. c #EFECD5",
"y. c #EFECD6",
"u. c #EEEBD9",
"i. c #EEEBDA",
"p. c #EFECDA",
"a. c #EFEDDA",
"s. c #EAF4D1",
"d. c #F0ECD1",
"f. c #F2EED0",
"g. c #F0EDD7",
"h. c #F4EFD0",
"j. c #F1EED9",
"k. c #F4F1DD",
"l. c #F4F1DF",
"z. c #F6F4DF",
"x. c #F0FBDD",
"c. c #FCF8D4",
"v. c #FCF8DC",
"b. c #E0E1E2",
"n. c #E6E2E6",
"m. c #EBE8E6",
"M. c #E9E8EB",
"N. c #EEFFE9",
"B. c #EAF3F3",
"V. c #EFFFF4",
"C. c #F7F5E8",
"Z. c #F2FFE4",
"A. c #F4FFEA",
"S. c #F8F5E2",
"D. c #FFFDE9",
"F. c #FFFFEE",
"G. c #F1F0F5",
"H. c gray97",
"J. c #F0F1F8",
"K. c #F0FFF3",
"L. c #F0FFF5",
"P. c #F0FFF6",
"I. c #F1FFF6",
"U. c #FCFBF7",
"Y. c #FCFCF4",
"T. c #FCFCF5",
"R. c #FCFCF6",
"E. c #FEFFF4",
"W. c #FFFFF5",
"Q. c #FEFEF6",
"!. c #FFFFF6",
"~. c #FFFFF7",
"^. c #F8F8F8",
"/. c #F9F9F9",
"(. c gray98",
"). c #FBFBFA",
"_. c #FBFBFB",
"`. c #F8F9FC",
"'. c #FAFBFF",
"]. c #FBFFFF",
"[. c gray99",
"{. c #FFFFFC",
"}. c #FEFEFE",
"|. c gray100",
" X c None",
/* pixels */
" XU X , 8 7 6 5 4 3 2 1 1 @ D ",
" X9 ; : = % + + # % % % = > . x ",
" X' { [ ] T Y a i p u y t r o z ",
" X2.s.x.Z.A.N.K.K.I.V.I.K.}.Q k ",
" X4.;.f.j j j j j j j j j ~.E b ",
" X1.<.i.j i.j q.j a.j a.j U.! m ",
" X@.<.q.j j j j j j j j j T./ A ",
" X*.f.g.j q.j >.j 0.j q.j T.o.G ",
"m.;.f.g.j j j j j j j j j E.O.G ",
"-.c.a./ j 9.j q.j 9.j 9.j U.^ H ",
"~ V f.g.j j j j j j j j S.T.B W ",
"b.d q n ) v.D.z.l.C.T.}.~.k.c #.",
" X X XS d w M =.F.T.5.J ` R h X",
" X X X X XX.Z f g N ( _ } 0 .. X",
" X X X X X X X X| l v I e C X X",
" X X X X X X X X X X XL K X X X"
};

Просмотреть файл

@ -0,0 +1,311 @@
/* XPM */
static char * mozicon50[] = {
/* columns rows colors chars-per-pixel */
"48 48 257 2",
" c #010101",
". c #0A0A08",
"X c #0B0B12",
"o c #151517",
"O c #18160E",
"+ c #1A1C26",
"@ c #211D11",
"# c #24221A",
"$ c #272628",
"% c #3B3827",
"& c #292A35",
"* c #393B44",
"= c #37464B",
"- c #3C5154",
"; c #403D2B",
": c #4C4834",
"> c #4C4C52",
", c #575965",
"< c #546A65",
"1 c #736F54",
"2 c #6C747B",
"3 c #78726B",
"4 c #7A7773",
"5 c #6E6C6C",
"6 c #784A42",
"7 c #757D85",
"8 c #7B8289",
"9 c #7F9297",
"0 c #BE1D18",
"q c #A83831",
"w c #BD572D",
"e c #9A504B",
"r c #807A5E",
"t c #817E67",
"y c #837D75",
"u c #9D7870",
"i c #A95A56",
"p c #AC6A5D",
"a c #AC7D70",
"s c #B16E6C",
"d c #DE1500",
"f c #DF1800",
"g c #DD3400",
"h c #D93B00",
"j c #DE270A",
"k c #C63C33",
"l c #D03D34",
"z c #D7362F",
"x c #E11C00",
"c c #FB1B00",
"v c #E90F00",
"b c #E32104",
"n c #E82708",
"m c #E53902",
"M c #F12E10",
"N c #EA342A",
"B c #D84901",
"V c #DE4A1D",
"C c #DB471B",
"Z c #D55507",
"A c #D95518",
"S c #CF5816",
"D c #C05428",
"F c #CB5F34",
"G c #D0433C",
"H c #CF462E",
"J c #D5641F",
"K c #D27439",
"L c #CF672E",
"P c #E34300",
"I c #E54B02",
"U c #E84507",
"Y c #E04D19",
"T c #E24B15",
"R c #E65506",
"E c #E0501A",
"W c #E55A13",
"Q c #E25C18",
"! c #F75501",
"~ c #F14505",
"^ c #CF4E4B",
"/ c #D04A44",
"( c #D04D49",
") c #CD5754",
"_ c #CF7E45",
"` c #C96F51",
"' c #C56766",
"] c #C67876",
"[ c #8B8754",
"{ c #888266",
"} c #8B847A",
"| c #938A7A",
" . c #99947A",
".. c #9C976A",
"X. c #A5A170",
"o. c #A7857A",
"O. c #D28B57",
"+. c #C8807E",
"@. c #D39567",
"#. c #D4A379",
"$. c #8B8580",
"%. c #89898D",
"&. c #898886",
"*. c #838A90",
"=. c #8D8E92",
"-. c #8F9093",
";. c #8E909A",
":. c #918E89",
">. c #918C83",
",. c #959289",
"<. c #999688",
"1. c #929396",
"2. c #999A9C",
"3. c #989896",
"4. c #9D9EA3",
"5. c #9EA0A3",
"6. c #A49E98",
"7. c #A99993",
"8. c #A9A487",
"9. c #A9A493",
"0. c #A6A296",
"q. c #B3AD8B",
"w. c #B1AD97",
"e. c #B8B488",
"r. c #B9B598",
"t. c #A3A3A4",
"y. c #A3A5AC",
"u. c #A9A9AC",
"i. c #ACA4A2",
"p. c #ABADB2",
"a. c #AEB0B7",
"s. c #B8B3A8",
"d. c #B7B8BA",
"f. c #BBB4B2",
"g. c #BCBDBE",
"h. c #B7B6B8",
"j. c #B6AEAC",
"k. c #BCBDC2",
"l. c #BFC0C2",
"z. c #C98B8A",
"x. c #C98482",
"c. c #D09797",
"v. c #C4B89A",
"b. c #D7B08C",
"n. c #C2BAA7",
"m. c #C2BCB5",
"M. c #DCBDA2",
"N. c #C0BAC3",
"B. c #C8C39C",
"V. c #D1CB9F",
"C. c #CCC9AA",
"Z. c #C9C5A8",
"A. c #C3C2BC",
"S. c #C9C3B3",
"D. c #C9C5BA",
"F. c #CCC9B4",
"G. c #CBC9BB",
"H. c #C5C2B2",
"J. c #D2CCAD",
"K. c #D2CDA1",
"L. c #D3CDB4",
"P. c #D4CEB8",
"I. c #DBC9B1",
"U. c #D9D5AE",
"Y. c #D5D0B5",
"T. c #D5D1BB",
"R. c #D9D4B6",
"E. c #DAD5BB",
"W. c #DDD9BC",
"Q. c #EAC19F",
"!. c #E1DCAC",
"~. c #E2DCBD",
"^. c #E0D8B6",
"/. c #E0CBB1",
"(. c #E5E0BC",
"). c #EAE5BC",
"_. c #EBE6B8",
"`. c #EDE8B9",
"'. c #C3C4C2",
"]. c #CCCAC2",
"[. c #CBCBCC",
"{. c #C5C4C7",
"}. c #C9CAD1",
"|. c #CED0D0",
" X c #CDDAD8",
".X c #D2CEC6",
"XX c #D5D3C2",
"oX c #D4D3CB",
"OX c #D9D6C3",
"+X c #D8D5CA",
"@X c #DDDAC3",
"#X c #DDDACB",
"$X c #D1D1D2",
"%X c #D6D5DA",
"&X c #DCDAD2",
"*X c #DADBDB",
"=X c #D9D8D7",
"-X c #D1CFD0",
";X c #DDDEE1",
":X c #D5D3E3",
">X c #DDE9D3",
",X c #DBE5CF",
"<X c #DBF2F5",
"1X c #E2DDC3",
"2X c #E1DECA",
"3X c #E2D5C3",
"4X c #E1DDD3",
"5X c #E0DCE4",
"6X c #E5E1C2",
"7X c #E4E1CB",
"8X c #E9E5C3",
"9X c #E9E5CA",
"0X c #EDE9C3",
"qX c #ECE9CC",
"wX c #E3E2D3",
"eX c #E4E3DA",
"rX c #ECEAD2",
"tX c #ECEBDC",
"yX c #E8E6D6",
"uX c #ECF2DD",
"iX c #F1EBC3",
"pX c #F2EDCB",
"aX c #F2E7C3",
"sX c #F2EDD3",
"dX c #F0EEDB",
"fX c #F5F1CC",
"gX c #F9F4CC",
"hX c #FAF4C6",
"jX c #F5F1D3",
"kX c #F5F2DB",
"lX c #FAF5D4",
"zX c #FAF5DB",
"xX c #FDFAD3",
"cX c #FDFBDC",
"vX c #F6F8D9",
"bX c #E4E3E3",
"nX c #EBEAE3",
"mX c #ECECEA",
"MX c #E7E6E8",
"NX c #EAEAF1",
"BX c #ECF7E7",
"VX c #EBF9F4",
"CX c #F0EEEA",
"ZX c #F0EFE2",
"AX c #F4F3E4",
"SX c #F3F3EC",
"DX c #F5F9EC",
"FX c #F9F5E3",
"GX c #F8F6EA",
"HX c #FDFBE3",
"JX c #FDFCEB",
"KX c #F3F3F3",
"LX c #F4FCFD",
"PX c #FDFDF2",
"IX c #FEFEFD",
"UX c #F5F5F7",
"YX c None",
/* pixels */
"YXYXYXYXYX7.q i i e e s c.c.z.z.z.z.z.z.x.x.x.+.+.+.] ] ] ] ] ' ] ' ' ' ' ' ' ' i ) i ( e < A.YX",
"YXYXYXYX Xs 0 k k k q / ^ ^ ^ ^ ^ ^ / / ( ( ( / / / / / / / G G G G l l l l l l z z N N 6 = s.YX",
"YXYXYXYXp v c j M n M x d d d d d d v d x d f f d x x v x f x x x x x b b x n x n j c n < - 3 YX",
"YXYXYXYXp m T H C C V V V V V V V V V V V V V V V C C V V V V V V V V C C V V V V V M H 9 8 | YX",
"YXYXYXYX` B U Y T Y Y Y E A E E V E A Y E E E Y E Y E Y V Y Y Y E E A Y Y Y T A E A ~ C *.2 | l.",
"YXYXYXYXw g j g g g m g m m m P U U P I I I I W W R W W Q Q Q Q Q Q W W Q Q Q W Q A ! W 8 2 y t.",
"YXYXYXYXn.b.b.b.#.@.O.O.O.K K L S S S Z B B B h h h B m B P P P I I I I I R R R R R ! W 9 7 y u.",
"YXYXYXYX,XDXIXPXIXLXIXIXVXDXVXBXBXuXuX2X2X1XI.M.M.b.#.#.@.O.K O.K L J J Z Z Z B I Z ~ B *.8 } 0.",
"YXYXYXYXL.0XiX^.1X8X6X8XqXvXvXHXJXPXPXPXIXIXIXIXIXIXIXLXIXLXLXLXLXUXVXmXeX4X2X3XI.I.Q.b.} 4 $.y.",
"YXYXYXYXL.pX6XY.6X~.~.~.@XW.W.~.W.W.W.~.~.W.1X8X0XsXsXzXzXHXPXPXPXPXIXIXIXIXIXIXIXIXLXLX} 5 &.t.",
"YXYXYXYXL.0X1X6XlXgXjXjXpXpXfXqXpX9X9X9XP.1X7XwX+XF.E.OXOXXXT.@X2X2X7XrXdXZXdXkXHXFXPXCX&.3 >.0.",
"YXYXYXYXP.aX8X8XlXpXpXpXjXfXjXjXpXvXcXzX1XxXcXPXSXOXgXkXAXmXT.0X9XrXeXF.R.W.#X+XoXFXIXnX&.3 >.t.",
"YXYXYXYXL.pX8XR.aX8XpXgXjXjXfXlXzXvXfXpX@XjXkXJXCX#XgXFXPXPX#XgXzXJXJX#XgXxXFXJX#XtXIXmX>.4 :.5.",
"YXYXYXYXL.pX(.T.9X2X@XT.W.1X1XqXpXyXlXsX7XHXJXPXKX1XcXFXJXGX@XjXdXJXGX#XjXFXcXJX*XdXIXCX>.y ,.0.",
"YXYXYXYXF.aX~.6XcXzXGX+X).qXtX+XF.3X2X1XP.wXtXSXmX#XHXPXIXUXwXxXFXJXPX2XfXkXFXPX4XtXIXmX>.4 ,.2.",
"YXYXYXYXL.pX1X9XcXzXPX2XpXzXPXyX~.xXkXAXXXU.@XyX$XD.6X&XbXbX+XdXGXLXUXwXcXJXPXIX4XkXIXCX,.} ,.u.",
"YXYXYXYXF.iX(.2XJXJXIXwXpXzXJXtX1XcXFXJX2XfXcXHXdXW.pX9XrXwXF.W.OX#X*X].7XtXSXUX*XkXIXSX,.} } =X",
"YXYXYXYXXXgX(.H.2XyXbXoXrXJXIXmX9XcXHXPX2XpXvXJXZX#XxXcXJXGX1XfXsXvXtXP.~.2X#X+X[.AXIXmX<.} >.|.",
"YXYXYXYX&XhX1X(.pX9XwXF.R.2XeX[.P.dXGXLX*XlXJXPXKX@XfXkXJXAX#XfXzXJXGX#XgXlXFXFX&XAXIXCX<.| >.oX",
"YXYXYXYXF.xXW.0XcXcXPX6XiXfXrX+XL.~.1X=XG.@XdXKXNX2XHXPXPXUX2XjXkXJXAX#XfXzXHXJXwXZXIXCX3.} ,.|.",
"YXYXYXYXT.xXE.7XcXJXUX@XgXzXJXtX8XxXlXuXT.~.1X2XoXD.2XtXmXNX&XzXJXPXIXwXlXzXFXJX*XAXIXCX6.| <.|.",
"YXYXYXP.8XxXF.T.W.nXbXOXlXcXPXeX6XgXHXGXW.gXxXcXtXY.).~.2X#XF.@X#XnXNX#XkXJXPXIXbXkXIXCX0.| <.|.",
"YXYXYXf.fXqXR.fX8XtXoXZ.@XwXmX#X8XzXPXSXE.gXzXJXtX~.gXlXHXkX~.).6X9X&XD.T.#XeXNX*XGXIXKX0.>.<.-X",
"YXYXYXm.xX8X~.cXcXPX#X).fXrXwXH.~.2XnX*X~.zXHXPXeX8XlXsXHXtX6XgXzXcXFXW.`.pXqX1X].DXIXCX0. .<.=X",
"YXYXYXE.lXY.qXcXJXPXXXfXzXJXZX~.gXpXyXG.R.7X2XSX&X8XcXzXPXmX~.gXrXHXCXE.gXcXzXcX4XSXIXnX9.<.<.{.",
"YXYXm.pXxXm.T.7XZXbX6XcXzXJX*X(.gXFXPX@X`.fXyXtXD.L.1XyXKXeX1XcXHXPXnXE.pXsXzXFX*XSXIXeX9.9.6.6.",
"YXYXm.xX1X1XfX9XwXA.Y.9XdXPX#XgXzXJXSXE.pXzXJXAXW.iXqX9XyX].Y.7XwXGXeX0XcXzXJXJXyXPXIX+Xw.w.,.:.",
"YXi.3XcXL.jXcXHXPX@X0X1XwX&Xm.~.dXPX*X0XcXsXPX4XR.xXzXcXDXOX0X8X2X>X'.L.7XrXGXCXbXPXIXH.w.r.:.2.",
"YXA.xX~.1XcXvXPXbX~.xXcXPX4XR.qX1X&XA.~.rXzXIXyXaXlXsXJXCXR.xXlXJXPXP.(.9X2X#X].nXIXIXs.w.r.:.YX",
"h.qXcXW.P.9XAXIX#XfXzXFXPXXXgXcXJXeXL.8XT.wX*XF.qXzXHXPX*X0XlXdXJXnX~.xXcXzXFX&XmXIXCXr.n.8.%.YX",
"n.0XcXHXjX@X2X].C.jXFXIX4X6XlXsXJX&X0XcXvXJX&XC.1XOXwXnXT.iXcXFXPX4X(.lXrXFXFXbXPXIX+Xw.R.{ -.YX",
"A. .r.2XqXcXcXfXqXOXW.*XG.0XcXPXCXY.gXvXHXPX#XhXcXrXtXoXXX7X2XkXbXR.gXcXzXJXyXbXIXIXF.r.W.y 8 YX",
"YX7.{ v.~.R.3X9XzXJXcX9X@XR.#XeX].iXcXzXPXbXW.gXjXzXJXeXGXPXnXnX+XOX7X7XzXJX=XPXIXMXr.L.B.3 YXYX",
"YXYX1.@ : 8.U.R.W.E.yXcXPXJXkX#XP.W.@XkXUXOXhXcXkXJXyXeXJXJXPXJXPXPXnXwXtX$X*XIXIXOXq.8X ., YXYX",
"YXYXYX* * o # 1 q.I.~.L.L.yXHXJXPXAX7XwXG.F.qXsXHXDXeXAXJXAXFXGXJXPXPXIXPXoXSXIXMXZ.Z.iX> 7 YXYX",
"YXYXYXYXYXa.8 + . ; r v.iX~.L.XXwXJXIXJXFXZX#XT.eXoXwXPXPXJXJXPXGXFXPXIXnXUXIX*XZ.B.qXU.$ YXYXYX",
"YXYXYXYXYXYXYXYXk.> $ $ ; { U.`.~.Y.P.yXPXIXPXPXtX2XeXeXwXtXPXAXGXIXIXIXIXmXf.B.U.L.JX: > YXYXYX",
"YXYXYXYXYXYXYXYXYXYXYX%.* & O : q.!.).~.L.E.tXPXIXIXPXFXnXtXwXZXIXbX . .9.8.B.`.J.zXB. [.YXYXYX",
"YXYXYXYXYXYXYXYXYXYXYXYXYXYX4 , X o 1 8.!.gX^.Y.OXyXGXPXIXIXIXKXs.1 [ [ ..B.^.C.(.JX@ > YXYXYXYX",
"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXbX1.+ . # 1 v.hXhX^.L.F.T.@XG.q.X.q.e.e.J.C.K.U.PX{ YXYXYXYXYX",
"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX[.2 * o # 3 K.hXxXhXK.e.e.Z.U.U.).).(.U.PXT. %.YXYXYXYXYX",
"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXy.7 & . % t B.cXJXlX).`.iX).0X_.cXGX = YXYXYXYXYXYX",
"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXk., X O % { 7XJXcXxX`.!.xXIX# o YXYXYXYXYXYXYX",
"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX4.= $ % 8.gXcXPXIX$ bXYXYXYXYXYXYXYX",
"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXy., . . 1 A.@ %XYXYXYXYXYXYXYXYX",
"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX4.= . o *XYXYXYXYXYXYXYXYXYX",
"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX4.u.YXYXYXYXYXYXYXYXYXYX",
"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
};

Двоичные данные
calendar/sunbird/app/sunbird.ico

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 124 KiB

После

Ширина:  |  Высота:  |  Размер: 264 KiB

Просмотреть файл

@ -48,3 +48,8 @@ DEFINES += -DAPP_VERSION="$(APP_VERSION)"
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
ifndef MOZ_BRANDING_DIRECTORY
DEFINES += -DMOZ_USE_GENERIC_BRANDING
endif

Двоичные данные
calendar/sunbird/base/content/about-sunbird.png

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 46 KiB

Двоичные данные
calendar/sunbird/base/content/aboutCredits.png

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 32 KiB

Просмотреть файл

@ -20,7 +20,7 @@
* Portions created by the Initial Developer are Copyright (C) 2004
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):Matthew Willis <mattwillis@gmail.com>
* Contributor(s): Matthew Willis <mattwillis@gmail.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@ -43,7 +43,7 @@
#clientBox {
background-color: #FFFFFF;
background-image: url("chrome://calendar/content/about-sunbird.png");
background-image: url("chrome://branding/content/about.png");
background-repeat: no-repeat;
padding-top: 203px;
color: #000000;
@ -99,3 +99,4 @@
button[dlgtype="accept"] {
margin-right: 13px;
}

Двоичные данные
calendar/sunbird/base/content/aboutFooter.png

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 299 B

Просмотреть файл

@ -193,7 +193,7 @@
</head>
<body onload="init();" onunload="uninit();">
<div id="titleBox">
<img src="chrome://calendar/content/aboutCredits.png" />
<img src="chrome://branding/content/aboutCredits.png" />
</div>
<div id="creditsBox">
@ -282,7 +282,7 @@
</div>
<div id="footerBox">
<img src="chrome://calendar/content/aboutFooter.png" />
<img src="chrome://branding/content/aboutFooter.png" />
</div>
</body>
</html>

Просмотреть файл

@ -1,13 +1,18 @@
calendar.jar:
% content calendar %content/calendar/
content/calendar/about-sunbird.png (content/about-sunbird.png)
content/calendar/aboutCredits.png (content/aboutCredits.png)
* content/calendar/aboutDialog.css (content/aboutDialog.css)
* content/calendar/aboutDialog.js (content/aboutDialog.js)
* content/calendar/aboutDialog.xul (content/aboutDialog.xul)
content/calendar/aboutFooter.png (content/aboutFooter.png)
* content/calendar/calendar.xul (content/calendar.xul)
* content/calendar/credits.xhtml (content/credits.xhtml)
* content/calendar/customizeToolbar.xul (content/customizeToolbar.xul)
* content/calendar/hiddenWindow.xul (content/hiddenWindow.xul)
* content/calendar/hiddenWindow.js (content/hiddenWindow.js)
#ifdef MOZ_USE_GENERIC_BRANDING
# NOTE: xpcnativewrappers=yes became the default in Gecko 1.8.1
% content branding %content/branding/ xpcnativewrappers=yes
content/branding/about.png (branding/about.png)
content/branding/aboutCredits.png (branding/aboutCredits.png)
content/branding/aboutFooter.png (branding/aboutFooter.png)
content/branding/icon64.png (branding/icon64.png)
#endif

Просмотреть файл

@ -4316,7 +4316,7 @@ composer)
calendar)
MOZ_APP_NAME=sunbird
MOZ_APP_DISPLAYNAME=Sunbird
MOZ_APP_DISPLAYNAME=Calendar
MOZ_XUL_APP=1
MOZ_UPDATER=1
MOZ_SUNBIRD=1
@ -4823,12 +4823,17 @@ browser)
MOZ_APP_DISPLAYNAME=Firefox
;;
calendar)
MOZ_BRANDING_DIRECTORY=other-licenses/branding/sunbird
MOZ_APP_DISPLAYNAME=Sunbird
;;
mail)
MOZ_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
;;
*)]
AC_MSG_ERROR([Official branding is only available for Firefox and Thunderbird.])
AC_MSG_ERROR([Official branding is only available for Firefox, Sunbird, and Thunderbird.])
esac
)

Просмотреть файл

@ -0,0 +1,6 @@
#filter substitution
@AB_CD@.jar:
% locale branding @AB_CD@ %locale/branding/
locale/branding/brand.dtd (%brand.dtd)
locale/branding/brand.properties (%brand.properties)