Merge into trunk : theme-icons : Code : The Webapps-core project

Status:	Needs review
Proposed branch:	lp://staging/~chipaca/webapps-core/theme-icons
Merge into:	lp://staging/webapps-core
Diff against target:	159 lines (+12/-12) 12 files modified webapp-amazon/manifest.json (+1/-1) webapp-amazon/webapp-amazon.desktop (+1/-1) webapp-ebay/manifest.json (+1/-1) webapp-ebay/webapp-ebay.desktop (+1/-1) webapp-facebook/manifest.json (+1/-1) webapp-facebook/webapp-facebook.desktop (+1/-1) webapp-gmail/manifest.json (+1/-1) webapp-gmail/webapp-gmail.desktop (+1/-1) webapp-twitter/manifest.json (+1/-1) webapp-twitter/webapp-twitter.desktop (+1/-1) webapp-ubuntuone/manifest.json (+1/-1) webapp-ubuntuone/webapp-ubuntuone.desktop (+1/-1)
To merge this branch:	bzr merge lp://staging/~chipaca/webapps-core/theme-icons
Related bugs:	Link a bug report

Commit message

For those icons provided in an icon theme in both plain and symbolic variants, use an icon name instead of providing and referring to the icon ourselves.

Description of the change

For those icons provided in an icon theme in both plain and symbolic variants, use an icon name instead of providing and referring to the icon ourselves.

This allows the notifications (org.freedesktop.Notifications bubbles and the messaging menu entries) for those webapps to use the symbolic variants for the secondary icon.

Revision history for this message

David Barth (dbarth) wrote on 2014-08-18:

#

Download full text (7.8 KiB)

Hey John,

My understanding was that these would not be part of the theme. I will
double check with Matthieu.

On Fri, Aug 15, 2014 at 2:46 PM, John Lenton <email address hidden>
wrote:

