Audience

Merge lp:~evfool/audience/gtk-3.12 into lp:~audience-members/audience/gtk-3.12

  1. gtk-3.12
  2. Merge into gtk-3.12
Proposed by Robert Roth
Status: Merged
Approved by: Corentin Noël
Approved revision: 346
Merged at revision: 347
Proposed branch: lp:~evfool/audience/gtk-3.12
Merge into: lp:~audience-members/audience/gtk-3.12
Diff against target: 55 lines (+7/-7)
2 files modified
src/Audience.vala (+3/-3)
src/Widgets/VideoPlayer.vala (+4/-4)
To merge this branch: bzr merge lp:~evfool/audience/gtk-3.12
Reviewer Review Type Date Requested Status
Corentin Noël Approve
Review via email: mp+223918@code.launchpad.net

Description of the change

Do not use deprecated stock items.

To post a comment you must log in.
Revision history for this message
Corentin Noël (tintou) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Audience.vala'
2--- src/Audience.vala 2014-06-13 16:12:01 +0000
3+++ src/Audience.vala 2014-06-20 13:22:11 +0000
4@@ -334,8 +334,8 @@
5 default:
6 var d = new Gtk.Dialog.with_buttons (_("Open location"),
7 this.mainwindow, Gtk.DialogFlags.MODAL,
8- Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
9- Gtk.Stock.OK, Gtk.ResponseType.OK);
10+ _("_Cancel"), Gtk.ResponseType.CANCEL,
11+ _("_OK"), Gtk.ResponseType.OK);
12
13 var grid = new Gtk.Grid ();
14 var entry = new Gtk.Entry ();
15@@ -553,7 +553,7 @@
16 public void run_open (int type) { //0=file, 2=dvd
17 if (type == 0) {
18 var file = new Gtk.FileChooserDialog (_("Open"), mainwindow, Gtk.FileChooserAction.OPEN,
19- Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL, Gtk.Stock.OPEN, Gtk.ResponseType.ACCEPT);
20+ _("_Cancel"), Gtk.ResponseType.CANCEL, _("_Open"), Gtk.ResponseType.ACCEPT);
21 file.select_multiple = true;
22
23 var all_files_filter = new Gtk.FileFilter ();
24
25=== modified file 'src/Widgets/VideoPlayer.vala'
26--- src/Widgets/VideoPlayer.vala 2014-05-02 21:27:42 +0000
27+++ src/Widgets/VideoPlayer.vala 2014-06-20 13:22:11 +0000
28@@ -326,9 +326,9 @@
29 }
30
31 void show_error (string? message=null) {
32- var dlg = new Gtk.Dialog.with_buttons (_("Error"), null, Gtk.DialogFlags.MODAL, Gtk.Stock.OK, Gtk.ResponseType.OK);
33+ var dlg = new Gtk.Dialog.with_buttons (_("Error"), null, Gtk.DialogFlags.MODAL, _("_OK"), Gtk.ResponseType.OK);
34 var grid = new Gtk.Grid ();
35- var err = new Gtk.Image.from_stock (Gtk.Stock.DIALOG_ERROR, Gtk.IconSize.DIALOG);
36+ var err = new Gtk.Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG);
37 err.margin_right = 12;
38
39 var err_label = new Gtk.Label ("");
40@@ -351,7 +351,7 @@
41 var detail = Gst.PbUtils.missing_plugin_message_get_description (msg);
42 var dlg = new Gtk.Dialog.with_buttons ("Missing plugin", null, Gtk.DialogFlags.MODAL);
43 var grid = new Gtk.Grid ();
44- var err = new Gtk.Image.from_stock (Gtk.Stock.DIALOG_ERROR, Gtk.IconSize.DIALOG);
45+ var err = new Gtk.Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG);
46 var phrase = new Gtk.Label (_("Some media files need extra software to be played. Audience can install this software automatically."));
47
48 err.margin_right = 12;
49@@ -411,4 +411,4 @@
50 }
51 }
52 }
53-}
54\ No newline at end of file
55+}

Subscribers

People subscribed via source and target branches

to all changes: