Merge lp:~elementary-apps/pantheon-files/annoying-icon-bug into lp:~elementary-apps/pantheon-files/trunk

Proposed by Danielle Foré
Status: Merged
Approved by: Danielle Foré
Approved revision: 1699
Merged at revision: 1698
Proposed branch: lp:~elementary-apps/pantheon-files/annoying-icon-bug
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 15 lines (+2/-3)
1 file modified
src/ProgressInfoWidget.vala (+2/-3)
To merge this branch: bzr merge lp:~elementary-apps/pantheon-files/annoying-icon-bug
Reviewer Review Type Date Requested Status
Avi Romanoff (community) Approve
Review via email: mp+245405@code.launchpad.net

Commit message

Replace the Gtk.Stock.CANCEL icon in the transfers dialog with process-stop

To post a comment you must log in.
1698. By Danielle Foré

use symbolic icon and flat button

1699. By Danielle Foré

button from icon name is smarter

Revision history for this message
Avi Romanoff (aroman) wrote :

looks good to me!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ProgressInfoWidget.vala'
2--- src/ProgressInfoWidget.vala 2013-09-01 20:04:55 +0000
3+++ src/ProgressInfoWidget.vala 2014-12-28 09:17:40 +0000
4@@ -63,9 +63,8 @@
5 box.pack_start (this.progress_bar, true, false, 0);
6 hbox.pack_start (box, true, true, 0);
7
8- var image = new Gtk.Image.from_stock (Gtk.Stock.CANCEL, Gtk.IconSize.BUTTON);
9- var button = new Gtk.Button ();
10- button.add (image);
11+ var button = new Gtk.Button.from_icon_name ("process-stop-symbolic", Gtk.IconSize.BUTTON);
12+ button.get_style_context ().add_class ("flat");
13 button.clicked.connect (() => {
14 this.info.cancel ();
15 button.sensitive = false;

Subscribers

People subscribed via source and target branches