1415014 - Move mozicon128.png from browser/icons to browser/chrome/icons/default

Status: RESOLVED FIXED

(Firefox :: Theme, enhancement, P3)

Description

[Makoto Kato [:m_kato]]

mozicon128.png is added by bug 261679.  But I don't know why this file is in browser/icons, not browser/chrome/icons/default and name isn't default128.png.

If possible, we should rename and move to browser/chrome/icons/default as hidpi icons.

Comment 1

[Makoto Kato [:m_kato]]

Dao, do you know a reason that mozicon128.png file is in browser/icons, not in browser/chrome/icons/default?  I cannot find it.

Comment 2

[Dão Gottwald [:dao]]

No idea, bug 261679 might have just put it there arbitrarily.

Comment 3

[Makoto Kato [:m_kato]]

Although I check Firefox distribution packages, they reference mozicon128.png from /usr/share/icons/hicolor/128x128/apps...

Comment 4

[Makoto Kato [:m_kato]]

:glandium, I would like to rename mozicon128.png to default128.png and to move to browser/chrome/icons/default to use it as HiDPI icon.  But debian package creates symlink to it.

Can we rename it and move it?  If no, I will copy it to browser/chrome/icons/default instead of rename & move.

Comment 5

[Mike Hommey [:glandium]]

if you do that, you might as well put a default64.png file too. (and I don't know why it's icon64.png, and not default64.png)

Comment 6

[Makoto Kato [:m_kato]]

Attachment: Bug 1415014 - Part 1. Add default64.png and default128.png for GTK HiDPI icons.

Now, default48.png is highest resolition icon for Firfox/GTK.  So we should add
default64.png (from icon64.png) and default128.png (from mozicon128.png) for
HiDPI.  Also mozicon128.png is for Linux distribution, we should move to
correct place for our GTK icons.

Review commit: https://reviewboard.mozilla.org/r/198474/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/198474/

Comment 7

[Makoto Kato [:m_kato]]

Attachment: Bug 1415014 - Part 2. Remove duplicated icon48.png from branding files.

default48.png and icon48.png is same file.  So we should remove one side.

Review commit: https://reviewboard.mozilla.org/r/198476/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/198476/

Comment 8

[Dão Gottwald [:dao]]

Comment on attachment 8927220 [details]
Bug 1415014 - Part 1. Add default64.png and default128.png for GTK HiDPI icons.

https://reviewboard.mozilla.org/r/198474/#review203724

::: browser/branding/branding-common.mozbuild:49
(Diff revision 1)
>          BRANDING_FILES += [
> +            'default128.png',
>              'default16.png',
>              'default32.png',
>              'default48.png',
> -            'mozicon128.png',
> +            'default64.png',

Please move default128.png to the bottom

::: browser/branding/branding-common.mozbuild:56
(Diff revision 1)
>          FINAL_TARGET_FILES.chrome.icons.default += [
> +            'default128.png',
>              'default16.png',
>              'default32.png',
>              'default48.png',
> +            'default64.png',

ditto

::: browser/branding/nightly/content/jar.mn:14
(Diff revision 1)
>    content/branding/[e-mail]
>    content/branding/about-wordmark.svg
>    content/branding/icon48.png
> -  content/branding/icon64.png
> +  content/branding/icon64.png                    (../default64.png)
>    content/branding/icon16.png                    (../default16.png)
>    content/branding/icon32.png                    (../default32.png)

Please move the icon48 and icon64 further down

::: browser/branding/official/content/jar.mn:12
(Diff revision 1)
>    content/branding/about.png
>    content/branding/about-logo.png
>    content/branding/[e-mail]
>    content/branding/about-wordmark.svg
>    content/branding/icon48.png
> -  content/branding/icon64.png
> +  content/branding/icon64.png                    (../default64.png)

ditto

::: browser/branding/unofficial/content/jar.mn:13
(Diff revision 1)
>    content/branding/about-background.png
>    content/branding/about-logo.png
>    content/branding/[e-mail]
>    content/branding/about-wordmark.svg
>    content/branding/icon48.png
> -  content/branding/icon64.png
> +  content/branding/icon64.png                    (../default64.png)

ditto

::: browser/installer/allowed-dupes.mn:80
(Diff revision 1)
>  browser/modules/devtools/gDevTools.jsm
> +browser/chrome/icons/default/default128.png
>  browser/chrome/icons/default/default16.png
>  browser/chrome/icons/default/default32.png
>  browser/chrome/icons/default/default48.png
> +browser/chrome/icons/default/default64.png

Please move the default128 entry down

::: browser/installer/package-manifest.in:619
(Diff revision 1)
>  #ifdef MOZ_GTK
> +@RESPATH@/browser/chrome/icons/default/default128.png
>  @RESPATH@/browser/chrome/icons/default/default16.png
>  @RESPATH@/browser/chrome/icons/default/default32.png
>  @RESPATH@/browser/chrome/icons/default/default48.png
> +@RESPATH@/browser/chrome/icons/default/default64.png

ditto

Comment 9

[Dão Gottwald [:dao]]

Comment on attachment 8927221 [details]
Bug 1415014 - Part 2. Remove duplicated icon48.png from branding files.

https://reviewboard.mozilla.org/r/198476/#review203728

Comment 10

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/607fd3ab6953
Part 1. Add default64.png and default128.png for GTK HiDPI icons. r=dao
https://hg.mozilla.org/integration/mozilla-inbound/rev/5d95a4f0d3a0
Part 2. Remove duplicated icon48.png from branding files. r=dao

Comment 11

[Makoto Kato [:m_kato]]

Comment on attachment 8927220 [details]
Bug 1415014 - Part 1. Add default64.png and default128.png for GTK HiDPI icons.

https://reviewboard.mozilla.org/r/198474/#review203724

> Please move default128.png to the bottom

This list must be sorted.  So default128.png must be top.

Comment 12

[Pulsebot]

Backout by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/7e12bbe132d6
Backed out changeset 5d95a4f0d3a0 
https://hg.mozilla.org/integration/mozilla-inbound/rev/fc119ef7a5b0
Backed out changeset 607fd3ab6953 due to mistake merge

Comment 13

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/7dabae5e261a
Part 1. Add default64.png and default128.png for GTK HiDPI icons. r=dao
https://hg.mozilla.org/integration/mozilla-inbound/rev/d7cb7c614fe1
Part 2. Remove duplicated icon48.png from branding files. r=dao

Comment 14

[Natalia Csoregi [:nataliaCs]]

https://hg.mozilla.org/mozilla-central/rev/7dabae5e261a
https://hg.mozilla.org/mozilla-central/rev/d7cb7c614fe1