X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-window.c;h=84206b7a4c99742e01bfb0d4a3f2efbdfb58d39d;hb=a92004b77fc73fe7ac2a781b5207249b2288b8c9;hp=ed1e4788c183331f83ac8c32f70b6887bd894280;hpb=a601c252dae06def4379c838ed176955903b34c9;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index ed1e4788..84206b7a 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -4,7 +4,7 @@ * Copyright (C) 2004 Martin Kretzschmar * Copyright (C) 2004 Red Hat, Inc. * Copyright (C) 2000, 2001, 2002, 2003, 2004 Marco Pesenti Gritti - * Copyright (C) 2003, 2004 Christian Persch + * Copyright (C) 2003, 2004, 2005 Christian Persch * * Author: * Martin Kretzschmar @@ -29,13 +29,14 @@ #endif #include "ev-window.h" -#include "ev-navigation-action.h" #include "ev-page-action.h" #include "ev-sidebar.h" #include "ev-sidebar-links.h" #include "ev-sidebar-thumbnails.h" #include "ev-view.h" +#include "ev-page-view.h" #include "ev-password.h" +#include "ev-password-view.h" #include "ev-print-job.h" #include "ev-document-find.h" #include "ev-document-security.h" @@ -51,123 +52,79 @@ #include #include +#include + #include #include "ev-application.h" #include "ev-stock-icons.h" -enum { - PROP_0, - PROP_ATTRIBUTE -}; - -enum { - SIGNAL, - N_SIGNALS -}; +typedef enum { + PAGE_MODE_SINGLE_PAGE, + PAGE_MODE_CONTINUOUS_PAGE, + PAGE_MODE_PASSWORD, +} EvWindowPageMode; + +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_NORMAL = EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR | EV_CHROME_SIDEBAR | EV_CHROME_STATUSBAR +} EvChrome; struct _EvWindowPrivate { GtkWidget *main_box; + GtkWidget *menubar; + GtkWidget *toolbar_dock; + GtkWidget *toolbar; GtkWidget *hpaned; GtkWidget *sidebar; GtkWidget *thumbs_sidebar; GtkWidget *find_bar; + GtkWidget *scrolled_window; GtkWidget *view; + GtkWidget *page_view; + GtkWidget *password_view; GtkActionGroup *action_group; GtkUIManager *ui_manager; GtkWidget *statusbar; guint help_message_cid; guint view_message_cid; GtkWidget *exit_fullscreen_popup; + GtkWidget *exit_fullscreen_toolbar; char *uri; EvDocument *document; + EvWindowPageMode page_mode; + /* These members are used temporarily when in PAGE_MODE_PASSWORD */ + EvDocument *password_document; + GtkWidget *password_dialog; + char *password_uri; + + EvChrome chrome; gboolean fullscreen_mode; }; - -#define NAVIGATION_BACK_ACTION "NavigationBack" -#define NAVIGATION_FORWARD_ACTION "NavigationForward" -#define PAGE_SELECTOR_ACTION "PageSelector" - -#if 0 -/* enable these to add support for signals */ -static guint ev_window_signals [N_SIGNALS] = { 0 }; -#endif - -static void update_fullscreen_popup (EvWindow *window); - -static GObjectClass *parent_class = NULL; - -G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW) - #define EV_WINDOW_GET_PRIVATE(object) \ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_WINDOW, EvWindowPrivate)) -#if 0 -const char * -ev_window_get_attribute (EvWindow *self) -{ - g_return_val_if_fail (self != NULL && EV_IS_WINDOW (self), NULL); +#define PAGE_SELECTOR_ACTION "PageSelector" - return self->priv->attribute; -} +#define GCONF_CHROME_TOOLBAR "/apps/evince/show_toolbar" +#define GCONF_CHROME_SIDEBAR "/apps/evince/show_sidebar" +#define GCONF_CHROME_STATUSBAR "/apps/evince/show_statusbar" -void -ev_window_set_attribute (EvWindow* self, const char *attribute) -{ - g_assert (self != NULL && EV_IS_WINDOW (self)); - g_assert (attribute != NULL); +static void ev_window_update_fullscreen_popup (EvWindow *window); +static void ev_window_set_page_mode (EvWindow *window, + EvWindowPageMode page_mode); +static gboolean start_loading_document (EvWindow *ev_window, + EvDocument *document, + const char *uri); - if (self->priv->attribute != NULL) { - g_free (self->priv->attribute); - } - - self->priv->attribute = g_strdup (attribute); - - g_object_notify (G_OBJECT (self), "attribute"); -} -static void -ev_window_get_property (GObject *object, guint prop_id, GValue *value, - GParamSpec *param_spec) -{ - EvWindow *self; - - self = EV_WINDOW (object); - - switch (prop_id) { - case PROP_ATTRIBUTE: - g_value_set_string (value, self->priv->attribute); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, - prop_id, - param_spec); - break; - } -} - -static void -ev_window_set_property (GObject *object, guint prop_id, const GValue *value, - GParamSpec *param_spec) -{ - EvWindow *self; - - self = EV_WINDOW (object); - - switch (prop_id) { - case PROP_ATTRIBUTE: - ev_window_set_attribute (self, g_value_get_string (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, - prop_id, - param_spec); - break; - } -} -#endif +G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW) static void set_action_sensitive (EvWindow *ev_window, @@ -183,20 +140,14 @@ static void update_action_sensitivity (EvWindow *ev_window) { EvDocument *document; + EvWindowPageMode page_mode; EvView *view; - gboolean can_go_back = FALSE; - gboolean can_go_forward = FALSE; - document = ev_window->priv->document; + page_mode = ev_window->priv->page_mode; view = EV_VIEW (ev_window->priv->view); - if (document) { - can_go_back = ev_view_can_go_back (view); - can_go_forward = ev_view_can_go_forward (view); - } - /* File menu */ /* "FileOpen": always sensitive */ set_action_sensitive (ev_window, "FileSaveAs", document!=NULL); @@ -220,8 +171,6 @@ update_action_sensitivity (EvWindow *ev_window) set_action_sensitive (ev_window, "ViewPageWidth", document!=NULL); /* Go menu */ - set_action_sensitive (ev_window, "GoBack", can_go_back); - set_action_sensitive (ev_window, "GoForward", can_go_forward); if (document) { int n_pages; int page; @@ -229,27 +178,79 @@ update_action_sensitivity (EvWindow *ev_window) page = ev_view_get_page (EV_VIEW (ev_window->priv->view)); n_pages = ev_document_get_n_pages (document); - set_action_sensitive (ev_window, "GoPageDown", page > 1); - set_action_sensitive (ev_window, "GoPageUp", page < n_pages); + set_action_sensitive (ev_window, "GoPageUp", page > 1); + set_action_sensitive (ev_window, "GoPageDown", page < n_pages); set_action_sensitive (ev_window, "GoFirstPage", page > 1); set_action_sensitive (ev_window, "GoLastPage", page < n_pages); } else { - set_action_sensitive (ev_window, "GoFirstPage", FALSE); - set_action_sensitive (ev_window, "GoPageDown", FALSE); + set_action_sensitive (ev_window, "GoFirstPage", FALSE); set_action_sensitive (ev_window, "GoPageUp", FALSE); + set_action_sensitive (ev_window, "GoPageDown", FALSE); set_action_sensitive (ev_window, "GoLastPage", FALSE); } + /* Page View radio group */ + if (document) { + set_action_sensitive (ev_window, "SinglePage", page_mode != PAGE_MODE_PASSWORD); + set_action_sensitive (ev_window, "ContinuousPage", page_mode != PAGE_MODE_PASSWORD); + } else { + set_action_sensitive (ev_window, "SinglePage", FALSE); + set_action_sensitive (ev_window, "ContinuousPage", FALSE); + } /* Help menu */ /* "HelpContents": always sensitive */ /* "HelpAbout": always sensitive */ /* Toolbar-specific actions: */ - set_action_sensitive (ev_window, NAVIGATION_BACK_ACTION, can_go_back); - set_action_sensitive (ev_window, NAVIGATION_FORWARD_ACTION, can_go_forward); set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, document!=NULL); } +static void +update_chrome_visibility (EvWindow *window) +{ + EvWindowPrivate *priv = window->priv; + gboolean menubar, toolbar, sidebar, findbar, statusbar; + + menubar = (priv->chrome & EV_CHROME_MENUBAR) != 0 && !priv->fullscreen_mode; + toolbar = (priv->chrome & EV_CHROME_TOOLBAR) != 0; + sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0; + findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0; + statusbar = (priv->chrome & EV_CHROME_STATUSBAR) != 0 && !priv->fullscreen_mode; + + g_object_set (priv->menubar, "visible", menubar, NULL); + g_object_set (priv->toolbar_dock, "visible", toolbar, NULL); + g_object_set (priv->sidebar, "visible", sidebar, NULL); + g_object_set (priv->find_bar, "visible", findbar, NULL); + g_object_set (priv->statusbar, "visible", statusbar, NULL); + + g_object_set (priv->exit_fullscreen_toolbar, "visible", priv->fullscreen_mode, NULL); + if (priv->exit_fullscreen_popup != NULL) { + g_object_set (priv->exit_fullscreen_popup, "visible", !toolbar, NULL); + } +} + +static void +update_chrome_flag (EvWindow *window, EvChrome flag, const char *pref, gboolean active) +{ + EvWindowPrivate *priv = window->priv; + GConfClient *client; + + if (active) { + priv->chrome |= flag; + } + 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); +} + void ev_window_open_page (EvWindow *ev_window, int page) { @@ -329,19 +330,44 @@ static void update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_window) { char *title = NULL; + char *doc_title = NULL; + gboolean password_needed; - if (document == NULL) { - title = g_strdup (_("Document Viewer")); - } else { - title = ev_document_get_title (document); + password_needed = (ev_window->priv->password_document != NULL); - if (title == NULL) { - title = g_path_get_basename (ev_window->priv->uri); + if (document) { + doc_title = ev_document_get_title (document); + + /* Make sure we get a valid title back */ + if (doc_title) { + if (doc_title[0] == '\000' || + !g_utf8_validate (doc_title, -1, NULL)) { + g_free (doc_title); + doc_title = NULL; + } + } + } + if (doc_title == NULL && ev_window->priv->uri) { + doc_title = g_path_get_basename (ev_window->priv->uri); + } + + 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); } @@ -363,44 +389,161 @@ static void ev_window_setup_document (EvWindow *ev_window) { EvDocument *document; - EvHistory *history; EvView *view = EV_VIEW (ev_window->priv->view); + //EvPageView *page_view = EV_PAGE_VIEW (ev_window->priv->page_view); EvSidebar *sidebar = EV_SIDEBAR (ev_window->priv->sidebar); - GtkAction *action; document = ev_window->priv->document; + g_signal_connect_object (G_OBJECT (document), + "notify::title", + G_CALLBACK (update_window_title), + ev_window, 0); + + ev_window_set_page_mode (ev_window, PAGE_MODE_SINGLE_PAGE); + ev_sidebar_set_document (sidebar, document); ev_view_set_document (view, document); + //ev_page_view_set_document (page_view, document); + + update_window_title (document, NULL, ev_window); + update_total_pages (ev_window); + update_action_sensitivity (ev_window); +} - history = ev_history_new (); - ev_view_set_history (view, history); - g_object_unref (history); +static void +password_dialog_response (GtkWidget *password_dialog, + gint response_id, + EvWindow *ev_window) +{ + char *password; + + if (response_id == GTK_RESPONSE_OK) { + EvDocument *document; + gchar *uri; - action = gtk_action_group_get_action - (ev_window->priv->action_group, NAVIGATION_BACK_ACTION); - ev_navigation_action_set_history - (EV_NAVIGATION_ACTION (action), history); + password = ev_password_dialog_get_password (password_dialog); + if (password) + ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->password_document), + password); + g_free (password); - action = gtk_action_group_get_action - (ev_window->priv->action_group, NAVIGATION_FORWARD_ACTION); - ev_navigation_action_set_history - (EV_NAVIGATION_ACTION (action), history); + document = ev_window->priv->password_document; + uri = ev_window->priv->password_uri; - update_total_pages (ev_window); - update_action_sensitivity (ev_window); + ev_window->priv->password_document = NULL; + ev_window->priv->password_uri = NULL; + + if (start_loading_document (ev_window, document, uri)) { + gtk_widget_destroy (password_dialog); + } + + g_object_unref (document); + g_free (uri); + + return; + } + + gtk_widget_set_sensitive (ev_window->priv->password_view, TRUE); + gtk_widget_destroy (password_dialog); } +/* Called either by start_loading_document or by the "unlock" callback on the + * password_view page. It assumes that ev_window->priv->password_* has been set + * correctly. These are cleared by password_dialog_response() */ -static gchar * -ev_window_get_password (GtkWidget *password_dialog) +static void +ev_window_popup_password_dialog (EvWindow *ev_window) { - gchar *password = NULL; + g_assert (ev_window->priv->password_document); + g_assert (ev_window->priv->password_uri); - if (gtk_dialog_run (GTK_DIALOG (password_dialog)) == GTK_RESPONSE_OK) - password = ev_password_dialog_get_password (password_dialog); + 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 *file_name; - return password; + file_name = g_path_get_basename (ev_window->priv->password_uri); + ev_window->priv->password_dialog = + ev_password_dialog_new (GTK_WIDGET (ev_window), file_name); + 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 (file_name); + gtk_widget_show (ev_window->priv->password_dialog); + } else { + ev_password_dialog_set_bad_pass (ev_window->priv->password_dialog); + } +} + +/* This wil try to load the document. It might be called multiple times on the + * same document by the password dialog. + * + * Since the flow of the error dialog is very confusing, we assume that both + * document and uri will go away after this function is called, and thus we need + * to ref/dup them. Additionally, it needs to clear + * ev_window->priv->password_{uri,document}, and thus people who call this + * function should _not_ necessarily expect those to exist after being + * called. */ +static gboolean +start_loading_document (EvWindow *ev_window, + EvDocument *document, + const char *uri) +{ + gboolean result; + GError *error = NULL; + + g_assert (document); + g_assert (document != ev_window->priv->document); + g_assert (uri); + if (ev_window->priv->password_document) { + g_object_unref (ev_window->priv->password_document); + ev_window->priv->password_document = NULL; + } + if (ev_window->priv->password_uri) { + g_free (ev_window->priv->password_uri); + ev_window->priv->password_uri = NULL; + } + + result = ev_document_load (document, uri, &error); + + /* Success! */ + if (result) { + if (ev_window->priv->document) + g_object_unref (ev_window->priv->document); + ev_window->priv->document = g_object_ref (document); + ev_window_setup_document (ev_window); + + return TRUE; + } + + /* unable to load the document */ + g_assert (error != NULL); + + if (error->domain == EV_DOCUMENT_ERROR && + error->code == EV_DOCUMENT_ERROR_ENCRYPTED) { + char *file_name; + + ev_window->priv->password_document = g_object_ref (document); + ev_window->priv->password_uri = g_strdup (uri); + + file_name = g_path_get_basename (uri); + ev_password_view_set_file_name (EV_PASSWORD_VIEW (ev_window->priv->password_view), + file_name); + g_free (file_name); + ev_window_set_page_mode (ev_window, PAGE_MODE_PASSWORD); + + ev_window_popup_password_dialog (ev_window); + } else { + unable_to_load (ev_window, error->message); + } + g_error_free (error); + + return FALSE; } void @@ -418,67 +561,19 @@ ev_window_open (EvWindow *ev_window, const char *uri) document = NULL; else if (!strcmp (mime_type, "application/pdf")) document = g_object_new (PDF_TYPE_DOCUMENT, NULL); - else if (!strcmp (mime_type, "application/postscript")) + else if (!strcmp (mime_type, "application/postscript") || + !strcmp (mime_type, "application/x-gzpostscript") || + !strcmp (mime_type, "image/x-eps")) document = g_object_new (PS_TYPE_DOCUMENT, NULL); else if (mime_type_supported_by_gdk_pixbuf (mime_type)) document = g_object_new (PIXBUF_TYPE_DOCUMENT, NULL); if (document) { - GError *error = NULL; - GtkWidget *password_dialog = NULL; - - g_signal_connect_object (G_OBJECT (document), - "notify::title", - G_CALLBACK (update_window_title), - ev_window, 0); - - /* If we get an error while loading the document, we try to fix - * it and try again. This is an ugly loop that could do with - * some refactoring.*/ - while (TRUE) { - gboolean result; - - result = ev_document_load (document, uri, &error); - - if (result) { - if (ev_window->priv->document) - g_object_unref (ev_window->priv->document); - ev_window->priv->document = document; - ev_window_setup_document (ev_window); - - if (password_dialog) - gtk_widget_destroy (password_dialog); - break; - } - - g_assert (error != NULL); - - if (error->domain == EV_DOCUMENT_ERROR && - error->code == EV_DOCUMENT_ERROR_ENCRYPTED) { - char *password; - - if (password_dialog == NULL) - password_dialog = ev_password_dialog_new (GTK_WIDGET (ev_window), uri); - else - ev_password_dialog_set_bad_pass (password_dialog); - password = ev_window_get_password (password_dialog); - if (password) { - ev_document_security_set_password (EV_DOCUMENT_SECURITY (document), - password); - g_free (password); - g_error_free (error); - error = NULL; - continue; - } else { - gtk_widget_destroy (password_dialog); - } - } else { - unable_to_load (ev_window, error->message); - } - g_object_unref (document); - g_error_free (error); - break; - } + start_loading_document (ev_window, document, uri); + /* See the comment on start_loading_document on ref counting. + * As the password dialog flow is confusing, we're very explicit + * on ref counting. */ + g_object_unref (document); } else { char *error_message; @@ -752,10 +847,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 { - gtk_widget_show (ev_window->priv->find_bar); - - if (ev_window->priv->exit_fullscreen_popup) - update_fullscreen_popup (ev_window); + update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, TRUE); egg_find_bar_grab_focus (EGG_FIND_BAR (ev_window->priv->find_bar)); } @@ -770,7 +862,7 @@ ev_window_cmd_edit_copy (GtkAction *action, EvWindow *ev_window) } static void -update_fullscreen_popup (EvWindow *window) +ev_window_update_fullscreen_popup (EvWindow *window) { GtkWidget *popup = window->priv->exit_fullscreen_popup; int popup_width, popup_height; @@ -778,9 +870,6 @@ update_fullscreen_popup (EvWindow *window) g_return_if_fail (popup != NULL); - if (!popup) - return; - popup_width = popup->requisition.width; popup_height = popup->requisition.height; @@ -791,24 +880,17 @@ update_fullscreen_popup (EvWindow *window) GTK_WIDGET (window)->window), &screen_rect); - if (GTK_WIDGET_VISIBLE (window->priv->find_bar)) { - GtkRequisition req; - - gtk_widget_size_request (window->priv->find_bar, &req); - - screen_rect.height -= req.height; - } - if (gtk_widget_get_direction (popup) == GTK_TEXT_DIR_RTL) { gtk_window_move (GTK_WINDOW (popup), - screen_rect.x + screen_rect.width - popup_width, - screen_rect.height - popup_height); + screen_rect.x, + screen_rect.y); } else { gtk_window_move (GTK_WINDOW (popup), - screen_rect.x, screen_rect.height - popup_height); + screen_rect.x + screen_rect.width - popup_width, + screen_rect.y); } } @@ -816,7 +898,7 @@ static void screen_size_changed_cb (GdkScreen *screen, EvWindow *window) { - update_fullscreen_popup (window); + ev_window_update_fullscreen_popup (window); } static void @@ -848,16 +930,18 @@ exit_fullscreen_button_clicked_cb (GtkWidget *button, EvWindow *window) static void fullscreen_popup_size_request_cb (GtkWidget *popup, GtkRequisition *req, EvWindow *window) { - update_fullscreen_popup (window); + ev_window_update_fullscreen_popup (window); } static void ev_window_fullscreen (EvWindow *window) { - GtkWidget *popup, *button, *icon, *label, *hbox, *main_menu; + GtkWidget *popup, *button, *icon, *label, *hbox; window->priv->fullscreen_mode = TRUE; + g_return_if_fail (window->priv->exit_fullscreen_popup == NULL); + popup = gtk_window_new (GTK_WINDOW_POPUP); window->priv->exit_fullscreen_popup = popup; @@ -872,11 +956,11 @@ ev_window_fullscreen (EvWindow *window) gtk_widget_show (hbox); gtk_container_add (GTK_CONTAINER (button), hbox); - icon = gtk_image_new_from_stock (GTK_STOCK_QUIT, GTK_ICON_SIZE_BUTTON); + icon = gtk_image_new_from_stock (EV_STOCK_LEAVE_FULLSCREEN, GTK_ICON_SIZE_BUTTON); gtk_widget_show (icon); gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); - label = gtk_label_new (_("Exit Fullscreen")); + label = gtk_label_new (_("Leave Fullscreen")); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); @@ -888,27 +972,19 @@ ev_window_fullscreen (EvWindow *window) g_signal_connect (popup, "size_request", G_CALLBACK (fullscreen_popup_size_request_cb), window); - main_menu = gtk_ui_manager_get_widget (window->priv->ui_manager, "/MainMenu"); - gtk_widget_hide (main_menu); - gtk_widget_hide (window->priv->statusbar); + update_chrome_visibility (window); - update_fullscreen_popup (window); - - gtk_widget_show (popup); + ev_window_update_fullscreen_popup (window); } static void ev_window_unfullscreen (EvWindow *window) { - GtkWidget *main_menu; - window->priv->fullscreen_mode = FALSE; - main_menu = gtk_ui_manager_get_widget (window->priv->ui_manager, "/MainMenu"); - gtk_widget_show (main_menu); - gtk_widget_show (window->priv->statusbar); - destroy_exit_fullscreen_popup (window); + + update_chrome_visibility (window); } static void @@ -962,13 +1038,70 @@ ev_window_state_event_cb (GtkWidget *widget, GdkEventWindowState *event, EvWindo } static gboolean -ev_window_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *ev_window) +ev_window_focus_in_event (GtkWidget *widget, GdkEventFocus *event) { - gtk_window_unfullscreen (GTK_WINDOW (ev_window)); + EvWindow *window = EV_WINDOW (widget); + EvWindowPrivate *priv = window->priv; - return FALSE; + if (priv->exit_fullscreen_popup != NULL && + (priv->chrome & EV_CHROME_TOOLBAR) == 0) + { + gtk_widget_show (priv->exit_fullscreen_popup); + } + + return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_in_event (widget, event); } +static gboolean +ev_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event) +{ + EvWindow *window = EV_WINDOW (widget); + EvWindowPrivate *priv = window->priv; + + if (priv->exit_fullscreen_popup != NULL && + (priv->chrome & EV_CHROME_TOOLBAR) == 0) + { + gtk_widget_hide (priv->exit_fullscreen_popup); + } + + return GTK_WIDGET_CLASS (ev_window_parent_class)->focus_out_event (widget, event); +} + +static void +ev_window_set_page_mode (EvWindow *window, + EvWindowPageMode page_mode) +{ + GtkWidget *child = NULL; + GtkWidget *real_child; + + if (window->priv->page_mode == page_mode) + return; + + window->priv->page_mode = page_mode; + + switch (page_mode) { + case PAGE_MODE_SINGLE_PAGE: + child = window->priv->view; + break; + case PAGE_MODE_PASSWORD: + child = window->priv->password_view; + break; + case PAGE_MODE_CONTINUOUS_PAGE: + child = window->priv->page_view; + break; + default: + g_assert_not_reached (); + } + + real_child = gtk_bin_get_child (GTK_BIN (window->priv->scrolled_window)); + if (child != real_child) { + gtk_container_remove (GTK_CONTAINER (window->priv->scrolled_window), + real_child); + gtk_container_add (GTK_CONTAINER (window->priv->scrolled_window), + child); + } + update_action_sensitivity (window); +} static void ev_window_cmd_view_zoom_in (GtkAction *action, EvWindow *ev_window) @@ -1010,22 +1143,6 @@ ev_window_cmd_view_page_width (GtkAction *action, EvWindow *ev_window) ev_view_fit_width (EV_VIEW (ev_window->priv->view)); } -static void -ev_window_cmd_go_back (GtkAction *action, EvWindow *ev_window) -{ - g_return_if_fail (EV_IS_WINDOW (ev_window)); - - ev_view_go_back (EV_VIEW (ev_window->priv->view)); -} - -static void -ev_window_cmd_go_forward (GtkAction *action, EvWindow *ev_window) -{ - g_return_if_fail (EV_IS_WINDOW (ev_window)); - - ev_view_go_forward (EV_VIEW (ev_window->priv->view)); -} - static void ev_window_cmd_go_page_up (GtkAction *action, EvWindow *ev_window) { @@ -1068,6 +1185,12 @@ ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window) /* FIXME */ } +static void +ev_window_cmd_leave_fullscreen (GtkAction *action, EvWindow *window) +{ + gtk_window_unfullscreen (GTK_WINDOW (window)); +} + static void ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) { @@ -1130,33 +1253,25 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) static void ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window) { - g_object_set ( - G_OBJECT (gtk_ui_manager_get_widget ( - ev_window->priv->ui_manager, - "/ToolBar")), - "visible", - gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)), - NULL); + update_chrome_flag (ev_window, EV_CHROME_TOOLBAR, + GCONF_CHROME_TOOLBAR, + gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); } static void ev_window_view_statusbar_cb (GtkAction *action, EvWindow *ev_window) { - g_object_set ( - ev_window->priv->statusbar, - "visible", - gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)), - NULL); + update_chrome_flag (ev_window, EV_CHROME_STATUSBAR, + GCONF_CHROME_STATUSBAR, + gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); } static void ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window) { - g_object_set ( - ev_window->priv->sidebar, - "visible", - gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)), - NULL); + update_chrome_flag (ev_window, EV_CHROME_SIDEBAR, + GCONF_CHROME_SIDEBAR, + gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); } static void @@ -1267,27 +1382,36 @@ static void find_bar_previous_cb (EggFindBar *find_bar, EvWindow *ev_window) { - /* FIXME - highlight previous result */ - g_printerr ("Find Previous\n"); - + ev_view_find_previous (EV_VIEW (ev_window->priv->view)); } static void find_bar_next_cb (EggFindBar *find_bar, EvWindow *ev_window) { - /* FIXME - highlight next result */ - g_printerr ("Find Next\n"); + ev_view_find_next (EV_VIEW (ev_window->priv->view)); } static void find_bar_close_cb (EggFindBar *find_bar, EvWindow *ev_window) { - gtk_widget_hide (ev_window->priv->find_bar); + update_chrome_flag (ev_window, EV_CHROME_FINDBAR, NULL, FALSE); +} + +static void +ev_window_page_mode_cb (GtkRadioAction *action, + GtkRadioAction *activated_action, + EvWindow *window) +{ + int mode; + + mode = gtk_radio_action_get_current_value (action); + + g_assert (mode == PAGE_MODE_CONTINUOUS_PAGE || + mode == PAGE_MODE_SINGLE_PAGE); - if (ev_window->priv->exit_fullscreen_popup) - update_fullscreen_popup (ev_window); + ev_window_set_page_mode (window, (EvWindowPageMode) mode); } static void @@ -1323,6 +1447,7 @@ find_bar_search_changed_cb (EggFindBar *find_bar, ev_document_find_cancel (EV_DOCUMENT_FIND (ev_window->priv->document)); 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)); } } } @@ -1330,11 +1455,8 @@ find_bar_search_changed_cb (EggFindBar *find_bar, static void ev_window_dispose (GObject *object) { - EvWindowPrivate *priv; - - g_return_if_fail (object != NULL && EV_IS_WINDOW (object)); - - priv = EV_WINDOW (object)->priv; + EvWindow *window = EV_WINDOW (object); + EvWindowPrivate *priv = window->priv; if (priv->ui_manager) { g_object_unref (priv->ui_manager); @@ -1346,52 +1468,48 @@ ev_window_dispose (GObject *object) priv->action_group = NULL; } - G_OBJECT_CLASS (parent_class)->dispose (object); + if (priv->document) { + g_object_unref (priv->document); + priv->document = NULL; + } + + if (priv->view) { + g_object_unref (priv->view); + priv->view = NULL; + } + + if (priv->page_view) { + g_object_unref (priv->page_view); + priv->page_view = NULL; + } + + if (priv->password_document) { + g_object_unref (priv->password_document); + priv->password_document = NULL; + } + + if (priv->password_uri) { + g_free (priv->password_uri); + priv->password_uri = NULL; + } + + destroy_exit_fullscreen_popup (window); + + G_OBJECT_CLASS (ev_window_parent_class)->dispose (object); } static void ev_window_class_init (EvWindowClass *ev_window_class) { - GObjectClass *g_object_class; + GObjectClass *g_object_class = G_OBJECT_CLASS (ev_window_class); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (ev_window_class); - parent_class = g_type_class_peek_parent (ev_window_class); - - g_object_class = G_OBJECT_CLASS (ev_window_class); g_object_class->dispose = ev_window_dispose; - g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate)); + widget_class->focus_in_event = ev_window_focus_in_event; + widget_class->focus_out_event = ev_window_focus_out_event; -#if 0 - /* setting up signal system */ - ev_window_class->signal = ev_window_signal; - - ev_window_signals [SIGNAL] = g_signal_new ( - "signal", - EV_TYPE_WINDOW, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EvWindowClass, - signal), - NULL, - NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, - 0); - /* setting up property system */ - g_object_class->set_property = ev_window_set_property; - g_object_class->get_property = ev_window_get_property; - - g_object_class_install_property ( - g_object_class, - PROP_ATTRIBUTE, - g_param_spec_string ("attribute", - "Attribute", - "A simple unneccessary attribute that " - "does nothing special except being a " - "demonstration for the correct implem" - "entation of a GObject property", - "default_value", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); -#endif + g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate)); } /* Normal items */ @@ -1445,16 +1563,10 @@ static GtkActionEntry entries[] = { G_CALLBACK (ev_window_cmd_view_page_width) }, /* Go menu */ - { "GoBack", GTK_STOCK_GO_BACK, N_("_Back"), "Left", - N_("Go to the page viewed before this one"), - G_CALLBACK (ev_window_cmd_go_back) }, - { "GoForward", GTK_STOCK_GO_FORWARD, N_("Fo_rward"), "Right", - N_("Go to the page viewed before this one"), - G_CALLBACK (ev_window_cmd_go_forward) }, - { "GoPageDown", GTK_STOCK_GO_UP, N_("_Page Up"), "Page_Up", + { "GoPageUp", GTK_STOCK_GO_UP, N_("_Page Up"), "Page_Up", N_("Go to the previous page"), G_CALLBACK (ev_window_cmd_go_page_up) }, - { "GoPageUp", GTK_STOCK_GO_DOWN, N_("_Page Down"), "Page_Down", + { "GoPageDown", GTK_STOCK_GO_DOWN, N_("_Page Down"), "Page_Down", N_("Go to the next page"), G_CALLBACK (ev_window_cmd_go_page_down) }, { "GoFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "Home", @@ -1472,6 +1584,11 @@ static GtkActionEntry entries[] = { { "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL, N_("Display credits for the document viewer creators"), G_CALLBACK (ev_window_cmd_help_about) }, + + /* Toolbar-only */ + { "LeaveFullscreen", EV_STOCK_LEAVE_FULLSCREEN, N_("Leave Fullscreen"), "Escape", + N_("Leave fullscreen mode"), + G_CALLBACK (ev_window_cmd_leave_fullscreen) } }; /* Toggle items */ @@ -1491,6 +1608,15 @@ static GtkToggleActionEntry toggle_entries[] = { G_CALLBACK (ev_window_cmd_view_fullscreen) }, }; +static GtkRadioActionEntry page_view_entries[] = { + { "SinglePage", GTK_STOCK_DND, N_("Single"), NULL, + N_("Show the document one page at a time"), + PAGE_MODE_SINGLE_PAGE }, + { "ContinuousPage", GTK_STOCK_DND_MULTIPLE, N_("Multi"), NULL, + N_("Show the full document at once"), + PAGE_MODE_CONTINUOUS_PAGE } +}; + static void goto_page_cb (GtkAction *action, int page_number, EvWindow *ev_window) { @@ -1506,33 +1632,6 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group) { GtkAction *action; - action = g_object_new (EV_TYPE_NAVIGATION_ACTION, - "name", NAVIGATION_BACK_ACTION, - "label", _("Back"), - "stock_id", GTK_STOCK_GO_BACK, - "tooltip", _("Go back"), - "arrow-tooltip", _("Back history"), - "direction", EV_NAVIGATION_DIRECTION_BACK, - "is_important", TRUE, - NULL); - g_signal_connect (action, "activate", - G_CALLBACK (ev_window_cmd_go_back), window); - gtk_action_group_add_action (group, action); - g_object_unref (action); - - action = g_object_new (EV_TYPE_NAVIGATION_ACTION, - "name", NAVIGATION_FORWARD_ACTION, - "label", _("Forward"), - "stock_id", GTK_STOCK_GO_FORWARD, - "tooltip", _("Go forward"), - "arrow-tooltip", _("Forward history"), - "direction", EV_NAVIGATION_DIRECTION_FORWARD, - NULL); - g_signal_connect (action, "activate", - G_CALLBACK (ev_window_cmd_go_forward), window); - gtk_action_group_add_action (group, action); - g_object_unref (action); - action = g_object_new (EV_TYPE_PAGE_ACTION, "name", PAGE_SELECTOR_ACTION, "label", _("Page"), @@ -1544,19 +1643,103 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group) g_object_unref (action); } +static void +set_action_properties (GtkActionGroup *action_group) +{ + GtkAction *action; + + action = gtk_action_group_get_action (action_group, "GoPageUp"); + g_object_set (action, "short_label", _("Up"), NULL); + action = gtk_action_group_get_action (action_group, "GoPageDown"); + g_object_set (action, "short_label", _("Down"), NULL); + action = gtk_action_group_get_action (action_group, "ViewPageWidth"); + g_object_set (action, "short_label", _("Fit Width"), NULL); + + action = gtk_action_group_get_action (action_group, "LeaveFullscreen"); + g_object_set (action, "is-important", TRUE, NULL); +} + +static void +set_chrome_actions (EvWindow *window) +{ + EvWindowPrivate *priv = window->priv; + GtkActionGroup *action_group = priv->action_group; + GtkAction *action; + + action= gtk_action_group_get_action (action_group, "ViewToolbar"); + g_signal_handlers_block_by_func + (action, G_CALLBACK (ev_window_view_toolbar_cb), window); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), + (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 +load_chrome (void) +{ + GConfClient *client; + GConfValue *value; + EvChrome chrome = EV_CHROME_NORMAL; + + 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); + } + + 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; +} + static void ev_window_init (EvWindow *ev_window) { GtkActionGroup *action_group; GtkAccelGroup *accel_group; GError *error = NULL; - GtkWidget *scrolled_window; - GtkWidget *menubar; - GtkWidget *toolbar; - GtkWidget *sidebar_widget; + GtkWidget *sidebar_widget, *toolbar_dock; ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window); + ev_window->priv->page_mode = PAGE_MODE_SINGLE_PAGE; update_window_title (NULL, NULL, ev_window); ev_window->priv->main_box = gtk_vbox_new (FALSE, 0); @@ -1571,7 +1754,12 @@ ev_window_init (EvWindow *ev_window) gtk_action_group_add_toggle_actions (action_group, toggle_entries, G_N_ELEMENTS (toggle_entries), ev_window); - + gtk_action_group_add_radio_actions (action_group, page_view_entries, + G_N_ELEMENTS (page_view_entries), + ev_window->priv->page_mode, + G_CALLBACK (ev_window_page_mode_cb), + ev_window); + set_action_properties (action_group); register_custom_actions (ev_window, action_group); ev_window->priv->ui_manager = gtk_ui_manager_new (); @@ -1594,15 +1782,39 @@ ev_window_init (EvWindow *ev_window) g_error_free (error); } - menubar = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, - "/MainMenu"); - gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), menubar, + ev_window->priv->menubar = + gtk_ui_manager_get_widget (ev_window->priv->ui_manager, + "/MainMenu"); + gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), + ev_window->priv->menubar, + FALSE, FALSE, 0); + + /* 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. + */ + toolbar_dock = ev_window->priv->toolbar_dock = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), toolbar_dock, FALSE, FALSE, 0); + gtk_widget_show (toolbar_dock); + + ev_window->priv->toolbar = + gtk_ui_manager_get_widget (ev_window->priv->ui_manager, + "/ToolBar"); + gtk_box_pack_start (GTK_BOX (toolbar_dock), ev_window->priv->toolbar, + TRUE, TRUE, 0); + gtk_widget_show (ev_window->priv->toolbar); - toolbar = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, - "/ToolBar"); - gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), toolbar, + ev_window->priv->exit_fullscreen_toolbar = + gtk_ui_manager_get_widget (ev_window->priv->ui_manager, + "/LeaveFullscreenToolbar"); + gtk_box_pack_start (GTK_BOX (toolbar_dock), + ev_window->priv->exit_fullscreen_toolbar, FALSE, FALSE, 0); + gtk_toolbar_set_show_arrow (GTK_TOOLBAR (ev_window->priv->exit_fullscreen_toolbar), + FALSE); + gtk_toolbar_set_style (GTK_TOOLBAR (ev_window->priv->exit_fullscreen_toolbar), + GTK_TOOLBAR_BOTH_HORIZ); /* Add the main area */ ev_window->priv->hpaned = gtk_hpaned_new (); @@ -1611,7 +1823,6 @@ ev_window_init (EvWindow *ev_window) TRUE, TRUE, 0); ev_window->priv->sidebar = ev_sidebar_new (); - gtk_widget_show (ev_window->priv->sidebar); gtk_paned_add1 (GTK_PANED (ev_window->priv->hpaned), ev_window->priv->sidebar); @@ -1630,17 +1841,34 @@ ev_window_init (EvWindow *ev_window) _("Thumbnails"), ev_window->priv->thumbs_sidebar); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolled_window); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + ev_window->priv->scrolled_window = + GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW, + "hscrollbar-policy", GTK_POLICY_AUTOMATIC, + "vscrollbar-policy", GTK_POLICY_AUTOMATIC, + "shadow-type", GTK_SHADOW_IN, + NULL)); + gtk_widget_show (ev_window->priv->scrolled_window); gtk_paned_add2 (GTK_PANED (ev_window->priv->hpaned), - scrolled_window); + ev_window->priv->scrolled_window); ev_window->priv->view = ev_view_new (); + //ev_window->priv->page_view = ev_page_view_new (); + ev_window->priv->password_view = ev_password_view_new (); + g_signal_connect_swapped (ev_window->priv->password_view, + "unlock", + G_CALLBACK (ev_window_popup_password_dialog), + ev_window); gtk_widget_show (ev_window->priv->view); - gtk_container_add (GTK_CONTAINER (scrolled_window), + //gtk_widget_show (ev_window->priv->page_view); + gtk_widget_show (ev_window->priv->password_view); + + /* We own a ref on these widgets, as we can swap them in and out */ + g_object_ref (ev_window->priv->view); + //g_object_ref (ev_window->priv->page_view); + g_object_ref (ev_window->priv->password_view); + + gtk_container_add (GTK_CONTAINER (ev_window->priv->scrolled_window), ev_window->priv->view); g_signal_connect (ev_window->priv->view, "page-changed", @@ -1656,7 +1884,6 @@ ev_window_init (EvWindow *ev_window) ev_window); ev_window->priv->statusbar = gtk_statusbar_new (); - gtk_widget_show (ev_window->priv->statusbar); gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box), ev_window->priv->statusbar, FALSE, TRUE, 0); @@ -1670,6 +1897,10 @@ ev_window_init (EvWindow *ev_window) ev_window->priv->find_bar, FALSE, TRUE, 0); + ev_window->priv->chrome = load_chrome (); + set_chrome_actions (ev_window); + update_chrome_visibility (ev_window); + /* Connect to find bar signals */ g_signal_connect (ev_window->priv->find_bar, "previous", @@ -1699,12 +1930,9 @@ ev_window_init (EvWindow *ev_window) g_signal_connect (ev_window, "window-state-event", G_CALLBACK (ev_window_state_event_cb), ev_window); - g_signal_connect (ev_window, "focus_out_event", - G_CALLBACK (ev_window_focus_out_cb), - ev_window); /* Give focus to the scrolled window */ - gtk_widget_grab_focus (scrolled_window); + gtk_widget_grab_focus (ev_window->priv->scrolled_window); update_action_sensitivity (ev_window); }