Commit 3c7b177f authored by Patrick Tierney's avatar Patrick Tierney

#1614: added icons to the ends of the zoom slider

parent 4863f4fc
......@@ -213,6 +213,13 @@ public abstract class CollectionPage : CheckerboardPage {
separator2.set_draw(false);
toolbar.insert(separator2, -1);
Gtk.ToolItem zoom_out_wrapper = new Gtk.ToolItem();
Gtk.Image zoom_out = new Gtk.Image.from_pixbuf(Resources.load_icon(Resources.ICON_ZOOM_OUT,
Resources.ICON_ZOOM_SCALE));
zoom_out_wrapper.add(zoom_out);
toolbar.insert(zoom_out_wrapper, -1);
// thumbnail size slider
slider = new Gtk.HScale(slider_adjustment);
......@@ -226,6 +233,13 @@ public abstract class CollectionPage : CheckerboardPage {
toolitem.set_tooltip_text(_("Adjust the size of the thumbnails"));
toolbar.insert(toolitem, -1);
Gtk.ToolItem zoom_in_wrapper = new Gtk.ToolItem();
Gtk.Image zoom_in = new Gtk.Image.from_pixbuf(Resources.load_icon(Resources.ICON_ZOOM_IN,
Resources.ICON_ZOOM_SCALE));
zoom_in_wrapper.add(zoom_in);
toolbar.insert(zoom_in_wrapper, -1);
// initialize scale from slider (since the scale adjustment may be modified from default)
scale = slider_to_scale(slider.get_value());
......
......@@ -454,6 +454,12 @@ public abstract class EditingHostPage : SinglePhotoPage {
separator.set_draw(false);
toolbar.insert(separator, -1);
Gtk.ToolItem zoom_out_wrapper = new Gtk.ToolItem();
Gtk.Image zoom_out = new Gtk.Image.from_pixbuf(Resources.load_icon(Resources.ICON_ZOOM_OUT,
Resources.ICON_ZOOM_SCALE));
zoom_out_wrapper.add(zoom_out);
toolbar.insert(zoom_out_wrapper, -1);
// zoom slider
zoom_slider = new Gtk.HScale(new Gtk.Adjustment(0.0, 0.0, 1.1, 0.1, 0.1, 0.1));
zoom_slider.set_draw_value(false);
......@@ -466,6 +472,12 @@ public abstract class EditingHostPage : SinglePhotoPage {
zoom_slider.button_release_event.connect(on_zoom_slider_drag_end);
zoom_slider.key_press_event.connect(on_zoom_slider_key_press);
Gtk.ToolItem zoom_in_wrapper = new Gtk.ToolItem();
Gtk.Image zoom_in = new Gtk.Image.from_pixbuf(Resources.load_icon(Resources.ICON_ZOOM_IN,
Resources.ICON_ZOOM_SCALE));
zoom_in_wrapper.add(zoom_in);
toolbar.insert(zoom_in_wrapper, -1);
// previous button
prev_button.set_tooltip_text(_("Previous photo"));
prev_button.clicked.connect(on_previous_photo);
......
......@@ -80,6 +80,9 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string ICON_FILTER_THREE_OR_BETTER = "three-star-filter-plus.svg";
public const string ICON_FILTER_FOUR_OR_BETTER = "four-star-filter-plus.svg";
public const string ICON_FILTER_FIVE = "five-star-filter.svg";
public const string ICON_ZOOM_IN = "zoom-in.png";
public const string ICON_ZOOM_OUT = "zoom-out.png";
public const int ICON_ZOOM_SCALE = 16;
public const string ICON_CAMERAS = "camera-photo";
public const string ICON_EVENTS = "x-office-calendar";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment