X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-window.c;h=8a364e25107302a07ab0740797e829dca4158bb0;hb=e9d82256c890d24d9465a2721f622083bab9de7b;hp=fe3d6241f522e65caf8b2f7d234caae8863d8434;hpb=07d1c6cffcfa0157ed447df3ef393c213306859f;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index fe3d6241..8a364e25 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -152,7 +152,6 @@ 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_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" @@ -219,6 +218,8 @@ update_action_sensitivity (EvWindow *ev_window) 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); @@ -263,6 +264,11 @@ update_action_sensitivity (EvWindow *ev_window) 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); @@ -272,8 +278,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", @@ -311,7 +317,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; @@ -373,24 +381,16 @@ update_chrome_visibility (EvWindow *window) } static void -update_chrome_flag (EvWindow *window, EvChrome flag, const char *pref, gboolean active) +update_chrome_flag (EvWindow *window, EvChrome flag, gboolean active) { EvWindowPrivate *priv = window->priv; - GConfClient *client; if (active) { priv->chrome |= flag; - } - else { + } else { priv->chrome &= ~flag; } - if (pref != NULL) { - client = gconf_client_get_default (); - gconf_client_set_bool (client, pref, active, NULL); - g_object_unref (client); - } - update_chrome_visibility (window); } @@ -399,7 +399,7 @@ ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window) { GtkAction *action; - update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, NULL, TRUE); + update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, TRUE); set_action_sensitive (window, "ViewToolbar", FALSE); action = gtk_action_group_get_action (window->priv->action_group, @@ -602,6 +602,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, TRUE)) { + set_widget_visibility (window->priv->sidebar, + g_value_get_boolean (&sidebar_visibility)); + } +} + static void setup_document_from_metadata (EvWindow *window) { @@ -609,12 +621,60 @@ setup_document_from_metadata (EvWindow *window) GValue page = { 0, }; /* Page */ - if (uri && ev_metadata_manager_get (uri, "page", &page)) { + if (uri && ev_metadata_manager_get (uri, "page", &page, TRUE)) { ev_page_cache_set_current_page (window->priv->page_cache, g_value_get_int (&page)); } } +static void +setup_chrome_from_metadata (EvWindow *window) +{ + EvChrome chrome = EV_CHROME_NORMAL; + GValue show_toolbar = { 0, }; + + if (ev_metadata_manager_get (NULL, "show_toolbar", &show_toolbar, FALSE)) { + if (!g_value_get_boolean (&show_toolbar)); + chrome &= ~EV_CHROME_TOOLBAR; + } + window->priv->chrome = chrome; +} + + +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, FALSE)) { + 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, FALSE)) { + 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 ev_window_setup_document (EvWindow *ev_window) { @@ -643,7 +703,8 @@ ev_window_setup_document (EvWindow *ev_window) ev_view_set_document (view, document); } - ev_window_title_set_document (ev_window->priv->title, document, ev_window->priv->uri); + ev_window_title_set_document (ev_window->priv->title, document); + ev_window_title_set_uri (ev_window->priv->title, ev_window->priv->uri); 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); @@ -657,6 +718,7 @@ ev_window_setup_document (EvWindow *ev_window) } setup_document_from_metadata (ev_window); + setup_sidebar_from_metadata (ev_window, document); } static void @@ -715,6 +777,7 @@ ev_window_popup_password_dialog (EvWindow *ev_window) gtk_widget_set_sensitive (ev_window->priv->password_view, FALSE); + 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); if (ev_window->priv->password_dialog == NULL) { @@ -875,18 +938,6 @@ ev_window_xfer_job_cb (EvJobXfer *job, } } -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_view_from_metadata (EvWindow *window) { @@ -905,18 +956,12 @@ setup_view_from_metadata (EvWindow *window) GValue presentation = { 0, }; GValue fullscreen = { 0, }; GValue rotation = { 0, }; - GValue sidebar_size = { 0, }; - GValue sidebar_page = { 0, }; - - if (window->priv->uri == NULL) { - return; - } /* Window size */ if (!GTK_WIDGET_VISIBLE (window)) { gboolean restore_size = TRUE; - if (ev_metadata_manager_get (uri, "window_maximized", &maximized)) { + if (ev_metadata_manager_get (uri, "window_maximized", &maximized, TRUE)) { if (g_value_get_boolean (&maximized)) { gtk_window_maximize (GTK_WINDOW (window)); restore_size = FALSE; @@ -924,20 +969,22 @@ setup_view_from_metadata (EvWindow *window) } 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)) { + ev_metadata_manager_get (uri, "window_width", &width, TRUE) && + ev_metadata_manager_get (uri, "window_height", &height, TRUE)) { gtk_window_set_default_size (GTK_WINDOW (window), g_value_get_int (&width), g_value_get_int (&height)); + } + if (restore_size && + ev_metadata_manager_get (uri, "window_x", &x, TRUE) && + ev_metadata_manager_get (uri, "window_y", &y, TRUE)) { 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)) { + if (ev_metadata_manager_get (uri, "sizing_mode", &sizing_mode, FALSE)) { enum_value = g_enum_get_value_by_nick (EV_SIZING_MODE_CLASS, g_value_get_string (&sizing_mode)); g_value_unset (&sizing_mode); @@ -945,37 +992,37 @@ setup_view_from_metadata (EvWindow *window) } /* Zoom */ - if (ev_metadata_manager_get (uri, "zoom", &zoom) && + if (ev_metadata_manager_get (uri, "zoom", &zoom, FALSE) && 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)) { + if (ev_metadata_manager_get (uri, "continuous", &continuous, FALSE)) { ev_view_set_continuous (view, g_value_get_boolean (&continuous)); } /* Dual page */ - if (ev_metadata_manager_get (uri, "dual-page", &dual_page)) { + if (ev_metadata_manager_get (uri, "dual-page", &dual_page, FALSE)) { ev_view_set_dual_page (view, g_value_get_boolean (&dual_page)); } /* Presentation */ - if (ev_metadata_manager_get (uri, "presentation", &presentation)) { + if (ev_metadata_manager_get (uri, "presentation", &presentation, FALSE)) { if (g_value_get_boolean (&presentation)) { ev_window_run_presentation (window); } } /* Fullscreen */ - if (ev_metadata_manager_get (uri, "fullscreen", &fullscreen)) { + if (ev_metadata_manager_get (uri, "fullscreen", &fullscreen, FALSE)) { if (g_value_get_boolean (&fullscreen)) { ev_window_run_fullscreen (window); } } /* Rotation */ - if (ev_metadata_manager_get (uri, "rotation", &rotation)) { + if (ev_metadata_manager_get (uri, "rotation", &rotation, TRUE)) { if (g_value_get_int (&rotation)) { switch (g_value_get_int (&rotation)) { case 90: @@ -992,26 +1039,6 @@ setup_view_from_metadata (EvWindow *window) } } } - - /* Sidebar */ - 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 (window->priv->sidebar), - window->priv->sidebar_links); - } else if (strcmp (page_id, "thumbnails")) { - ev_sidebar_set_page (EV_SIDEBAR (window->priv->sidebar), - window->priv->sidebar_thumbs); - } - } - - update_sidebar_visibility (window); } void @@ -1522,7 +1549,7 @@ ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window) } else if (!EV_IS_DOCUMENT_FIND (ev_window->priv->document)) { find_not_supported_dialog (ev_window); } else { - update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, TRUE); + update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE); gtk_widget_grab_focus (ev_window->priv->find_bar); } @@ -2117,7 +2144,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 @@ -2125,7 +2152,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 @@ -2223,7 +2250,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); + update_chrome_flag (window, EV_CHROME_FINDBAR, FALSE); gtk_widget_grab_focus (window->priv->view); } else { gboolean fullscreen; @@ -2406,6 +2433,12 @@ ev_window_rotation_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window rotation); } +static void +ev_window_has_selection_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window) +{ + update_action_sensitivity (window); +} + static void ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window) { @@ -2512,9 +2545,11 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) static void ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window) { - update_chrome_flag (ev_window, EV_CHROME_TOOLBAR, - GCONF_CHROME_TOOLBAR, - gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + gboolean active; + + active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); + update_chrome_flag (ev_window, EV_CHROME_TOOLBAR, active); + ev_metadata_manager_set_boolean (NULL, "show_toolbar", active); } static void @@ -2565,7 +2600,8 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspe g_signal_handlers_unblock_by_func (action, G_CALLBACK (ev_window_view_sidebar_cb), ev_window); - if (!ev_view_get_presentation (view) && !ev_view_get_fullscreen (view)) { + 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)); } @@ -2601,7 +2637,7 @@ static void find_bar_close_cb (EggFindBar *find_bar, EvWindow *ev_window) { - update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, FALSE); + update_chrome_flag (ev_window, EV_CHROME_FINDBAR, FALSE); } static void @@ -2643,6 +2679,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)); @@ -2677,23 +2714,14 @@ zoom_control_changed_cb (EphyZoomAction *action, static void ev_window_finalize (GObject *object) { - gboolean empty = TRUE; - GList *list, *windows; - - - windows = gtk_window_list_toplevels (); + GList *windows = ev_application_get_windows (EV_APP); - for (list = windows; list; list = list->next) { - if (EV_IS_WINDOW (list->data)) { - empty = FALSE; - break; - } - } - - if (empty) + 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); } @@ -2901,6 +2929,8 @@ static const GtkActionEntry entries[] = { G_CALLBACK (ev_window_cmd_view_zoom_in) }, { "CtrlEqual", GTK_STOCK_ZOOM_IN, NULL, "equal", NULL, G_CALLBACK (ev_window_cmd_view_zoom_in) }, + { "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", NULL, @@ -2913,6 +2943,10 @@ static const GtkActionEntry entries[] = { G_CALLBACK (ev_window_cmd_view_zoom_in) }, { "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) }, }; /* Toggle items */ @@ -3078,28 +3112,6 @@ set_chrome_actions (EvWindow *window) (action, G_CALLBACK (ev_window_view_toolbar_cb), window); } -static EvChrome -load_chrome (void) -{ - EvChrome chrome = EV_CHROME_NORMAL; - GConfClient *client; - GConfValue *value; - - client = gconf_client_get_default (); - - value = gconf_client_get (client, GCONF_CHROME_TOOLBAR, NULL); - if (value != NULL) { - if (value->type == GCONF_VALUE_BOOL && !gconf_value_get_bool (value)) { - chrome &= ~EV_CHROME_TOOLBAR; - } - gconf_value_free (value); - } - - g_object_unref (client); - - return chrome; -} - static void sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links, GParamSpec *pspec, @@ -3133,13 +3145,14 @@ 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); } } static gboolean view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window) { - update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, NULL, FALSE); + update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, FALSE); set_action_sensitive (window, "ViewToolbar", TRUE); ev_window_set_view_accels_sensitivity (window, TRUE); @@ -3218,6 +3231,68 @@ sidebar_links_link_activated_cb (EvSidebarLinks *sidebar_links, EvLink *link, Ev 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) { @@ -3358,9 +3433,16 @@ 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); + 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, + FALSE, TRUE, 0); /* We own a ref on these widgets, as we can swap them in and out */ g_object_ref (ev_window->priv->view); @@ -3394,18 +3476,12 @@ ev_window_init (EvWindow *ev_window) "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->find_bar = egg_find_bar_new (); - gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box), - ev_window->priv->find_bar, - FALSE, TRUE, 0); - - ev_window_setup_recent (ev_window); - ev_window->priv->chrome = load_chrome (); - set_chrome_actions (ev_window); - update_chrome_visibility (ev_window); - - /* Connect sidebar signals */ + /* Connect sidebar signals */ g_signal_connect (ev_window->priv->sidebar, "notify::visible", G_CALLBACK (ev_window_sidebar_visibility_changed_cb), @@ -3452,7 +3528,16 @@ ev_window_init (EvWindow *ev_window) g_signal_connect (G_OBJECT (ev_window), "drag_data_received", G_CALLBACK (drag_data_received_cb), NULL); - /* Set it to something random to force a change */ + /* Set it user interface params */ + + ev_window_setup_recent (ev_window); + setup_chrome_from_metadata (ev_window); + set_chrome_actions (ev_window); + update_chrome_visibility (ev_window); + + gtk_window_set_default_size (GTK_WINDOW (ev_window), + 600, 600); + setup_view_from_metadata (ev_window); ev_window_sizing_mode_changed_cb (EV_VIEW (ev_window->priv->view), NULL, ev_window); update_action_sensitivity (ev_window); @@ -3465,8 +3550,6 @@ ev_window_new (void) ev_window = GTK_WIDGET (g_object_new (EV_TYPE_WINDOW, "type", GTK_WINDOW_TOPLEVEL, - "default-width", 600, - "default-height", 600, NULL)); return ev_window;