has_pages && ev_view_can_zoom_in (view));
set_action_sensitive (ev_window, "ViewZoomOut",
has_pages && ev_view_can_zoom_out (view));
- set_action_sensitive (ev_window, "ViewNormalSize", has_pages);
set_action_sensitive (ev_window, "ViewBestFit", has_pages);
set_action_sensitive (ev_window, "ViewPageWidth", has_pages);
set_action_sensitive (ev_window, "ViewReload", has_pages);
}
void
-ev_window_open_page (EvWindow *ev_window, int page)
+ev_window_open_page_label (EvWindow *ev_window,
+ const char *label)
{
if (ev_window->priv->page_cache) {
- page = CLAMP (page, 0, ev_page_cache_get_n_pages (ev_window->priv->page_cache));
- ev_page_cache_set_current_page (ev_window->priv->page_cache, page);
+ ev_page_cache_set_page_label (ev_window->priv->page_cache,
+ label);
}
}
info = ev_document_get_info (document);
update_document_mode (ev_window, info->mode);
- g_free (info);
+ ev_document_info_free (info);
}
static void
}
static void
-ev_window_print (EvWindow *ev_window)
+ev_window_print (EvWindow *window)
+{
+ EvPageCache *page_cache;
+ int last_page;
+
+ page_cache = ev_document_get_page_cache (window->priv->document);
+ last_page = ev_page_cache_get_n_pages (page_cache);
+
+ ev_window_print_range (window, 1, -1);
+}
+
+void
+ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
{
GnomePrintConfig *config;
GnomePrintJob *job;
GtkWidget *print_dialog;
- EvPageCache *page_cache;
gchar *pages_label;
EvPrintJob *print_job = NULL;
+ EvPageCache *page_cache;
g_return_if_fail (EV_IS_WINDOW (ev_window));
g_return_if_fail (ev_window->priv->document != NULL);
+ page_cache = ev_document_get_page_cache (ev_window->priv->document);
+ if (last_page == -1) {
+ last_page = ev_page_cache_get_n_pages (page_cache);
+ }
+
config = gnome_print_config_default ();
job = gnome_print_job_new (config);
- page_cache = ev_document_get_page_cache (ev_window->priv->document);
-
print_dialog = gnome_print_dialog_new (job, (guchar *) _("Print"),
(GNOME_PRINT_DIALOG_RANGE |
GNOME_PRINT_DIALOG_COPIES));
gnome_print_dialog_construct_range_page (GNOME_PRINT_DIALOG (print_dialog),
GNOME_PRINT_RANGE_ALL |
GNOME_PRINT_RANGE_RANGE,
- 1,
- ev_page_cache_get_n_pages (page_cache),
+ first_page, last_page,
NULL, (const guchar *)pages_label);
g_free (pages_label);
update_action_sensitivity (ev_window);
}
-static void
-ev_window_cmd_view_normal_size (GtkAction *action, EvWindow *ev_window)
-{
- g_return_if_fail (EV_IS_WINDOW (ev_window));
-
- ev_view_zoom_normal (EV_VIEW (ev_window->priv->view));
- update_action_sensitivity (ev_window);
-}
-
static void
ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window)
{
uri = g_strdup (ev_window->priv->uri);
ev_window_open (ev_window, uri);
- ev_window_open_page (ev_window, page);
+
+ /* In case the number of pages in the document has changed. */
+ page = CLAMP (page, 0, ev_page_cache_get_n_pages (ev_window->priv->page_cache));
+
+ ev_page_cache_set_current_page (ev_window->priv->page_cache, page);
g_free (uri);
}
}
static void
-update_view_size (EvWindow *window)
+update_view_size (EvView *view, EvWindow *window)
{
int width, height;
GtkRequisition vsb_requisition;
hsb_requisition.height + scrollbar_spacing);
}
-static void
-size_allocate_cb (GtkWidget *scrolled_window,
- GtkAllocation *allocation,
- EvWindow *window)
-{
- update_view_size (window);
-}
-
static void
ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec,
EvWindow *ev_window)
scrolled_window = ev_window->priv->scrolled_window;
- g_signal_handlers_disconnect_by_func (scrolled_window, size_allocate_cb, ev_window);
+ g_signal_handlers_disconnect_by_func (ev_window->priv->view, update_view_size, ev_window);
if (sizing_mode != EV_SIZING_FREE)
- update_view_size (ev_window);
+ update_view_size (NULL, ev_window);
switch (sizing_mode) {
case EV_SIZING_BEST_FIT:
"hscrollbar-policy", GTK_POLICY_NEVER,
"vscrollbar-policy", GTK_POLICY_AUTOMATIC,
NULL);
- g_signal_connect (scrolled_window, "size-allocate",
- G_CALLBACK (size_allocate_cb),
+ g_signal_connect (ev_window->priv->view, "zoom_invalid",
+ G_CALLBACK (update_view_size),
ev_window);
break;
case EV_SIZING_FIT_WIDTH:
"hscrollbar-policy", GTK_POLICY_NEVER,
"vscrollbar-policy", GTK_POLICY_AUTOMATIC,
NULL);
- g_signal_connect (scrolled_window, "size-allocate",
- G_CALLBACK (size_allocate_cb),
+ g_signal_connect (ev_window->priv->view, "zoom_invalid",
+ G_CALLBACK (update_view_size),
ev_window);
break;
case EV_SIZING_FREE:
{ "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "<control>minus",
N_("Shrink the document"),
G_CALLBACK (ev_window_cmd_view_zoom_out) },
- { "ViewNormalSize", GTK_STOCK_ZOOM_100, NULL, "<control>0",
- N_("Reset the zoom level to the default value"),
- G_CALLBACK (ev_window_cmd_view_normal_size) },
{ "ViewReload", GTK_STOCK_REFRESH, N_("_Reload"), "<control>R",
N_("Reload the document"),
G_CALLBACK (ev_window_cmd_view_reload) },
/* Go menu */
- { "GoPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "Page_Up",
+ { "GoPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<control>Page_Up",
N_("Go to the previous page"),
G_CALLBACK (ev_window_cmd_go_previous_page) },
- { "GoNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "Page_Down",
+ { "GoNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<control>Page_Down",
N_("Go to the next page"),
G_CALLBACK (ev_window_cmd_go_next_page) },
{ "GoFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home",
{ "Slash", GTK_STOCK_FIND, NULL, "slash",
N_("Find a word or phrase in the document"),
G_CALLBACK (ev_window_cmd_edit_find) },
+ { "PageDown", NULL, "", "Page_Down",
+ N_("Scroll one page forward"),
+ G_CALLBACK (ev_window_cmd_scroll_forward) },
+ { "PageUp", NULL, "", "Page_Up",
+ N_("Scroll one page backward"),
+ G_CALLBACK (ev_window_cmd_scroll_backward) },
{ "Space", NULL, "", "space",
N_("Scroll one page forward"),
G_CALLBACK (ev_window_cmd_scroll_forward) },
set_view_actions_sensitivity (EvWindow *window, gboolean sensitive)
{
if (window->priv->action_group) {
+ set_action_sensitive (window, "PageDown", sensitive);
+ set_action_sensitive (window, "PageUp", sensitive);
set_action_sensitive (window, "Space", sensitive);
set_action_sensitive (window, "ShiftSpace", sensitive);
set_action_sensitive (window, "BackSpace", sensitive);
if (!gtk_ui_manager_add_ui_from_file (ev_window->priv->ui_manager,
DATADIR"/evince-ui.xml",
&error)) {
- g_message ("building menus failed: %s", error->message);
+ g_warning ("building menus failed: %s", error->message);
g_error_free (error);
}
G_CALLBACK (find_bar_search_changed_cb),
ev_window);
- /* Give focus to the scrolled window */
- gtk_widget_grab_focus (ev_window->priv->scrolled_window);
+ /* Give focus to the document view */
+ gtk_widget_grab_focus (ev_window->priv->view);
/* Drag and Drop */
gtk_drag_dest_unset (GTK_WIDGET (ev_window));