Imported Upstream version 0.22.0upstream/0.22.0

1 files changed, 13 insertions, 12 deletions

diff --git a/src/SlideshowPage.vala b/src/SlideshowPage.vala
index f22fd53..654576d 100644
--- a/src/SlideshowPage.vala
+++ b/src/SlideshowPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -44,8 +44,8 @@ class SlideshowPage : SinglePhotoPage {
             set_modal(true);
             set_transient_for(AppWindow.get_fullscreen());
             
-            add_buttons(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL, 
-                Gtk.Stock.OK, Gtk.ResponseType.OK);
+            add_buttons(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL, 
+                Resources.OK_LABEL, Gtk.ResponseType.OK);
             set_title(_("Settings"));
             
             Gtk.Adjustment adjustment = new Gtk.Adjustment(delay, Config.Facade.SLIDESHOW_DELAY_MIN, Config.Facade.SLIDESHOW_DELAY_MAX, 0.1, 1, 0);
@@ -157,28 +157,29 @@ class SlideshowPage : SinglePhotoPage {
         Gtk.Toolbar toolbar = get_toolbar();
         
         // add toolbar buttons
-        Gtk.ToolButton previous_button = new Gtk.ToolButton.from_stock(Gtk.Stock.GO_BACK);
-        previous_button.set_label(_("Back"));
+        Gtk.ToolButton previous_button = new Gtk.ToolButton(null, _("Back"));
+        previous_button.set_icon_name("go-previous");
         previous_button.set_tooltip_text(_("Go to the previous photo"));
         previous_button.clicked.connect(on_previous_photo);
         
         toolbar.insert(previous_button, -1);
         
-        play_pause_button = new Gtk.ToolButton.from_stock(Gtk.Stock.MEDIA_PAUSE);
-        play_pause_button.set_label(_("Pause"));
+        play_pause_button = new Gtk.ToolButton(null, _("Pause"));
+        play_pause_button.set_icon_name("media-playback-pause");
         play_pause_button.set_tooltip_text(_("Pause the slideshow"));
         play_pause_button.clicked.connect(on_play_pause);
         
         toolbar.insert(play_pause_button, -1);
         
-        Gtk.ToolButton next_button = new Gtk.ToolButton.from_stock(Gtk.Stock.GO_FORWARD);
-        next_button.set_label(_("Next"));
+        Gtk.ToolButton next_button = new Gtk.ToolButton(null, _("Next"));
+        next_button.set_icon_name("go-next");
         next_button.set_tooltip_text(_("Go to the next photo"));
         next_button.clicked.connect(on_next_photo);
         
         toolbar.insert(next_button, -1);
 
-        settings_button = new Gtk.ToolButton.from_stock(Gtk.Stock.PREFERENCES);
+        settings_button = new Gtk.ToolButton(null, null);
+        settings_button.set_icon_name("preferences-system");
         settings_button.set_label(_("Settings"));
         settings_button.set_tooltip_text(_("Change slideshow settings"));
         settings_button.clicked.connect(on_change_settings);
@@ -265,11 +266,11 @@ class SlideshowPage : SinglePhotoPage {
 
     private void on_play_pause() {
         if (playing) {
-            play_pause_button.set_stock_id(Gtk.Stock.MEDIA_PLAY);
+            play_pause_button.set_icon_name("media-playback-start");
             play_pause_button.set_label(_("Play"));
             play_pause_button.set_tooltip_text(_("Continue the slideshow"));
         } else {
-            play_pause_button.set_stock_id(Gtk.Stock.MEDIA_PAUSE);
+            play_pause_button.set_icon_name("media-playback-pause");
             play_pause_button.set_label(_("Pause"));
             play_pause_button.set_tooltip_text(_("Pause the slideshow"));
         }