X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-window.c;h=8b3044f1799924563b56ca63750fc06dfc9a1503;hb=e8096c18ba580156072e8c84103bee6f6d3f0bfc;hp=dd554a14a4d94f62a8a48a4fbf55988f6d89abc5;hpb=75eac88174e3a7843b702ffd38e06b0e4d3d62ac;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index dd554a14..8b3044f1 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -34,12 +34,14 @@ #include "ev-sidebar-links.h" #include "ev-sidebar-thumbnails.h" #include "ev-view.h" -#include "ev-page-view.h" #include "ev-password.h" #include "ev-password-view.h" #include "ev-print-job.h" +#include "ev-document-thumbnails.h" +#include "ev-document-links.h" #include "ev-document-find.h" #include "ev-document-security.h" +#include "ev-job-queue.h" #include "eggfindbar.h" #include "pdf-document.h" @@ -51,6 +53,7 @@ #include #include +#include #include #include @@ -60,6 +63,12 @@ #include "ev-application.h" #include "ev-stock-icons.h" +typedef enum { + EV_SIZING_BEST_FIT, + EV_SIZING_FIT_WIDTH, + EV_SIZING_FREE, +} EvSizingMode; + typedef enum { PAGE_MODE_SINGLE_PAGE, PAGE_MODE_CONTINUOUS_PAGE, @@ -98,6 +107,7 @@ struct _EvWindowPrivate { char *uri; EvDocument *document; + EvPageCache *page_cache; EvWindowPageMode page_mode; /* These members are used temporarily when in PAGE_MODE_PASSWORD */ @@ -125,7 +135,12 @@ static GtkTargetEntry ev_drop_types[] = { #define GCONF_CHROME_SIDEBAR "/apps/evince/show_sidebar" #define GCONF_CHROME_STATUSBAR "/apps/evince/show_statusbar" +#define GCONF_SIDEBAR_SIZE "/apps/evince/sidebar_size" +#define SIDEBAR_DEFAULT_SIZE 132 + static void ev_window_update_fullscreen_popup (EvWindow *window); +static void ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspec, + EvWindow *ev_window); static void ev_window_set_page_mode (EvWindow *window, EvWindowPageMode page_mode); static gboolean start_loading_document (EvWindow *ev_window, @@ -155,7 +170,6 @@ update_action_sensitivity (EvWindow *ev_window) document = ev_window->priv->document; page_mode = ev_window->priv->page_mode; - view = EV_VIEW (ev_window->priv->view); /* File menu */ @@ -179,19 +193,19 @@ update_action_sensitivity (EvWindow *ev_window) set_action_sensitive (ev_window, "ViewNormalSize", document!=NULL); set_action_sensitive (ev_window, "ViewBestFit", document!=NULL); set_action_sensitive (ev_window, "ViewPageWidth", document!=NULL); + set_action_sensitive (ev_window, "ViewReload", document!=NULL); /* Go menu */ if (document) { int n_pages; int page; + page = ev_page_cache_get_current_page (ev_window->priv->page_cache); + n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache); - page = ev_view_get_page (EV_VIEW (ev_window->priv->view)); - n_pages = ev_document_get_n_pages (document); - - set_action_sensitive (ev_window, "GoPreviousPage", page > 1); - set_action_sensitive (ev_window, "GoNextPage", page < n_pages); - set_action_sensitive (ev_window, "GoFirstPage", page > 1); - set_action_sensitive (ev_window, "GoLastPage", page < n_pages); + set_action_sensitive (ev_window, "GoPreviousPage", page > 0); + set_action_sensitive (ev_window, "GoNextPage", page < n_pages - 1); + set_action_sensitive (ev_window, "GoFirstPage", page > 0); + set_action_sensitive (ev_window, "GoLastPage", page < n_pages - 1); } else { set_action_sensitive (ev_window, "GoFirstPage", FALSE); set_action_sensitive (ev_window, "GoPreviousPage", FALSE); @@ -215,6 +229,17 @@ update_action_sensitivity (EvWindow *ev_window) set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, document!=NULL); } +static void +set_widget_visibility (GtkWidget *widget, gboolean visible) +{ + g_return_if_fail (GTK_IS_WIDGET (widget)); + + if (visible) + gtk_widget_show (widget); + else + gtk_widget_hide (widget); +} + static void update_chrome_visibility (EvWindow *window) { @@ -228,16 +253,16 @@ update_chrome_visibility (EvWindow *window) statusbar = (priv->chrome & EV_CHROME_STATUSBAR) != 0 && !priv->fullscreen_mode; findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0; - g_object_set (priv->menubar, "visible", menubar, NULL); - g_object_set (priv->toolbar_dock, "visible", toolbar, NULL); - g_object_set (priv->sidebar, "visible", sidebar, NULL); - g_object_set (priv->find_bar, "visible", findbar, NULL); - g_object_set (priv->statusbar, "visible", statusbar, NULL); - g_object_set (priv->fullscreen_toolbar, "visible", fullscreen_toolbar, NULL); + set_widget_visibility (priv->menubar, menubar); + set_widget_visibility (priv->toolbar_dock, toolbar); + set_widget_visibility (priv->sidebar, sidebar); + set_widget_visibility (priv->find_bar, findbar); + set_widget_visibility (priv->statusbar, statusbar); + set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar); - if (priv->fullscreen_popup) { - g_object_set (priv->fullscreen_popup, "visible", priv->fullscreen_mode, NULL); - } + if (priv->fullscreen_popup != NULL) { + set_widget_visibility (priv->fullscreen_popup, priv->fullscreen_mode); + } } static void @@ -263,36 +288,67 @@ update_chrome_flag (EvWindow *window, EvChrome flag, const char *pref, gboolean } static void -update_sizing_buttons (EvWindow *ev_window) +ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window) { - GtkWidget *best_fit; - GtkWidget *fit_width; + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) { + ev_window_set_sizing_mode (ev_window, EV_SIZING_BEST_FIT); + } else { + ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE); + } +} - best_fit = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, - "/ToolBar/ViewBestFit"); - fit_width = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, - "/ToolBar/ViewPageWidth"); +static void +ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window) +{ + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) { + ev_window_set_sizing_mode (ev_window, EV_SIZING_FIT_WIDTH); + } else { + ev_window_set_sizing_mode (ev_window, EV_SIZING_FREE); + } +} - switch (ev_window->priv->sizing_mode) { +static void +update_sizing_buttons (EvWindow *window) +{ + GtkActionGroup *action_group = window->priv->action_group; + GtkAction *action; + gboolean best_fit, page_width; + + switch (window->priv->sizing_mode) { case EV_SIZING_BEST_FIT: - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (best_fit), TRUE); - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (fit_width), FALSE); + best_fit = TRUE; + page_width = FALSE; break; case EV_SIZING_FIT_WIDTH: - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (best_fit), FALSE); - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (fit_width), TRUE); + best_fit = FALSE; + page_width = TRUE; break; - case EV_SIZING_FREE: - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (best_fit), FALSE); - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (fit_width), FALSE); + + default: + best_fit = page_width = FALSE; break; } + + action = gtk_action_group_get_action (action_group, "ViewBestFit"); + 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); + g_signal_handlers_unblock_by_func + (action, G_CALLBACK (ev_window_cmd_view_best_fit), window); + + action = gtk_action_group_get_action (action_group, "ViewPageWidth"); + 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); + g_signal_handlers_unblock_by_func + (action, G_CALLBACK (ev_window_cmd_view_page_width), window); } void ev_window_open_page (EvWindow *ev_window, int page) { - ev_view_set_page (EV_VIEW (ev_window->priv->view), page); + if (ev_window->priv->page_cache) + ev_page_cache_set_current_page (ev_window->priv->page_cache, page); } void @@ -372,9 +428,8 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo gboolean password_needed; password_needed = (ev_window->priv->password_document != NULL); - if (document) { - doc_title = ev_document_get_title (document); + doc_title = ev_page_cache_get_title (ev_window->priv->page_cache); /* Make sure we get a valid title back */ if (doc_title) { @@ -397,7 +452,11 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo } if (doc_title == NULL && ev_window->priv->uri) { - doc_title = g_path_get_basename (ev_window->priv->uri); + char *basename; + + basename = g_path_get_basename (ev_window->priv->uri); + doc_title = gnome_vfs_unescape_string_for_display (basename); + g_free (basename); } if (password_needed) { @@ -426,14 +485,50 @@ update_total_pages (EvWindow *ev_window) GtkAction *action; int pages; - pages = ev_document_get_n_pages (ev_window->priv->document); - action = gtk_action_group_get_action - (ev_window->priv->action_group, PAGE_SELECTOR_ACTION); + pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache); + action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION); ev_page_action_set_total_pages (EV_PAGE_ACTION (action), pages); } /* This function assumes that ev_window just had ev_window->document set. */ +static gboolean +document_supports_sidebar (EvDocument *document) +{ + /* FIXME: Remove the (TRUE ||) after links are fixed in poppler-glib */ + return (EV_IS_DOCUMENT_THUMBNAILS (document) && (EV_IS_DOCUMENT_LINKS (document))); +} + +static void +hide_sidebar_and_actions (EvWindow *ev_window) +{ + GtkAction *action; + /* Alsthough we update the hiddenness of the sidebar, we don't want to + * store the value */ + g_signal_handlers_disconnect_by_func (ev_window->priv->sidebar, + ev_window_sidebar_visibility_changed_cb, + ev_window); + gtk_widget_hide (ev_window->priv->sidebar); + action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar"); + gtk_action_set_sensitive (action, FALSE); + +} + +static void +page_changed_cb (EvPageCache *page_cache, + gint page, + EvWindow *ev_window) +{ + GtkAction *action; + + action = gtk_action_group_get_action + (ev_window->priv->action_group, PAGE_SELECTOR_ACTION); + + ev_page_action_set_current_page (EV_PAGE_ACTION (action), page); + update_action_sensitivity (ev_window); +} + + static void ev_window_setup_document (EvWindow *ev_window) { @@ -442,6 +537,8 @@ ev_window_setup_document (EvWindow *ev_window) EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar); document = ev_window->priv->document; + ev_window->priv->page_cache = ev_document_get_page_cache (ev_window->priv->document); + g_signal_connect (ev_window->priv->page_cache, "page-changed", G_CALLBACK (page_changed_cb), ev_window); g_signal_connect_object (G_OBJECT (document), "notify::title", @@ -450,7 +547,11 @@ ev_window_setup_document (EvWindow *ev_window) ev_window_set_page_mode (ev_window, PAGE_MODE_SINGLE_PAGE); - ev_sidebar_set_document (sidebar, document); + if (document_supports_sidebar (document)) + ev_sidebar_set_document (sidebar, document); + else + hide_sidebar_and_actions (ev_window); + ev_view_set_document (view, document); update_window_title (document, NULL, ev_window); @@ -470,9 +571,12 @@ password_dialog_response (GtkWidget *password_dialog, gchar *uri; password = ev_password_dialog_get_password (password_dialog); - if (password) + if (password) { + g_mutex_lock (EV_DOC_MUTEX); ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->password_document), password); + g_mutex_unlock (EV_DOC_MUTEX); + } g_free (password); document = ev_window->priv->password_document; @@ -509,9 +613,10 @@ ev_window_popup_password_dialog (EvWindow *ev_window) update_window_title (ev_window->priv->password_document, NULL, ev_window); if (ev_window->priv->password_dialog == NULL) { - gchar *file_name; + gchar *basename, *file_name; - file_name = g_path_get_basename (ev_window->priv->password_uri); + basename = g_path_get_basename (ev_window->priv->password_uri); + file_name = gnome_vfs_unescape_string_for_display (basename); ev_window->priv->password_dialog = ev_password_dialog_new (GTK_WIDGET (ev_window), file_name); g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog), @@ -520,6 +625,7 @@ ev_window_popup_password_dialog (EvWindow *ev_window) "response", G_CALLBACK (password_dialog_response), ev_window); + g_free (basename); g_free (file_name); gtk_widget_show (ev_window->priv->password_dialog); } else { @@ -771,6 +877,7 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) GtkWidget *fc; GtkFileFilter *pdf_filter, *all_filter; gchar *uri = NULL; + gboolean success; fc = gtk_file_chooser_dialog_new ( _("Save a Copy"), @@ -803,8 +910,12 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) !overwrite_existing_file (GTK_WINDOW (fc), uri)) continue; */ + + g_mutex_lock (EV_DOC_MUTEX); + success = ev_document_save (ev_window->priv->document, uri, NULL); + g_mutex_unlock (EV_DOC_MUTEX); - if (ev_document_save (ev_window->priv->document, uri, NULL)) + if (success) break; else save_error_dialog (GTK_WINDOW (fc), uri); @@ -851,7 +962,7 @@ ev_window_print (EvWindow *ev_window) config = gnome_print_config_default (); job = gnome_print_job_new (config); - print_dialog = gnome_print_dialog_new (job, _("Print"), + print_dialog = gnome_print_dialog_new (job, (guchar *) _("Print"), (GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES)); gtk_dialog_set_response_sensitive (GTK_DIALOG (print_dialog), @@ -879,7 +990,7 @@ ev_window_print (EvWindow *ev_window) GTK_MESSAGE_DIALOG (dialog), _("You were trying to print to a printer using the \"%s\" driver. This program requires a PostScript printer driver."), gnome_print_config_get ( - config, "Settings.Engine.Backend.Driver")); + config, (guchar *)"Settings.Engine.Backend.Driver")); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -1017,6 +1128,20 @@ screen_size_changed_cb (GdkScreen *screen, ev_window_update_fullscreen_popup (window); } +static void +ev_window_sidebar_position_change_cb (GObject *object, GParamSpec *pspec, + EvWindow *ev_window) +{ + GConfClient *client; + int sidebar_size; + + sidebar_size = gtk_paned_get_position (GTK_PANED (object)); + + client = gconf_client_get_default (); + gconf_client_set_int (client, GCONF_SIDEBAR_SIZE, sidebar_size, NULL); + g_object_unref (client); +} + static void destroy_fullscreen_popup (EvWindow *window) { @@ -1275,7 +1400,7 @@ ev_window_focus_in_event (GtkWidget *widget, GdkEventFocus *event) EvWindow *window = EV_WINDOW (widget); EvWindowPrivate *priv = window->priv; - if (priv->fullscreen_popup != NULL) + if (priv->fullscreen_mode) { gtk_widget_show (priv->fullscreen_popup); } @@ -1289,7 +1414,7 @@ ev_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event) EvWindow *window = EV_WINDOW (widget); EvWindowPrivate *priv = window->priv; - if (priv->fullscreen_popup != NULL) + if (priv->fullscreen_mode) { gtk_widget_hide (priv->fullscreen_popup); } @@ -1358,93 +1483,64 @@ ev_window_cmd_view_normal_size (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); - ev_view_normal_size (EV_VIEW (ev_window->priv->view)); + ev_view_set_size (EV_VIEW (ev_window->priv->view), -1, -1); } static void -ev_window_cmd_view_best_fit (GtkAction *action, EvWindow *ev_window) +ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window) { - EvWindowPrivate *priv = ev_window->priv; - GtkWidget *button; - g_return_if_fail (EV_IS_WINDOW (ev_window)); - button = gtk_ui_manager_get_widget (priv->ui_manager, "/ToolBar/ViewBestFit"); - if (! gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (button))) - return; - - ev_window_set_sizing_mode (ev_window, EV_SIZING_BEST_FIT); + ev_page_cache_prev_page (ev_window->priv->page_cache); } static void -ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window) +ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window) { - EvWindowPrivate *priv = ev_window->priv; - GtkWidget *button; - int width, height; - GtkRequisition vsb_requisition; - int scrollbar_spacing; - g_return_if_fail (EV_IS_WINDOW (ev_window)); - button = gtk_ui_manager_get_widget (priv->ui_manager, "/ToolBar/ViewPageWidth"); - if (! gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (button))) - return; - - - width = priv->scrolled_window->allocation.width; - height = priv->scrolled_window->allocation.height; - - /* the scrolled window has a GTK_SHADOW_IN */ - width -= 2 * priv->view->style->xthickness; - height -= 2 * priv->view->style->ythickness; - - gtk_widget_size_request ( - GTK_SCROLLED_WINDOW (priv->scrolled_window)->vscrollbar, - &vsb_requisition); - gtk_widget_style_get (priv->scrolled_window, - "scrollbar_spacing", &scrollbar_spacing, - NULL); - - ev_window_set_sizing_mode (ev_window, EV_SIZING_FIT_WIDTH); - - ev_view_fit_width (EV_VIEW (ev_window->priv->view), - width, height, - vsb_requisition.width + scrollbar_spacing); + ev_page_cache_next_page (ev_window->priv->page_cache); } static void -ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window) +ev_window_cmd_go_first_page (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); - ev_view_set_page (EV_VIEW (ev_window->priv->view), - ev_view_get_page (EV_VIEW (ev_window->priv->view)) - 1); + ev_page_cache_set_current_page (ev_window->priv->page_cache, 1); } static void -ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window) +ev_window_cmd_go_last_page (GtkAction *action, EvWindow *ev_window) { + int n_pages; + g_return_if_fail (EV_IS_WINDOW (ev_window)); - ev_view_set_page (EV_VIEW (ev_window->priv->view), - ev_view_get_page (EV_VIEW (ev_window->priv->view)) + 1); + n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache); + ev_page_cache_set_current_page (ev_window->priv->page_cache, n_pages); } static void -ev_window_cmd_go_first_page (GtkAction *action, EvWindow *ev_window) +ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window) { - g_return_if_fail (EV_IS_WINDOW (ev_window)); + char *uri; + int page; - ev_view_set_page (EV_VIEW (ev_window->priv->view), 1); -} + g_return_if_fail (EV_IS_WINDOW (ev_window)); -static void -ev_window_cmd_go_last_page (GtkAction *action, EvWindow *ev_window) -{ - g_return_if_fail (EV_IS_WINDOW (ev_window)); +#if 0 + /* FIXME: uncomment when this is written.*/ + page = ev_page_cache_get_page (ev_window->priv->page_cache); +#else + page = 1; +#endif + uri = g_strdup (ev_window->priv->uri); + + ev_window_open (ev_window, uri); + ev_window_open_page (ev_window, page); - ev_view_set_page (EV_VIEW (ev_window->priv->view), G_MAXINT); + g_free (uri); } static void @@ -1462,36 +1558,41 @@ ev_window_cmd_leave_fullscreen (GtkAction *action, EvWindow *window) } static void -size_allocate_cb (GtkWidget *scrolled_window, - GtkAllocation *allocation, - EvWindow *ev_window) +update_view_size (EvWindow *window) { int width, height; GtkRequisition vsb_requisition; int scrollbar_spacing; - width = ev_window->priv->scrolled_window->allocation.width; - height = ev_window->priv->scrolled_window->allocation.height; + width = window->priv->scrolled_window->allocation.width; + height = window->priv->scrolled_window->allocation.height; /* the scrolled window has a GTK_SHADOW_IN */ - width -= 2 * ev_window->priv->view->style->xthickness; - height -= 2 * ev_window->priv->view->style->ythickness; + width -= 2 * window->priv->view->style->xthickness; + height -= 2 * window->priv->view->style->ythickness; - if (ev_window->priv->sizing_mode == EV_SIZING_BEST_FIT) { - ev_view_best_fit (EV_VIEW (ev_window->priv->view), + if (window->priv->sizing_mode == EV_SIZING_BEST_FIT) { + ev_view_set_size (EV_VIEW (window->priv->view), MAX (1, width), MAX (1, height)); - } else if (ev_window->priv->sizing_mode == EV_SIZING_FIT_WIDTH) { - gtk_widget_size_request (GTK_SCROLLED_WINDOW (ev_window->priv->scrolled_window)->vscrollbar, + } else if (window->priv->sizing_mode == EV_SIZING_FIT_WIDTH) { + gtk_widget_size_request (GTK_SCROLLED_WINDOW (window->priv->scrolled_window)->vscrollbar, &vsb_requisition); - gtk_widget_style_get (ev_window->priv->scrolled_window, + gtk_widget_style_get (window->priv->scrolled_window, "scrollbar_spacing", &scrollbar_spacing, NULL); - ev_view_fit_width (EV_VIEW (ev_window->priv->view), - width, height, - vsb_requisition.width + scrollbar_spacing); + ev_view_set_size (EV_VIEW (window->priv->view), + width - vsb_requisition.width - scrollbar_spacing, -1); } } +static void +size_allocate_cb (GtkWidget *scrolled_window, + GtkAllocation *allocation, + EvWindow *window) +{ + update_view_size (window); +} + static void ev_window_set_sizing_mode (EvWindow *ev_window, EvSizingMode sizing_mode) @@ -1506,6 +1607,8 @@ ev_window_set_sizing_mode (EvWindow *ev_window, g_signal_handlers_disconnect_by_func (scrolled_window, size_allocate_cb, ev_window); + update_view_size (ev_window); + switch (sizing_mode) { case EV_SIZING_BEST_FIT: g_object_set (G_OBJECT (scrolled_window), @@ -1533,7 +1636,6 @@ ev_window_set_sizing_mode (EvWindow *ev_window, break; } - ev_view_set_mode (EV_VIEW (ev_window->priv->view), sizing_mode); update_sizing_buttons (ev_window); } @@ -1620,6 +1722,33 @@ ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window) gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); } +static void +ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspec, + EvWindow *ev_window) +{ + GtkAction *action; + gboolean visible; + + visible = GTK_WIDGET_VISIBLE (ev_sidebar); + + /* In fullscreen mode the sidebar is not visible, + * but we don't want to update the chrome + */ + if (ev_window->priv->fullscreen_mode) + return; + + action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar"); + + g_signal_handlers_block_by_func + (action, G_CALLBACK (ev_window_view_sidebar_cb), ev_window); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible); + g_signal_handlers_unblock_by_func + (action, G_CALLBACK (ev_window_view_sidebar_cb), ev_window); + + update_chrome_flag (ev_window, EV_CHROME_SIDEBAR, + GCONF_CHROME_SIDEBAR, visible); +} + static void menu_item_select_cb (GtkMenuItem *proxy, EvWindow *ev_window) { @@ -1669,32 +1798,6 @@ disconnect_proxy_cb (GtkUIManager *ui_manager, GtkAction *action, } } -static void -update_current_page (EvWindow *ev_window, - EvView *view) -{ - int page; - GtkAction *action; - EvSidebarThumbnails *thumbs; - - thumbs = EV_SIDEBAR_THUMBNAILS (ev_window->priv->thumbs_sidebar); - ev_sidebar_thumbnails_select_page (thumbs, ev_view_get_page (view)); - - action = gtk_action_group_get_action - (ev_window->priv->action_group, PAGE_SELECTOR_ACTION); - - page = ev_view_get_page (EV_VIEW (ev_window->priv->view)); - ev_page_action_set_current_page (EV_PAGE_ACTION (action), page); -} - -static void -view_page_changed_cb (EvView *view, - EvWindow *ev_window) -{ - update_current_page (ev_window, view); - update_action_sensitivity (ev_window); -} - static void view_status_changed_cb (EvView *view, GParamSpec *pspec, @@ -1788,9 +1891,14 @@ find_bar_search_changed_cb (EggFindBar *find_bar, if (ev_window->priv->document && EV_IS_DOCUMENT_FIND (ev_window->priv->document)) { if (visible && search_string) { + g_mutex_lock (EV_DOC_MUTEX); ev_document_find_begin (EV_DOCUMENT_FIND (ev_window->priv->document), search_string, case_sensitive); + g_mutex_unlock (EV_DOC_MUTEX); } else { + g_mutex_lock (EV_DOC_MUTEX); ev_document_find_cancel (EV_DOCUMENT_FIND (ev_window->priv->document)); + g_mutex_unlock (EV_DOC_MUTEX); + egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar), NULL); gtk_widget_queue_draw (GTK_WIDGET (ev_window->priv->view)); @@ -1901,6 +2009,9 @@ static GtkActionEntry entries[] = { { "ViewNormalSize", GTK_STOCK_ZOOM_100, NULL, "0", N_("Reset the zoom level to the default value"), G_CALLBACK (ev_window_cmd_view_normal_size) }, + { "ViewReload", GTK_STOCK_REFRESH, N_("_Reload"), "R", + N_("Reload the document"), + G_CALLBACK (ev_window_cmd_view_reload) }, /* Go menu */ { "GoPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "Page_Up", @@ -1966,11 +2077,8 @@ static GtkRadioActionEntry page_view_entries[] = { static void goto_page_cb (GtkAction *action, int page_number, EvWindow *ev_window) { - EvView *view = EV_VIEW (ev_window->priv->view); - - if (ev_view_get_page (view) != page_number) { - ev_view_set_page (view, page_number); - } + ev_page_cache_set_current_page (ev_window->priv->page_cache, + page_number); } static void @@ -2064,9 +2172,9 @@ set_chrome_actions (EvWindow *window) static EvChrome load_chrome (void) { - GConfClient *client; - GConfValue *value; EvChrome chrome = EV_CHROME_NORMAL; + GConfClient *client; + GConfValue *value; client = gconf_client_get_default (); @@ -2106,6 +2214,9 @@ ev_window_init (EvWindow *ev_window) GtkAccelGroup *accel_group; GError *error = NULL; GtkWidget *sidebar_widget, *toolbar_dock; + GConfValue *value; + GConfClient *client; + int sidebar_size; ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window); @@ -2182,13 +2293,30 @@ ev_window_init (EvWindow *ev_window) /* Add the main area */ ev_window->priv->hpaned = gtk_hpaned_new (); - gtk_widget_show (ev_window->priv->hpaned); + g_signal_connect (ev_window->priv->hpaned, + "notify::position", + G_CALLBACK (ev_window_sidebar_position_change_cb), + ev_window); + + sidebar_size = SIDEBAR_DEFAULT_SIZE; + client = gconf_client_get_default (); + value = gconf_client_get (client, GCONF_SIDEBAR_SIZE, NULL); + if (value != NULL) { + if (value->type == GCONF_VALUE_INT) { + sidebar_size = gconf_value_get_int (value); + } + gconf_value_free (value); + } + g_object_unref (client); + gtk_paned_set_position (GTK_PANED (ev_window->priv->hpaned), sidebar_size); gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), ev_window->priv->hpaned, TRUE, TRUE, 0); - + gtk_widget_show (ev_window->priv->hpaned); + ev_window->priv->sidebar = ev_sidebar_new (); - gtk_paned_add1 (GTK_PANED (ev_window->priv->hpaned), - ev_window->priv->sidebar); + gtk_paned_pack1 (GTK_PANED (ev_window->priv->hpaned), + ev_window->priv->sidebar, FALSE, FALSE); + gtk_widget_show (ev_window->priv->sidebar); /* Stub sidebar, for now */ sidebar_widget = ev_sidebar_links_new (); @@ -2232,10 +2360,6 @@ ev_window_init (EvWindow *ev_window) gtk_container_add (GTK_CONTAINER (ev_window->priv->scrolled_window), ev_window->priv->view); - g_signal_connect (ev_window->priv->view, - "page-changed", - G_CALLBACK (view_page_changed_cb), - ev_window); g_signal_connect (ev_window->priv->view, "notify::find-status", G_CALLBACK (view_find_status_changed_cb), @@ -2263,6 +2387,12 @@ ev_window_init (EvWindow *ev_window) set_chrome_actions (ev_window); update_chrome_visibility (ev_window); + /* Connect sidebar signals */ + g_signal_connect (ev_window->priv->sidebar, + "notify::visible", + G_CALLBACK (ev_window_sidebar_visibility_changed_cb), + ev_window); + /* Connect to find bar signals */ g_signal_connect (ev_window->priv->find_bar, "previous", @@ -2306,6 +2436,6 @@ ev_window_init (EvWindow *ev_window) /* Set it to something random to force a change */ ev_window->priv->sizing_mode = EV_SIZING_FREE; - ev_window_set_sizing_mode (ev_window, EV_SIZING_BEST_FIT); + ev_window_set_sizing_mode (ev_window, EV_SIZING_FIT_WIDTH); update_action_sensitivity (ev_window); }