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

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 :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/history-widget.vala'
--- src/history-widget.vala 2013-07-10 06:24:51 +0000
+++ src/history-widget.vala 2014-02-03 15:23:22 +0000
@@ -99,8 +99,7 @@
99 this.pack_end(new Gtk.Box(Orientation.HORIZONTAL, 0), true, true);99 this.pack_end(new Gtk.Box(Orientation.HORIZONTAL, 0), true, true);
100 this.pack_end(this.button_box, false, false);100 this.pack_end(this.button_box, false, false);
101101
102 this.del_button = new Button.from_stock(Stock.DELETE);102 this.del_button = new Button.with_label(_("Delete history"));
103 del_button.set_label(_("Delete history"));
104 103
105 // Create Calendar104 // Create Calendar
106 this.calendar_box = new CalendarWidget(del_button);105 this.calendar_box = new CalendarWidget(del_button);
@@ -141,8 +140,8 @@
141 yield;140 yield;
142 141
143 var dialog = new Gtk.Dialog();142 var dialog = new Gtk.Dialog();
144 dialog.add_button(Stock.CANCEL, ResponseType.CANCEL);143 dialog.add_button(_("_Cancel"), ResponseType.CANCEL);
145 dialog.add_button(Stock.YES, ResponseType.OK);144 dialog.add_button(_("_Yes"), ResponseType.OK);
146 dialog.set_title("");145 dialog.set_title("");
147 146
148 var label = new Gtk.Label(_("This operation cannot be undone, are you sure you want to delete this activity?"));147 var label = new Gtk.Label(_("This operation cannot be undone, are you sure you want to delete this activity?"));
149148
=== modified file 'src/unified-privacy-applications.vala'
--- src/unified-privacy-applications.vala 2013-07-09 01:34:49 +0000
+++ src/unified-privacy-applications.vala 2014-02-03 15:23:22 +0000
@@ -531,7 +531,7 @@
531 this.treeview = new AppSelectionTreeView (this.app_blacklist);531 this.treeview = new AppSelectionTreeView (this.app_blacklist);
532 var area = this.get_content_area () as Gtk.Box;532 var area = this.get_content_area () as Gtk.Box;
533 area.pack_start(this.treeview);533 area.pack_start(this.treeview);
534 this.add_buttons (Stock.CANCEL, ResponseType.CANCEL, Stock.OK, ResponseType.OK);534 this.add_buttons (_("_Cancel"), ResponseType.CANCEL, _("_OK"), ResponseType.OK);
535 535
536 this.treeview.show_all ();536 this.treeview.show_all ();
537 }537 }
538538
=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala 2013-07-11 02:13:34 +0000
+++ src/unified-privacy.vala 2014-02-03 15:23:22 +0000
@@ -144,7 +144,7 @@
144 }144 }
145 145
146 //FIXME: Not sure if the correct icon is being fetched for stock folder146 //FIXME: Not sure if the correct icon is being fetched for stock folder
147 stock_folder_icon = this.render_icon_pixbuf(Stock.DIRECTORY, IconSize.LARGE_TOOLBAR);147 stock_folder_icon = this.render_icon_pixbuf("gtk-directory", IconSize.LARGE_TOOLBAR);
148 148
149 //Application Stuffs149 //Application Stuffs
150 this.blocked_list = new HashTable<string, AppChooseInfo>(str_hash, str_equal);150 this.blocked_list = new HashTable<string, AppChooseInfo>(str_hash, str_equal);
@@ -194,8 +194,7 @@
194 }194 }
195 });195 });
196 196
197 this.del_button = new Button.from_stock(Stock.DELETE);197 this.del_button = new Button.with_label(_("Clear Usage Data…"));
198 del_button.set_label(_("Clear Usage Data…"));
199198
200 del_button.clicked.connect(()=> {199 del_button.clicked.connect(()=> {
201 delete_dialog.on_delete_history ();200 delete_dialog.on_delete_history ();
@@ -389,7 +388,7 @@
389 var chooser = new FileChooserDialog(388 var chooser = new FileChooserDialog(
390 _("Select a folder to blacklist"), 389 _("Select a folder to blacklist"),
391 null, FileChooserAction.SELECT_FOLDER);390 null, FileChooserAction.SELECT_FOLDER);
392 chooser.add_buttons (Stock.OK, ResponseType.OK, Stock.CANCEL, ResponseType.CANCEL);391 chooser.add_buttons (_("_OK"), ResponseType.OK, _("_Cancel"), ResponseType.CANCEL);
393 int res = chooser.run();392 int res = chooser.run();
394 chooser.hide();393 chooser.hide();
395 if(res == ResponseType.OK)394 if(res == ResponseType.OK)
@@ -407,7 +406,7 @@
407 var chooser = new FileChooserDialog(406 var chooser = new FileChooserDialog(
408 _("Select a file to blacklist"), 407 _("Select a file to blacklist"),
409 null, FileChooserAction.OPEN);408 null, FileChooserAction.OPEN);
410 chooser.add_buttons (Stock.OK, ResponseType.OK, Stock.CANCEL, ResponseType.CANCEL);409 chooser.add_buttons (_("_OK"), ResponseType.OK, _("_Cancel"), ResponseType.CANCEL);
411 int res = chooser.run();410 int res = chooser.run();
412 chooser.hide();411 chooser.hide();
413 if(res == ResponseType.OK)412 if(res == ResponseType.OK)
@@ -808,7 +807,7 @@
808 807
809 var area = this.get_content_area () as Gtk.Box;808 var area = this.get_content_area () as Gtk.Box;
810 area.pack_start(vbox, false, false, 0);809 area.pack_start(vbox, false, false, 0);
811 this.add_buttons (Stock.CANCEL, ResponseType.CANCEL, Stock.OK, ResponseType.OK);810 this.add_buttons (_("_Cancel"), ResponseType.CANCEL, _("_OK"), ResponseType.OK);
812 }811 }
813 812
814 public int get_active_radio_button () {813 public int get_active_radio_button () {
@@ -868,8 +867,8 @@
868 yield;867 yield;
869 868
870 var dialog = new Gtk.Dialog();869 var dialog = new Gtk.Dialog();
871 dialog.add_button(Stock.CANCEL, ResponseType.CANCEL);870 dialog.add_button(_("_Cancel"), ResponseType.CANCEL);
872 dialog.add_button(Stock.YES, ResponseType.OK);871 dialog.add_button(_("_Yes"), ResponseType.OK);
873 dialog.set_title("");872 dialog.set_title("");
874 873
875 var label = new Gtk.Label(_("This operation cannot be undone, are you sure you want to delete this activity?"));874 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