GNOME.org
 

[evince/gnome3-style] Rename Fit Page Width as Fit Width

commit dd359308d1d00b196bb39ad87a08311fd2a2ecef
Author: William Jon McCann <jmccann redhat com>
Date:   Sat Dec 29 13:58:43 2012 +0100

    Rename Fit Page Width as Fit Width
    
    https://bugzilla.gnome.org/show_bug.cgi?id=689468

 previewer/ev-previewer-window.c |   14 +++++++-------
 previewer/previewer-ui.xml      |    2 +-
 shell/ev-window.c               |   36 ++++++++++++++++++------------------
 shell/ev-zoom-action-widget.c   |    8 ++++----
 shell/evince-toolbar.xml        |    2 +-
 shell/evince-ui.xml             |    2 +-
 6 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c
index 8862468..cfd981a 100644
--- a/previewer/ev-previewer-window.c
+++ b/previewer/ev-previewer-window.c
@@ -143,8 +143,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) ?
@@ -342,9 +342,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
@@ -376,14 +376,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/previewer/previewer-ui.xml b/previewer/previewer-ui.xml
index 1c65924..0a291df 100644
--- a/previewer/previewer-ui.xml
+++ b/previewer/previewer-ui.xml
@@ -5,7 +5,7 @@
     <separator/>
     <toolitem name="PageSelector" action="PageSelector"/>
     <separator/>
-    <toolitem name="ViewPageWidth" action="ViewPageWidth"/>
+    <toolitem name="ViewFitWidth" action="ViewFitWidth"/>
     <toolitem name="ViewFitPage" action="ViewFitPage"/>
     <toolitem name="ViewZoomIn" action="ViewZoomIn"/>
     <toolitem name="ViewZoomOut" action="ViewZoomOut"/>
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 19d6313..fa89c81 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	view_handle_link_cb 			(EvView           *view, 
 							 EvLink           *link, 
@@ -473,7 +473,7 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
 	ev_window_set_action_sensitive (ev_window, "ViewDual", has_pages);
 	ev_window_set_action_sensitive (ev_window, "ViewDualOddLeft", has_pages);
 	ev_window_set_action_sensitive (ev_window, "ViewFitPage", has_pages);
-	ev_window_set_action_sensitive (ev_window, "ViewPageWidth", has_pages);
+	ev_window_set_action_sensitive (ev_window, "ViewFitWidth", has_pages);
 	ev_window_set_action_sensitive (ev_window, "ViewReload", has_pages);
 	ev_window_set_action_sensitive (ev_window, "ViewAutoscroll", has_pages);
 	ev_window_set_action_sensitive (ev_window, "ViewInvertedColors", has_pages);
@@ -565,7 +565,7 @@ static const gchar *view_accels[] = {
 	"n",
 	"p",
 	"FitPage",
-	"PageWidth"
+	"FitWidth"
 };
 
 static void
@@ -632,19 +632,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;
 	}
 
@@ -655,12 +655,12 @@ 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);
 }
 
 /**
@@ -3868,7 +3868,7 @@ ev_window_cmd_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);
 
@@ -3881,7 +3881,7 @@ ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window)
 }
 
 static void
-ev_window_cmd_page_width (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_fit_width (GtkAction *action, EvWindow *ev_window)
 {
 	ev_document_model_set_sizing_mode (ev_window->priv->model, EV_SIZING_FIT_WIDTH);
 }
@@ -5963,8 +5963,8 @@ static const GtkActionEntry entries[] = {
 	  G_CALLBACK (ev_window_cmd_edit_copy) },
 	{ "FitPage", EV_STOCK_ZOOM_PAGE, NULL, "f", NULL,
 	  G_CALLBACK (ev_window_cmd_fit_page) },
-	{ "PageWidth", EV_STOCK_ZOOM_WIDTH, NULL, "w", NULL,
-	  G_CALLBACK (ev_window_cmd_page_width) },
+	{ "FitWidth", EV_STOCK_ZOOM_WIDTH, NULL, "w", NULL,
+	  G_CALLBACK (ev_window_cmd_fit_width) },
 };
 
 /* Toggle items */
@@ -5991,9 +5991,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"), "<control>I",
 	  N_("Show page contents with the colors inverted"),
 	  G_CALLBACK (ev_window_cmd_view_inverted_colors) },
@@ -6201,7 +6201,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);
 
diff --git a/shell/ev-zoom-action-widget.c b/shell/ev-zoom-action-widget.c
index 958bcc0..feee43f 100644
--- a/shell/ev-zoom-action-widget.c
+++ b/shell/ev-zoom-action-widget.c
@@ -39,9 +39,9 @@ static const struct {
         const gchar *name;
         float        level;
 } zoom_levels[] = {
-        { N_("Fit Page"),       EV_ZOOM_FIT_PAGE  },
-        { N_("Fit Page Width"), EV_ZOOM_FIT_WIDTH },
-        { NULL,                 EV_ZOOM_SEPARATOR },
+        { N_("Fit Page"),  EV_ZOOM_FIT_PAGE  },
+        { N_("Fit Width"), EV_ZOOM_FIT_WIDTH },
+        { NULL,            EV_ZOOM_SEPARATOR },
         { N_("50%"), 0.5 },
         { N_("70%"), 0.7071067811 },
         { N_("85%"), 0.8408964152 },
@@ -127,7 +127,7 @@ ev_zoom_action_widget_update_sizing_mode (EvZoomActionWidget *control)
                 break;
         case EV_SIZING_FIT_WIDTH:
                 icon_name = EV_STOCK_ZOOM_WIDTH;
-                tooltip = _("Fit Page Width");
+                tooltip = _("Fit Width");
                 break;
         case EV_SIZING_FREE:
                 break;
diff --git a/shell/evince-toolbar.xml b/shell/evince-toolbar.xml
index 11e096a..586096d 100644
--- a/shell/evince-toolbar.xml
+++ b/shell/evince-toolbar.xml
@@ -16,7 +16,7 @@
     <toolitem name="ViewZoomIn"/>
     <toolitem name="ViewZoomOut"/>
     <toolitem name="ViewFitPage"/>
-    <toolitem name="ViewPageWidth"/>
+    <toolitem name="ViewFitWidth"/>
     <toolitem name="ViewFullscreen"/>
     <toolitem name="ViewPresentation"/>
     <toolitem name="GoPreviousPage"/>
diff --git a/shell/evince-ui.xml b/shell/evince-ui.xml
index 725ea96..7dc61c2 100644
--- a/shell/evince-ui.xml
+++ b/shell/evince-ui.xml
@@ -108,5 +108,5 @@
   <accelerator name="CtrlKpMinusAccel" action="CtrlKpMinus"/>
   <accelerator name="CtrlInsertAccel" action="CtrlInsert" />
   <accelerator name="FitPageAccel" action ="FitPage" />
-  <accelerator name="PageWidthAccel" action ="PageWidth" />
+  <accelerator name="FitWidthAccel" action ="FitWidth" />
 </ui>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]