X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=d3ac46a540a9efb0523c5a2ee9256ff9c9baf163;hb=33d99c9f51df0234e7df10d367fe883b0800685b;hp=dc67739915faf9eba3864a8469952a3e363cebac;hpb=00efc5c16ed191f07f9a8a5d00acc41ddb064b46;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index dc677399..d3ac46a5 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -29,6 +29,7 @@ #endif #include "ev-window.h" +#include "ev-window-title.h" #include "ev-page-action.h" #include "ev-sidebar.h" #include "ev-sidebar-links.h" @@ -47,7 +48,6 @@ #include "ev-document-types.h" #include "ev-job-queue.h" #include "ev-jobs.h" -#include "ev-statusbar.h" #include "ev-sidebar-page.h" #include "eggfindbar.h" #include "egg-recent-view-uimanager.h" @@ -62,6 +62,8 @@ #include "ev-stock-icons.h" #include "ev-metadata-manager.h" #include "ev-file-helpers.h" +#include "ev-utils.h" +#include "ev-debug.h" #include @@ -82,11 +84,9 @@ typedef enum { typedef enum { EV_CHROME_MENUBAR = 1 << 0, EV_CHROME_TOOLBAR = 1 << 1, - EV_CHROME_SIDEBAR = 1 << 2, - EV_CHROME_FINDBAR = 1 << 3, - EV_CHROME_STATUSBAR = 1 << 4, - EV_CHROME_RAISE_TOOLBAR = 1 << 5, - EV_CHROME_NORMAL = EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR | EV_CHROME_SIDEBAR | EV_CHROME_STATUSBAR + EV_CHROME_FINDBAR = 1 << 2, + EV_CHROME_RAISE_TOOLBAR = 1 << 3, + EV_CHROME_NORMAL = EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR } EvChrome; struct _EvWindowPrivate { @@ -104,8 +104,10 @@ struct _EvWindowPrivate { GtkWidget *view; GtkWidget *page_view; GtkWidget *password_view; - GtkWidget *statusbar; GtkWidget *sidebar_thumbs; + GtkWidget *sidebar_links; + + EvWindowTitle *title; /* Dialogs */ GtkWidget *properties; @@ -150,14 +152,16 @@ static const GtkTargetEntry ev_drop_types[] = { #define PAGE_SELECTOR_ACTION "PageSelector" #define ZOOM_CONTROL_ACTION "ViewZoom" -#define GCONF_CHROME_TOOLBAR "/apps/evince/show_toolbar" -#define GCONF_CHROME_SIDEBAR "/apps/evince/show_sidebar" -#define GCONF_CHROME_STATUSBAR "/apps/evince/show_statusbar" -#define GCONF_LOCKDOWN_SAVE "/desktop/gnome/lockdown/disable_save_to_disk" -#define GCONF_LOCKDOWN_PRINT "/desktop/gnome/lockdown/disable_printing" -#define GCONF_SIDEBAR_SIZE "/apps/evince/sidebar_size" +#define GCONF_CHROME_TOOLBAR "/apps/evince/show_toolbar" +#define GCONF_OVERRIDE_RESTRICTIONS "/apps/evince/override_restrictions" +#define GCONF_LOCKDOWN_SAVE "/desktop/gnome/lockdown/disable_save_to_disk" +#define GCONF_LOCKDOWN_PRINT "/desktop/gnome/lockdown/disable_printing" + +#define FULLSCREEN_TIMEOUT 5 * 1000 #define SIDEBAR_DEFAULT_SIZE 132 +#define LINKS_SIDEBAR_ID "links" +#define THUMBNAILS_SIDEBAR_ID "thumbnails" #define PRINT_CONFIG_FILENAME "ev-print-config.xml" @@ -214,6 +218,9 @@ update_action_sensitivity (EvWindow *ev_window) gboolean ok_to_print = TRUE; gboolean ok_to_copy = TRUE; gboolean has_properties = TRUE; + gboolean override_restrictions = FALSE; + gboolean can_get_text = FALSE; + gboolean ok_to_copy_text = FALSE; GConfClient *client; view = EV_VIEW (ev_window->priv->view); @@ -232,7 +239,11 @@ update_action_sensitivity (EvWindow *ev_window) has_pages = has_document && n_pages > 0; } - if (info && info->fields_mask & EV_DOCUMENT_INFO_PERMISSIONS) { + client = gconf_client_get_default (); + override_restrictions = gconf_client_get_bool (client, + GCONF_OVERRIDE_RESTRICTIONS, + NULL); + if (!override_restrictions && info && info->fields_mask & EV_DOCUMENT_INFO_PERMISSIONS) { ok_to_print = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_PRINT); ok_to_copy = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_COPY); } @@ -244,8 +255,6 @@ update_action_sensitivity (EvWindow *ev_window) has_properties = FALSE; } - client = gconf_client_get_default (); - if (gconf_client_get_bool (client, GCONF_LOCKDOWN_SAVE, NULL)) { ok_to_copy = FALSE; } @@ -253,7 +262,14 @@ update_action_sensitivity (EvWindow *ev_window) if (gconf_client_get_bool (client, GCONF_LOCKDOWN_PRINT, NULL)) { ok_to_print = FALSE; } + + g_object_unref (client); + if (has_document && ev_document_can_get_text (document)) { + can_get_text = TRUE; + ok_to_copy_text = ev_view_get_has_selection (view); + } + /* File menu */ /* "FileOpen": always sensitive */ set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy); @@ -263,8 +279,8 @@ update_action_sensitivity (EvWindow *ev_window) /* Edit menu */ sensitive = has_pages && ev_document_can_get_text (document); - set_action_sensitive (ev_window, "EditCopy", sensitive && ok_to_copy); - set_action_sensitive (ev_window, "EditSelectAll", sensitive && ok_to_copy); + set_action_sensitive (ev_window, "EditCopy", sensitive && ok_to_copy_text); + set_action_sensitive (ev_window, "EditSelectAll", sensitive && can_get_text); set_action_sensitive (ev_window, "EditFind", has_pages && EV_IS_DOCUMENT_FIND (document)); set_action_sensitive (ev_window, "Slash", @@ -302,7 +318,9 @@ update_action_sensitivity (EvWindow *ev_window) set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, has_pages); set_action_sensitive (ev_window, ZOOM_CONTROL_ACTION, has_pages); - if (has_pages && ev_view_get_sizing_mode (view) == EV_SIZING_FREE) { + if (has_pages && + ev_view_get_sizing_mode (view) != EV_SIZING_FIT_WIDTH && + ev_view_get_sizing_mode (view) != EV_SIZING_BEST_FIT) { GtkAction *action; float zoom; float real_zoom; @@ -332,7 +350,7 @@ static void update_chrome_visibility (EvWindow *window) { EvWindowPrivate *priv = window->priv; - gboolean menubar, toolbar, sidebar, findbar, statusbar, fullscreen_toolbar; + gboolean menubar, toolbar, findbar, fullscreen_toolbar; gboolean fullscreen_mode, presentation, fullscreen; presentation = ev_view_get_presentation (EV_VIEW (priv->view)); @@ -342,10 +360,8 @@ update_chrome_visibility (EvWindow *window) menubar = (priv->chrome & EV_CHROME_MENUBAR) != 0 && !fullscreen_mode; toolbar = ((priv->chrome & EV_CHROME_TOOLBAR) != 0 || (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0) && !fullscreen_mode; - sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !fullscreen_mode; fullscreen_toolbar = ((priv->chrome & EV_CHROME_TOOLBAR) != 0 || (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0); - statusbar = (priv->chrome & EV_CHROME_STATUSBAR) != 0 && !fullscreen_mode; findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0; set_widget_visibility (priv->menubar, menubar); @@ -353,9 +369,7 @@ update_chrome_visibility (EvWindow *window) 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); if (priv->fullscreen_popup != NULL) { if (fullscreen) @@ -541,6 +555,14 @@ ev_window_is_empty (const EvWindow *ev_window) (ev_window->priv->xfer_job == NULL); } +static void +unable_to_load_dialog_response_cb (GtkWidget *dialog, + gint response_id, + EvWindow *ev_window) +{ + gtk_widget_destroy (dialog); +} + static void unable_to_load (EvWindow *ev_window, const char *error_message) @@ -554,66 +576,10 @@ unable_to_load (EvWindow *ev_window, _("Unable to open document")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error_message); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -static void -update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_window) -{ - char *title = NULL; - char *doc_title = NULL; - gboolean password_needed; - - password_needed = (ev_window->priv->password_document != NULL); - if (document && ev_window->priv->page_cache) { - doc_title = g_strdup (ev_page_cache_get_title (ev_window->priv->page_cache)); - - /* Make sure we get a valid title back */ - if (doc_title) { - if (doc_title[0] == '\000' || - !g_utf8_validate (doc_title, -1, NULL)) { - doc_title = NULL; - } - } - } - - if (doc_title) { - char *p; - - for (p = doc_title; *p; ++p) { - /* an '\n' byte is always ASCII, no need for UTF-8 special casing */ - if (*p == '\n') - *p = ' '; - } - } - - if (doc_title == NULL && 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) { - if (doc_title == NULL) { - title = g_strdup (_("Document Viewer - Password Required")); - } else { - title = g_strdup_printf (_("%s - Password Required"), doc_title); - } - } else { - if (doc_title == NULL) { - title = g_strdup (_("Document Viewer")); - } else { - title = g_strdup (doc_title); - } - } - - gtk_window_set_title (GTK_WINDOW (ev_window), title); - - g_free (doc_title); - g_free (title); + g_signal_connect (dialog, "response", + G_CALLBACK (unable_to_load_dialog_response_cb), + ev_window); + gtk_widget_show (dialog); } static void @@ -629,7 +595,9 @@ page_changed_cb (EvPageCache *page_cache, { update_action_sensitivity (ev_window); - ev_metadata_manager_set_int (ev_window->priv->uri, "page", page); + if (ev_window->priv->uri) { + ev_metadata_manager_set_int (ev_window->priv->uri, "page", page); + } } static void @@ -643,6 +611,18 @@ update_document_mode (EvWindow *window, EvDocumentMode mode) } } +static void +update_sidebar_visibility (EvWindow *window) +{ + char *uri = window->priv->uri; + GValue sidebar_visibility = { 0, }; + + if (uri && ev_metadata_manager_get (uri, "sidebar_visibility", &sidebar_visibility)) { + set_widget_visibility (window->priv->sidebar, + g_value_get_boolean (&sidebar_visibility)); + } +} + static void setup_document_from_metadata (EvWindow *window) { @@ -650,11 +630,44 @@ setup_document_from_metadata (EvWindow *window) GValue page = { 0, }; /* Page */ - if (ev_metadata_manager_get (uri, "page", &page)) { + if (uri && ev_metadata_manager_get (uri, "page", &page)) { ev_page_cache_set_current_page (window->priv->page_cache, g_value_get_int (&page)); } +} + +static void +setup_sidebar_from_metadata (EvWindow *window, EvDocument *document) +{ + char *uri = window->priv->uri; + GtkWidget *sidebar = window->priv->sidebar; + GtkWidget *links = window->priv->sidebar_links; + GtkWidget *thumbs = window->priv->sidebar_thumbs; + GValue sidebar_size = { 0, }; + GValue sidebar_page = { 0, }; + if (ev_metadata_manager_get (uri, "sidebar_size", &sidebar_size)) { + gtk_paned_set_position (GTK_PANED (window->priv->hpaned), + g_value_get_int (&sidebar_size)); + } + + if (ev_metadata_manager_get (uri, "sidebar_page", &sidebar_page)) { + const char *page_id = g_value_get_string (&sidebar_page); + + if (strcmp (page_id, "links") == 0) { + ev_sidebar_set_page (EV_SIDEBAR (sidebar), links); + } else if (strcmp (page_id, "thumbnails")) { + ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs); + } + } else { + if (ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (links), document)) { + ev_sidebar_set_page (EV_SIDEBAR (sidebar), links); + } else if (ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (thumbs), document)) { + ev_sidebar_set_page (EV_SIDEBAR (sidebar), thumbs); + } + } + + update_sidebar_visibility (window); } static void @@ -670,10 +683,6 @@ ev_window_setup_document (EvWindow *ev_window) ev_window->priv->page_cache = ev_page_cache_get (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", - G_CALLBACK (update_window_title), - ev_window, 0); if (EV_IS_DOCUMENT_FIND (document)) { g_signal_connect_object (G_OBJECT (document), "find_changed", @@ -689,7 +698,8 @@ ev_window_setup_document (EvWindow *ev_window) ev_view_set_document (view, document); } - update_window_title (document, NULL, ev_window); + ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri); + ev_window_title_set_document (ev_window->priv->title, document); action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION); ev_page_action_set_document (EV_PAGE_ACTION (action), document); update_action_sensitivity (ev_window); @@ -703,6 +713,7 @@ ev_window_setup_document (EvWindow *ev_window) } setup_document_from_metadata (ev_window); + setup_sidebar_from_metadata (ev_window, document); } static void @@ -716,7 +727,7 @@ password_dialog_response (GtkWidget *password_dialog, EvDocument *document; gchar *uri; - password = ev_password_dialog_get_password (password_dialog); + password = ev_password_dialog_get_password (EV_PASSWORD_DIALOG (password_dialog)); if (password) { ev_document_doc_mutex_lock (); ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->password_document), @@ -725,21 +736,18 @@ password_dialog_response (GtkWidget *password_dialog, } g_free (password); + ev_password_dialog_save_password (EV_PASSWORD_DIALOG (password_dialog)); + document = ev_window->priv->password_document; uri = ev_window->priv->password_uri; ev_window->priv->password_document = NULL; ev_window->priv->password_uri = NULL; - + + ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_DOCUMENT); + ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH); - ev_statusbar_push (EV_STATUSBAR (ev_window->priv->statusbar), - EV_CONTEXT_PROGRESS, - _("Loading document. Please wait")); - - ev_statusbar_set_progress (EV_STATUSBAR (ev_window->priv->statusbar), - TRUE); - gtk_widget_destroy (password_dialog); g_object_unref (document); @@ -764,25 +772,23 @@ ev_window_popup_password_dialog (EvWindow *ev_window) gtk_widget_set_sensitive (ev_window->priv->password_view, FALSE); - update_window_title (ev_window->priv->password_document, NULL, ev_window); - if (ev_window->priv->password_dialog == NULL) { - gchar *basename, *file_name; + ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->password_uri); + ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_PASSWORD); - basename = g_path_get_basename (ev_window->priv->password_uri); - file_name = gnome_vfs_unescape_string_for_display (basename); + if (ev_window->priv->password_dialog == NULL) { ev_window->priv->password_dialog = - ev_password_dialog_new (GTK_WIDGET (ev_window), file_name); + g_object_new (EV_TYPE_PASSWORD_DIALOG, "uri", ev_window->priv->password_uri, NULL); + gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->password_dialog), GTK_WINDOW (ev_window)); + g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog), (gpointer *) &(ev_window->priv->password_dialog)); g_signal_connect (ev_window->priv->password_dialog, "response", G_CALLBACK (password_dialog_response), ev_window); - g_free (basename); - g_free (file_name); gtk_widget_show (ev_window->priv->password_dialog); } else { - ev_password_dialog_set_bad_pass (ev_window->priv->password_dialog); + ev_password_dialog_set_bad_pass (EV_PASSWORD_DIALOG (ev_window->priv->password_dialog)); } } @@ -846,12 +852,6 @@ ev_window_load_job_cb (EvJobLoad *job, g_assert (document != ev_window->priv->document); g_assert (job->uri); - ev_statusbar_pop (EV_STATUSBAR (ev_window->priv->statusbar), - EV_CONTEXT_PROGRESS); - - ev_statusbar_set_progress (EV_STATUSBAR (ev_window->priv->statusbar), - FALSE); - if (ev_window->priv->password_document) { g_object_unref (ev_window->priv->password_document); ev_window->priv->password_document = NULL; @@ -881,11 +881,10 @@ ev_window_load_job_cb (EvJobLoad *job, ev_window->priv->password_document = g_object_ref (document); ev_window->priv->password_uri = g_strdup (job->uri); - base_name = g_path_get_basename (job->uri); - file_name = gnome_vfs_unescape_string_for_display (base_name); - + file_name = gnome_vfs_format_uri_for_display (job->uri); + base_name = g_path_get_basename (file_name); ev_password_view_set_file_name (EV_PASSWORD_VIEW (ev_window->priv->password_view), - file_name); + base_name); g_free (file_name); g_free (base_name); ev_window_set_page_mode (ev_window, PAGE_MODE_PASSWORD); @@ -907,11 +906,6 @@ ev_window_xfer_job_cb (EvJobXfer *job, if (job->error != NULL) { - ev_statusbar_pop (EV_STATUSBAR (ev_window->priv->statusbar), - EV_CONTEXT_PROGRESS); - ev_statusbar_set_progress (EV_STATUSBAR (ev_window->priv->statusbar), - FALSE); - unable_to_load (ev_window, job->error->message); ev_window_clear_jobs (ev_window); } else { @@ -956,6 +950,11 @@ setup_view_from_metadata (EvWindow *window) GValue dual_page = { 0, }; GValue presentation = { 0, }; GValue fullscreen = { 0, }; + GValue rotation = { 0, }; + + if (window->priv->uri == NULL) { + return; + } /* Window size */ if (!GTK_WIDGET_VISIBLE (window)) { @@ -1018,6 +1017,25 @@ setup_view_from_metadata (EvWindow *window) ev_window_run_fullscreen (window); } } + + /* Rotation */ + if (ev_metadata_manager_get (uri, "rotation", &rotation)) { + if (g_value_get_int (&rotation)) { + switch (g_value_get_int (&rotation)) { + case 90: + ev_view_set_rotation (view, 90); + break; + case 180: + ev_view_set_rotation (view, 180); + break; + case 270: + ev_view_set_rotation (view, 270); + break; + default: + break; + } + } + } } void @@ -1040,21 +1058,33 @@ ev_window_open_uri (EvWindow *ev_window, const char *uri) G_CALLBACK (ev_window_xfer_job_cb), ev_window); ev_job_queue_add_job (ev_window->priv->xfer_job, EV_JOB_PRIORITY_HIGH); +} + +static void +file_open_dialog_response_cb (GtkWidget *chooser, + gint response_id, + EvWindow *ev_window) +{ + if (response_id == GTK_RESPONSE_OK) { + GSList *uris; + + uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser)); + + ev_application_open_uri_list (EV_APP, uris, GDK_CURRENT_TIME); + + g_slist_foreach (uris, (GFunc)g_free, NULL); + g_slist_free (uris); + } - ev_statusbar_push (EV_STATUSBAR (ev_window->priv->statusbar), - EV_CONTEXT_PROGRESS, - _("Loading document. Please wait")); - ev_statusbar_set_progress (EV_STATUSBAR (ev_window->priv->statusbar), - TRUE); + gtk_widget_destroy (chooser); } static void ev_window_cmd_file_open (GtkAction *action, EvWindow *window) { GtkWidget *chooser; - static char *folder = NULL; - chooser = gtk_file_chooser_dialog_new (_("Open document"), + chooser = gtk_file_chooser_dialog_new (_("Open Document"), GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, @@ -1062,35 +1092,15 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window) GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); - if (folder) { - gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (chooser), - folder); - } - ev_document_types_add_filters (chooser, NULL); gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), TRUE); gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), FALSE); - if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_OK) { - GSList *uris; - - uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser)); - - if (folder != NULL) - g_free (folder); - - folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (chooser)); - - ev_application_open_uri_list (EV_APP, uris); - - g_slist_foreach (uris, (GFunc)g_free, NULL); - g_slist_free (uris); - } else { - if (!GTK_WIDGET_VISIBLE (window)) - gtk_widget_destroy (GTK_WIDGET (window)); - } + g_signal_connect (chooser, "response", + G_CALLBACK (file_open_dialog_response_cb), + window); - gtk_widget_destroy (GTK_WIDGET (chooser)); + gtk_widget_show (chooser); } static void @@ -1105,7 +1115,7 @@ ev_window_cmd_recent_file_activate (GtkAction *action, uri = egg_recent_item_get_uri (item); - ev_application_open_uri (EV_APP, uri, NULL, NULL); + ev_application_open_uri (EV_APP, uri, NULL, GDK_CURRENT_TIME, NULL); g_free (uri); } @@ -1207,63 +1217,57 @@ save_error_dialog (GtkWindow *window, const gchar *file_name) } static void -ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) +file_save_dialog_response_cb (GtkWidget *fc, + gint response_id, + EvWindow *ev_window) { - GtkWidget *fc; + gboolean success; - gchar *uri; - gchar *basename; - static char* folder = NULL; + if (response_id == GTK_RESPONSE_OK) { + const char *uri; - gboolean success; + uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc)); + + ev_document_doc_mutex_lock (); + success = ev_document_save (ev_window->priv->document, uri, NULL); + ev_document_doc_mutex_unlock (); + + if (!success) { + save_error_dialog (GTK_WINDOW (fc), uri); + } + } + + gtk_widget_destroy (fc); +} + +static void +ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) +{ + GtkWidget *fc; + gchar *base_name; + gchar *file_name; fc = gtk_file_chooser_dialog_new ( _("Save a Copy"), - NULL, GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_WINDOW (ev_window), 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); ev_document_types_add_filters (fc, ev_window->priv->document); gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK); - if (folder) { - gtk_file_chooser_set_current_folder_uri(GTK_FILE_CHOOSER (fc), - folder); - } - - basename = g_path_get_basename (ev_window->priv->uri); - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), basename); - g_free (basename); - - 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; -*/ - - ev_document_doc_mutex_lock (); - success = ev_document_save (ev_window->priv->document, uri, NULL); - ev_document_doc_mutex_unlock (); - - if (success) - break; - else - save_error_dialog (GTK_WINDOW (fc), uri); - } + file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri); + base_name = g_path_get_basename (file_name); + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name); + g_free (file_name); + g_free (base_name); - if (folder != NULL) - g_free (folder); - - folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (fc)); + g_signal_connect (fc, "response", + G_CALLBACK (file_save_dialog_response_cb), + ev_window); - gtk_widget_destroy (fc); + gtk_widget_show (fc); } static gboolean @@ -1462,6 +1466,8 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page) break; } + g_object_unref (job); + gtk_widget_destroy (print_dialog); if (print_job != NULL) { @@ -1567,6 +1573,7 @@ ev_window_update_fullscreen_popup (EvWindow *window) { GtkWidget *popup = window->priv->fullscreen_popup; int popup_width, popup_height; + GdkScreen *screen; GdkRectangle screen_rect; gboolean toolbar; @@ -1580,10 +1587,10 @@ ev_window_update_fullscreen_popup (EvWindow *window) popup_width = popup->requisition.width; popup_height = popup->requisition.height; - /* FIXME multihead */ - gdk_screen_get_monitor_geometry (gdk_screen_get_default (), + screen = gtk_widget_get_screen (GTK_WIDGET (window)); + gdk_screen_get_monitor_geometry (screen, gdk_screen_get_monitor_at_window - (gdk_screen_get_default (), + (screen, GTK_WIDGET (window)->window), &screen_rect); if (toolbar) { @@ -1619,14 +1626,10 @@ 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); + if (ev_window->priv->uri) { + ev_metadata_manager_set_int (ev_window->priv->uri, "sidebar_size", + gtk_paned_get_position (GTK_PANED (object))); + } } static void @@ -1663,6 +1666,7 @@ fullscreen_timeout_cb (gpointer data) g_object_set (window->priv->fullscreen_popup, "visible", FALSE, NULL); ev_view_hide_cursor (EV_VIEW (window->priv->view)); + g_source_unref (window->priv->fullscreen_timeout_source); window->priv->fullscreen_timeout_source = NULL; return FALSE; @@ -1673,10 +1677,12 @@ fullscreen_set_timeout (EvWindow *window) { GSource *source; - if (window->priv->fullscreen_timeout_source != NULL) + if (window->priv->fullscreen_timeout_source != NULL) { + g_source_unref (window->priv->fullscreen_timeout_source); g_source_destroy (window->priv->fullscreen_timeout_source); + } - source = g_timeout_source_new (1000); + source = g_timeout_source_new (FULLSCREEN_TIMEOUT); g_source_set_callback (source, fullscreen_timeout_cb, window, NULL); g_source_attach (source, NULL); window->priv->fullscreen_timeout_source = source; @@ -1685,8 +1691,10 @@ fullscreen_set_timeout (EvWindow *window) static void fullscreen_clear_timeout (EvWindow *window) { - if (window->priv->fullscreen_timeout_source != NULL) + if (window->priv->fullscreen_timeout_source != NULL) { + g_source_unref (window->priv->fullscreen_timeout_source); g_source_destroy (window->priv->fullscreen_timeout_source); + } window->priv->fullscreen_timeout_source = NULL; ev_view_show_cursor (EV_VIEW (window->priv->view)); @@ -1760,6 +1768,7 @@ ev_window_create_fullscreen_popup (EvWindow *window) GtkWidget *popup; GtkWidget *hbox; GtkWidget *button; + GdkScreen *screen; window->priv->fullscreen_toolbar = egg_editable_toolbar_new_with_model (window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP)); @@ -1778,14 +1787,17 @@ ev_window_create_fullscreen_popup (EvWindow *window) gtk_window_set_resizable (GTK_WINDOW (popup), FALSE); - /* FIXME multihead */ - g_signal_connect_object (gdk_screen_get_default (), "size-changed", + screen = gtk_widget_get_screen (GTK_WIDGET (window)); + g_signal_connect_object (screen, "size-changed", G_CALLBACK (screen_size_changed_cb), window, 0); g_signal_connect_object (popup, "size_request", G_CALLBACK (fullscreen_popup_size_request_cb), window, 0); + gtk_window_set_screen (GTK_WINDOW (popup), + gtk_widget_get_screen (GTK_WIDGET (window))); + return popup; } @@ -1811,7 +1823,9 @@ ev_window_run_fullscreen (EvWindow *window) if (window->priv->fullscreen_popup == NULL) window->priv->fullscreen_popup = ev_window_create_fullscreen_popup (window); + update_chrome_visibility (window); + gtk_widget_hide (window->priv->sidebar); g_object_set (G_OBJECT (window->priv->scrolled_window), "shadow-type", GTK_SHADOW_NONE, @@ -1832,7 +1846,9 @@ ev_window_run_fullscreen (EvWindow *window) gtk_window_fullscreen (GTK_WINDOW (window)); ev_window_update_fullscreen_popup (window); - ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE); + if (window->priv->uri) { + ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE); + } } static void @@ -1859,8 +1875,11 @@ ev_window_stop_fullscreen (EvWindow *window) ev_window_update_fullscreen_action (window); gtk_window_unfullscreen (GTK_WINDOW (window)); update_chrome_visibility (window); + update_sidebar_visibility (window); - ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE); + if (window->priv->uri) { + ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE); + } } static void @@ -1905,8 +1924,11 @@ ev_window_run_presentation (EvWindow *window) gtk_window_fullscreen (GTK_WINDOW (window)); ev_window_update_presentation_action (window); update_chrome_visibility (window); + gtk_widget_hide (window->priv->sidebar); - ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE); + if (window->priv->uri) { + ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE); + } } static void @@ -1922,8 +1944,11 @@ ev_window_stop_presentation (EvWindow *window) gtk_window_unfullscreen (GTK_WINDOW (window)); ev_window_update_presentation_action (window); update_chrome_visibility (window); + update_sidebar_visibility (window); - ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE); + if (window->priv->uri) { + ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE); + } } static void @@ -1942,23 +1967,6 @@ ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window) } } -static gboolean -ev_window_state_event (GtkWidget *widget, GdkEventWindowState *event) -{ - EvWindow *window = EV_WINDOW (widget); - - if (event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) { - gboolean maximized; - - maximized = (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) == 0; - - ev_statusbar_set_maximized (EV_STATUSBAR (window->priv->statusbar), - maximized); - } - - return FALSE; -} - static gboolean ev_window_focus_in_event (GtkWidget *widget, GdkEventFocus *event) { @@ -1993,6 +2001,32 @@ ev_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event) return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_out_event (widget, event); } +static void +ev_window_screen_changed (GtkWidget *widget, + GdkScreen *old_screen) +{ + EvWindow *window = EV_WINDOW (widget); + EvWindowPrivate *priv = window->priv; + GdkScreen *screen; + + if (GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed) { + GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed (widget, old_screen); + } + + if (priv->fullscreen_popup != NULL) { + g_signal_handlers_disconnect_by_func + (old_screen, G_CALLBACK (screen_size_changed_cb), window); + + screen = gtk_widget_get_screen (widget); + g_signal_connect_object (screen, "size-changed", + G_CALLBACK (screen_size_changed_cb), + window, 0); + gtk_window_set_screen (GTK_WINDOW (priv->fullscreen_popup), screen); + + ev_window_update_fullscreen_popup (window); + } +} + static void ev_window_set_page_mode (EvWindow *window, EvWindowPageMode page_mode) @@ -2040,14 +2074,12 @@ static void ev_window_cmd_edit_rotate_left (GtkAction *action, EvWindow *ev_window) { ev_view_rotate_left (EV_VIEW (ev_window->priv->view)); - ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (ev_window->priv->sidebar_thumbs)); } static void ev_window_cmd_edit_rotate_right (GtkAction *action, EvWindow *ev_window) { ev_view_rotate_right (EV_VIEW (ev_window->priv->view)); - ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (ev_window->priv->sidebar_thumbs)); } static void @@ -2056,14 +2088,15 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window) GtkWidget *dialog; GtkWidget *editor; - dialog = gtk_dialog_new_with_buttons (_("Toolbar editor"), + dialog = gtk_dialog_new_with_buttons (_("Toolbar Editor"), GTK_WINDOW (ev_window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)), 5); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 18); + gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2); gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400); @@ -2108,7 +2141,7 @@ ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); - ev_page_cache_prev_page (ev_window->priv->page_cache); + ev_view_previous_page (EV_VIEW (ev_window->priv->view)); } static void @@ -2116,7 +2149,7 @@ ev_window_cmd_go_next_page (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); - ev_page_cache_next_page (ev_window->priv->page_cache); + ev_view_next_page (EV_VIEW (ev_window->priv->view)); } static void @@ -2215,6 +2248,7 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window) widget = gtk_window_get_focus (GTK_WINDOW (window)); if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) { update_chrome_flag (window, EV_CHROME_FINDBAR, NULL, FALSE); + gtk_widget_grab_focus (window->priv->view); } else { gboolean fullscreen; gboolean presentation; @@ -2374,8 +2408,32 @@ ev_window_continuous_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_w { ev_window_update_continuous_action (ev_window); - ev_metadata_manager_set_boolean (ev_window->priv->uri, "continuous", - ev_view_get_continuous (EV_VIEW (ev_window->priv->view))); + if (ev_window->priv->uri) { + ev_metadata_manager_set_boolean (ev_window->priv->uri, "continuous", + ev_view_get_continuous (EV_VIEW (ev_window->priv->view))); + } +} + +static void +ev_window_rotation_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window) +{ + int rotation; + + rotation = ev_view_get_rotation (EV_VIEW (window->priv->view)); + + if (window->priv->uri) { + ev_metadata_manager_set_int (window->priv->uri, "rotation", + rotation); + } + + ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (window->priv->sidebar_thumbs), + rotation); +} + +static void +ev_window_has_selection_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window) +{ + update_action_sensitivity (window); } static void @@ -2383,8 +2441,10 @@ ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_wi { ev_window_update_dual_page_action (ev_window); - ev_metadata_manager_set_boolean (ev_window->priv->uri, "dual-page", - ev_view_get_dual_page (EV_VIEW (ev_window->priv->view))); + if (ev_window->priv->uri) { + ev_metadata_manager_set_boolean (ev_window->priv->uri, "dual-page", + ev_view_get_dual_page (EV_VIEW (ev_window->priv->view))); + } } static char * @@ -2488,115 +2548,56 @@ ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window) } static void -ev_window_view_statusbar_cb (GtkAction *action, EvWindow *ev_window) +ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window) { - update_chrome_flag (ev_window, EV_CHROME_STATUSBAR, - GCONF_CHROME_STATUSBAR, - gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + set_widget_visibility (ev_window->priv->sidebar, + gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); } static void -ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window) +ev_window_sidebar_current_page_changed_cb (EvSidebar *ev_sidebar, + GParamSpec *pspec, + EvWindow *ev_window) { - update_chrome_flag (ev_window, EV_CHROME_SIDEBAR, - GCONF_CHROME_SIDEBAR, - gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + GtkWidget *current_page; + const char *id; + + g_object_get (G_OBJECT (ev_sidebar), "current_page", ¤t_page, NULL); + + if (current_page == ev_window->priv->sidebar_links) { + id = LINKS_SIDEBAR_ID; + } else if (current_page == ev_window->priv->sidebar_thumbs) { + id = THUMBNAILS_SIDEBAR_ID; + } else { + g_assert_not_reached(); + } + + g_object_unref (current_page); + + if (ev_window->priv->uri) { + ev_metadata_manager_set_string (ev_window->priv->uri, "sidebar_page", id); + } } static void ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspec, EvWindow *ev_window) { + EvView *view = EV_VIEW (ev_window->priv->view); GtkAction *action; - gboolean visible, fullscreen_mode; - - fullscreen_mode = ev_view_get_presentation (EV_VIEW (ev_window->priv->view)) || - ev_view_get_fullscreen (EV_VIEW (ev_window->priv->view)); - - visible = GTK_WIDGET_VISIBLE (ev_sidebar); - - /* In fullscreen mode the sidebar is not visible, - * but we don't want to update the chrome - */ - if (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); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), + GTK_WIDGET_VISIBLE (ev_sidebar)); 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) -{ - GtkAction *action; - char *message; - - action = g_object_get_data (G_OBJECT (proxy), "gtk-action"); - g_return_if_fail (action != NULL); - - g_object_get (G_OBJECT (action), "tooltip", &message, NULL); - if (message) { - ev_statusbar_push (EV_STATUSBAR (ev_window->priv->statusbar), - EV_CONTEXT_VIEW, message); - g_free (message); - } -} - -static void -menu_item_deselect_cb (GtkMenuItem *proxy, EvWindow *ev_window) -{ - ev_statusbar_pop (EV_STATUSBAR (ev_window->priv->statusbar), - EV_CONTEXT_VIEW); -} - -static void -connect_proxy_cb (GtkUIManager *ui_manager, GtkAction *action, - GtkWidget *proxy, EvWindow *ev_window) -{ - if (GTK_IS_MENU_ITEM (proxy)) { - g_signal_connect (proxy, "select", - G_CALLBACK (menu_item_select_cb), ev_window); - g_signal_connect (proxy, "deselect", - G_CALLBACK (menu_item_deselect_cb), - ev_window); - } -} - -static void -disconnect_proxy_cb (GtkUIManager *ui_manager, GtkAction *action, - GtkWidget *proxy, EvWindow *ev_window) -{ - if (GTK_IS_MENU_ITEM (proxy)) { - g_signal_handlers_disconnect_by_func - (proxy, G_CALLBACK (menu_item_select_cb), ev_window); - g_signal_handlers_disconnect_by_func - (proxy, G_CALLBACK (menu_item_deselect_cb), ev_window); - } -} - -static void -view_status_changed_cb (EvView *view, - GParamSpec *pspec, - EvWindow *ev_window) -{ - const char *message; - - ev_statusbar_pop (EV_STATUSBAR (ev_window->priv->statusbar), - EV_CONTEXT_HELP); - - message = ev_view_get_status (view); - if (message) { - ev_statusbar_push (EV_STATUSBAR (ev_window->priv->statusbar), - EV_CONTEXT_HELP, message); + if (!ev_view_get_presentation (view) && !ev_view_get_fullscreen (view)) { + ev_metadata_manager_set_boolean (ev_window->priv->uri, "sidebar_visibility", + GTK_WIDGET_VISIBLE (ev_sidebar)); } } @@ -2672,6 +2673,7 @@ find_bar_search_changed_cb (EggFindBar *find_bar, ev_document_find_cancel (EV_DOCUMENT_FIND (ev_window->priv->document)); ev_document_doc_mutex_unlock (); + update_action_sensitivity (ev_window); 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)); @@ -2706,14 +2708,15 @@ zoom_control_changed_cb (EphyZoomAction *action, static void ev_window_finalize (GObject *object) { - GList *windows = gtk_window_list_toplevels (); + GList *windows = ev_application_get_windows (EV_APP); if (windows == NULL) { ev_application_shutdown (EV_APP); } else { g_list_free (windows); } - + + g_list_free (windows); G_OBJECT_CLASS (ev_window_parent_class)->finalize (object); } @@ -2723,6 +2726,11 @@ ev_window_dispose (GObject *object) EvWindow *window = EV_WINDOW (object); EvWindowPrivate *priv = window->priv; + if (priv->title) { + ev_window_title_free (priv->title); + priv->title = NULL; + } + if (priv->recent_view) { g_object_unref (priv->recent_view); priv->recent_view = NULL; @@ -2788,7 +2796,13 @@ ev_window_dispose (GObject *object) priv->find_bar = NULL; } + if (priv->uri) { + g_free (priv->uri); + priv->uri = NULL; + } + if (window->priv->fullscreen_timeout_source) { + g_source_unref (window->priv->fullscreen_timeout_source); g_source_destroy (window->priv->fullscreen_timeout_source); window->priv->fullscreen_timeout_source = NULL; } @@ -2806,9 +2820,9 @@ ev_window_class_init (EvWindowClass *ev_window_class) g_object_class->dispose = ev_window_dispose; g_object_class->finalize = ev_window_finalize; - widget_class->window_state_event = ev_window_state_event; widget_class->focus_in_event = ev_window_focus_in_event; widget_class->focus_out_event = ev_window_focus_out_event; + widget_class->screen_changed = ev_window_screen_changed; g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate)); } @@ -2822,43 +2836,34 @@ static const GtkActionEntry entries[] = { { "Help", NULL, N_("_Help") }, /* File menu */ - { "FileOpen", GTK_STOCK_OPEN, NULL, "O", + { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "O", N_("Open an existing document"), G_CALLBACK (ev_window_cmd_file_open) }, - { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL, - N_("Save the current document with a new filename"), + { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL, NULL, G_CALLBACK (ev_window_cmd_save_as) }, - { "FilePrint", GTK_STOCK_PRINT, N_("Print..."), "P", + { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "P", N_("Print this document"), G_CALLBACK (ev_window_cmd_file_print) }, - { "FileProperties", GTK_STOCK_PROPERTIES, N_("Properties"), "Return", - N_("View the properties of this document"), + { "FileProperties", GTK_STOCK_PROPERTIES, N_("P_roperties"), "Return", NULL, G_CALLBACK (ev_window_cmd_file_properties) }, - { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "W", - N_("Close this window"), + { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "W", NULL, G_CALLBACK (ev_window_cmd_file_close_window) }, /* Edit menu */ - { "EditCopy", GTK_STOCK_COPY, NULL, "C", - N_("Copy text from the document"), + { "EditCopy", GTK_STOCK_COPY, NULL, "C", NULL, G_CALLBACK (ev_window_cmd_edit_copy) }, - { "EditSelectAll", NULL, N_("Select _All"), "A", - N_("Select the entire page"), + { "EditSelectAll", NULL, N_("Select _All"), "A", NULL, G_CALLBACK (ev_window_cmd_edit_select_all) }, { "EditFind", GTK_STOCK_FIND, NULL, "F", N_("Find a word or phrase in the document"), G_CALLBACK (ev_window_cmd_edit_find) }, - { "EditFindNext", NULL, N_("Find Ne_xt"), "G", - N_("Find next occurrence of the word or phrase"), + { "EditFindNext", NULL, N_("Find Ne_xt"), "G", NULL, G_CALLBACK (ev_window_cmd_edit_find_next) }, - { "EditToolbar", NULL, N_("T_oolbar"), NULL, - N_("Customize the toolbar"), + { "EditToolbar", NULL, N_("T_oolbar"), NULL, NULL, G_CALLBACK (ev_window_cmd_edit_toolbar) }, - { "EditRotateLeft", NULL, N_("Rotate _Left"), NULL, - N_("Rotate the document to the left"), + { "EditRotateLeft", NULL, N_("Rotate _Left"), NULL, NULL, G_CALLBACK (ev_window_cmd_edit_rotate_left) }, - { "EditRotateRight", NULL, N_("Rotate _Right"), NULL, - N_("Rotate the document to the right"), + { "EditRotateRight", NULL, N_("Rotate _Right"), NULL, NULL, G_CALLBACK (ev_window_cmd_edit_rotate_right) }, /* View menu */ @@ -2887,12 +2892,10 @@ static const GtkActionEntry entries[] = { G_CALLBACK (ev_window_cmd_go_last_page) }, /* Help menu */ - { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", - N_("Display help for the viewer application"), + { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", NULL, G_CALLBACK (ev_window_cmd_help_contents) }, - { "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL, - N_("Display credits for the document viewer creators"), + { "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, G_CALLBACK (ev_window_cmd_help_about) }, /* Toolbar-only */ @@ -2903,50 +2906,41 @@ static const GtkActionEntry entries[] = { /* Accellerators */ { "Escape", NULL, "", "Escape", "", G_CALLBACK (ev_window_cmd_escape) }, - { "Slash", GTK_STOCK_FIND, NULL, "slash", - N_("Find a word or phrase in the document"), + { "Slash", GTK_STOCK_FIND, NULL, "slash", NULL, G_CALLBACK (ev_window_cmd_edit_find) }, - { "PageDown", NULL, "", "Page_Down", - N_("Scroll one page forward"), + { "PageDown", NULL, "", "Page_Down", NULL, G_CALLBACK (ev_window_cmd_scroll_forward) }, - { "PageUp", NULL, "", "Page_Up", - N_("Scroll one page backward"), + { "PageUp", NULL, "", "Page_Up", NULL, G_CALLBACK (ev_window_cmd_scroll_backward) }, - { "Space", NULL, "", "space", - N_("Scroll one page forward"), + { "Space", NULL, "", "space", NULL, G_CALLBACK (ev_window_cmd_scroll_forward) }, - { "ShiftSpace", NULL, "", "space", - N_("Scroll one page backward"), + { "ShiftSpace", NULL, "", "space", NULL, G_CALLBACK (ev_window_cmd_scroll_backward) }, - { "BackSpace", NULL, "", "BackSpace", - N_("Scroll one page backward"), + { "BackSpace", NULL, "", "BackSpace", NULL, G_CALLBACK (ev_window_cmd_scroll_backward) }, - { "ShiftBackSpace", NULL, "", "BackSpace", - N_("Scroll one page forward"), + { "ShiftBackSpace", NULL, "", "BackSpace", NULL, G_CALLBACK (ev_window_cmd_scroll_forward) }, - { "Plus", GTK_STOCK_ZOOM_IN, NULL, "plus", - N_("Enlarge the document"), + { "Plus", GTK_STOCK_ZOOM_IN, NULL, "plus", NULL, G_CALLBACK (ev_window_cmd_view_zoom_in) }, - { "CtrlEqual", GTK_STOCK_ZOOM_IN, NULL, "equal", - N_("Enlarge the document"), + { "CtrlEqual", GTK_STOCK_ZOOM_IN, NULL, "equal", NULL, G_CALLBACK (ev_window_cmd_view_zoom_in) }, - { "Minus", GTK_STOCK_ZOOM_OUT, NULL, "minus", - N_("Shrink the document"), + { "Equal", GTK_STOCK_ZOOM_IN, NULL, "equal", NULL, + G_CALLBACK (ev_window_cmd_view_zoom_in) }, + { "Minus", GTK_STOCK_ZOOM_OUT, NULL, "minus", NULL, G_CALLBACK (ev_window_cmd_view_zoom_out) }, - { "FocusPageSelector", NULL, "", "l", - N_("Focus the page selector"), + { "FocusPageSelector", NULL, "", "l", NULL, G_CALLBACK (ev_window_cmd_focus_page_selector) }, - { "GoBackwardFast", NULL, "", "Page_Up", - N_("Go ten pages backward"), + { "GoBackwardFast", NULL, "", "Page_Up", NULL, G_CALLBACK (ev_window_cmd_go_backward) }, - { "GoForwardFast", NULL, "", "Page_Down", - N_("Go ten pages forward"), + { "GoForwardFast", NULL, "", "Page_Down", NULL, G_CALLBACK (ev_window_cmd_go_forward) }, - { "KpPlus", GTK_STOCK_ZOOM_IN, NULL, "KP_Add", - N_("Enlarge the document"), + { "KpPlus", GTK_STOCK_ZOOM_IN, NULL, "KP_Add", NULL, G_CALLBACK (ev_window_cmd_view_zoom_in) }, - { "KpMinus", GTK_STOCK_ZOOM_OUT, NULL, "KP_Subtract", - N_("Shrink the document"), + { "KpMinus", GTK_STOCK_ZOOM_OUT, NULL, "KP_Subtract", NULL, + G_CALLBACK (ev_window_cmd_view_zoom_out) }, + { "CtrlKpPlus", GTK_STOCK_ZOOM_IN, NULL, "KP_Add", NULL, + G_CALLBACK (ev_window_cmd_view_zoom_in) }, + { "CtrlKpMinus", GTK_STOCK_ZOOM_OUT, NULL, "KP_Subtract", NULL, G_CALLBACK (ev_window_cmd_view_zoom_out) }, }; @@ -2956,10 +2950,7 @@ static const GtkToggleActionEntry toggle_entries[] = { { "ViewToolbar", NULL, N_("_Toolbar"), "T", N_("Show or hide the toolbar"), G_CALLBACK (ev_window_view_toolbar_cb), TRUE }, - { "ViewStatusbar", NULL, N_("_Statusbar"), NULL, - N_("Show or hide the statusbar"), - G_CALLBACK (ev_window_view_statusbar_cb), TRUE }, - { "ViewSidebar", NULL, N_("Side _pane"), "F9", + { "ViewSidebar", NULL, N_("Side _Pane"), "F9", N_("Show or hide the side pane"), G_CALLBACK (ev_window_view_sidebar_cb), TRUE }, { "ViewContinuous", EV_STOCK_VIEW_CONTINUOUS, N_("_Continuous"), NULL, @@ -3003,7 +2994,7 @@ drag_data_received_cb (GtkWidget *widget, GdkDragContext *context, gnome_vfs_uri_list_free (uri_list); - ev_application_open_uri_list (EV_APP, uris); + ev_application_open_uri_list (EV_APP, uris, 0); g_slist_free (uris); @@ -3016,7 +3007,7 @@ 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); + ev_view_goto_link (EV_VIEW (window->priv->view), link); gtk_widget_grab_focus (window->priv->view); } @@ -3114,22 +3105,6 @@ set_chrome_actions (EvWindow *window) (priv->chrome & EV_CHROME_TOOLBAR) != 0); g_signal_handlers_unblock_by_func (action, G_CALLBACK (ev_window_view_toolbar_cb), window); - - action= gtk_action_group_get_action (action_group, "ViewSidebar"); - g_signal_handlers_block_by_func - (action, G_CALLBACK (ev_window_view_sidebar_cb), window); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), - (priv->chrome & EV_CHROME_SIDEBAR) != 0); - g_signal_handlers_unblock_by_func - (action, G_CALLBACK (ev_window_view_sidebar_cb), window); - - action= gtk_action_group_get_action (action_group, "ViewStatusbar"); - g_signal_handlers_block_by_func - (action, G_CALLBACK (ev_window_view_statusbar_cb), window); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), - (priv->chrome & EV_CHROME_STATUSBAR) != 0); - g_signal_handlers_unblock_by_func - (action, G_CALLBACK (ev_window_view_statusbar_cb), window); } static EvChrome @@ -3149,22 +3124,6 @@ load_chrome (void) gconf_value_free (value); } - value = gconf_client_get (client, GCONF_CHROME_SIDEBAR, NULL); - if (value != NULL) { - if (value->type == GCONF_VALUE_BOOL && !gconf_value_get_bool (value)) { - chrome &= ~EV_CHROME_SIDEBAR; - } - gconf_value_free (value); - } - - value = gconf_client_get (client, GCONF_CHROME_STATUSBAR, NULL); - if (value != NULL) { - if (value->type == GCONF_VALUE_BOOL && !gconf_value_get_bool (value)) { - chrome &= ~EV_CHROME_STATUSBAR; - } - gconf_value_free (value); - } - g_object_unref (client); return chrome; @@ -3203,6 +3162,7 @@ ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive) set_action_sensitive (window, "Minus", sensitive); set_action_sensitive (window, "KpPlus", sensitive); set_action_sensitive (window, "KpMinus", sensitive); + set_action_sensitive (window, "Equal", sensitive); } } @@ -3282,6 +3242,74 @@ window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer return FALSE; } +static void +sidebar_links_link_activated_cb (EvSidebarLinks *sidebar_links, EvLink *link, EvWindow *window) +{ + ev_view_goto_link (EV_VIEW (window->priv->view), link); +} + +static void +launch_link (EvWindow *window, EvLink *link) +{ + const char *filename = ev_link_get_filename (link); + char *uri = NULL; + + if (filename && g_path_is_absolute (filename)) { + uri = gnome_vfs_get_uri_from_local_path (filename); + } else { + GnomeVFSURI *base_uri, *resolved_uri; + + base_uri = gnome_vfs_uri_new (window->priv->uri); + if (base_uri && filename) { + resolved_uri = gnome_vfs_uri_resolve_relative (base_uri, filename); + if (resolved_uri) { + uri = gnome_vfs_uri_to_string (resolved_uri, GNOME_VFS_URI_HIDE_NONE); + gnome_vfs_uri_unref (resolved_uri); + } + gnome_vfs_uri_unref (base_uri); + } + } + + if (uri) { + gnome_vfs_url_show (uri); + } else { + gnome_vfs_url_show (filename); + } + + g_free (uri); + + /* According to the PDF spec filename can be an executable. I'm not sure + allowing to launch executables is a good idea though. -- marco */ +} + +static void +launch_external_uri (EvWindow *window, EvLink *link) +{ + const char *uri; + char *escaped; + + uri = ev_link_get_uri (link); + escaped = gnome_vfs_escape_host_and_path_string (uri); + + gnome_vfs_url_show (escaped); + g_free (escaped); +} + +static void +view_external_link_cb (EvView *view, EvLink *link, EvWindow *window) +{ + switch (ev_link_get_link_type (link)) { + case EV_LINK_TYPE_EXTERNAL_URI: + launch_external_uri (window, link); + break; + case EV_LINK_TYPE_LAUNCH: + launch_link (window, link); + break; + default: + g_assert_not_reached (); + } +} + static void ev_window_init (EvWindow *ev_window) { @@ -3289,9 +3317,6 @@ ev_window_init (EvWindow *ev_window) GtkAccelGroup *accel_group; GError *error = NULL; GtkWidget *sidebar_widget, *toolbar_dock; - GConfValue *value; - GConfClient *client; - int sidebar_size; g_signal_connect (ev_window, "configure_event", G_CALLBACK (window_configure_event_cb), NULL); @@ -3301,7 +3326,7 @@ ev_window_init (EvWindow *ev_window) ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window); ev_window->priv->page_mode = PAGE_MODE_DOCUMENT; - update_window_title (NULL, NULL, ev_window); + ev_window->priv->title = ev_window_title_new (ev_window); ev_window->priv->main_box = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (ev_window), ev_window->priv->main_box); @@ -3328,11 +3353,6 @@ ev_window_init (EvWindow *ev_window) ev_window_set_view_accels_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", - G_CALLBACK (disconnect_proxy_cb), ev_window); - if (!gtk_ui_manager_add_ui_from_file (ev_window->priv->ui_manager, DATADIR"/evince-ui.xml", &error)) { @@ -3371,17 +3391,7 @@ ev_window_init (EvWindow *ev_window) 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_paned_set_position (GTK_PANED (ev_window->priv->hpaned), SIDEBAR_DEFAULT_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); @@ -3393,10 +3403,15 @@ ev_window_init (EvWindow *ev_window) /* Stub sidebar, for now */ sidebar_widget = ev_sidebar_links_new (); + ev_window->priv->sidebar_links = sidebar_widget; g_signal_connect (sidebar_widget, "notify::model", G_CALLBACK (sidebar_widget_model_set), ev_window); + g_signal_connect (sidebar_widget, + "link_activated", + G_CALLBACK (sidebar_links_link_activated_cb), + ev_window); sidebar_page_main_widget_update_cb (G_OBJECT (sidebar_widget), NULL, ev_window); gtk_widget_show (sidebar_widget); ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar), @@ -3435,6 +3450,9 @@ ev_window_init (EvWindow *ev_window) g_signal_connect_object (ev_window->priv->view, "focus_out_event", G_CALLBACK (view_actions_focus_out_cb), ev_window, 0); + g_signal_connect_object (ev_window->priv->view, "external-link", + G_CALLBACK (view_external_link_cb), + ev_window, 0); gtk_widget_show (ev_window->priv->view); gtk_widget_show (ev_window->priv->password_view); @@ -3451,10 +3469,6 @@ ev_window_init (EvWindow *ev_window) "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); g_signal_connect (ev_window->priv->view, "notify::sizing-mode", G_CALLBACK (ev_window_sizing_mode_changed_cb), @@ -3471,12 +3485,15 @@ ev_window_init (EvWindow *ev_window) "notify::continuous", G_CALLBACK (ev_window_continuous_changed_cb), ev_window); + g_signal_connect (ev_window->priv->view, + "notify::rotation", + G_CALLBACK (ev_window_rotation_changed_cb), + ev_window); + g_signal_connect (ev_window->priv->view, + "notify::has-selection", + G_CALLBACK (ev_window_has_selection_changed_cb), + ev_window); - ev_window->priv->statusbar = ev_statusbar_new (); - gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box), - ev_window->priv->statusbar, - FALSE, TRUE, 0); - ev_window->priv->find_bar = egg_find_bar_new (); gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box), ev_window->priv->find_bar, @@ -3492,7 +3509,11 @@ ev_window_init (EvWindow *ev_window) "notify::visible", G_CALLBACK (ev_window_sidebar_visibility_changed_cb), ev_window); - + g_signal_connect (ev_window->priv->sidebar, + "notify::current-page", + G_CALLBACK (ev_window_sidebar_current_page_changed_cb), + ev_window); + /* Connect to find bar signals */ g_signal_connect (ev_window->priv->find_bar, "previous",