diff options
| author | William Jon McCann <[email protected]> | 2012-12-29 13:36:09 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2017-08-31 13:28:21 +0200 |
| commit | 36348a35643fb353847ca50c23c4d95a6e91ee1a (patch) | |
| tree | 0cae04acb41d9c6e74e0bd2cd2a2277651951e5c /shell | |
| parent | ad4ce2cbce9cf6a25082118b3380fc64555d9fb7 (diff) | |
| download | atril-36348a35643fb353847ca50c23c4d95a6e91ee1a.tar.bz2 atril-36348a35643fb353847ca50c23c4d95a6e91ee1a.tar.xz | |
Rename Best Fit mode as Fit Page
https://bugzilla.gnome.org/show_bug.cgi?id=689468
origin commit:
https://git.gnome.org/browse/evince/commit/?h=gnome-3-10&id=ffd3853
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ev-window.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/shell/ev-window.c b/shell/ev-window.c index d91344f2..add31cc2 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -342,7 +342,7 @@ static void ev_attachment_popup_cmd_open_attachment (GtkAction *action, EvWindow *window); static void ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, EvWindow *window); -static void ev_window_cmd_view_best_fit (GtkAction *action, +static void ev_window_cmd_view_fit_page (GtkAction *action, EvWindow *ev_window); static void ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window); @@ -493,7 +493,7 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window) ev_window_set_action_sensitive (ev_window, "ViewContinuous", has_pages && !(document->iswebdocument)); ev_window_set_action_sensitive (ev_window, "ViewDual", has_pages && !(document->iswebdocument)); ev_window_set_action_sensitive (ev_window, "ViewDualOddLeft", has_pages); - ev_window_set_action_sensitive (ev_window, "ViewBestFit", has_pages && !(document->iswebdocument)); + ev_window_set_action_sensitive (ev_window, "ViewFitPage", has_pages && !(document->iswebdocument)); ev_window_set_action_sensitive (ev_window, "ViewPageWidth", has_pages && !(document->iswebdocument)); ev_window_set_action_sensitive (ev_window, "ViewReload", has_pages); ev_window_set_action_sensitive (ev_window, "ViewAutoscroll", has_pages && !(document->iswebdocument)); @@ -595,7 +595,7 @@ ev_window_update_actions (EvWindow *ev_window) } sizing_mode = ev_document_model_get_sizing_mode (ev_window->priv->model); - if (has_pages && sizing_mode != EV_SIZING_FIT_WIDTH && sizing_mode != EV_SIZING_BEST_FIT) { + if (has_pages && sizing_mode != EV_SIZING_FIT_WIDTH && sizing_mode != EV_SIZING_FIT_PAGE) { GtkAction *action; float zoom; float real_zoom; @@ -699,28 +699,28 @@ update_sizing_buttons (EvWindow *window) { GtkActionGroup *action_group = window->priv->action_group; GtkAction *action; - gboolean best_fit, page_width; + gboolean fit_page, page_width; switch (ev_document_model_get_sizing_mode (window->priv->model)) { - case EV_SIZING_BEST_FIT: - best_fit = TRUE; + case EV_SIZING_FIT_PAGE: + fit_page = TRUE; page_width = FALSE; break; case EV_SIZING_FIT_WIDTH: - best_fit = FALSE; + fit_page = FALSE; page_width = TRUE; break; default: - best_fit = page_width = FALSE; + fit_page = page_width = FALSE; break; } - action = gtk_action_group_get_action (action_group, "ViewBestFit"); + action = gtk_action_group_get_action (action_group, "ViewFitPage"); g_signal_handlers_block_by_func - (action, G_CALLBACK (ev_window_cmd_view_best_fit), window); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), best_fit); + (action, G_CALLBACK (ev_window_cmd_view_fit_page), window); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), fit_page); g_signal_handlers_unblock_by_func - (action, G_CALLBACK (ev_window_cmd_view_best_fit), window); + (action, G_CALLBACK (ev_window_cmd_view_fit_page), window); action = gtk_action_group_get_action (action_group, "ViewPageWidth"); g_signal_handlers_block_by_func @@ -731,9 +731,9 @@ update_sizing_buttons (EvWindow *window) action = gtk_action_group_get_action (window->priv->action_group, ZOOM_CONTROL_ACTION); - if (best_fit) { + if (fit_page) { ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), - EPHY_ZOOM_BEST_FIT); + EPHY_ZOOM_FIT_PAGE); } else if (page_width) { if (!window->priv->document || (window->priv->document && !window->priv->document->iswebdocument)) { ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), @@ -3963,12 +3963,12 @@ ev_window_cmd_dual_odd_pages_left (GtkAction *action, EvWindow *ev_window) } static void -ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window) +ev_window_cmd_view_fit_page (GtkAction *action, EvWindow *ev_window) { ev_window_stop_presentation (ev_window, TRUE); if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) { - ev_document_model_set_sizing_mode (ev_window->priv->model, EV_SIZING_BEST_FIT); + ev_document_model_set_sizing_mode (ev_window->priv->model, EV_SIZING_FIT_PAGE); } else { ev_document_model_set_sizing_mode (ev_window->priv->model, EV_SIZING_FREE); } @@ -5756,8 +5756,8 @@ zoom_control_changed_cb (EphyZoomAction *action, return; } - if (zoom == EPHY_ZOOM_BEST_FIT) { - mode = EV_SIZING_BEST_FIT; + if (zoom == EPHY_ZOOM_FIT_PAGE) { + mode = EV_SIZING_FIT_PAGE; } else if (zoom == EPHY_ZOOM_FIT_WIDTH) { mode = EV_SIZING_FIT_WIDTH; } else { @@ -6322,9 +6322,9 @@ static const GtkToggleActionEntry toggle_entries[] = { { "ViewPresentation", EV_STOCK_RUN_PRESENTATION, N_("Pre_sentation"), "F5", N_("Run document as a presentation"), G_CALLBACK (ev_window_cmd_view_presentation) }, - { "ViewBestFit", EV_STOCK_ZOOM_PAGE, N_("_Best Fit"), NULL, + { "ViewFitPage", EV_STOCK_ZOOM_PAGE, N_("Fit Pa_ge"), NULL, N_("Make the current document fill the window"), - G_CALLBACK (ev_window_cmd_view_best_fit) }, + G_CALLBACK (ev_window_cmd_view_fit_page) }, { "ViewPageWidth", EV_STOCK_ZOOM_WIDTH, N_("Fit Page _Width"), NULL, N_("Make the current document fill the window width"), G_CALLBACK (ev_window_cmd_view_page_width) }, @@ -6557,9 +6557,9 @@ set_action_properties (GtkActionGroup *action_group) /*translators: this is the label for toolbar button*/ g_object_set (action, "short_label", _("Zoom Out"), NULL); - action = gtk_action_group_get_action (action_group, "ViewBestFit"); + action = gtk_action_group_get_action (action_group, "ViewFitPage"); /*translators: this is the label for toolbar button*/ - g_object_set (action, "short_label", _("Best Fit"), NULL); + g_object_set (action, "short_label", _("Fit Page"), NULL); action = gtk_action_group_get_action (action_group, "ViewPageWidth"); /*translators: this is the label for toolbar button*/ |