> John Lenton has proposed merging lp:~chipaca/webapps-core/theme-icons into
> lp:webapps-core.
>
> Commit message:
> For those icons provided in an icon theme in both plain and symbolic
> variants, use an icon name instead of providing and referring to the icon
> ourselves.
>
> Requested reviews:
> WebApps Team (webapps-team)
>
> For more details, see:
> https://code.launchpad.net/~chipaca/webapps-core/theme-icons/+merge/230968
>
> For those icons provided in an icon theme in both plain and symbolic
> variants, use an icon name instead of providing and referring to the icon
> ourselves.
>
> This allows the notifications (org.freedesktop.Notifications bubbles and
> the messaging menu entries) for those webapps to use the symbolic variants
> for the secondary icon.
> --
> https://code.launchpad.net/~chipaca/webapps-core/theme-icons/+merge/230968
> You are subscribed to branch lp:webapps-core.
>
> === removed file 'webapp-amazon/amazon.png'
> Binary files webapp-amazon/amazon.png 2013-09-17 17:49:08 +0000 and
> webapp-amazon/amazon.png 1970-01-01 00:00:00 +0000 differ
> === modified file 'webapp-amazon/manifest.json'
> --- webapp-amazon/manifest.json 2014-08-11 12:07:56 +0000
> +++ webapp-amazon/manifest.json 2014-08-15 12:45:46 +0000
> @@ -11,6 +11,6 @@
> "maintainer": "Webapps Team <email address hidden>",
> "name": "com.ubuntu.developer.webapps.webapp-amazon",
> "title": "webapp-amazon",
> - "version": "1.0.9"
> + "version": "1.0.10"
> }
>
>
> === modified file 'webapp-amazon/webapp-amazon.desktop'
> --- webapp-amazon/webapp-amazon.desktop 2014-08-11 12:07:56 +0000
> +++ webapp-amazon/webapp-amazon.desktop 2014-08-15 12:45:46 +0000
> @@ -3,7 +3,7 @@
> Terminal=false
> Exec=webapp-container --enable-back-forward --webappUrlPatterns=https?://
> www.amazon.com/*,https?://s.amazon-adsystem.com/*
> http://www.amazon.com/gp/aw %u
> Name=Amazon
> -Icon=./amazon.png
> +Icon=amazon
> X-Ubuntu-Touch=true
> X-Ubuntu-Single-Instance=true
> X-Ubuntu-Default-Department-ID=internet
>
> === removed file 'webapp-ebay/ebay.png'
> Binary files webapp-ebay/ebay.png 2013-09-17 17:53:01 +0000 and
> webapp-ebay/ebay.png 1970-01-01 00:00:00 +0000 differ
> === modified file 'webapp-ebay/manifest.json'
> --- webapp-ebay/manifest.json 2014-08-11 12:07:56 +0000
> +++ webapp-ebay/manifest.json 2014-08-15 12:45:46 +0000
> @@ -11,6 +11,6 @@
> "maintainer": "Webapps Team <email address hidden>",
> "name": "com.ubuntu.developer.webapps.webapp-ebay",
> "title": "webapp-ebay",
> - "version": "1.0.11"
> + "version": "1.0.12"
> }
>
>
> === modified file 'webapp-ebay/webapp-ebay.desktop'
> --- webapp-ebay/webapp-ebay.desktop 2014-08-11 12:07:56 +0000
> +++ webapp-ebay/webapp-ebay.desktop 2014-08-15 12:45:46 +0000
> @@ -3,7 +3,7 @@
> Terminal=false
> Exec=webapp-container --enable-back-forward
> --webappUrlPatterns=https?://*.ebay.com/* http://m.ebay.com/ %u
> Name=eBay
> -Icon=./ebay.png
> +Icon=...

Hey John,

My understanding was that these would not be part of the theme. I will
double check with Matthieu.

On Fri, Aug 15, 2014 at 2:46 PM, John Lenton <john.lenton@canonical.com>
wrote:

> John Lenton has proposed merging lp:~chipaca/webapps-core/theme-icons into
> lp:webapps-core.
>
> Commit message:
> For those icons provided in an icon theme in both plain and symbolic
> variants, use an icon name instead of providing and referring to the icon
> ourselves.
>
> Requested reviews:
>   WebApps Team (webapps-team)
>
> For more details, see:
> https://code.launchpad.net/~chipaca/webapps-core/theme-icons/+merge/230968
>
> For those icons provided in an icon theme in both plain and symbolic
> variants, use an icon name instead of providing and referring to the icon
> ourselves.
>
> This allows the notifications (org.freedesktop.Notifications bubbles and
> the messaging menu entries) for those webapps to use the symbolic variants
> for the secondary icon.
> --
> https://code.launchpad.net/~chipaca/webapps-core/theme-icons/+merge/230968
> You are subscribed to branch lp:webapps-core.
>
> === removed file 'webapp-amazon/amazon.png'
> Binary files webapp-amazon/amazon.png   2013-09-17 17:49:08 +0000 and
> webapp-amazon/amazon.png  1970-01-01 00:00:00 +0000 differ
> === modified file 'webapp-amazon/manifest.json'
> --- webapp-amazon/manifest.json 2014-08-11 12:07:56 +0000
> +++ webapp-amazon/manifest.json 2014-08-15 12:45:46 +0000
> @@ -11,6 +11,6 @@
>      "maintainer": "Webapps Team <webapps@lists.launchpad.net>",
>      "name": "com.ubuntu.developer.webapps.webapp-amazon",
>      "title": "webapp-amazon",
> -    "version": "1.0.9"
> +    "version": "1.0.10"
>  }
>
>
> === modified file 'webapp-amazon/webapp-amazon.desktop'
> --- webapp-amazon/webapp-amazon.desktop 2014-08-11 12:07:56 +0000
> +++ webapp-amazon/webapp-amazon.desktop 2014-08-15 12:45:46 +0000
> @@ -3,7 +3,7 @@
>  Terminal=false
>  Exec=webapp-container --enable-back-forward --webappUrlPatterns=https?://
> www.amazon.com/*,https?://s.amazon-adsystem.com/*
> http://www.amazon.com/gp/aw %u
>  Name=Amazon
> -Icon=./amazon.png
> +Icon=amazon
>  X-Ubuntu-Touch=true
>  X-Ubuntu-Single-Instance=true
>  X-Ubuntu-Default-Department-ID=internet
>
> === removed file 'webapp-ebay/ebay.png'
> Binary files webapp-ebay/ebay.png       2013-09-17 17:53:01 +0000 and
> webapp-ebay/ebay.png      1970-01-01 00:00:00 +0000 differ
> === modified file 'webapp-ebay/manifest.json'
> --- webapp-ebay/manifest.json   2014-08-11 12:07:56 +0000
> +++ webapp-ebay/manifest.json   2014-08-15 12:45:46 +0000
> @@ -11,6 +11,6 @@
>      "maintainer": "Webapps Team <webapps@lists.launchpad.net>",
>      "name": "com.ubuntu.developer.webapps.webapp-ebay",
>      "title": "webapp-ebay",
> -    "version": "1.0.11"
> +    "version": "1.0.12"
>  }
>
>
> === modified file 'webapp-ebay/webapp-ebay.desktop'
> --- webapp-ebay/webapp-ebay.desktop     2014-08-11 12:07:56 +0000
> +++ webapp-ebay/webapp-ebay.desktop     2014-08-15 12:45:46 +0000
> @@ -3,7 +3,7 @@
>  Terminal=false
>  Exec=webapp-container --enable-back-forward
> --webappUrlPatterns=https?://*.ebay.com/* http://m.ebay.com/ %u
>  Name=eBay
> -Icon=./ebay.png
> +Icon=ebay
>  X-Ubuntu-Touch=true
>  X-Ubuntu-Single-Instance=true
>  X-Ubuntu-Default-Department-ID=internet
>
> === removed file 'webapp-facebook/facebook.png'
> Binary files webapp-facebook/facebook.png       2013-09-16 13:32:43 +0000
> and webapp-facebook/facebook.png      1970-01-01 00:00:00 +0000 differ
> === modified file 'webapp-facebook/manifest.json'
> --- webapp-facebook/manifest.json       2014-08-11 12:07:56 +0000
> +++ webapp-facebook/manifest.json       2014-08-15 12:45:46 +0000
> @@ -19,5 +19,5 @@
>      "maintainer": "Webapps Team <webapps@lists.launchpad.net>",
>      "name": "com.ubuntu.developer.webapps.webapp-facebook",
>      "title": "webapp-facebook",
> -    "version": "1.0.19"
> +    "version": "1.0.20"
>  }
>
> === modified file 'webapp-facebook/webapp-facebook.desktop'
> --- webapp-facebook/webapp-facebook.desktop     2014-08-11 12:07:56 +0000
> +++ webapp-facebook/webapp-facebook.desktop     2014-08-15 12:45:46 +0000
> @@ -3,7 +3,7 @@
>  Terminal=false
>  Exec=webapp-container --popup-redirection-url-prefix=
> http://lm.facebook.com/l.php?u= --webapp='ZmFjZWJvb2s='
> --webappModelSearchPath=.  https://m.facebook.com/ %u
>  Name=Facebook
> -Icon=./facebook.png
> +Icon=facebook
>  X-Ubuntu-Touch=true
>  X-Ubuntu-StageHint=SideStage
>  X-Ubuntu-Single-Instance=true
>
> === removed file 'webapp-gmail/gmail.png'
> Binary files webapp-gmail/gmail.png     2014-08-13 20:01:50 +0000 and
> webapp-gmail/gmail.png    1970-01-01 00:00:00 +0000 differ
> === modified file 'webapp-gmail/manifest.json'
> --- webapp-gmail/manifest.json  2014-08-13 20:01:50 +0000
> +++ webapp-gmail/manifest.json  2014-08-15 12:45:46 +0000
> @@ -16,6 +16,6 @@
>      "maintainer": "Webapps Team <webapps@lists.launchpad.net>",
>      "name": "com.ubuntu.developer.webapps.webapp-gmail",
>      "title": "webapp-gmail",
> -    "version": "1.0.18"
> +    "version": "1.0.19"
>  }
>
>
> === modified file 'webapp-gmail/webapp-gmail.desktop'
> --- webapp-gmail/webapp-gmail.desktop   2014-08-13 20:01:50 +0000
> +++ webapp-gmail/webapp-gmail.desktop   2014-08-15 12:45:46 +0000
> @@ -3,7 +3,7 @@
>  Terminal=false
>  Exec=webapp-container --store-session-cookies
> --webappUrlPatterns=https?://mail.google.*/*,https?://accounts.google.*/*,https?://www.google.*/accounts/*
> https://mail.google.com/ %u
>  Name=Gmail
> -Icon=./gmail.png
> +Icon=gmail
>  X-Ubuntu-Touch=true
>  X-Ubuntu-Single-Instance=true
>  X-Ubuntu-Default-Department-ID=mail
>
> === modified file 'webapp-twitter/manifest.json'
> --- webapp-twitter/manifest.json        2014-08-11 12:07:56 +0000
> +++ webapp-twitter/manifest.json        2014-08-15 12:45:46 +0000
> @@ -17,6 +17,6 @@
>      "maintainer": "Webapps Team <webapps@lists.launchpad.net>",
>      "name": "com.ubuntu.developer.webapps.webapp-twitter",
>      "title": "webapp-twitter",
> -    "version": "1.0.15"
> +    "version": "1.0.16"
>  }
>
>
> === removed file 'webapp-twitter/twitter.png'
> Binary files webapp-twitter/twitter.png 2013-09-13 10:35:33 +0000 and
> webapp-twitter/twitter.png        1970-01-01 00:00:00 +0000 differ
> === modified file 'webapp-twitter/webapp-twitter.desktop'
> --- webapp-twitter/webapp-twitter.desktop       2014-08-11 12:07:56 +0000
> +++ webapp-twitter/webapp-twitter.desktop       2014-08-15 12:45:46 +0000
> @@ -3,7 +3,7 @@
>  Terminal=false
>  Exec=webapp-container --store-session-cookies
> --webappUrlPatterns=https?://mobile.twitter.com/*
> https://mobile.twitter.com/session/new %u
>  Name=Twitter
> -Icon=./twitter.png
> +Icon=twitter
>  X-Ubuntu-Touch=true
>  X-Ubuntu-StageHint=SideStage
>  X-Ubuntu-Single-Instance=true
>
> === modified file 'webapp-ubuntuone/manifest.json'
> --- webapp-ubuntuone/manifest.json      2014-03-31 17:30:39 +0000
> +++ webapp-ubuntuone/manifest.json      2014-08-15 12:45:46 +0000
> @@ -11,6 +11,6 @@
>      "maintainer": "Webapps Team <webapps@lists.launchpad.net>",
>      "name": "com.ubuntu.developer.webapps.webapp-ubuntuone",
>      "title": "webapp-ubuntuone",
> -    "version": "1.0.6"
> +    "version": "1.0.7"
>  }
>
>
> === removed file 'webapp-ubuntuone/ubuntuone.png'
> Binary files webapp-ubuntuone/ubuntuone.png     2013-09-17 18:45:01 +0000
> and webapp-ubuntuone/ubuntuone.png    1970-01-01 00:00:00 +0000 differ
> === modified file 'webapp-ubuntuone/webapp-ubuntuone.desktop'
> --- webapp-ubuntuone/webapp-ubuntuone.desktop   2014-03-28 20:46:10 +0000
> +++ webapp-ubuntuone/webapp-ubuntuone.desktop   2014-08-15 12:45:46 +0000
> @@ -3,6 +3,6 @@
>  Terminal=false
>  Exec=webapp-container --enable-back-forward --webappUrlPatterns=https?://
> one.ubuntu.com/*,https?://login.ubuntu.com/* https://one.ubuntu.com/
>  Name=Ubuntu One
> -Icon=./ubuntuone.png
> +Icon=ubuntuone
>  X-Ubuntu-Touch=true
>  X-Ubuntu-Single-Instance=true
>
>
>

Reply

Unmerged revisions

73. By John Lenton on 2014-08-15: For those icons provided in an icon theme in both plain and symbolic variants, use an icon name instead of providing and referring to the icon ourselves.

The Webapps-core project

Merge lp://staging/~chipaca/webapps-core/theme-icons into lp://staging/webapps-core

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers