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=54effcd24e9b124180088b89ddbe5e4adb625783;hb=57a8ca8e4c7ee8cd49081ba500563d33cfa048d0;hp=4e1cc65008d6a503f58a4e411971fff9e3ca90b6;hpb=37ca059dda89fecb22f6297d337ea393b2069605;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index 4e1cc650..54effcd2 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -29,19 +29,24 @@ #endif #include "ev-window.h" +#include "ev-navigation-action.h" +#include "ev-page-action.h" #include "ev-sidebar.h" -#include "ev-sidebar-bookmarks.h" +#include "ev-sidebar-links.h" #include "ev-sidebar-thumbnails.h" #include "ev-view.h" +#include "ev-print-job.h" +#include "ev-document-find.h" #include "eggfindbar.h" #include "pdf-document.h" #include "pixbuf-document.h" -#include "gtkgs.h" +#include "ps-document.h" #include #include #include +#include #include @@ -68,13 +73,19 @@ struct _EvWindowPrivate { GtkUIManager *ui_manager; GtkWidget *statusbar; guint help_message_cid; + guint view_message_cid; GtkWidget *exit_fullscreen_popup; + char *uri; EvDocument *document; gboolean fullscreen_mode; }; +#define NAVIGATION_BACK_ACTION "NavigationBack" +#define NAVIGATION_FORWARD_ACTION "NavigationForward" +#define PAGE_SELECTOR_ACTION "PageSelector" + #if 0 /* enable these to add support for signals */ static guint ev_window_signals [N_SIGNALS] = { 0 }; @@ -167,20 +178,78 @@ set_action_sensitive (EvWindow *ev_window, static void update_action_sensitivity (EvWindow *ev_window) { - int n_pages; - int page; + EvDocument *document; + EvView *view; + + gboolean can_go_back = FALSE; + gboolean can_go_forward = FALSE; + + document = ev_window->priv->document; + + view = EV_VIEW (ev_window->priv->view); + + if (document) { + can_go_back = ev_view_can_go_back (view); + can_go_forward = ev_view_can_go_forward (view); + } + + /* File menu */ + /* "FileOpen": always sensitive */ + set_action_sensitive (ev_window, "FileSaveAs", document!=NULL); + set_action_sensitive (ev_window, "FilePrint", document!=NULL); + /* "FileCloseWindow": always sensitive */ + + /* Edit menu */ + set_action_sensitive (ev_window, "EditCopy", document!=NULL); + set_action_sensitive (ev_window, "EditSelectAll", document!=NULL); - if (ev_window->priv->document) - n_pages = ev_document_get_n_pages (ev_window->priv->document); + if (document) + set_action_sensitive (ev_window, "EditFind", EV_IS_DOCUMENT_FIND (document)); else - n_pages = 1; + set_action_sensitive (ev_window, "EditFind", FALSE); - page = ev_view_get_page (EV_VIEW (ev_window->priv->view)); + /* View menu */ + set_action_sensitive (ev_window, "ViewZoomIn", document!=NULL); + set_action_sensitive (ev_window, "ViewZoomOut", document!=NULL); + set_action_sensitive (ev_window, "ViewNormalSize", document!=NULL); + set_action_sensitive (ev_window, "ViewBestFit", document!=NULL); + set_action_sensitive (ev_window, "ViewPageWidth", document!=NULL); + + /* Go menu */ + set_action_sensitive (ev_window, "GoBack", can_go_back); + set_action_sensitive (ev_window, "GoForward", can_go_forward); + if (document) { + int n_pages; + int page; + + page = ev_view_get_page (EV_VIEW (ev_window->priv->view)); + n_pages = ev_document_get_n_pages (document); + + set_action_sensitive (ev_window, "GoPageDown", page > 1); + set_action_sensitive (ev_window, "GoPageUp", page < n_pages); + set_action_sensitive (ev_window, "GoFirstPage", page > 1); + set_action_sensitive (ev_window, "GoLastPage", page < n_pages); + } else { + set_action_sensitive (ev_window, "GoFirstPage", FALSE); + set_action_sensitive (ev_window, "GoPageDown", FALSE); + set_action_sensitive (ev_window, "GoPageUp", FALSE); + set_action_sensitive (ev_window, "GoLastPage", FALSE); + } + + /* Help menu */ + /* "HelpContents": always sensitive */ + /* "HelpAbout": always sensitive */ - set_action_sensitive (ev_window, "GoFirstPage", page > 1); - set_action_sensitive (ev_window, "GoPreviousPage", page > 1); - set_action_sensitive (ev_window, "GoNextPage", page < n_pages); - set_action_sensitive (ev_window, "GoLastPage", page < n_pages); + /* Toolbar-specific actions: */ + set_action_sensitive (ev_window, NAVIGATION_BACK_ACTION, can_go_back); + set_action_sensitive (ev_window, NAVIGATION_FORWARD_ACTION, can_go_forward); + set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, document!=NULL); +} + +void +ev_window_open_link (EvWindow *ev_window, EvLink *link) +{ + ev_view_go_to_link (EV_VIEW (ev_window->priv->view), link); } gboolean @@ -246,36 +315,95 @@ mime_type_supported_by_gdk_pixbuf (const gchar *mime_type) return retval; } +static void +update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_window) +{ + char *title = NULL; + + if (document == NULL) { + title = g_strdup (_("Document Viewer")); + } else { + title = ev_document_get_title (document); + + if (title == NULL) { + title = g_path_get_basename (ev_window->priv->uri); + } + } + + gtk_window_set_title (GTK_WINDOW (ev_window), title); + + g_free (title); +} + +static void +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); + ev_page_action_set_total_pages (EV_PAGE_ACTION (action), pages); +} + void ev_window_open (EvWindow *ev_window, const char *uri) { EvDocument *document = NULL; char *mime_type; + + g_free (ev_window->priv->uri); + ev_window->priv->uri = g_strdup (uri); mime_type = gnome_vfs_get_mime_type (uri); - if (!strcmp (mime_type, "application/pdf")) + if (mime_type == NULL) + document = NULL; + else if (!strcmp (mime_type, "application/pdf")) document = g_object_new (PDF_TYPE_DOCUMENT, NULL); else if (!strcmp (mime_type, "application/postscript")) - document = g_object_new (GTK_GS_TYPE, NULL); + document = g_object_new (PS_TYPE_DOCUMENT, NULL); else if (mime_type_supported_by_gdk_pixbuf (mime_type)) document = g_object_new (PIXBUF_TYPE_DOCUMENT, NULL); if (document) { GError *error = NULL; + g_signal_connect_object (G_OBJECT (document), + "notify::title", + G_CALLBACK (update_window_title), + ev_window, 0); + if (ev_document_load (document, uri, &error)) { + EvHistory *history; + EvView *view = EV_VIEW (ev_window->priv->view); + EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar); + GtkAction *action; + if (ev_window->priv->document) g_object_unref (ev_window->priv->document); ev_window->priv->document = document; - ev_view_set_document (EV_VIEW (ev_window->priv->view), - document); - ev_sidebar_set_document (EV_SIDEBAR (ev_window->priv->sidebar), - document); + ev_view_set_document (view, document); + ev_sidebar_set_document (sidebar, document); + history = ev_history_new (); + ev_view_set_history (view, history); + g_object_unref (history); + + action = gtk_action_group_get_action + (ev_window->priv->action_group, NAVIGATION_BACK_ACTION); + ev_navigation_action_set_history + (EV_NAVIGATION_ACTION (action), history); + + action = gtk_action_group_get_action + (ev_window->priv->action_group, NAVIGATION_FORWARD_ACTION); + ev_navigation_action_set_history + (EV_NAVIGATION_ACTION (action), history); + + update_total_pages (ev_window); update_action_sensitivity (ev_window); - } else { g_assert (error != NULL); g_object_unref (document); @@ -286,7 +414,7 @@ ev_window_open (EvWindow *ev_window, const char *uri) char *error_message; error_message = g_strdup_printf (_("Unhandled MIME type: '%s'"), - mime_type); + mime_type?mime_type:""); unable_to_load (ev_window, error_message); g_free (error_message); } @@ -300,11 +428,213 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *ev_window) ev_application_open (EV_APP, NULL); } +/* FIXME +static gboolean +overwrite_existing_file (GtkWindow *window, const gchar *file_name) +{ + GtkWidget *msgbox; + gchar *utf8_file_name; + AtkObject *obj; + gint ret; + + utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL, NULL); + msgbox = gtk_message_dialog_new ( + window, + (GtkDialogFlags)GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_NONE, + _("A file named \"%s\" already exists."), + utf8_file_name); + g_free (utf8_file_name); + + gtk_message_dialog_format_secondary_text ( + GTK_MESSAGE_DIALOG (msgbox), + _("Do you want to replace it with the one you are saving?")); + + gtk_dialog_add_button (GTK_DIALOG (msgbox), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + + gtk_dialog_add_button (GTK_DIALOG (msgbox), + _("_Replace"), GTK_RESPONSE_YES); + + gtk_dialog_set_default_response (GTK_DIALOG (msgbox), + GTK_RESPONSE_CANCEL); + + obj = gtk_widget_get_accessible (msgbox); + + if (GTK_IS_ACCESSIBLE (obj)) + atk_object_set_name (obj, _("Question")); + + ret = gtk_dialog_run (GTK_DIALOG (msgbox)); + gtk_widget_destroy (msgbox); + + return (ret == GTK_RESPONSE_YES); +} +*/ + static void -ev_window_cmd_file_print (GtkAction *action, EvWindow *ev_window) +save_error_dialog (GtkWindow *window, const gchar *file_name) { + GtkWidget *error_dialog; + + error_dialog = gtk_message_dialog_new ( + window, + (GtkDialogFlags)GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + _("The file could not be saved as \"%s\"."), + file_name); + + /* Easy way to make the text bold while keeping the string + * above free from pango markup (FIXME ?) */ + gtk_message_dialog_format_secondary_text ( + GTK_MESSAGE_DIALOG (error_dialog), " "); + + gtk_dialog_run (GTK_DIALOG (error_dialog)); + gtk_widget_destroy (error_dialog); +} + +static void +ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) +{ + GtkWidget *fc; + GtkFileFilter *pdf_filter, *all_filter; + gchar *uri = NULL; + + fc = gtk_file_chooser_dialog_new ( + _("Save a Copy"), + NULL, GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, + NULL); + gtk_window_set_modal (GTK_WINDOW (fc), TRUE); + + pdf_filter = gtk_file_filter_new (); + gtk_file_filter_set_name (pdf_filter, _("PDF Documents")); + gtk_file_filter_add_mime_type (pdf_filter, "application/pdf"); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fc), pdf_filter); + + all_filter = gtk_file_filter_new (); + gtk_file_filter_set_name (all_filter, _("All Files")); + gtk_file_filter_add_pattern (all_filter, "*"); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fc), all_filter); + gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (fc), pdf_filter); + + gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK); + + gtk_widget_show (fc); + + while (gtk_dialog_run (GTK_DIALOG (fc)) == GTK_RESPONSE_OK) { + uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc)); + +/* FIXME + if (g_file_test (uri, G_FILE_TEST_EXISTS) && + !overwrite_existing_file (GTK_WINDOW (fc), uri)) + continue; +*/ + + if (ev_document_save (ev_window->priv->document, uri, NULL)) + break; + else + save_error_dialog (GTK_WINDOW (fc), uri); + } + gtk_widget_destroy (fc); +} + +static gboolean +using_postscript_printer (GnomePrintConfig *config) +{ + const guchar *driver; + const guchar *transport; + + driver = gnome_print_config_get ( + config, (const guchar *)"Settings.Engine.Backend.Driver"); + + transport = gnome_print_config_get ( + config, (const guchar *)"Settings.Transport.Backend"); + + if (driver) { + if (!strcmp ((const gchar *)driver, "gnome-print-ps")) + return TRUE; + else + return FALSE; + } else if (transport) { + if (!strcmp ((const gchar *)transport, "CUPS")) + return TRUE; + } + + return FALSE; +} + +static void +ev_window_print (EvWindow *ev_window) +{ + GnomePrintConfig *config; + GnomePrintJob *job; + GtkWidget *print_dialog; + EvPrintJob *print_job = NULL; + g_return_if_fail (EV_IS_WINDOW (ev_window)); - /* FIXME */ + g_return_if_fail (ev_window->priv->document != NULL); + + config = gnome_print_config_default (); + job = gnome_print_job_new (config); + + print_dialog = gnome_print_dialog_new (job, _("Print"), + (GNOME_PRINT_DIALOG_RANGE | + GNOME_PRINT_DIALOG_COPIES)); + gtk_dialog_set_response_sensitive (GTK_DIALOG (print_dialog), + GNOME_PRINT_DIALOG_RESPONSE_PREVIEW, + FALSE); + + while (TRUE) { + int response; + response = gtk_dialog_run (GTK_DIALOG (print_dialog)); + + if (response != GNOME_PRINT_DIALOG_RESPONSE_PRINT) + break; + + /* FIXME: Change this when we have the first backend + * that can print more than postscript + */ + if (!using_postscript_printer (config)) { + GtkWidget *dialog; + + dialog = gtk_message_dialog_new ( + GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, + _("Printing is not supported on this printer.")); + gtk_message_dialog_format_secondary_text ( + 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")); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + + continue; + } + + print_job = g_object_new (EV_TYPE_PRINT_JOB, + "gnome_print_job", job, + "document", ev_window->priv->document, + "print_dialog", print_dialog, + NULL); + break; + } + + gtk_widget_destroy (print_dialog); + + if (print_job != NULL) { + ev_print_job_print (print_job, GTK_WINDOW (ev_window)); + g_object_unref (print_job); + } +} + +static void +ev_window_cmd_file_print (GtkAction *action, EvWindow *ev_window) +{ + ev_window_print (ev_window); } static void @@ -315,17 +645,51 @@ ev_window_cmd_file_close_window (GtkAction *action, EvWindow *ev_window) gtk_widget_destroy (GTK_WIDGET (ev_window)); } +static void +find_not_supported_dialog (EvWindow *ev_window) +{ + GtkWidget *dialog; + + /* If you change this so it isn't modal, be sure you don't + * allow multiple copies of the dialog... + */ + + dialog = gtk_message_dialog_new (GTK_WINDOW (ev_window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + _("The \"Find\" feature will not work with this document")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + _("Searching for text is only supported for PDF documents.")); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +} + +static void +ev_window_cmd_edit_select_all (GtkAction *action, EvWindow *ev_window) +{ + g_return_if_fail (EV_IS_WINDOW (ev_window)); + + ev_view_select_all (EV_VIEW (ev_window->priv->view)); +} + static void ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); - gtk_widget_show (ev_window->priv->find_bar); + if (ev_window->priv->document == NULL) { + g_printerr ("We should have set the Find menu item insensitive since there's no document\n"); + } else if (!EV_IS_DOCUMENT_FIND (ev_window->priv->document)) { + find_not_supported_dialog (ev_window); + } else { + gtk_widget_show (ev_window->priv->find_bar); - if (ev_window->priv->exit_fullscreen_popup) - update_fullscreen_popup (ev_window); + if (ev_window->priv->exit_fullscreen_popup) + update_fullscreen_popup (ev_window); - egg_find_bar_grab_focus (EGG_FIND_BAR (ev_window->priv->find_bar)); + egg_find_bar_grab_focus (EGG_FIND_BAR (ev_window->priv->find_bar)); + } } static void @@ -333,7 +697,7 @@ ev_window_cmd_edit_copy (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); - /* FIXME */ + ev_view_copy (EV_VIEW (ev_window->priv->view)); } static void @@ -353,7 +717,7 @@ update_fullscreen_popup (EvWindow *window) /* FIXME multihead */ gdk_screen_get_monitor_geometry (gdk_screen_get_default (), - gdk_screen_get_monitor_at_window + gdk_screen_get_monitor_at_window (gdk_screen_get_default (), GTK_WIDGET (window)->window), &screen_rect); @@ -582,7 +946,7 @@ ev_window_cmd_go_back (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); - /* FIXME */ + ev_view_go_back (EV_VIEW (ev_window->priv->view)); } static void @@ -590,11 +954,11 @@ ev_window_cmd_go_forward (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); - /* FIXME */ + ev_view_go_forward (EV_VIEW (ev_window->priv->view)); } static void -ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window) +ev_window_cmd_go_page_up (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); @@ -603,7 +967,7 @@ ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window) } static void -ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window) +ev_window_cmd_go_page_down (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); @@ -719,7 +1083,11 @@ ev_window_view_statusbar_cb (GtkAction *action, EvWindow *ev_window) static void ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window) { - /* FIXME */ + g_object_set ( + ev_window->priv->sidebar, + "visible", + gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)), + NULL); } static void @@ -771,13 +1139,56 @@ disconnect_proxy_cb (GtkUIManager *ui_manager, GtkAction *action, } } +static void +update_current_page (EvWindow *ev_window) +{ + int page; + GtkAction *action; + + 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); update_action_sensitivity (ev_window); } +static void +view_status_changed_cb (EvView *view, + GParamSpec *pspec, + EvWindow *ev_window) +{ + const char *message; + + gtk_statusbar_pop (GTK_STATUSBAR (ev_window->priv->statusbar), + ev_window->priv->view_message_cid); + + message = ev_view_get_status (view); + if (message) { + gtk_statusbar_push (GTK_STATUSBAR (ev_window->priv->statusbar), + ev_window->priv->view_message_cid, message); + } +} + +static void +view_find_status_changed_cb (EvView *view, + GParamSpec *pspec, + EvWindow *ev_window) +{ + const char *text; + + text = ev_view_get_find_status (view); + egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar), + text); +} + static void find_bar_previous_cb (EggFindBar *find_bar, EvWindow *ev_window) @@ -830,13 +1241,15 @@ find_bar_search_changed_cb (EggFindBar *find_bar, g_printerr ("search for '%s'\n", search_string ? search_string : "(nil)"); #endif - /* We don't require begin/end find calls to be matched up, it's really - * start_find and cancel_any_find_that_may_not_be_finished - */ - if (visible && search_string) { - ev_document_begin_find (ev_window->priv->document, search_string, case_sensitive); - } else { - ev_document_end_find (ev_window->priv->document); + if (ev_window->priv->document && + EV_IS_DOCUMENT_FIND (ev_window->priv->document)) { + if (visible && search_string) { + ev_document_find_begin (EV_DOCUMENT_FIND (ev_window->priv->document), search_string, case_sensitive); + } else { + ev_document_find_cancel (EV_DOCUMENT_FIND (ev_window->priv->document)); + egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar), + NULL); + } } } @@ -919,7 +1332,10 @@ static GtkActionEntry entries[] = { { "FileOpen", GTK_STOCK_OPEN, N_("_Open"), "O", N_("Open a file"), G_CALLBACK (ev_window_cmd_file_open) }, - { "FilePrint", GTK_STOCK_PRINT, N_("_Print"), "P", + { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL, + N_("Save the current document with a new filename"), + G_CALLBACK (ev_window_cmd_save_as) }, + { "FilePrint", GTK_STOCK_PRINT, N_("_Print"), "P", N_("Print this document"), G_CALLBACK (ev_window_cmd_file_print) }, { "FileCloseWindow", GTK_STOCK_CLOSE, N_("_Close"), "W", @@ -930,7 +1346,9 @@ static GtkActionEntry entries[] = { { "EditCopy", GTK_STOCK_COPY, N_("_Copy"), "C", N_("Copy text from the document"), G_CALLBACK (ev_window_cmd_edit_copy) }, - + { "EditSelectAll", NULL, N_("Select _All"), "A", + N_("Select the entire page"), + G_CALLBACK (ev_window_cmd_edit_select_all) }, { "EditFind", GTK_STOCK_FIND, N_("_Find"), "F", N_("Find a word or phrase in the document"), G_CALLBACK (ev_window_cmd_edit_find) }, @@ -959,12 +1377,12 @@ static GtkActionEntry entries[] = { { "GoForward", GTK_STOCK_GO_FORWARD, N_("Fo_rward"), "Right", N_("Go to the page viewed before this one"), G_CALLBACK (ev_window_cmd_go_forward) }, - { "GoPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "Page_Up", + { "GoPageDown", GTK_STOCK_GO_UP, N_("_Page Up"), "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", + G_CALLBACK (ev_window_cmd_go_page_up) }, + { "GoPageUp", GTK_STOCK_GO_DOWN, N_("_Page Down"), "Page_Down", N_("Go to the next page"), - G_CALLBACK (ev_window_cmd_go_next_page) }, + G_CALLBACK (ev_window_cmd_go_page_down) }, { "GoFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "Home", N_("Go to the first page"), G_CALLBACK (ev_window_cmd_go_first_page) }, @@ -993,12 +1411,65 @@ static GtkToggleActionEntry toggle_entries[] = { G_CALLBACK (ev_window_view_statusbar_cb), TRUE }, { "ViewSidebar", NULL, N_("Side_bar"), "F9", N_("Show or hide sidebar"), - G_CALLBACK (ev_window_view_sidebar_cb), FALSE }, + G_CALLBACK (ev_window_view_sidebar_cb), TRUE }, { "ViewFullscreen", NULL, N_("_Fullscreen"), "F11", N_("Expand the window to fill the screen"), G_CALLBACK (ev_window_cmd_view_fullscreen) }, }; +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); + } +} + +static void +register_custom_actions (EvWindow *window, GtkActionGroup *group) +{ + GtkAction *action; + + action = g_object_new (EV_TYPE_NAVIGATION_ACTION, + "name", NAVIGATION_BACK_ACTION, + "label", _("Back"), + "stock_id", GTK_STOCK_GO_BACK, + "tooltip", _("Go back"), + "arrow-tooltip", _("Back history"), + "direction", EV_NAVIGATION_DIRECTION_BACK, + "is_important", TRUE, + NULL); + g_signal_connect (action, "activate", + G_CALLBACK (ev_window_cmd_go_back), window); + gtk_action_group_add_action (group, action); + g_object_unref (action); + + action = g_object_new (EV_TYPE_NAVIGATION_ACTION, + "name", NAVIGATION_FORWARD_ACTION, + "label", _("Forward"), + "stock_id", GTK_STOCK_GO_FORWARD, + "tooltip", _("Go forward"), + "arrow-tooltip", _("Forward history"), + "direction", EV_NAVIGATION_DIRECTION_FORWARD, + NULL); + g_signal_connect (action, "activate", + G_CALLBACK (ev_window_cmd_go_forward), window); + gtk_action_group_add_action (group, action); + g_object_unref (action); + + action = g_object_new (EV_TYPE_PAGE_ACTION, + "name", PAGE_SELECTOR_ACTION, + "label", _("Page"), + "tooltip", _("Select Page"), + NULL); + g_signal_connect (action, "goto_page", + G_CALLBACK (goto_page_cb), window); + gtk_action_group_add_action (group, action); + g_object_unref (action); +} + static void ev_window_init (EvWindow *ev_window) { @@ -1012,7 +1483,7 @@ ev_window_init (EvWindow *ev_window) ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window); - gtk_window_set_title (GTK_WINDOW (ev_window), _("Document Viewer")); + update_window_title (NULL, NULL, ev_window); ev_window->priv->main_box = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (ev_window), ev_window->priv->main_box); @@ -1027,6 +1498,8 @@ ev_window_init (EvWindow *ev_window) G_N_ELEMENTS (toggle_entries), ev_window); + register_custom_actions (ev_window, action_group); + ev_window->priv->ui_manager = gtk_ui_manager_new (); gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager, action_group, 0); @@ -1069,11 +1542,11 @@ ev_window_init (EvWindow *ev_window) ev_window->priv->sidebar); /* Stub sidebar, for now */ - sidebar_widget = ev_sidebar_bookmarks_new (); + sidebar_widget = ev_sidebar_links_new (); gtk_widget_show (sidebar_widget); ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar), - "bookmarks", - _("Bookmarks"), + "index", + _("Index"), sidebar_widget); sidebar_widget = ev_sidebar_thumbnails_new (); @@ -1099,6 +1572,14 @@ ev_window_init (EvWindow *ev_window) "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), + ev_window); + g_signal_connect (ev_window->priv->view, + "notify::status", + G_CALLBACK (view_status_changed_cb), + ev_window); ev_window->priv->statusbar = gtk_statusbar_new (); gtk_widget_show (ev_window->priv->statusbar); @@ -1107,6 +1588,8 @@ ev_window_init (EvWindow *ev_window) FALSE, TRUE, 0); ev_window->priv->help_message_cid = gtk_statusbar_get_context_id (GTK_STATUSBAR (ev_window->priv->statusbar), "help_message"); + ev_window->priv->view_message_cid = gtk_statusbar_get_context_id + (GTK_STATUSBAR (ev_window->priv->statusbar), "view_message"); ev_window->priv->find_bar = egg_find_bar_new (); gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),