[evince/gnome3-style] Rename Best Fit mode as Fit Page
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince/gnome3-style] Rename Best Fit mode as Fit Page
- Date: Sat, 29 Dec 2012 13:02:12 +0000 (UTC)
commit 1e4bc6117ab0e5cc6e270c7fe7379bcbda8d253f
Author: William Jon McCann <jmccann redhat com>
Date: Sat Dec 29 13:36:09 2012 +0100
Rename Best Fit mode as Fit Page
https://bugzilla.gnome.org/show_bug.cgi?id=689468
data/org.gnome.Evince.gschema.xml.in | 2 +-
libview/ev-document-model.h | 3 +-
libview/ev-view.c | 44 +++++++++++++++++-----------------
previewer/ev-previewer-window.c | 16 ++++++------
previewer/previewer-ui.xml | 2 +-
shell/ev-window.c | 44 +++++++++++++++++-----------------
shell/ev-zoom-action-widget.c | 12 ++++----
shell/evince-toolbar.xml | 2 +-
shell/evince-ui.xml | 2 +-
9 files changed, 64 insertions(+), 63 deletions(-)
---
diff --git a/data/org.gnome.Evince.gschema.xml.in b/data/org.gnome.Evince.gschema.xml.in
index 3de283a..6c0fdce 100644
--- a/data/org.gnome.Evince.gschema.xml.in
+++ b/data/org.gnome.Evince.gschema.xml.in
@@ -1,7 +1,7 @@
<schemalist>
<enum id="org.gnome.Evince.SizingMode">
- <value nick="best-fit" value="0"/>
+ <value nick="fit-page" value="0"/>
<value nick="fit-width" value="1"/>
<value nick="free" value="2"/>
</enum>
diff --git a/libview/ev-document-model.h b/libview/ev-document-model.h
index df3db14..c91478b 100644
--- a/libview/ev-document-model.h
+++ b/libview/ev-document-model.h
@@ -34,7 +34,8 @@ G_BEGIN_DECLS
#define EV_IS_DOCUMENT_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EV_TYPE_DOCUMENT_MODEL))
typedef enum {
- EV_SIZING_BEST_FIT,
+ EV_SIZING_FIT_PAGE,
+ EV_SIZING_BEST_FIT = EV_SIZING_FIT_PAGE, /* Deprecated */
EV_SIZING_FIT_WIDTH,
EV_SIZING_FREE,
} EvSizingMode;
diff --git a/libview/ev-view.c b/libview/ev-view.c
index b82842b..5c50404 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -236,7 +236,7 @@ static double zoom_for_size_fit_height (gdouble doc_width,
gdouble doc_height,
int target_width,
int target_height);
-static double zoom_for_size_best_fit (gdouble doc_width,
+static double zoom_for_size_fit_page (gdouble doc_width,
gdouble doc_height,
int target_width,
int target_height);
@@ -890,7 +890,7 @@ ev_view_scroll (EvView *view,
view->jump_to_find_result = FALSE;
- if (view->sizing_mode == EV_SIZING_BEST_FIT) {
+ if (view->sizing_mode == EV_SIZING_FIT_PAGE) {
switch (scroll) {
case GTK_SCROLL_PAGE_BACKWARD:
case GTK_SCROLL_STEP_BACKWARD:
@@ -1548,7 +1548,7 @@ goto_fitr_dest (EvView *view, EvLinkDest *dest)
left = ev_link_dest_get_left (dest, &change_left);
top = ev_link_dest_get_top (dest, &change_top);
- zoom = zoom_for_size_best_fit (ev_link_dest_get_right (dest) - left,
+ zoom = zoom_for_size_fit_page (ev_link_dest_get_right (dest) - left,
ev_link_dest_get_bottom (dest) - top,
allocation.width,
allocation.height);
@@ -1639,11 +1639,11 @@ goto_fit_dest (EvView *view, EvLinkDest *dest)
page = ev_link_dest_get_page (dest);
ev_document_get_page_size (view->document, page, &doc_width, &doc_height);
- zoom = zoom_for_size_best_fit (doc_width, doc_height,
+ zoom = zoom_for_size_fit_page (doc_width, doc_height,
allocation.width,
allocation.height);
- ev_document_model_set_sizing_mode (view->model, EV_SIZING_BEST_FIT);
+ ev_document_model_set_sizing_mode (view->model, EV_SIZING_FIT_PAGE);
ev_document_model_set_scale (view->model, zoom);
ev_view_change_page (view, page);
@@ -3029,7 +3029,7 @@ ev_view_size_request_continuous_dual_page (EvView *view,
switch (view->sizing_mode) {
case EV_SIZING_FIT_WIDTH:
- case EV_SIZING_BEST_FIT:
+ case EV_SIZING_FIT_PAGE:
requisition->width = 1;
break;
@@ -3058,7 +3058,7 @@ ev_view_size_request_continuous (EvView *view,
switch (view->sizing_mode) {
case EV_SIZING_FIT_WIDTH:
- case EV_SIZING_BEST_FIT:
+ case EV_SIZING_FIT_PAGE:
requisition->width = 1;
break;
@@ -3083,7 +3083,7 @@ ev_view_size_request_dual_page (EvView *view,
GtkBorder border;
gint width, height;
- if (view->sizing_mode == EV_SIZING_BEST_FIT) {
+ if (view->sizing_mode == EV_SIZING_FIT_PAGE) {
requisition->width = 1;
requisition->height = 1;
@@ -3118,7 +3118,7 @@ ev_view_size_request_single_page (EvView *view,
GtkBorder border;
gint width, height;
- if (view->sizing_mode == EV_SIZING_BEST_FIT) {
+ if (view->sizing_mode == EV_SIZING_FIT_PAGE) {
requisition->width = 1;
requisition->height = 1;
@@ -3153,7 +3153,7 @@ ev_view_size_request (GtkWidget *widget,
*/
if (!view->internal_size_request &&
(view->sizing_mode == EV_SIZING_FIT_WIDTH ||
- view->sizing_mode == EV_SIZING_BEST_FIT)) {
+ view->sizing_mode == EV_SIZING_FIT_PAGE)) {
GtkAllocation allocation;
gtk_widget_get_allocation (widget, &allocation);
@@ -3219,7 +3219,7 @@ ev_view_size_allocate (GtkWidget *widget,
return;
if (view->sizing_mode == EV_SIZING_FIT_WIDTH ||
- view->sizing_mode == EV_SIZING_BEST_FIT) {
+ view->sizing_mode == EV_SIZING_FIT_PAGE) {
GtkRequisition req;
ev_view_zoom_for_size (view,
@@ -3328,7 +3328,7 @@ ev_view_scroll_event (GtkWidget *widget, GdkEventScroll *event)
state &= ~GDK_SHIFT_MASK;
}
- if (state == 0 && view->sizing_mode == EV_SIZING_BEST_FIT && !view->continuous) {
+ if (state == 0 && view->sizing_mode == EV_SIZING_FIT_PAGE && !view->continuous) {
switch (event->direction) {
case GDK_SCROLL_DOWN:
case GDK_SCROLL_RIGHT:
@@ -5442,7 +5442,7 @@ zoom_for_size_fit_height (gdouble doc_width,
}
static double
-zoom_for_size_best_fit (gdouble doc_width,
+zoom_for_size_fit_page (gdouble doc_width,
gdouble doc_height,
int target_width,
int target_height)
@@ -5485,8 +5485,8 @@ ev_view_zoom_for_size_continuous_and_dual_page (EvView *view,
if (view->sizing_mode == EV_SIZING_FIT_WIDTH) {
scale = zoom_for_size_fit_width (doc_width, doc_height, width - sb_size, height);
- } else if (view->sizing_mode == EV_SIZING_BEST_FIT)
- scale = zoom_for_size_best_fit (doc_width, doc_height, width - sb_size, height);
+ } else if (view->sizing_mode == EV_SIZING_FIT_PAGE)
+ scale = zoom_for_size_fit_page (doc_width, doc_height, width - sb_size, height);
else
g_assert_not_reached ();
@@ -5521,8 +5521,8 @@ ev_view_zoom_for_size_continuous (EvView *view,
if (view->sizing_mode == EV_SIZING_FIT_WIDTH) {
scale = zoom_for_size_fit_width (doc_width, doc_height, width - sb_size, height);
- } else if (view->sizing_mode == EV_SIZING_BEST_FIT)
- scale = zoom_for_size_best_fit (doc_width, doc_height, width - sb_size, height);
+ } else if (view->sizing_mode == EV_SIZING_FIT_PAGE)
+ scale = zoom_for_size_fit_page (doc_width, doc_height, width - sb_size, height);
else
g_assert_not_reached ();
@@ -5563,8 +5563,8 @@ ev_view_zoom_for_size_dual_page (EvView *view,
sb_size = ev_view_get_scrollbar_size (view, GTK_ORIENTATION_VERTICAL);
scale = zoom_for_size_fit_width (doc_width, doc_height, width - sb_size, height);
- } else if (view->sizing_mode == EV_SIZING_BEST_FIT)
- scale = zoom_for_size_best_fit (doc_width, doc_height, width, height);
+ } else if (view->sizing_mode == EV_SIZING_FIT_PAGE)
+ scale = zoom_for_size_fit_page (doc_width, doc_height, width, height);
else
g_assert_not_reached ();
@@ -5593,8 +5593,8 @@ ev_view_zoom_for_size_single_page (EvView *view,
sb_size = ev_view_get_scrollbar_size (view, GTK_ORIENTATION_VERTICAL);
scale = zoom_for_size_fit_width (doc_width, doc_height, width - sb_size, height);
- } else if (view->sizing_mode == EV_SIZING_BEST_FIT)
- scale = zoom_for_size_best_fit (doc_width, doc_height, width, height);
+ } else if (view->sizing_mode == EV_SIZING_FIT_PAGE)
+ scale = zoom_for_size_fit_page (doc_width, doc_height, width, height);
else
g_assert_not_reached ();
@@ -5608,7 +5608,7 @@ ev_view_zoom_for_size (EvView *view,
{
g_return_if_fail (EV_IS_VIEW (view));
g_return_if_fail (view->sizing_mode == EV_SIZING_FIT_WIDTH ||
- view->sizing_mode == EV_SIZING_BEST_FIT);
+ view->sizing_mode == EV_SIZING_FIT_PAGE);
g_return_if_fail (width >= 0);
g_return_if_fail (height >= 0);
diff --git a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c
index 4b20ef6..8862468 100644
--- a/previewer/ev-previewer-window.c
+++ b/previewer/ev-previewer-window.c
@@ -134,12 +134,12 @@ ev_previewer_window_zoom_out (GtkAction *action,
}
static void
-ev_previewer_window_zoom_best_fit (GtkToggleAction *action,
+ev_previewer_window_zoom_fit_page (GtkToggleAction *action,
EvPreviewerWindow *window)
{
ev_document_model_set_sizing_mode (window->model,
gtk_toggle_action_get_active (action) ?
- EV_SIZING_BEST_FIT : EV_SIZING_FREE);
+ EV_SIZING_FIT_PAGE : EV_SIZING_FREE);
}
static void
@@ -339,9 +339,9 @@ static const GtkActionEntry accel_entries[] = {
};
static const GtkToggleActionEntry toggle_action_entries[] = {
- { "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_previewer_window_zoom_best_fit) },
+ G_CALLBACK (ev_previewer_window_zoom_fit_page) },
{ "ViewPageWidth", EV_STOCK_ZOOM_WIDTH, N_("Fit Page _Width"), NULL,
N_("Make the current document fill the window width"),
G_CALLBACK (ev_previewer_window_zoom_page_width) }
@@ -366,14 +366,14 @@ view_sizing_mode_changed (EvDocumentModel *model,
EvSizingMode sizing_mode = ev_document_model_get_sizing_mode (model);
GtkAction *action;
- action = gtk_action_group_get_action (window->action_group, "ViewBestFit");
+ action = gtk_action_group_get_action (window->action_group, "ViewFitPage");
g_signal_handlers_block_by_func (action,
- G_CALLBACK (ev_previewer_window_zoom_best_fit),
+ G_CALLBACK (ev_previewer_window_zoom_fit_page),
window);
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
- sizing_mode == EV_SIZING_BEST_FIT);
+ sizing_mode == EV_SIZING_FIT_PAGE);
g_signal_handlers_unblock_by_func (action,
- G_CALLBACK (ev_previewer_window_zoom_best_fit),
+ G_CALLBACK (ev_previewer_window_zoom_fit_page),
window);
action = gtk_action_group_get_action (window->action_group, "ViewPageWidth");
diff --git a/previewer/previewer-ui.xml b/previewer/previewer-ui.xml
index 896b472..1c65924 100644
--- a/previewer/previewer-ui.xml
+++ b/previewer/previewer-ui.xml
@@ -6,7 +6,7 @@
<toolitem name="PageSelector" action="PageSelector"/>
<separator/>
<toolitem name="ViewPageWidth" action="ViewPageWidth"/>
- <toolitem name="ViewBestFit" action="ViewBestFit"/>
+ <toolitem name="ViewFitPage" action="ViewFitPage"/>
<toolitem name="ViewZoomIn" action="ViewZoomIn"/>
<toolitem name="ViewZoomOut" action="ViewZoomOut"/>
<separator/>
diff --git a/shell/ev-window.c b/shell/ev-window.c
index f8e2ef6..19d6313 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);
@@ -472,7 +472,7 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
ev_window_set_action_sensitive (ev_window, "ViewContinuous", has_pages);
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, "ViewBestFit", 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, "ViewReload", has_pages);
ev_window_set_action_sensitive (ev_window, "ViewAutoscroll", has_pages);
@@ -564,7 +564,7 @@ static const gchar *view_accels[] = {
"Equal",
"n",
"p",
- "BestFit",
+ "FitPage",
"PageWidth"
};
@@ -632,28 +632,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
@@ -3849,12 +3849,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);
}
@@ -3862,9 +3862,9 @@ ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window)
}
static void
-ev_window_cmd_best_fit (GtkAction *action, EvWindow *ev_window)
+ev_window_cmd_fit_page (GtkAction *action, EvWindow *ev_window)
{
- 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);
}
static void
@@ -5961,8 +5961,8 @@ static const GtkActionEntry entries[] = {
G_CALLBACK (ev_window_cmd_view_zoom_out) },
{ "CtrlInsert", GTK_STOCK_COPY, NULL, "<control>Insert", NULL,
G_CALLBACK (ev_window_cmd_edit_copy) },
- { "BestFit", EV_STOCK_ZOOM_PAGE, NULL, "f", NULL,
- G_CALLBACK (ev_window_cmd_best_fit) },
+ { "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) },
};
@@ -5988,9 +5988,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) },
@@ -6197,9 +6197,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*/
diff --git a/shell/ev-zoom-action-widget.c b/shell/ev-zoom-action-widget.c
index 67d7f1d..958bcc0 100644
--- a/shell/ev-zoom-action-widget.c
+++ b/shell/ev-zoom-action-widget.c
@@ -31,7 +31,7 @@ struct _EvZoomActionWidgetPrivate {
gulong combo_changed_handler;
};
-#define EV_ZOOM_BEST_FIT (-3.0)
+#define EV_ZOOM_FIT_PAGE (-3.0)
#define EV_ZOOM_FIT_WIDTH (-4.0)
#define EV_ZOOM_SEPARATOR (-5.0)
@@ -39,7 +39,7 @@ static const struct {
const gchar *name;
float level;
} zoom_levels[] = {
- { N_("Best Fit"), EV_ZOOM_BEST_FIT },
+ { N_("Fit Page"), EV_ZOOM_FIT_PAGE },
{ N_("Fit Page Width"), EV_ZOOM_FIT_WIDTH },
{ NULL, EV_ZOOM_SEPARATOR },
{ N_("50%"), 0.5 },
@@ -121,9 +121,9 @@ ev_zoom_action_widget_update_sizing_mode (EvZoomActionWidget *control)
const gchar *tooltip = NULL;
switch (mode) {
- case EV_SIZING_BEST_FIT:
+ case EV_SIZING_FIT_PAGE:
icon_name = "zoom-fit-best-symbolic";
- tooltip = _("Best Fit");
+ tooltip = _("Fit Page");
break;
case EV_SIZING_FIT_WIDTH:
icon_name = EV_STOCK_ZOOM_WIDTH;
@@ -170,8 +170,8 @@ combo_changed_cb (GtkComboBox *combo,
return;
zoom = zoom_levels[index].level;
- if (zoom == EV_ZOOM_BEST_FIT)
- mode = EV_SIZING_BEST_FIT;
+ if (zoom == EV_ZOOM_FIT_PAGE)
+ mode = EV_SIZING_FIT_PAGE;
else if (zoom == EV_ZOOM_FIT_WIDTH)
mode = EV_SIZING_FIT_WIDTH;
else
diff --git a/shell/evince-toolbar.xml b/shell/evince-toolbar.xml
index df1be26..11e096a 100644
--- a/shell/evince-toolbar.xml
+++ b/shell/evince-toolbar.xml
@@ -15,7 +15,7 @@
<toolitem name="ViewZoom"/>
<toolitem name="ViewZoomIn"/>
<toolitem name="ViewZoomOut"/>
- <toolitem name="ViewBestFit"/>
+ <toolitem name="ViewFitPage"/>
<toolitem name="ViewPageWidth"/>
<toolitem name="ViewFullscreen"/>
<toolitem name="ViewPresentation"/>
diff --git a/shell/evince-ui.xml b/shell/evince-ui.xml
index 18469d5..725ea96 100644
--- a/shell/evince-ui.xml
+++ b/shell/evince-ui.xml
@@ -107,6 +107,6 @@
<accelerator name="CtrlKpPlusAccel" action="CtrlKpPlus"/>
<accelerator name="CtrlKpMinusAccel" action="CtrlKpMinus"/>
<accelerator name="CtrlInsertAccel" action="CtrlInsert" />
- <accelerator name="BestFitAccel" action ="BestFit" />
+ <accelerator name="FitPageAccel" action ="FitPage" />
<accelerator name="PageWidthAccel" action ="PageWidth" />
</ui>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]