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=dc67739915faf9eba3864a8469952a3e363cebac;hb=d84ffaa16587cbaa734d85f1601d9ce4d8cba137;hp=d7bfa777defd6666ecc81671b502156445850df6;hpb=778d065b076cd3177ed90890dd864ceb8b7f9d98;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index d7bfa777..dc677399 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -52,16 +52,16 @@ #include "eggfindbar.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-file-helpers.h" #include "ev-metadata-manager.h" +#include "ev-file-helpers.h" #include @@ -114,13 +114,10 @@ struct _EvWindowPrivate { 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; @@ -139,8 +136,6 @@ struct _EvWindowPrivate { EvJob *xfer_job; EvJob *load_job; - /* recent file stuff */ - EggRecentModel *recent_model; EggRecentViewUIManager *recent_view; }; @@ -158,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, @@ -216,6 +214,7 @@ update_action_sensitivity (EvWindow *ev_window) gboolean ok_to_print = TRUE; gboolean ok_to_copy = TRUE; gboolean has_properties = TRUE; + GConfClient *client; view = EV_VIEW (ev_window->priv->view); @@ -244,6 +243,16 @@ update_action_sensitivity (EvWindow *ev_window) 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 */ @@ -262,8 +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_document); - set_action_sensitive (ev_window, "EditRotateRight", has_document); + 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); @@ -347,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); } } @@ -619,9 +629,7 @@ page_changed_cb (EvPageCache *page_cache, { update_action_sensitivity (ev_window); -#ifdef ENABLE_METADATA ev_metadata_manager_set_int (ev_window->priv->uri, "page", page); -#endif } static void @@ -635,7 +643,6 @@ update_document_mode (EvWindow *window, EvDocumentMode mode) } } -#ifdef ENABLE_METADATA static void setup_document_from_metadata (EvWindow *window) { @@ -649,7 +656,6 @@ setup_document_from_metadata (EvWindow *window) } } -#endif static void ev_window_setup_document (EvWindow *ev_window) @@ -696,9 +702,7 @@ ev_window_setup_document (EvWindow *ev_window) ev_window->priv->document); } -#ifdef ENABLE_METADATA setup_document_from_metadata (ev_window); -#endif } static void @@ -935,7 +939,6 @@ ev_window_xfer_job_cb (EvJobXfer *job, } } -#ifdef ENABLE_METADATA static void setup_view_from_metadata (EvWindow *window) { @@ -955,12 +958,17 @@ setup_view_from_metadata (EvWindow *window) GValue fullscreen = { 0, }; /* Window size */ - if (ev_metadata_manager_get (uri, "window_maximized", &maximized)) { - if (g_value_get_boolean (&maximized) && !GTK_WIDGET_VISIBLE (window)) { - gtk_window_maximize (GTK_WINDOW (window)); + 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 (!g_value_get_boolean (&maximized) && + 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) && @@ -1011,7 +1019,6 @@ setup_view_from_metadata (EvWindow *window) } } } -#endif void ev_window_open_uri (EvWindow *ev_window, const char *uri) @@ -1022,9 +1029,7 @@ ev_window_open_uri (EvWindow *ev_window, const char *uri) g_free (ev_window->priv->uri); ev_window->priv->uri = g_strdup (uri); -#ifdef ENABLE_METADATA setup_view_from_metadata (ev_window); -#endif ev_window_clear_jobs (ev_window); ev_window_clear_local_uri (ev_window); @@ -1112,33 +1117,22 @@ 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) { - - - /* 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_uimanager_new (ev_window->priv->ui_manager, "/MainMenu/FileMenu/RecentFilesMenu", G_CALLBACK (ev_window_cmd_recent_file_activate), ev_window); egg_recent_view_uimanager_show_icons (EGG_RECENT_VIEW_UIMANAGER (ev_window->priv->recent_view), FALSE); - egg_recent_model_set_limit (ev_window->priv->recent_model, 5); 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_uimanager_set_trailing_sep (ev_window->priv->recent_view, TRUE); @@ -1272,6 +1266,24 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) 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) { @@ -1289,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")) @@ -1299,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) { @@ -1335,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"), @@ -1364,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 ( @@ -1382,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, @@ -1396,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 @@ -1498,6 +1572,9 @@ ev_window_update_fullscreen_popup (EvWindow *window) g_return_if_fail (popup != NULL); + if (GTK_WIDGET (window)->window == NULL) + return; + toolbar = (window->priv->chrome & EV_CHROME_TOOLBAR) != 0 || (window->priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0; popup_width = popup->requisition.width; @@ -1684,6 +1761,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); @@ -1752,9 +1832,7 @@ ev_window_run_fullscreen (EvWindow *window) gtk_window_fullscreen (GTK_WINDOW (window)); ev_window_update_fullscreen_popup (window); -#ifdef ENABLE_METADATA ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", TRUE); -#endif } static void @@ -1782,9 +1860,7 @@ ev_window_stop_fullscreen (EvWindow *window) gtk_window_unfullscreen (GTK_WINDOW (window)); update_chrome_visibility (window); -#ifdef ENABLE_METADATA ev_metadata_manager_set_boolean (window->priv->uri, "fullscreen", FALSE); -#endif } static void @@ -1830,9 +1906,7 @@ ev_window_run_presentation (EvWindow *window) ev_window_update_presentation_action (window); update_chrome_visibility (window); -#ifdef ENABLE_METADATA ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE); -#endif } static void @@ -1849,9 +1923,7 @@ ev_window_stop_presentation (EvWindow *window) ev_window_update_presentation_action (window); update_chrome_visibility (window); -#ifdef ENABLE_METADATA ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE); -#endif } static void @@ -1960,8 +2032,7 @@ 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)); } @@ -1984,33 +2055,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 @@ -2197,7 +2269,6 @@ update_view_size (EvView *view, EvWindow *window) static void save_sizing_mode (EvWindow *window) { -#ifdef ENABLE_METADATA EvSizingMode mode; GEnumValue *enum_value; @@ -2208,7 +2279,6 @@ save_sizing_mode (EvWindow *window) ev_metadata_manager_set_string (window->priv->uri, "sizing_mode", enum_value->value_nick); } -#endif } static void @@ -2265,10 +2335,10 @@ ev_window_zoom_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window) { update_action_sensitivity (ev_window); -#ifdef ENABLE_METADATA - ev_metadata_manager_set_double (ev_window->priv->uri, "zoom", - ev_view_get_zoom (EV_VIEW (ev_window->priv->view))); -#endif + 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 @@ -2304,10 +2374,8 @@ ev_window_continuous_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_w { ev_window_update_continuous_action (ev_window); -#ifdef ENABLE_METADATA ev_metadata_manager_set_boolean (ev_window->priv->uri, "continuous", ev_view_get_continuous (EV_VIEW (ev_window->priv->view))); -#endif } static void @@ -2315,10 +2383,8 @@ ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_wi { ev_window_update_dual_page_action (ev_window); -#ifdef ENABLE_METADATA ev_metadata_manager_set_boolean (ev_window->priv->uri, "dual-page", ev_view_get_dual_page (EV_VIEW (ev_window->priv->view))); -#endif } static char * @@ -2657,18 +2723,6 @@ 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_model) { - g_object_unref (priv->recent_model); - priv->recent_model = NULL; - } - if (priv->recent_view) { g_object_unref (priv->recent_view); priv->recent_view = NULL; @@ -2888,6 +2942,12 @@ static const GtkActionEntry entries[] = { { "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 */ @@ -2911,7 +2971,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, @@ -3129,7 +3189,7 @@ sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links, 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); @@ -3141,22 +3201,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 @@ -3182,7 +3248,6 @@ sidebar_page_main_widget_update_cb (GObject *ev_sidebar_page, static gboolean window_state_event_cb (EvWindow *window, GdkEventWindowState *event, gpointer dummy) { -#ifdef ENABLE_METADATA char *uri = window->priv->uri; if (uri && !(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) { @@ -3191,7 +3256,6 @@ window_state_event_cb (EvWindow *window, GdkEventWindowState *event, gpointer du maximized = event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED; ev_metadata_manager_set_boolean (uri, "window_maximized", maximized); } -#endif return FALSE; } @@ -3199,7 +3263,6 @@ window_state_event_cb (EvWindow *window, GdkEventWindowState *event, gpointer du static gboolean window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer dummy) { -#ifdef ENABLE_METADATA char *uri = window->priv->uri; GdkWindowState state; int x, y, width, height; @@ -3215,7 +3278,6 @@ window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer ev_metadata_manager_set_int (uri, "window_width", width); ev_metadata_manager_set_int (uri, "window_height", height); } -#endif return FALSE; } @@ -3264,7 +3326,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); @@ -3285,23 +3347,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. @@ -3312,18 +3357,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,