[gthumb] image viewer buttons: always fit to size, added fit to width

[Paolo Bacchilega <paobac src gnome org>]

commit 7a245b6c9f3f0f7b11ae9bd41e9cdb5b286385a4
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Fri May 2 19:27:18 2014 +0200

    image viewer buttons: always fit to size, added fit to width

 extensions/image_viewer/actions.c               |    4 ++--
 extensions/image_viewer/gth-image-viewer-page.c |   17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/extensions/image_viewer/actions.c b/extensions/image_viewer/actions.c
index 1b80801..3a98c6e 100644
--- a/extensions/image_viewer/actions.c
+++ b/extensions/image_viewer/actions.c
@@ -70,7 +70,7 @@ gth_browser_activate_image_zoom_fit (GSimpleAction    *action,
        GthBrowser         *browser = user_data;
        GthImageViewerPage *self = GTH_IMAGE_VIEWER_PAGE (gth_browser_get_viewer_page (browser));
 
-       gth_image_viewer_set_fit_mode (GTH_IMAGE_VIEWER (gth_image_viewer_page_get_image_viewer (self)), 
GTH_FIT_SIZE_IF_LARGER);
+       gth_image_viewer_set_fit_mode (GTH_IMAGE_VIEWER (gth_image_viewer_page_get_image_viewer (self)), 
GTH_FIT_SIZE);
 }
 
 
@@ -82,7 +82,7 @@ gth_browser_activate_image_zoom_fit_width (GSimpleAction      *action,
        GthBrowser         *browser = user_data;
        GthImageViewerPage *self = GTH_IMAGE_VIEWER_PAGE (gth_browser_get_viewer_page (browser));
 
-       gth_image_viewer_set_fit_mode (GTH_IMAGE_VIEWER (gth_image_viewer_page_get_image_viewer (self)), 
GTH_FIT_WIDTH_IF_LARGER);
+       gth_image_viewer_set_fit_mode (GTH_IMAGE_VIEWER (gth_image_viewer_page_get_image_viewer (self)), 
GTH_FIT_WIDTH);
 }
 
 
diff --git a/extensions/image_viewer/gth-image-viewer-page.c b/extensions/image_viewer/gth-image-viewer-page.c
index 5a6c17d..a4a42d0 100644
--- a/extensions/image_viewer/gth-image-viewer-page.c
+++ b/extensions/image_viewer/gth-image-viewer-page.c
@@ -30,7 +30,7 @@
 
 #define UPDATE_QUALITY_DELAY 500
 #define UPDATE_VISIBILITY_DELAY 100
-#define N_HEADER_BAR_BUTTONS 2
+#define N_HEADER_BAR_BUTTONS 3
 #define HIDE_OVERVIEW_TIMEOUT 2 /* in seconds */
 #define OVERLAY_MARGIN 10
 
@@ -825,16 +825,23 @@ gth_image_viewer_page_real_activate (GthViewerPage *base,
                        gth_browser_add_header_bar_button (browser,
                                                           GTH_BROWSER_HEADER_SECTION_VIEWER_VIEW,
                                                           "view-zoom-original-symbolic",
-                                                          NULL,
+                                                          _("Set to actual size"),
                                                           "win.image-zoom-100",
                                                           NULL);
        self->priv->buttons[1] =
                        gth_browser_add_header_bar_button (browser,
                                                           GTH_BROWSER_HEADER_SECTION_VIEWER_VIEW,
                                                           "view-zoom-fit-symbolic",
-                                                          NULL,
+                                                          _("Fit to window"),
                                                           "win.image-zoom-fit",
                                                           NULL);
+       self->priv->buttons[2] =
+                       gth_browser_add_header_bar_button (browser,
+                                                          GTH_BROWSER_HEADER_SECTION_VIEWER_VIEW,
+                                                          "view-zoom-fit-width-symbolic",
+                                                          _("Fit to width"),
+                                                          "win.image-zoom-fit-width",
+                                                          NULL);
        gth_window_add_accelerators (GTH_WINDOW (browser), accelerators, G_N_ELEMENTS (accelerators));
 
        self->priv->preloader = gth_browser_get_image_preloader (browser);
@@ -1234,8 +1241,8 @@ gth_image_viewer_page_real_update_sensitivity (GthViewerPage *base)
        gth_window_enable_action (GTH_WINDOW (self->priv->browser), "image-zoom-in", zoom_enabled && (zoom < 
100.0));
 
        fit_mode = gth_image_viewer_get_fit_mode (GTH_IMAGE_VIEWER (self->priv->viewer));
-       gth_window_enable_action (GTH_WINDOW (self->priv->browser), "image-zoom-fit", zoom_enabled && 
(fit_mode != GTH_FIT_SIZE_IF_LARGER));
-       gth_window_enable_action (GTH_WINDOW (self->priv->browser), "image-zoom-fit-width", zoom_enabled && 
(fit_mode != GTH_FIT_WIDTH_IF_LARGER));
+       gth_window_enable_action (GTH_WINDOW (self->priv->browser), "image-zoom-fit", zoom_enabled && 
(fit_mode != GTH_FIT_SIZE));
+       gth_window_enable_action (GTH_WINDOW (self->priv->browser), "image-zoom-fit-width", zoom_enabled && 
(fit_mode != GTH_FIT_WIDTH));
 
        _gth_image_viewer_page_update_paste_command_sensitivity (self, NULL);
 }