Activity Log Manager

Merge lp:~robert-ancell/activity-log-manager/no-stock into lp:activity-log-manager

  1. no-stock
  2. Merge into redesign
Proposed by Robert Ancell
Status: Merged
Merged at revision: 102
Proposed branch: lp:~robert-ancell/activity-log-manager/no-stock
Merge into: lp:activity-log-manager
Diff against target: 98 lines (+11/-13)
3 files modified
src/history-widget.vala (+3/-4)
src/unified-privacy-applications.vala (+1/-1)
src/unified-privacy.vala (+7/-8)
To merge this branch: bzr merge lp:~robert-ancell/activity-log-manager/no-stock
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Activity Log Manager Pending
Review via email: mp+204512@code.launchpad.net

Commit message

Gtk.Stock is deprecated

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/activity-log-manager-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/activity-log-manager-trusty-amd64-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/activity-log-manager-trusty-armhf-ci/4
    FAILURE: http://jenkins.qa.ubuntu.com/job/activity-log-manager-trusty-i386-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/activity-log-manager-ci/4/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/history-widget.vala'
2--- src/history-widget.vala 2013-07-10 06:24:51 +0000
3+++ src/history-widget.vala 2014-02-03 15:23:22 +0000
4@@ -99,8 +99,7 @@
5 this.pack_end(new Gtk.Box(Orientation.HORIZONTAL, 0), true, true);
6 this.pack_end(this.button_box, false, false);
7
8- this.del_button = new Button.from_stock(Stock.DELETE);
9- del_button.set_label(_("Delete history"));
10+ this.del_button = new Button.with_label(_("Delete history"));
11
12 // Create Calendar
13 this.calendar_box = new CalendarWidget(del_button);
14@@ -141,8 +140,8 @@
15 yield;
16
17 var dialog = new Gtk.Dialog();
18- dialog.add_button(Stock.CANCEL, ResponseType.CANCEL);
19- dialog.add_button(Stock.YES, ResponseType.OK);
20+ dialog.add_button(_("_Cancel"), ResponseType.CANCEL);
21+ dialog.add_button(_("_Yes"), ResponseType.OK);
22 dialog.set_title("");
23
24 var label = new Gtk.Label(_("This operation cannot be undone, are you sure you want to delete this activity?"));
25
26=== modified file 'src/unified-privacy-applications.vala'
27--- src/unified-privacy-applications.vala 2013-07-09 01:34:49 +0000
28+++ src/unified-privacy-applications.vala 2014-02-03 15:23:22 +0000
29@@ -531,7 +531,7 @@
30 this.treeview = new AppSelectionTreeView (this.app_blacklist);
31 var area = this.get_content_area () as Gtk.Box;
32 area.pack_start(this.treeview);
33- this.add_buttons (Stock.CANCEL, ResponseType.CANCEL, Stock.OK, ResponseType.OK);
34+ this.add_buttons (_("_Cancel"), ResponseType.CANCEL, _("_OK"), ResponseType.OK);
35
36 this.treeview.show_all ();
37 }
38
39=== modified file 'src/unified-privacy.vala'
40--- src/unified-privacy.vala 2013-07-11 02:13:34 +0000
41+++ src/unified-privacy.vala 2014-02-03 15:23:22 +0000
42@@ -144,7 +144,7 @@
43 }
44
45 //FIXME: Not sure if the correct icon is being fetched for stock folder
46- stock_folder_icon = this.render_icon_pixbuf(Stock.DIRECTORY, IconSize.LARGE_TOOLBAR);
47+ stock_folder_icon = this.render_icon_pixbuf("gtk-directory", IconSize.LARGE_TOOLBAR);
48
49 //Application Stuffs
50 this.blocked_list = new HashTable<string, AppChooseInfo>(str_hash, str_equal);
51@@ -194,8 +194,7 @@
52 }
53 });
54
55- this.del_button = new Button.from_stock(Stock.DELETE);
56- del_button.set_label(_("Clear Usage Data…"));
57+ this.del_button = new Button.with_label(_("Clear Usage Data…"));
58
59 del_button.clicked.connect(()=> {
60 delete_dialog.on_delete_history ();
61@@ -389,7 +388,7 @@
62 var chooser = new FileChooserDialog(
63 _("Select a folder to blacklist"),
64 null, FileChooserAction.SELECT_FOLDER);
65- chooser.add_buttons (Stock.OK, ResponseType.OK, Stock.CANCEL, ResponseType.CANCEL);
66+ chooser.add_buttons (_("_OK"), ResponseType.OK, _("_Cancel"), ResponseType.CANCEL);
67 int res = chooser.run();
68 chooser.hide();
69 if(res == ResponseType.OK)
70@@ -407,7 +406,7 @@
71 var chooser = new FileChooserDialog(
72 _("Select a file to blacklist"),
73 null, FileChooserAction.OPEN);
74- chooser.add_buttons (Stock.OK, ResponseType.OK, Stock.CANCEL, ResponseType.CANCEL);
75+ chooser.add_buttons (_("_OK"), ResponseType.OK, _("_Cancel"), ResponseType.CANCEL);
76 int res = chooser.run();
77 chooser.hide();
78 if(res == ResponseType.OK)
79@@ -808,7 +807,7 @@
80
81 var area = this.get_content_area () as Gtk.Box;
82 area.pack_start(vbox, false, false, 0);
83- this.add_buttons (Stock.CANCEL, ResponseType.CANCEL, Stock.OK, ResponseType.OK);
84+ this.add_buttons (_("_Cancel"), ResponseType.CANCEL, _("_OK"), ResponseType.OK);
85 }
86
87 public int get_active_radio_button () {
88@@ -868,8 +867,8 @@
89 yield;
90
91 var dialog = new Gtk.Dialog();
92- dialog.add_button(Stock.CANCEL, ResponseType.CANCEL);
93- dialog.add_button(Stock.YES, ResponseType.OK);
94+ dialog.add_button(_("_Cancel"), ResponseType.CANCEL);
95+ dialog.add_button(_("_Yes"), ResponseType.OK);
96 dialog.set_title("");
97
98 var label = new Gtk.Label(_("This operation cannot be undone, are you sure you want to delete this activity?"));

Subscribers

People subscribed via source and target branches