From a75c067b9143e0fd2223647e4414227b4613619b Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Sat, 29 Dec 2012 13:58:43 +0100 Subject: Rename Fit Page Width as Fit Width https://bugzilla.gnome.org/show_bug.cgi?id=689468 origin commit: https://git.gnome.org/browse/evince/commit/?h=gnome-3-10&id=88d7a4a --- cut-n-paste/zoom-control/ephy-zoom.h | 2 +- data/atril-previewer-ui.xml | 2 +- data/atril-toolbar.xml | 2 +- data/atril-ui.xml | 2 +- previewer/ev-previewer-window.c | 14 +++++++------- shell/ev-window.c | 30 +++++++++++++++--------------- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cut-n-paste/zoom-control/ephy-zoom.h b/cut-n-paste/zoom-control/ephy-zoom.h index 895e76a9..8f15c173 100644 --- a/cut-n-paste/zoom-control/ephy-zoom.h +++ b/cut-n-paste/zoom-control/ephy-zoom.h @@ -47,7 +47,7 @@ struct zoom_levels[] = { { N_("Fit Page"), EPHY_ZOOM_FIT_PAGE }, - { N_("Fit Page Width"), EPHY_ZOOM_FIT_WIDTH }, + { N_("Fit Width"), EPHY_ZOOM_FIT_WIDTH }, { N_("Expand Window to Fit"), EPHY_ZOOM_EXPAND_WINDOW_TO_FIT }, { NULL, EPHY_ZOOM_SEPARATOR }, { N_("50%"), 0.5 }, diff --git a/data/atril-previewer-ui.xml b/data/atril-previewer-ui.xml index 1c659242..0a291df3 100644 --- a/data/atril-previewer-ui.xml +++ b/data/atril-previewer-ui.xml @@ -5,7 +5,7 @@ - + diff --git a/data/atril-toolbar.xml b/data/atril-toolbar.xml index 5fbf012e..f49fe2f1 100644 --- a/data/atril-toolbar.xml +++ b/data/atril-toolbar.xml @@ -15,7 +15,7 @@ - + diff --git a/data/atril-ui.xml b/data/atril-ui.xml index dc9035c9..5faafaeb 100644 --- a/data/atril-ui.xml +++ b/data/atril-ui.xml @@ -48,7 +48,7 @@ - + diff --git a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c index 5094fcf5..73885f9e 100644 --- a/previewer/ev-previewer-window.c +++ b/previewer/ev-previewer-window.c @@ -155,8 +155,8 @@ ev_previewer_window_zoom_fit_page (GtkToggleAction *action, } static void -ev_previewer_window_zoom_page_width (GtkToggleAction *action, - EvPreviewerWindow *window) +ev_previewer_window_zoom_fit_width (GtkToggleAction *action, + EvPreviewerWindow *window) { ev_document_model_set_sizing_mode (window->model, gtk_toggle_action_get_active (action) ? @@ -355,9 +355,9 @@ static const GtkToggleActionEntry toggle_action_entries[] = { { "ViewFitPage", EV_STOCK_ZOOM_PAGE, N_("Fit Pa_ge"), NULL, N_("Make the current document fill the window"), G_CALLBACK (ev_previewer_window_zoom_fit_page) }, - { "ViewPageWidth", EV_STOCK_ZOOM_WIDTH, N_("Fit Page _Width"), NULL, + { "ViewFitWidth", EV_STOCK_ZOOM_WIDTH, N_("Fit _Width"), NULL, N_("Make the current document fill the window width"), - G_CALLBACK (ev_previewer_window_zoom_page_width) } + G_CALLBACK (ev_previewer_window_zoom_fit_width) } }; static gboolean @@ -389,14 +389,14 @@ view_sizing_mode_changed (EvDocumentModel *model, G_CALLBACK (ev_previewer_window_zoom_fit_page), window); - action = gtk_action_group_get_action (window->action_group, "ViewPageWidth"); + action = gtk_action_group_get_action (window->action_group, "ViewFitWidth"); g_signal_handlers_block_by_func (action, - G_CALLBACK (ev_previewer_window_zoom_page_width), + G_CALLBACK (ev_previewer_window_zoom_fit_width), window); gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), sizing_mode == EV_SIZING_FIT_WIDTH); g_signal_handlers_unblock_by_func (action, - G_CALLBACK (ev_previewer_window_zoom_page_width), + G_CALLBACK (ev_previewer_window_zoom_fit_width), window); } diff --git a/shell/ev-window.c b/shell/ev-window.c index add31cc2..0e2f42c0 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -344,7 +344,7 @@ static void ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, EvWindow *window); static void ev_window_cmd_view_fit_page (GtkAction *action, EvWindow *ev_window); -static void ev_window_cmd_view_page_width (GtkAction *action, +static void ev_window_cmd_view_fit_width (GtkAction *action, EvWindow *ev_window); static void ev_window_cmd_view_expand_window (GtkAction *action, EvWindow *ev_window); @@ -494,7 +494,7 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window) 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, "ViewFitPage", has_pages && !(document->iswebdocument)); - ev_window_set_action_sensitive (ev_window, "ViewPageWidth", has_pages && !(document->iswebdocument)); + ev_window_set_action_sensitive (ev_window, "ViewFitWidth", 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)); ev_window_set_action_sensitive (ev_window, "ViewInvertedColors", has_pages); @@ -699,19 +699,19 @@ update_sizing_buttons (EvWindow *window) { GtkActionGroup *action_group = window->priv->action_group; GtkAction *action; - gboolean fit_page, page_width; + gboolean fit_page, fit_width; switch (ev_document_model_get_sizing_mode (window->priv->model)) { case EV_SIZING_FIT_PAGE: fit_page = TRUE; - page_width = FALSE; + fit_width = FALSE; break; case EV_SIZING_FIT_WIDTH: fit_page = FALSE; - page_width = TRUE; + fit_width = TRUE; break; default: - fit_page = page_width = FALSE; + fit_page = fit_width = FALSE; break; } @@ -722,19 +722,19 @@ update_sizing_buttons (EvWindow *window) g_signal_handlers_unblock_by_func (action, G_CALLBACK (ev_window_cmd_view_fit_page), window); - action = gtk_action_group_get_action (action_group, "ViewPageWidth"); + action = gtk_action_group_get_action (action_group, "ViewFitWidth"); g_signal_handlers_block_by_func - (action, G_CALLBACK (ev_window_cmd_view_page_width), window); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), page_width); + (action, G_CALLBACK (ev_window_cmd_view_fit_width), window); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), fit_width); g_signal_handlers_unblock_by_func - (action, G_CALLBACK (ev_window_cmd_view_page_width), window); + (action, G_CALLBACK (ev_window_cmd_view_fit_width), window); action = gtk_action_group_get_action (window->priv->action_group, ZOOM_CONTROL_ACTION); if (fit_page) { ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), EPHY_ZOOM_FIT_PAGE); - } else if (page_width) { + } else if (fit_width) { if (!window->priv->document || (window->priv->document && !window->priv->document->iswebdocument)) { ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), EPHY_ZOOM_FIT_WIDTH); @@ -3976,7 +3976,7 @@ ev_window_cmd_view_fit_page (GtkAction *action, EvWindow *ev_window) } static void -ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window) +ev_window_cmd_view_fit_width (GtkAction *action, EvWindow *ev_window) { ev_window_stop_presentation (ev_window, TRUE); @@ -6325,9 +6325,9 @@ static const GtkToggleActionEntry toggle_entries[] = { { "ViewFitPage", EV_STOCK_ZOOM_PAGE, N_("Fit Pa_ge"), NULL, N_("Make the current document fill the window"), G_CALLBACK (ev_window_cmd_view_fit_page) }, - { "ViewPageWidth", EV_STOCK_ZOOM_WIDTH, N_("Fit Page _Width"), NULL, + { "ViewFitWidth", EV_STOCK_ZOOM_WIDTH, N_("Fit _Width"), NULL, N_("Make the current document fill the window width"), - G_CALLBACK (ev_window_cmd_view_page_width) }, + G_CALLBACK (ev_window_cmd_view_fit_width) }, { "ViewInvertedColors", EV_STOCK_INVERTED_COLORS, N_("_Inverted Colors"), "I", N_("Show page contents with the colors inverted"), G_CALLBACK (ev_window_cmd_view_inverted_colors) }, @@ -6561,7 +6561,7 @@ set_action_properties (GtkActionGroup *action_group) /*translators: this is the label for toolbar button*/ g_object_set (action, "short_label", _("Fit Page"), NULL); - action = gtk_action_group_get_action (action_group, "ViewPageWidth"); + action = gtk_action_group_get_action (action_group, "ViewFitWidth"); /*translators: this is the label for toolbar button*/ g_object_set (action, "short_label", _("Fit Width"), NULL); -- cgit v1.2.1