Merge lp:~lains/appcenter/appcenter into lp:~elementary-apps/appcenter/appcenter

Proposed by Lains
Status: Merged
Approved by: Danielle Foré
Approved revision: 284
Merged at revision: 284
Proposed branch: lp:~lains/appcenter/appcenter
Merge into: lp:~elementary-apps/appcenter/appcenter
Diff against target: 24 lines (+2/-2)
2 files modified
src/Core/Client.vala (+1/-1)
src/MainWindow.vala (+1/-1)
To merge this branch: bzr merge lp:~lains/appcenter/appcenter
Reviewer Review Type Date Requested Status
Felipe Escoto (community) split commits Needs Fixing
Review via email: mp+304199@code.launchpad.net

Commit message

Use the same icon for everything related to AppCenter

To post a comment you must log in.
Revision history for this message
Felipe Escoto (philip.scott) wrote :

We should probably split this into two separate commits.

I'm file with the icon change, but it's currently too late in the cycle to change strings since the string change would require new translations for it

review: Needs Fixing (split commits)
Revision history for this message
Lains (lains) wrote :

I can fix the translations by hand, is it OK to do this?

Revision history for this message
Felipe Escoto (philip.scott) wrote :

English wouldn't be a problem, we would need translations for the rest of the languages ;)

Revision history for this message
Lains (lains) wrote :

I see. I'll revert this branch so it only fixes the icons bug when I get home. ;)

Revision history for this message
Lains (lains) wrote :

Reverted, and ready to merge! ;P

lp:~lains/appcenter/appcenter updated
284. By Lains <email address hidden>

Change notification icons to match branding

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Core/Client.vala'
2--- src/Core/Client.vala 2016-08-23 14:35:57 +0000
3+++ src/Core/Client.vala 2016-08-28 20:16:28 +0000
4@@ -347,7 +347,7 @@
5 string body = ngettext ("%u update is available for your system", "%u updates are available for your system", updates_number).printf (updates_number);
6 var notification = new Notification (title);
7 notification.set_body (body);
8- notification.set_icon (new ThemedIcon ("software-update-available"));
9+ notification.set_icon (new ThemedIcon ("system-software-install"));
10 notification.set_default_action ("app.open-application");
11 Application.get_default ().send_notification ("updates", notification);
12 } else {
13
14=== modified file 'src/MainWindow.vala'
15--- src/MainWindow.vala 2016-08-20 16:51:58 +0000
16+++ src/MainWindow.vala 2016-08-28 20:16:28 +0000
17@@ -85,7 +85,7 @@
18 }
19
20 construct {
21- icon_name = "system-software-installer";
22+ icon_name = "system-software-install";
23 title = _("AppCenter");
24 window_position = Gtk.WindowPosition.CENTER;
25

Subscribers

People subscribed via source and target branches

to all changes: