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=f1b41602fa17dd3953f17ea5ee0e5d759ff336bb;hb=1a1099e24c625b8ab7816f1ec1ff85cb8e2880d4;hp=652d435552020d6f4f1d25758cb61a9e1995c502;hpb=08693866e1d7b85df9d362eb4412e94959b3948d;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index 652d4355..f1b41602 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -47,8 +47,15 @@ #include "egg-recent-view-gtk.h" #include "egg-recent-view.h" #include "egg-recent-model.h" +#include "egg-toolbar-editor.h" +#include "egg-toolbars-model.h" +#include "egg-editable-toolbar.h" #include "ephy-zoom.h" #include "ephy-zoom-action.h" +#include "ev-application.h" +#include "ev-stock-icons.h" +#include "ev-file-helpers.h" +#include #include #include @@ -56,19 +63,16 @@ #include #include +#include #include #include #include -#include "ev-application.h" -#include "ev-stock-icons.h" - typedef enum { - PAGE_MODE_SINGLE_PAGE, - PAGE_MODE_CONTINUOUS_PAGE, - PAGE_MODE_PASSWORD, + PAGE_MODE_DOCUMENT, + PAGE_MODE_PASSWORD } EvWindowPageMode; typedef enum { @@ -92,8 +96,13 @@ struct _EvWindowPrivate { GtkWidget *view; GtkWidget *page_view; GtkWidget *password_view; + GtkActionGroup *action_group; GtkUIManager *ui_manager; + + gchar *toolbar_file; + EggToolbarsModel *toolbar_model; + GtkWidget *statusbar; guint help_message_cid; guint view_message_cid; @@ -205,6 +214,8 @@ update_action_sensitivity (EvWindow *ev_window) set_action_sensitive (ev_window, "EditSelectAll", sensitive); set_action_sensitive (ev_window, "EditFind", has_pages && EV_IS_DOCUMENT_FIND (document)); + set_action_sensitive (ev_window, "Slash", + has_pages && EV_IS_DOCUMENT_FIND (document)); set_action_sensitive (ev_window, "EditFindNext", ev_view_can_find_next (view)); @@ -233,18 +244,6 @@ update_action_sensitivity (EvWindow *ev_window) set_action_sensitive (ev_window, "GoLastPage", FALSE); } - /* Page View radio group */ - if (document) { - set_action_sensitive (ev_window, "SinglePage", page_mode != PAGE_MODE_PASSWORD); - set_action_sensitive (ev_window, "ContinuousPage", page_mode != PAGE_MODE_PASSWORD); - } else { - set_action_sensitive (ev_window, "SinglePage", FALSE); - set_action_sensitive (ev_window, "ContinuousPage", FALSE); - } - /* Help menu */ - /* "HelpContents": always sensitive */ - /* "HelpAbout": always sensitive */ - /* Toolbar-specific actions: */ set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, has_pages); set_action_sensitive (ev_window, ZOOM_CONTROL_ACTION, has_pages); @@ -294,7 +293,10 @@ update_chrome_visibility (EvWindow *window) findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0; set_widget_visibility (priv->menubar, menubar); + set_widget_visibility (priv->toolbar_dock, toolbar); + set_action_sensitive (window, "EditToolbar", toolbar); + set_widget_visibility (priv->sidebar, sidebar); set_widget_visibility (priv->find_bar, findbar); set_widget_visibility (priv->statusbar, statusbar); @@ -327,6 +329,28 @@ update_chrome_flag (EvWindow *window, EvChrome flag, const char *pref, gboolean update_chrome_visibility (window); } +static void +ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window) +{ + GtkAction *action; + + action = gtk_action_group_get_action (window->priv->action_group, + PAGE_SELECTOR_ACTION); + ev_page_action_grab_focus (EV_PAGE_ACTION (action)); +} + +static void +ev_window_cmd_scroll_forward (GtkAction *action, EvWindow *window) +{ + ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_FORWARD); +} + +static void +ev_window_cmd_scroll_backward (GtkAction *action, EvWindow *window) +{ + ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_BACKWARD); +} + static void ev_window_cmd_continuous (GtkAction *action, EvWindow *ev_window) { @@ -575,7 +599,7 @@ ev_window_setup_document (EvWindow *ev_window) ev_window, 0); } - ev_window_set_page_mode (ev_window, PAGE_MODE_SINGLE_PAGE); + ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT); ev_sidebar_set_document (sidebar, document); @@ -738,6 +762,29 @@ start_loading_document (EvWindow *ev_window, return FALSE; } +static gboolean +sanity_check_uri (EvWindow *window, const char *uri) +{ + gboolean result = FALSE; + GnomeVFSURI *vfs_uri; + char *err; + + vfs_uri = gnome_vfs_uri_new (uri); + if (vfs_uri) { + if (gnome_vfs_uri_exists (vfs_uri)) { + result = TRUE; + } + } + + if (!result) { + err = g_strdup_printf (_("The file %s does not exist."), uri); + unable_to_load (window, err); + g_free (err); + } + + return result; +} + void ev_window_open (EvWindow *ev_window, const char *uri) { @@ -745,6 +792,10 @@ ev_window_open (EvWindow *ev_window, const char *uri) GType document_type; char *mime_type = NULL; + if (!sanity_check_uri (ev_window, uri)) { + return; + } + g_free (ev_window->priv->uri); ev_window->priv->uri = g_strdup (uri); @@ -1011,28 +1062,58 @@ using_postscript_printer (GnomePrintConfig *config) } else if (transport) { if (!strcmp ((const gchar *)transport, "CUPS")) return TRUE; + else if (!strcmp ((const gchar *)transport, "LPD")) + return TRUE; } return FALSE; } 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; + 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); print_dialog = gnome_print_dialog_new (job, (guchar *) _("Print"), (GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES)); + + pages_label = g_strconcat (_("Pages"), " ", NULL); + gnome_print_dialog_construct_range_page (GNOME_PRINT_DIALOG (print_dialog), + GNOME_PRINT_RANGE_ALL | + GNOME_PRINT_RANGE_RANGE, + first_page, last_page, + NULL, (const guchar *)pages_label); + g_free (pages_label); + gtk_dialog_set_response_sensitive (GTK_DIALOG (print_dialog), GNOME_PRINT_DIALOG_RESPONSE_PREVIEW, FALSE); @@ -1573,15 +1654,12 @@ ev_window_set_page_mode (EvWindow *window, window->priv->page_mode = page_mode; switch (page_mode) { - case PAGE_MODE_SINGLE_PAGE: + case PAGE_MODE_DOCUMENT: child = window->priv->view; break; case PAGE_MODE_PASSWORD: child = window->priv->password_view; break; - case PAGE_MODE_CONTINUOUS_PAGE: - child = window->priv->page_view; - break; default: g_assert_not_reached (); } @@ -1596,6 +1674,51 @@ ev_window_set_page_mode (EvWindow *window, update_action_sensitivity (window); } +static void +ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog, gint response, gpointer data) +{ + EvWindow *ev_window = EV_WINDOW (data); + egg_editable_toolbar_set_edit_mode + (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), FALSE); + egg_toolbars_model_save (ev_window->priv->toolbar_model, + ev_window->priv->toolbar_file, "1.0"); + gtk_widget_destroy (GTK_WIDGET (dialog)); +} + +static void +ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window) +{ + GtkWidget *dialog; + GtkWidget *editor; + g_return_if_fail (EV_IS_WINDOW (ev_window)); + + dialog = gtk_dialog_new_with_buttons (_("Toolbar editor"), GTK_WINDOW (ev_window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CLOSE, + GTK_RESPONSE_CANCEL, + NULL); + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); + gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400); + + editor = egg_toolbar_editor_new (ev_window->priv->ui_manager, + ev_window->priv->toolbar_model); + gtk_container_set_border_width (GTK_CONTAINER (editor), 5); + gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5); + + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), editor); + egg_toolbar_editor_load_actions (EGG_TOOLBAR_EDITOR (editor), + DATADIR"/evince-toolbar.xml"); + + egg_editable_toolbar_set_edit_mode + (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), TRUE); + + gtk_widget_show_all (dialog); + + g_signal_connect (G_OBJECT (dialog), "response", + G_CALLBACK (ev_window_cmd_edit_toolbar_cb), + ev_window); +} + static void ev_window_cmd_view_zoom_in (GtkAction *action, EvWindow *ev_window) { @@ -1813,16 +1936,46 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec, update_sizing_buttons (ev_window); } +static char * +build_comments_string (void) +{ + PopplerBackend backend; + const char *backend_name; + const char *version; + + backend = poppler_get_backend (); + version = poppler_get_version (); + switch (backend) { + case POPPLER_BACKEND_CAIRO: + backend_name = "cairo"; + break; + case POPPLER_BACKEND_SPLASH: + backend_name = "splash"; + break; + default: + backend_name = "unknown"; + break; + } + + return g_strdup_printf (_("PostScript and PDF File Viewer.\n" + "Using poppler %s (%s)"), + version, backend_name); +} + static void ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) { const char *authors[] = { - N_("Many..."), + "Martin Kretzschmar ", + "Jonathan Blandford ", + "Marco Pesenti Gritti ", + "Nickolay V. Shmyrev ", + "Bryan Clark ", NULL }; const char *documenters[] = { - N_("Not so many..."), + "Nickolay V. Shmyrev ", NULL }; @@ -1841,6 +1994,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) }; char *license_trans; + char *comments; #ifdef ENABLE_NLS const char **p; @@ -1854,6 +2008,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) license_trans = g_strconcat (_(license[0]), "\n", _(license[1]), "\n", _(license[2]), "\n", NULL); + comments = build_comments_string (); gtk_show_about_dialog ( GTK_WINDOW (ev_window), @@ -1863,12 +2018,13 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) _("\xc2\xa9 1996-2004 The Evince authors"), "license", license_trans, "website", "http://www.gnome.org/projects/evince", - "comments", _("PostScript and PDF File Viewer."), + "comments", comments, "authors", authors, "documenters", documenters, "translator-credits", _("translator-credits"), NULL); + g_free (comments); g_free (license_trans); } @@ -2025,21 +2181,6 @@ find_bar_close_cb (EggFindBar *find_bar, update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, FALSE); } -static void -ev_window_page_mode_cb (GtkRadioAction *action, - GtkRadioAction *activated_action, - EvWindow *window) -{ - int mode; - - mode = gtk_radio_action_get_current_value (action); - - g_assert (mode == PAGE_MODE_CONTINUOUS_PAGE || - mode == PAGE_MODE_SINGLE_PAGE); - - ev_window_set_page_mode (window, (EvWindowPageMode) mode); -} - static void find_bar_search_changed_cb (EggFindBar *find_bar, GParamSpec *param, @@ -2114,6 +2255,13 @@ ev_window_dispose (GObject *object) EvWindow *window = EV_WINDOW (object); EvWindowPrivate *priv = window->priv; + if (priv->toolbar_model) { + g_object_unref (priv->toolbar_model); + g_free (priv->toolbar_file); + priv->toolbar_model = NULL; + priv->toolbar_file = NULL; + } + if (priv->ui_manager) { g_object_unref (priv->ui_manager); priv->ui_manager = NULL; @@ -2217,6 +2365,9 @@ static const GtkActionEntry entries[] = { { "EditFindNext", NULL, N_("Find Ne_xt"), "G", N_("Find next occurrence of the word or phrase"), G_CALLBACK (ev_window_cmd_edit_find_next) }, + { "EditToolbar", NULL, N_("T_oolbar"), NULL, + N_("Customize the toolbar"), + G_CALLBACK (ev_window_cmd_edit_toolbar) }, /* View menu */ { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", @@ -2261,11 +2412,26 @@ static const GtkActionEntry entries[] = { G_CALLBACK (ev_window_cmd_leave_fullscreen) }, /* Accellerators */ - { "Escape", NULL, N_("Selection Caret"), "Escape", "", + { "Escape", NULL, "", "Escape", "", G_CALLBACK (ev_window_cmd_escape) }, { "Slash", GTK_STOCK_FIND, NULL, "slash", N_("Find a word or phrase in the document"), - G_CALLBACK (ev_window_cmd_edit_find) } + G_CALLBACK (ev_window_cmd_edit_find) }, + { "Space", NULL, "", "space", + N_("Scroll one page forward"), + G_CALLBACK (ev_window_cmd_scroll_forward) }, + { "ShiftSpace", NULL, "", "space", + N_("Scroll one page backward"), + G_CALLBACK (ev_window_cmd_scroll_backward) }, + { "BackSpace", NULL, "", "BackSpace", + N_("Scroll one page backward"), + G_CALLBACK (ev_window_cmd_scroll_backward) }, + { "ShiftBackSpace", NULL, "", "BackSpace", + N_("Scroll one page forward"), + G_CALLBACK (ev_window_cmd_scroll_forward) }, + { "FocusPageSelector", NULL, "", "l", + N_("Focus the page selector"), + G_CALLBACK (ev_window_cmd_focus_page_selector) } }; /* Toggle items */ @@ -2300,15 +2466,6 @@ static const GtkToggleActionEntry toggle_entries[] = { G_CALLBACK (ev_window_cmd_view_page_width) }, }; -static const GtkRadioActionEntry page_view_entries[] = { - { "SinglePage", GTK_STOCK_DND, N_("Single"), NULL, - N_("Show the document one page at a time"), - PAGE_MODE_SINGLE_PAGE }, - { "ContinuousPage", GTK_STOCK_DND_MULTIPLE, N_("Multi"), NULL, - N_("Show the full document at once"), - PAGE_MODE_CONTINUOUS_PAGE } -}; - static void drag_data_received_cb (GtkWidget *widget, GdkDragContext *context, gint x, gint y, GtkSelectionData *selection_data, @@ -2327,6 +2484,25 @@ drag_data_received_cb (GtkWidget *widget, GdkDragContext *context, } } +static void +activate_link_cb (EvPageAction *page_action, EvLink *link, EvWindow *window) +{ + g_return_if_fail (EV_IS_WINDOW (window)); + + ev_page_cache_set_link (window->priv->page_cache, link); + gtk_widget_grab_focus (window->priv->view); +} + +static gboolean +activate_label_cb (EvPageAction *page_action, char *label, EvWindow *window) +{ + g_return_val_if_fail (EV_IS_WINDOW (window), FALSE); + + gtk_widget_grab_focus (window->priv->view); + + return ev_page_cache_set_page_label (window->priv->page_cache, label); +} + static void register_custom_actions (EvWindow *window, GtkActionGroup *group) { @@ -2336,7 +2512,12 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group) "name", PAGE_SELECTOR_ACTION, "label", _("Page"), "tooltip", _("Select Page"), + "visible_overflown", FALSE, NULL); + g_signal_connect (action, "activate_link", + G_CALLBACK (activate_link_cb), window); + g_signal_connect (action, "activate_label", + G_CALLBACK (activate_label_cb), window); gtk_action_group_add_action (group, action); g_object_unref (action); @@ -2478,20 +2659,55 @@ sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links, ev_page_action_set_model (EV_PAGE_ACTION (action), model); } + +static void +set_view_actions_sensitivity (EvWindow *window, gboolean sensitive) +{ + if (window->priv->action_group) { + set_action_sensitive (window, "Space", sensitive); + set_action_sensitive (window, "ShiftSpace", sensitive); + set_action_sensitive (window, "BackSpace", sensitive); + set_action_sensitive (window, "ShiftBackSpace", sensitive); + } +} + +static void +view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window) +{ + set_view_actions_sensitivity (window, TRUE); +} + +static void +view_actions_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window) +{ + set_view_actions_sensitivity (window, FALSE); +} + +static void +enable_view_actions_for_widget (EvWindow *window, GtkWidget *widget) +{ + g_signal_connect_object (widget, "focus_in_event", + G_CALLBACK (view_actions_focus_in_cb), + window, 0); + g_signal_connect_object (widget, "focus_out_event", + G_CALLBACK (view_actions_focus_out_cb), + window, 0); +} + static void ev_window_init (EvWindow *ev_window) { GtkActionGroup *action_group; GtkAccelGroup *accel_group; GError *error = NULL; - GtkWidget *sidebar_widget, *toolbar_dock; + GtkWidget *sidebar_widget, *toolbar_dock, *tree_view; GConfValue *value; GConfClient *client; int sidebar_size; ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window); - ev_window->priv->page_mode = PAGE_MODE_SINGLE_PAGE; + ev_window->priv->page_mode = PAGE_MODE_DOCUMENT; update_window_title (NULL, NULL, ev_window); ev_window->priv->main_box = gtk_vbox_new (FALSE, 0); @@ -2506,11 +2722,6 @@ ev_window_init (EvWindow *ev_window) gtk_action_group_add_toggle_actions (action_group, toggle_entries, G_N_ELEMENTS (toggle_entries), ev_window); - gtk_action_group_add_radio_actions (action_group, page_view_entries, - G_N_ELEMENTS (page_view_entries), - ev_window->priv->page_mode, - G_CALLBACK (ev_window_page_mode_cb), - ev_window); set_action_properties (action_group); register_custom_actions (ev_window, action_group); @@ -2522,6 +2733,8 @@ ev_window_init (EvWindow *ev_window) gtk_ui_manager_get_accel_group (ev_window->priv->ui_manager); gtk_window_add_accel_group (GTK_WINDOW (ev_window), accel_group); + set_view_actions_sensitivity (ev_window, FALSE); + g_signal_connect (ev_window->priv->ui_manager, "connect_proxy", G_CALLBACK (connect_proxy_cb), ev_window); g_signal_connect (ev_window->priv->ui_manager, "disconnect_proxy", @@ -2541,6 +2754,23 @@ ev_window_init (EvWindow *ev_window) ev_window->priv->menubar, FALSE, FALSE, 0); + /* Toolbar editor */ + ev_window->priv->toolbar_model = egg_toolbars_model_new (); + + ev_window->priv->toolbar_file = g_build_filename + (ev_dot_dir (), "evince_toolbar.xml", NULL); + + if (!g_file_test (ev_window->priv->toolbar_file, G_FILE_TEST_EXISTS)) { + egg_toolbars_model_load (ev_window->priv->toolbar_model, + DATADIR"/evince-toolbar.xml"); + } else { + egg_toolbars_model_load (ev_window->priv->toolbar_model, + ev_window->priv->toolbar_file); + } + + egg_toolbars_model_set_flags (ev_window->priv->toolbar_model, 0, + EGG_TB_MODEL_NOT_REMOVABLE); + /* This sucks, but there is no way to have a draw=no, expand=true separator * in a GtkUIManager-built toolbar. So, just add another toolbar. * See gtk+ bug 166489. @@ -2550,9 +2780,10 @@ ev_window_init (EvWindow *ev_window) FALSE, FALSE, 0); gtk_widget_show (toolbar_dock); - ev_window->priv->toolbar = - gtk_ui_manager_get_widget (ev_window->priv->ui_manager, - "/ToolBar"); + ev_window->priv->toolbar = egg_editable_toolbar_new_with_model + (ev_window->priv->ui_manager, ev_window->priv->toolbar_model); + egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), + "DefaultToolBar"); gtk_box_pack_start (GTK_BOX (toolbar_dock), ev_window->priv->toolbar, TRUE, TRUE, 0); gtk_widget_show (ev_window->priv->toolbar); @@ -2560,6 +2791,7 @@ ev_window_init (EvWindow *ev_window) ev_window->priv->fullscreen_toolbar = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/LeaveFullscreenToolbar"); gtk_toolbar_set_show_arrow (GTK_TOOLBAR (ev_window->priv->fullscreen_toolbar), TRUE); + /* Add the main area */ ev_window->priv->hpaned = gtk_hpaned_new (); @@ -2594,11 +2826,17 @@ ev_window_init (EvWindow *ev_window) "notify::model", G_CALLBACK (sidebar_widget_model_set), ev_window); + tree_view = ev_sidebar_links_get_treeview + (EV_SIDEBAR_LINKS (sidebar_widget)); + enable_view_actions_for_widget (ev_window, tree_view); gtk_widget_show (sidebar_widget); ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar), sidebar_widget); sidebar_widget = ev_sidebar_thumbnails_new (); + tree_view = ev_sidebar_thumbnails_get_treeview + (EV_SIDEBAR_THUMBNAILS (sidebar_widget)); + enable_view_actions_for_widget (ev_window, tree_view); gtk_widget_show (sidebar_widget); ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar), sidebar_widget); @@ -2618,8 +2856,8 @@ ev_window_init (EvWindow *ev_window) "unlock", G_CALLBACK (ev_window_popup_password_dialog), ev_window); + enable_view_actions_for_widget (ev_window, ev_window->priv->view); gtk_widget_show (ev_window->priv->view); - //gtk_widget_show (ev_window->priv->page_view); gtk_widget_show (ev_window->priv->password_view); /* We own a ref on these widgets, as we can swap them in and out */