zeitgeist team mailing list archive

[Robert Ancell <robert.ancell@xxxxxxxxxxxxx>]

Robert Ancell has proposed merging lp:~robert-ancell/activity-log-manager/no-stock into lp:activity-log-manager.

Commit message:
Gtk.Stock is deprecated

Requested reviews:
  Activity Log Manager (activity-log-manager)

For more details, see:
https://code.launchpad.net/~robert-ancell/activity-log-manager/no-stock/+merge/204512
-- 
https://code.launchpad.net/~robert-ancell/activity-log-manager/no-stock/+merge/204512
Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/no-stock into lp:activity-log-manager.

=== 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:17:45 +0000
@@ -99,8 +99,7 @@
 			this.pack_end(new Gtk.Box(Orientation.HORIZONTAL, 0), true, true);
 			this.pack_end(this.button_box, false, false);
 
-			this.del_button = new Button.from_stock(Stock.DELETE);
-			del_button.set_label(_("Delete history"));
+			this.del_button = new Button.with_label(_("Delete history"));
 			
 			// Create Calendar
 			this.calendar_box = new CalendarWidget(del_button);
@@ -141,8 +140,8 @@
 			yield;
 			
 			var dialog = new Gtk.Dialog();
-			dialog.add_button(Stock.CANCEL, ResponseType.CANCEL);
-			dialog.add_button(Stock.YES, ResponseType.OK);
+			dialog.add_button(_("_Cancel"), ResponseType.CANCEL);
+			dialog.add_button(_("_Yes"), ResponseType.OK);
 			dialog.set_title("");
 			
 			var label = new Gtk.Label(_("This operation cannot be undone, are you sure you want to delete this activity?"));

=== 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:17:45 +0000
@@ -531,7 +531,7 @@
 			this.treeview = new AppSelectionTreeView (this.app_blacklist);
 			var area = this.get_content_area () as Gtk.Box;
 			area.pack_start(this.treeview);
-			this.add_buttons (Stock.CANCEL, ResponseType.CANCEL, Stock.OK, ResponseType.OK);
+			this.add_buttons (_("_Cancel"), ResponseType.CANCEL, _("_OK"), ResponseType.OK);
 			
 			this.treeview.show_all ();
 		}

=== 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:17:45 +0000
@@ -144,7 +144,7 @@
 			}
 			
 			//FIXME: Not sure if the correct icon is being fetched for stock folder
-			stock_folder_icon = this.render_icon_pixbuf(Stock.DIRECTORY, IconSize.LARGE_TOOLBAR);
+			stock_folder_icon = this.render_icon_pixbuf("gtk-directory", IconSize.LARGE_TOOLBAR);
 			
 			//Application Stuffs
 			this.blocked_list = new HashTable<string, AppChooseInfo>(str_hash, str_equal);
@@ -194,8 +194,7 @@
 				}
 			});
 			
-			this.del_button = new Button.from_stock(Stock.DELETE);
-			del_button.set_label(_("Clear Usage Data…"));
+			this.del_button = new Button.with_label(_("Clear Usage Data…"));
 
 			del_button.clicked.connect(()=> {
 				delete_dialog.on_delete_history ();
@@ -389,7 +388,7 @@
 			var chooser = new FileChooserDialog(
 				_("Select a folder to blacklist"), 
 				null, FileChooserAction.SELECT_FOLDER);
-			chooser.add_buttons (Stock.OK, ResponseType.OK, Stock.CANCEL, ResponseType.CANCEL);
+			chooser.add_buttons (_("_OK"), ResponseType.OK, _("_Cancel"), ResponseType.CANCEL);
 			int res = chooser.run();
 			chooser.hide();
 			if(res == ResponseType.OK)
@@ -407,7 +406,7 @@
 			var chooser = new FileChooserDialog(
 				_("Select a file to blacklist"), 
 				null, FileChooserAction.OPEN);
-			chooser.add_buttons (Stock.OK, ResponseType.OK, Stock.CANCEL, ResponseType.CANCEL);
+			chooser.add_buttons (_("_OK"), ResponseType.OK, _("_Cancel"), ResponseType.CANCEL);
 			int res = chooser.run();
 			chooser.hide();
 			if(res == ResponseType.OK)
@@ -808,7 +807,7 @@
 			
 			var area = this.get_content_area () as Gtk.Box;
 			area.pack_start(vbox, false, false, 0);
-			this.add_buttons (Stock.CANCEL, ResponseType.CANCEL, Stock.OK, ResponseType.OK);
+			this.add_buttons (_("_Cancel"), ResponseType.CANCEL, _("_OK"), ResponseType.OK);
 		}
 		
 		public int get_active_radio_button () {
@@ -868,8 +867,8 @@
 			yield;
 			
 			var dialog = new Gtk.Dialog();
-			dialog.add_button(Stock.CANCEL, ResponseType.CANCEL);
-			dialog.add_button(Stock.YES, ResponseType.OK);
+			dialog.add_button(_("_Cancel"), ResponseType.CANCEL);
+			dialog.add_button(_("_Yes"), ResponseType.OK);
 			dialog.set_title("");
 			
 			var label = new Gtk.Label(_("This operation cannot be undone, are you sure you want to delete this activity?"));