X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=fac6047d77ac868369087cbf0c4818979df05085;hb=1ba681aa9eb43a60f0a01c1939e70f9f6de755c7;hp=e9e1c4e65a6699e656aa059941e01fe525a7c3ac;hpb=4f1722b0523879cd73ee936d483a735e163a6b54;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index e9e1c4e6..fac6047d 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -37,28 +37,32 @@ #include "ev-password.h" #include "ev-password-view.h" #include "ev-print-job.h" -#include "ev-properties.h" +#include "ev-properties-dialog.h" +#include "ev-ps-exporter.h" #include "ev-document-thumbnails.h" #include "ev-document-links.h" #include "ev-document-fonts.h" #include "ev-document-find.h" #include "ev-document-security.h" +#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-gtk.h" +#include "egg-recent-view-uimanager.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 "egg-recent-model.h" +#include "egg-toolbars-model.h" #include "ephy-zoom.h" #include "ephy-zoom-action.h" #include "ev-application.h" #include "ev-stock-icons.h" +#include "ev-metadata-manager.h" #include "ev-file-helpers.h" + #include #include @@ -101,21 +105,19 @@ struct _EvWindowPrivate { GtkWidget *page_view; GtkWidget *password_view; GtkWidget *statusbar; + GtkWidget *sidebar_thumbs; /* Dialogs */ - EvProperties *properties; + GtkWidget *properties; /* UI Builders */ GtkActionGroup *action_group; GtkUIManager *ui_manager; - gchar *toolbar_file; - EggToolbarsModel *toolbar_model; - /* Fullscreen mode */ GtkWidget *fullscreen_toolbar; GtkWidget *fullscreen_popup; - GSource *fullscreen_timeout_source; + GSource *fullscreen_timeout_source; /* Document */ char *uri; @@ -134,9 +136,7 @@ struct _EvWindowPrivate { EvJob *xfer_job; EvJob *load_job; - /* recent file stuff */ - EggRecentModel *recent_model; - EggRecentViewGtk *recent_view; + EggRecentViewUIManager *recent_view; }; static const GtkTargetEntry ev_drop_types[] = { @@ -153,11 +153,14 @@ static const GtkTargetEntry ev_drop_types[] = { #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 SIDEBAR_DEFAULT_SIZE 132 +#define PRINT_CONFIG_FILENAME "ev-print-config.xml" + static void ev_window_update_fullscreen_popup (EvWindow *window); static void ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspec, @@ -176,8 +179,8 @@ static void ev_window_zoom_changed_cb (EvView *view, EvWindow *ev_window); static void ev_window_add_recent (EvWindow *window, const char *filename); -static void ev_window_fullscreen (EvWindow *window); -static void ev_window_unfullscreen (EvWindow *window); +static void ev_window_run_fullscreen (EvWindow *window); +static void ev_window_stop_fullscreen (EvWindow *window); static void ev_window_cmd_view_fullscreen (GtkAction *action, EvWindow *window); static void ev_window_run_presentation (EvWindow *window); @@ -185,7 +188,7 @@ static void ev_window_stop_presentation (EvWindow *windo static void ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window); static void show_fullscreen_popup (EvWindow *window); - + G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW) @@ -210,13 +213,19 @@ update_action_sensitivity (EvWindow *ev_window) int n_pages = 0, page = -1; gboolean ok_to_print = TRUE; gboolean ok_to_copy = TRUE; + gboolean has_properties = TRUE; + GConfClient *client; view = EV_VIEW (ev_window->priv->view); + document = ev_window->priv->document; + if (document) info = ev_page_cache_get_info (ev_window->priv->page_cache); + page_mode = ev_window->priv->page_mode; has_document = document != NULL; + if (has_document && ev_window->priv->page_cache) { page = ev_page_cache_get_current_page (ev_window->priv->page_cache); n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache); @@ -228,11 +237,28 @@ update_action_sensitivity (EvWindow *ev_window) ok_to_copy = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_COPY); } + if (has_document && !EV_IS_PS_EXPORTER(document)) + ok_to_print = FALSE; + + if (!info || info->fields_mask == 0) { + has_properties = FALSE; + } + + client = gconf_client_get_default (); + + if (gconf_client_get_bool (client, GCONF_LOCKDOWN_SAVE, NULL)) { + ok_to_copy = FALSE; + } + + if (gconf_client_get_bool (client, GCONF_LOCKDOWN_PRINT, NULL)) { + ok_to_print = FALSE; + } + /* File menu */ /* "FileOpen": always sensitive */ set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy); set_action_sensitive (ev_window, "FilePrint", has_pages && ok_to_print); - set_action_sensitive (ev_window, "FileProperties", has_document); + set_action_sensitive (ev_window, "FileProperties", has_document && has_properties); /* "FileCloseWindow": always sensitive */ /* Edit menu */ @@ -245,6 +271,8 @@ update_action_sensitivity (EvWindow *ev_window) has_pages && EV_IS_DOCUMENT_FIND (document)); set_action_sensitive (ev_window, "EditFindNext", ev_view_can_find_next (view)); + set_action_sensitive (ev_window, "EditRotateLeft", has_pages); + set_action_sensitive (ev_window, "EditRotateRight", has_pages); /* View menu */ set_action_sensitive (ev_window, "ViewContinuous", has_pages); @@ -328,13 +356,14 @@ update_chrome_visibility (EvWindow *window) set_widget_visibility (priv->sidebar, sidebar); set_widget_visibility (priv->find_bar, findbar); set_widget_visibility (priv->statusbar, statusbar); - set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar); if (priv->fullscreen_popup != NULL) { if (fullscreen) show_fullscreen_popup (window); else set_widget_visibility (priv->fullscreen_popup, FALSE); + + set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar); } } @@ -599,16 +628,33 @@ page_changed_cb (EvPageCache *page_cache, EvWindow *ev_window) { update_action_sensitivity (ev_window); + + ev_metadata_manager_set_int (ev_window->priv->uri, "page", page); } static void update_document_mode (EvWindow *window, EvDocumentMode mode) { - if (mode == EV_DOCUMENT_MODE_FULL_SCREEN) { - ev_window_fullscreen (window); - } else if (mode == EV_DOCUMENT_MODE_PRESENTATION) { + if (mode == EV_DOCUMENT_MODE_PRESENTATION) { ev_window_run_presentation (window); } + else if (mode == EV_DOCUMENT_MODE_FULL_SCREEN) { + ev_window_run_fullscreen (window); + } +} + +static void +setup_document_from_metadata (EvWindow *window) +{ + char *uri = window->priv->uri; + GValue page = { 0, }; + + /* Page */ + if (ev_metadata_manager_get (uri, "page", &page)) { + ev_page_cache_set_current_page (window->priv->page_cache, + g_value_get_int (&page)); + } + } static void @@ -652,9 +698,11 @@ ev_window_setup_document (EvWindow *ev_window) update_document_mode (ev_window, info->mode); if (ev_window->priv->properties) { - ev_properties_set_document (ev_window->priv->properties, - ev_window->priv->document); + ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties), + ev_window->priv->document); } + + setup_document_from_metadata (ev_window); } static void @@ -887,9 +935,91 @@ ev_window_xfer_job_cb (EvJobXfer *job, G_CALLBACK (ev_window_load_job_cb), ev_window); ev_job_queue_add_job (ev_window->priv->load_job, EV_JOB_PRIORITY_HIGH); + g_object_unref (document); } } +static void +setup_view_from_metadata (EvWindow *window) +{ + EvView *view = EV_VIEW (window->priv->view); + char *uri = window->priv->uri; + GEnumValue *enum_value; + GValue width = { 0, }; + GValue height = { 0, }; + GValue maximized = { 0, }; + GValue x = { 0, }; + GValue y = { 0, }; + GValue sizing_mode = { 0, }; + GValue zoom = { 0, }; + GValue continuous = { 0, }; + GValue dual_page = { 0, }; + GValue presentation = { 0, }; + GValue fullscreen = { 0, }; + + /* Window size */ + if (!GTK_WIDGET_VISIBLE (window)) { + gboolean restore_size = TRUE; + + if (ev_metadata_manager_get (uri, "window_maximized", &maximized)) { + if (g_value_get_boolean (&maximized)) { + gtk_window_maximize (GTK_WINDOW (window)); + restore_size = FALSE; + } + } + + if (restore_size && + ev_metadata_manager_get (uri, "window_x", &x) && + ev_metadata_manager_get (uri, "window_y", &y) && + ev_metadata_manager_get (uri, "window_width", &width) && + ev_metadata_manager_get (uri, "window_height", &height)) { + gtk_window_set_default_size (GTK_WINDOW (window), + g_value_get_int (&width), + g_value_get_int (&height)); + gtk_window_move (GTK_WINDOW (window), g_value_get_int (&x), + g_value_get_int (&y)); + } + } + + /* Sizing mode */ + if (ev_metadata_manager_get (uri, "sizing_mode", &sizing_mode)) { + enum_value = g_enum_get_value_by_nick + (EV_SIZING_MODE_CLASS, g_value_get_string (&sizing_mode)); + g_value_unset (&sizing_mode); + ev_view_set_sizing_mode (view, enum_value->value); + } + + /* Zoom */ + if (ev_metadata_manager_get (uri, "zoom", &zoom) && + ev_view_get_sizing_mode (view) == EV_SIZING_FREE) { + ev_view_set_zoom (view, g_value_get_double (&zoom), FALSE); + } + + /* Continuous */ + if (ev_metadata_manager_get (uri, "continuous", &continuous)) { + ev_view_set_continuous (view, g_value_get_boolean (&continuous)); + } + + /* Dual page */ + if (ev_metadata_manager_get (uri, "dual-page", &dual_page)) { + ev_view_set_dual_page (view, g_value_get_boolean (&dual_page)); + } + + /* Presentation */ + if (ev_metadata_manager_get (uri, "presentation", &presentation)) { + if (g_value_get_boolean (&presentation)) { + ev_window_run_presentation (window); + } + } + + /* Fullscreen */ + if (ev_metadata_manager_get (uri, "fullscreen", &fullscreen)) { + if (g_value_get_boolean (&fullscreen)) { + ev_window_run_fullscreen (window); + } + } +} + void ev_window_open_uri (EvWindow *ev_window, const char *uri) { @@ -898,6 +1028,8 @@ ev_window_open_uri (EvWindow *ev_window, const char *uri) g_free (ev_window->priv->uri); ev_window->priv->uri = g_strdup (uri); + + setup_view_from_metadata (ev_window); ev_window_clear_jobs (ev_window); ev_window_clear_local_uri (ev_window); @@ -916,56 +1048,64 @@ ev_window_open_uri (EvWindow *ev_window, const char *uri) TRUE); } -void -ev_window_open_uri_list (EvWindow *ev_window, GSList *uri_list) +static void +ev_window_cmd_file_open (GtkAction *action, EvWindow *window) { - GSList *list; - gchar *uri; - - g_return_if_fail (uri_list != NULL); - - list = uri_list; - while (list) { + GtkWidget *chooser; + static char *folder = NULL; - uri = (gchar *)list->data; - - if (ev_window_is_empty (EV_WINDOW (ev_window))) { - ev_window_open_uri (ev_window, uri); + chooser = gtk_file_chooser_dialog_new (_("Open document"), + GTK_WINDOW (window), + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_OK, + NULL); - gtk_widget_show (GTK_WIDGET (ev_window)); - } else { - EvWindow *new_window; + if (folder) { + gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (chooser), + folder); + } - new_window = ev_application_new_window (EV_APP); - ev_window_open_uri (new_window, uri); + 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); - gtk_widget_show (GTK_WIDGET (new_window)); - } + if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_OK) { + GSList *uris; - g_free (uri); + 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)); - list = g_slist_next (list); + 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)); } -} -static void -ev_window_cmd_file_open (GtkAction *action, EvWindow *ev_window) -{ - ev_application_open (EV_APP, NULL); + gtk_widget_destroy (GTK_WIDGET (chooser)); } static void -ev_window_cmd_recent_file_activate (EggRecentViewGtk *view, EggRecentItem *item, +ev_window_cmd_recent_file_activate (GtkAction *action, EvWindow *ev_window) { char *uri; - GtkWidget *window; + EggRecentItem *item; + + item = egg_recent_view_uimanager_get_item (ev_window->priv->recent_view, + action); uri = egg_recent_item_get_uri (item); - window = GTK_WIDGET (ev_application_get_empty_window (EV_APP)); - gtk_widget_show (window); - ev_window_open_uri (EV_WINDOW (window), uri); + ev_application_open_uri (EV_APP, uri, NULL, NULL); g_free (uri); } @@ -977,38 +1117,24 @@ ev_window_add_recent (EvWindow *window, const char *filename) item = egg_recent_item_new_from_uri (filename); egg_recent_item_add_group (item, "Evince"); - egg_recent_model_add_full (window->priv->recent_model, item); + egg_recent_model_add_full (ev_application_get_recent_model (EV_APP), item); } static void ev_window_setup_recent (EvWindow *ev_window) { - GtkWidget *menu_item; - GtkWidget *menu; - - menu_item = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/MainMenu/FileMenu"); - menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item)); - menu_item = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/MainMenu/FileMenu/RecentFilesMenu"); - g_return_if_fail (menu != NULL); - g_return_if_fail (menu_item != NULL); + ev_window->priv->recent_view = egg_recent_view_uimanager_new (ev_window->priv->ui_manager, + "/MainMenu/FileMenu/RecentFilesMenu", + G_CALLBACK (ev_window_cmd_recent_file_activate), + ev_window); - /* it would be better if we just filtered by mime-type, but there - * doesn't seem to be an easy way to figure out which mime-types we - * can handle */ - ev_window->priv->recent_model = egg_recent_model_new (EGG_RECENT_MODEL_SORT_MRU); - - ev_window->priv->recent_view = egg_recent_view_gtk_new (menu, menu_item); - egg_recent_view_gtk_show_icons (EGG_RECENT_VIEW_GTK (ev_window->priv->recent_view), FALSE); - egg_recent_model_set_limit (ev_window->priv->recent_model, 5); + egg_recent_view_uimanager_show_icons (EGG_RECENT_VIEW_UIMANAGER (ev_window->priv->recent_view), FALSE); egg_recent_view_set_model (EGG_RECENT_VIEW (ev_window->priv->recent_view), - ev_window->priv->recent_model); - - egg_recent_model_set_filter_groups (ev_window->priv->recent_model, - "Evince", NULL); + ev_application_get_recent_model (EV_APP)); - egg_recent_view_gtk_set_trailing_sep (ev_window->priv->recent_view, TRUE); + egg_recent_view_uimanager_set_trailing_sep (ev_window->priv->recent_view, TRUE); g_signal_connect (ev_window->priv->recent_view, "activate", G_CALLBACK (ev_window_cmd_recent_file_activate), ev_window); @@ -1084,8 +1210,11 @@ static void ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) { GtkWidget *fc; - GtkFileFilter *pdf_filter, *all_filter; - gchar *uri = NULL; + + gchar *uri; + gchar *basename; + static char* folder = NULL; + gboolean success; fc = gtk_file_chooser_dialog_new ( @@ -1096,18 +1225,17 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) 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); - + 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); @@ -1129,9 +1257,33 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) else save_error_dialog (GTK_WINDOW (fc), uri); } + + if (folder != NULL) + g_free (folder); + + folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (fc)); + gtk_widget_destroy (fc); } +static gboolean +using_pdf_printer (GnomePrintConfig *config) +{ + const guchar *driver; + + driver = gnome_print_config_get ( + config, (const guchar *)"Settings.Engine.Backend.Driver"); + + if (driver) { + if (!strcmp ((const gchar *)driver, "gnome-print-pdf")) + return TRUE; + else + return FALSE; + } + + return FALSE; +} + static gboolean using_postscript_printer (GnomePrintConfig *config) { @@ -1149,7 +1301,7 @@ using_postscript_printer (GnomePrintConfig *config) return TRUE; else return FALSE; - } else if (transport) { + } else if (transport) { /* these transports default to PostScript */ if (!strcmp ((const gchar *)transport, "CUPS")) return TRUE; else if (!strcmp ((const gchar *)transport, "LPD")) @@ -1159,6 +1311,53 @@ using_postscript_printer (GnomePrintConfig *config) return FALSE; } +static GnomePrintConfig * +load_print_config_from_file (void) +{ + GnomePrintConfig *print_config = NULL; + char *file_name, *contents = NULL; + + file_name = g_build_filename (ev_dot_dir (), PRINT_CONFIG_FILENAME, + NULL); + + if (g_file_get_contents (file_name, &contents, NULL, NULL)) { + print_config = gnome_print_config_from_string (contents, 0); + g_free (contents); + } + + if (print_config == NULL) { + print_config = gnome_print_config_default (); + } + + g_free (file_name); + + return print_config; +} + +static void +save_print_config_to_file (GnomePrintConfig *config) +{ + char *file_name, *str; + + g_return_if_fail (config != NULL); + + str = gnome_print_config_to_string (config, 0); + if (str == NULL) return; + + file_name = g_build_filename (ev_dot_dir (), + PRINT_CONFIG_FILENAME, + NULL); + +#ifdef HAVE_G_FILE_SET_CONTENTS + g_file_set_contents (file_name, str, -1, NULL); +#else + ev_file_set_contents (file_name, str, -1, NULL); +#endif + + g_free (file_name); + g_free (str); +} + static void ev_window_print (EvWindow *window) { @@ -1171,6 +1370,12 @@ ev_window_print (EvWindow *window) ev_window_print_range (window, 1, -1); } +const char * +ev_window_get_uri (EvWindow *ev_window) +{ + return ev_window->priv->uri; +} + void ev_window_print_range (EvWindow *ev_window, int first_page, int last_page) { @@ -1189,7 +1394,7 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page) last_page = ev_page_cache_get_n_pages (page_cache); } - config = gnome_print_config_default (); + config = load_print_config_from_file (); job = gnome_print_job_new (config); print_dialog = gnome_print_dialog_new (job, (guchar *) _("Print"), @@ -1218,7 +1423,18 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page) /* FIXME: Change this when we have the first backend * that can print more than postscript */ - if (!using_postscript_printer (config)) { + if (using_pdf_printer (config)) { + GtkWidget *dialog; + + dialog = gtk_message_dialog_new ( + GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, + _("Generating PDF is not supported")); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + + continue; + } else if (!using_postscript_printer (config)) { GtkWidget *dialog; dialog = gtk_message_dialog_new ( @@ -1236,6 +1452,8 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page) continue; } + save_print_config_to_file (config); + print_job = g_object_new (EV_TYPE_PRINT_JOB, "gnome_print_job", job, "document", ev_window->priv->document, @@ -1250,6 +1468,8 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page) ev_print_job_print (print_job, GTK_WINDOW (ev_window)); g_object_unref (print_job); } + + g_object_unref (config); } static void @@ -1262,14 +1482,16 @@ static void ev_window_cmd_file_properties (GtkAction *action, EvWindow *ev_window) { if (ev_window->priv->properties == NULL) { - ev_window->priv->properties = ev_properties_new (); - ev_properties_set_document (ev_window->priv->properties, - ev_window->priv->document); + ev_window->priv->properties = ev_properties_dialog_new (); + ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties), + ev_window->priv->document); g_object_add_weak_pointer (G_OBJECT (ev_window->priv->properties), (gpointer *) &(ev_window->priv->properties)); + gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->properties), + GTK_WINDOW (ev_window)); } - ev_properties_show (ev_window->priv->properties, GTK_WIDGET (ev_window)); + gtk_widget_show (ev_window->priv->properties); } static void @@ -1536,6 +1758,9 @@ ev_window_create_fullscreen_popup (EvWindow *window) GtkWidget *hbox; GtkWidget *button; + window->priv->fullscreen_toolbar = egg_editable_toolbar_new_with_model + (window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP)); + popup = gtk_window_new (GTK_WINDOW_POPUP); hbox = gtk_hbox_new (FALSE, 0); button = ev_window_get_exit_fullscreen_button (window); @@ -1577,7 +1802,7 @@ ev_window_update_fullscreen_action (EvWindow *window) } static void -ev_window_fullscreen (EvWindow *window) +ev_window_run_fullscreen (EvWindow *window) { ev_view_set_fullscreen (EV_VIEW (window->priv->view), TRUE); if (window->priv->fullscreen_popup == NULL) @@ -1588,7 +1813,7 @@ ev_window_fullscreen (EvWindow *window) g_object_set (G_OBJECT (window->priv->scrolled_window), "shadow-type", GTK_SHADOW_NONE, NULL); - + g_signal_connect (window->priv->view, "motion-notify-event", G_CALLBACK (fullscreen_motion_notify_cb), @@ -1603,13 +1828,18 @@ ev_window_fullscreen (EvWindow *window) ev_window_update_fullscreen_action (window); gtk_window_fullscreen (GTK_WINDOW (window)); ev_window_update_fullscreen_popup (window); + + ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE); } static void -ev_window_unfullscreen (EvWindow *window) +ev_window_stop_fullscreen (EvWindow *window) { EvView *view = EV_VIEW (window->priv->view); + if (!ev_view_get_fullscreen (EV_VIEW (view))) + return; + ev_view_set_fullscreen (view, FALSE); g_object_set (G_OBJECT (window->priv->scrolled_window), "shadow-type", GTK_SHADOW_IN, @@ -1626,6 +1856,8 @@ ev_window_unfullscreen (EvWindow *window) ev_window_update_fullscreen_action (window); gtk_window_unfullscreen (GTK_WINDOW (window)); update_chrome_visibility (window); + + ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE); } static void @@ -1638,9 +1870,9 @@ ev_window_cmd_view_fullscreen (GtkAction *action, EvWindow *window) fullscreen = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); if (fullscreen) { - ev_window_fullscreen (window); + ev_window_run_fullscreen (window); } else { - ev_window_unfullscreen (window); + ev_window_stop_fullscreen (window); } } @@ -1670,12 +1902,14 @@ ev_window_run_presentation (EvWindow *window) gtk_window_fullscreen (GTK_WINDOW (window)); ev_window_update_presentation_action (window); update_chrome_visibility (window); + + ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE); } static void ev_window_stop_presentation (EvWindow *window) { - if (! ev_view_get_presentation (EV_VIEW (window->priv->view))) + if (!ev_view_get_presentation (EV_VIEW (window->priv->view))) return; g_object_set (G_OBJECT (window->priv->scrolled_window), @@ -1685,6 +1919,8 @@ ev_window_stop_presentation (EvWindow *window) gtk_window_unfullscreen (GTK_WINDOW (window)); ev_window_update_presentation_action (window); update_chrome_visibility (window); + + ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE); } static void @@ -1693,6 +1929,7 @@ ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window) gboolean presentation; g_return_if_fail (EV_IS_WINDOW (window)); + ev_window_stop_fullscreen (window); presentation = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); if (presentation) { @@ -1792,30 +2029,22 @@ 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"); + ev_application_save_toolbars_model (EV_APP); gtk_widget_destroy (GTK_WIDGET (dialog)); } static void -ev_window_cmd_edit_landscape (GtkAction *action, EvWindow *ev_window) -{ - ev_view_set_orientation (EV_VIEW (ev_window->priv->view), - EV_ORIENTATION_LANDSCAPE); -} - -static void -ev_window_cmd_edit_portrait (GtkAction *action, EvWindow *ev_window) +ev_window_cmd_edit_rotate_left (GtkAction *action, EvWindow *ev_window) { - ev_view_set_orientation (EV_VIEW (ev_window->priv->view), - EV_ORIENTATION_PORTRAIT); + 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_flip (GtkAction *action, EvWindow *ev_window) +ev_window_cmd_edit_rotate_right (GtkAction *action, EvWindow *ev_window) { - ev_view_set_orientation (EV_VIEW (ev_window->priv->view), - EV_ORIENTATION_SEASCAPE); + ev_view_rotate_right (EV_VIEW (ev_window->priv->view)); + ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (ev_window->priv->sidebar_thumbs)); } static void @@ -1823,33 +2052,34 @@ 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), + + dialog = gtk_dialog_new_with_buttons (_("Toolbar editor"), + GTK_WINDOW (ev_window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, - GTK_RESPONSE_CANCEL, + GTK_RESPONSE_CLOSE, NULL); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)), 5); + gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 18); 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); + ev_application_get_toolbars_model (EV_APP)); 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"); + 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_signal_connect (dialog, "response", G_CALLBACK (ev_window_cmd_edit_toolbar_cb), ev_window); + gtk_widget_show_all (dialog); } static void @@ -1905,6 +2135,33 @@ ev_window_cmd_go_last_page (GtkAction *action, EvWindow *ev_window) ev_page_cache_set_current_page (ev_window->priv->page_cache, n_pages - 1); } +static void +ev_window_cmd_go_forward (GtkAction *action, EvWindow *ev_window) +{ + int n_pages, current_page; + + g_return_if_fail (EV_IS_WINDOW (ev_window)); + + n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache); + current_page = ev_page_cache_get_current_page (ev_window->priv->page_cache); + + if (current_page + 10 < n_pages) + ev_page_cache_set_current_page (ev_window->priv->page_cache, current_page + 10); +} + +static void +ev_window_cmd_go_backward (GtkAction *action, EvWindow *ev_window) +{ + int current_page; + + g_return_if_fail (EV_IS_WINDOW (ev_window)); + + current_page = ev_page_cache_get_current_page (ev_window->priv->page_cache); + + if (current_page - 10 >= 0) + ev_page_cache_set_current_page (ev_window->priv->page_cache, current_page - 10); +} + static void ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window) { @@ -1965,7 +2222,7 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window) NULL); if (fullscreen) - ev_window_unfullscreen (window); + ev_window_stop_fullscreen (window); if (presentation) ev_window_stop_presentation (window); @@ -2006,6 +2263,21 @@ update_view_size (EvView *view, EvWindow *window) hsb_requisition.height + scrollbar_spacing); } +static void +save_sizing_mode (EvWindow *window) +{ + EvSizingMode mode; + GEnumValue *enum_value; + + if (window->priv->uri) { + mode = ev_view_get_sizing_mode (EV_VIEW (window->priv->view)); + enum_value = g_enum_get_value (EV_SIZING_MODE_CLASS, mode); + + ev_metadata_manager_set_string (window->priv->uri, "sizing_mode", + enum_value->value_nick); + } +} + static void ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window) @@ -2052,13 +2324,64 @@ ev_window_sizing_mode_changed_cb (EvView *view, GParamSpec *pspec, } update_sizing_buttons (ev_window); + save_sizing_mode (ev_window); } static void -ev_window_zoom_changed_cb (EvView *view, GParamSpec *pspec, - EvWindow *ev_window) +ev_window_zoom_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window) { update_action_sensitivity (ev_window); + + if (ev_view_get_sizing_mode (view) == EV_SIZING_FREE) { + ev_metadata_manager_set_double (ev_window->priv->uri, "zoom", + ev_view_get_zoom (view)); + } +} + +static void +ev_window_update_continuous_action (EvWindow *window) +{ + GtkAction *action; + + action = gtk_action_group_get_action (window->priv->action_group, "ViewContinuous"); + g_signal_handlers_block_by_func + (action, G_CALLBACK (ev_window_cmd_continuous), window); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), + ev_view_get_continuous (EV_VIEW (window->priv->view))); + g_signal_handlers_unblock_by_func + (action, G_CALLBACK (ev_window_cmd_continuous), window); +} + +static void +ev_window_update_dual_page_action (EvWindow *window) +{ + GtkAction *action; + + action = gtk_action_group_get_action (window->priv->action_group, "ViewDual"); + g_signal_handlers_block_by_func + (action, G_CALLBACK (ev_window_cmd_dual), window); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), + ev_view_get_dual_page (EV_VIEW (window->priv->view))); + g_signal_handlers_unblock_by_func + (action, G_CALLBACK (ev_window_cmd_dual), window); +} + +static void +ev_window_continuous_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window) +{ + 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))); +} + +static void +ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window) +{ + 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))); } static char * @@ -2140,7 +2463,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) "name", _("Evince"), "version", VERSION, "copyright", - _("\xc2\xa9 1996-2004 The Evince authors"), + _("\xc2\xa9 1996-2005 The Evince authors"), "license", license_trans, "website", "http://www.gnome.org/projects/evince", "comments", comments, @@ -2182,17 +2505,18 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspe EvWindow *ev_window) { GtkAction *action; - gboolean visible, fullscreen; + 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)); - g_object_get (ev_window->priv->view, - "fullscreen", &fullscreen, - NULL); 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) + if (fullscreen_mode) return; action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar"); @@ -2367,10 +2691,27 @@ zoom_control_changed_cb (EphyZoomAction *action, mode = EV_SIZING_FIT_WIDTH; } else { mode = EV_SIZING_FREE; - ev_view_set_zoom (EV_VIEW (ev_window->priv->view), zoom, FALSE); } ev_view_set_sizing_mode (EV_VIEW (ev_window->priv->view), mode); + + if (mode == EV_SIZING_FREE) { + ev_view_set_zoom (EV_VIEW (ev_window->priv->view), zoom, FALSE); + } +} + +static void +ev_window_finalize (GObject *object) +{ + GList *windows = gtk_window_list_toplevels (); + + if (windows == NULL) { + ev_application_shutdown (EV_APP); + } else { + g_list_free (windows); + } + + G_OBJECT_CLASS (ev_window_parent_class)->finalize (object); } static void @@ -2379,11 +2720,9 @@ 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->recent_view) { + g_object_unref (priv->recent_view); + priv->recent_view = NULL; } if (priv->ui_manager) { @@ -2462,6 +2801,7 @@ ev_window_class_init (EvWindowClass *ev_window_class) GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (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; @@ -2511,15 +2851,12 @@ static const GtkActionEntry entries[] = { { "EditToolbar", NULL, N_("T_oolbar"), NULL, N_("Customize the toolbar"), G_CALLBACK (ev_window_cmd_edit_toolbar) }, - { "EditLandscape", NULL, N_("_Landscape"), NULL, - N_("Change the document orientation to landscape"), - G_CALLBACK (ev_window_cmd_edit_landscape) }, - { "EditPortrait", NULL, N_("_Portrait"), NULL, - N_("Change the document orientation to portrait"), - G_CALLBACK (ev_window_cmd_edit_portrait) }, - { "EditFlip", NULL, N_("_Flip"), NULL, - N_("Flip the document"), - G_CALLBACK (ev_window_cmd_edit_flip) }, + { "EditRotateLeft", NULL, N_("Rotate _Left"), NULL, + N_("Rotate the document to the left"), + G_CALLBACK (ev_window_cmd_edit_rotate_left) }, + { "EditRotateRight", NULL, N_("Rotate _Right"), NULL, + N_("Rotate the document to the right"), + G_CALLBACK (ev_window_cmd_edit_rotate_right) }, /* View menu */ { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", @@ -2587,12 +2924,27 @@ static const GtkActionEntry entries[] = { { "Plus", GTK_STOCK_ZOOM_IN, NULL, "plus", N_("Enlarge the document"), G_CALLBACK (ev_window_cmd_view_zoom_in) }, + { "CtrlEqual", GTK_STOCK_ZOOM_IN, NULL, "equal", + N_("Enlarge the document"), + G_CALLBACK (ev_window_cmd_view_zoom_in) }, { "Minus", GTK_STOCK_ZOOM_OUT, NULL, "minus", N_("Shrink the document"), G_CALLBACK (ev_window_cmd_view_zoom_out) }, { "FocusPageSelector", NULL, "", "l", N_("Focus the page selector"), - G_CALLBACK (ev_window_cmd_focus_page_selector) } + G_CALLBACK (ev_window_cmd_focus_page_selector) }, + { "GoBackwardFast", NULL, "", "Page_Up", + N_("Go ten pages backward"), + G_CALLBACK (ev_window_cmd_go_backward) }, + { "GoForwardFast", NULL, "", "Page_Down", + N_("Go ten pages forward"), + G_CALLBACK (ev_window_cmd_go_forward) }, + { "KpPlus", GTK_STOCK_ZOOM_IN, NULL, "KP_Add", + N_("Enlarge the document"), + G_CALLBACK (ev_window_cmd_view_zoom_in) }, + { "KpMinus", GTK_STOCK_ZOOM_OUT, NULL, "KP_Subtract", + N_("Shrink the document"), + G_CALLBACK (ev_window_cmd_view_zoom_out) }, }; /* Toggle items */ @@ -2616,7 +2968,7 @@ static const GtkToggleActionEntry toggle_entries[] = { { "ViewFullscreen", NULL, N_("_Fullscreen"), "F11", N_("Expand the window to fill the screen"), G_CALLBACK (ev_window_cmd_view_fullscreen) }, - { "ViewPresentation", NULL, N_("_Presentation"), "F12", + { "ViewPresentation", NULL, N_("_Presentation"), "F5", N_("Run document as a presentation"), G_CALLBACK (ev_window_cmd_view_presentation) }, { "ViewBestFit", EV_STOCK_ZOOM_PAGE, N_("_Best Fit"), NULL, @@ -2648,7 +3000,7 @@ drag_data_received_cb (GtkWidget *widget, GdkDragContext *context, gnome_vfs_uri_list_free (uri_list); - ev_window_open_uri_list (EV_WINDOW (widget), uris); + ev_application_open_uri_list (EV_APP, uris); g_slist_free (uris); @@ -2829,11 +3181,12 @@ sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links, action = gtk_action_group_get_action (ev_window->priv->action_group, PAGE_SELECTOR_ACTION); ev_page_action_set_model (EV_PAGE_ACTION (action), model); + g_object_unref (model); } static void -set_view_actions_sensitivity (EvWindow *window, gboolean sensitive) +ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive) { if (window->priv->action_group) { set_action_sensitive (window, "PageDown", sensitive); @@ -2845,22 +3198,28 @@ set_view_actions_sensitivity (EvWindow *window, gboolean sensitive) set_action_sensitive (window, "Slash", sensitive); set_action_sensitive (window, "Plus", sensitive); set_action_sensitive (window, "Minus", sensitive); + set_action_sensitive (window, "KpPlus", sensitive); + set_action_sensitive (window, "KpMinus", sensitive); } } -static void +static gboolean view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window) { update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, NULL, FALSE); set_action_sensitive (window, "ViewToolbar", TRUE); - set_view_actions_sensitivity (window, TRUE); + ev_window_set_view_accels_sensitivity (window, TRUE); + + return FALSE; } -static void +static gboolean view_actions_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window) { - set_view_actions_sensitivity (window, FALSE); + ev_window_set_view_accels_sensitivity (window, FALSE); + + return FALSE; } static void @@ -2872,14 +3231,52 @@ sidebar_page_main_widget_update_cb (GObject *ev_sidebar_page, g_object_get (ev_sidebar_page, "main_widget", &widget, NULL); - if (widget != NULL) { - g_signal_connect_object (widget, "focus_in_event", - G_CALLBACK (view_actions_focus_in_cb), + if (widget != NULL) { + g_signal_connect_object (widget, "focus_in_event", + G_CALLBACK (view_actions_focus_in_cb), ev_window, 0); - g_signal_connect_object (widget, "focus_out_event", - G_CALLBACK (view_actions_focus_out_cb), + g_signal_connect_object (widget, "focus_out_event", + G_CALLBACK (view_actions_focus_out_cb), ev_window, 0); + g_object_unref (widget); + } +} + +static gboolean +window_state_event_cb (EvWindow *window, GdkEventWindowState *event, gpointer dummy) +{ + char *uri = window->priv->uri; + + if (uri && !(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) { + gboolean maximized; + + maximized = event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED; + ev_metadata_manager_set_boolean (uri, "window_maximized", maximized); + } + + return FALSE; +} + +static gboolean +window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer dummy) +{ + char *uri = window->priv->uri; + GdkWindowState state; + int x, y, width, height; + + state = gdk_window_get_state (GTK_WIDGET (window)->window); + + if (uri && !(state & GDK_WINDOW_STATE_FULLSCREEN)) { + gtk_window_get_position (GTK_WINDOW (window), &x, &y); + gtk_window_get_size (GTK_WINDOW (window), &width, &height); + + ev_metadata_manager_set_int (uri, "window_x", x); + ev_metadata_manager_set_int (uri, "window_y", y); + ev_metadata_manager_set_int (uri, "window_width", width); + ev_metadata_manager_set_int (uri, "window_height", height); } + + return FALSE; } static void @@ -2893,6 +3290,11 @@ ev_window_init (EvWindow *ev_window) GConfClient *client; int sidebar_size; + g_signal_connect (ev_window, "configure_event", + G_CALLBACK (window_configure_event_cb), NULL); + g_signal_connect (ev_window, "window_state_event", + G_CALLBACK (window_state_event_cb), NULL); + ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window); ev_window->priv->page_mode = PAGE_MODE_DOCUMENT; @@ -2921,7 +3323,7 @@ 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); + 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); @@ -2942,23 +3344,6 @@ 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. @@ -2969,18 +3354,13 @@ ev_window_init (EvWindow *ev_window) gtk_widget_show (toolbar_dock); ev_window->priv->toolbar = egg_editable_toolbar_new_with_model - (ev_window->priv->ui_manager, ev_window->priv->toolbar_model); + (ev_window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP)); 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); - 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 (); g_signal_connect (ev_window->priv->hpaned, @@ -3020,6 +3400,7 @@ ev_window_init (EvWindow *ev_window) sidebar_widget); sidebar_widget = ev_sidebar_thumbnails_new (); + ev_window->priv->sidebar_thumbs = sidebar_widget; g_signal_connect (sidebar_widget, "notify::main-widget", G_CALLBACK (sidebar_page_main_widget_update_cb), @@ -3079,6 +3460,14 @@ ev_window_init (EvWindow *ev_window) "notify::zoom", G_CALLBACK (ev_window_zoom_changed_cb), ev_window); + g_signal_connect (ev_window->priv->view, + "notify::dual-page", + G_CALLBACK (ev_window_dual_mode_changed_cb), + ev_window); + g_signal_connect (ev_window->priv->view, + "notify::continuous", + G_CALLBACK (ev_window_continuous_changed_cb), + ev_window); ev_window->priv->statusbar = ev_statusbar_new (); gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box), @@ -3144,3 +3533,16 @@ ev_window_init (EvWindow *ev_window) update_action_sensitivity (ev_window); } +GtkWidget * +ev_window_new (void) +{ + GtkWidget *ev_window; + + ev_window = GTK_WIDGET (g_object_new (EV_TYPE_WINDOW, + "type", GTK_WINDOW_TOPLEVEL, + "default-width", 600, + "default-height", 600, + NULL)); + + return ev_window; +}