diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-12-22 02:19:48 (GMT) |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-12-22 02:19:48 (GMT) |
| commit | ff8d0330fc705c931a40d07e28eb4060f1dd92f9 (patch) | |
| tree | 386af38110a5d9e9b7f8ede9b17aa92947955971 /shell/ev-window.c | |
| parent | 1d8612cf9fa4348ad27e06b38d9c21d38d31c94a (diff) | |
Start of content-area widget.
Tue Dec 21 21:07:55 2004 Owen Taylor <otaylor@redhat.com>
* shell/ev-view.[ch]: Start of content-area widget.
* shell/ev-window.c: Create a EvView, update it
as we change documents.
* shell/Makefile.am shell/ev-marshal.list: Add
generated marshalers.
Diffstat (limited to 'shell/ev-window.c')
| -rw-r--r-- | shell/ev-window.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/shell/ev-window.c b/shell/ev-window.c index a6097ce..d04dd91 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -28,6 +28,7 @@ #include "ev-window.h" #include "ev-sidebar.h" +#include "ev-view.h" #include "eggfindbar.h" #include "pdf-document.h" @@ -56,6 +57,7 @@ struct _EvWindowPrivate { GtkWidget *sidebar; GtkWidget *find_bar; GtkWidget *bonobo_widget; + GtkWidget *view; GtkUIManager *ui_manager; GtkWidget *statusbar; guint help_message_cid; @@ -158,6 +160,9 @@ ev_window_open (EvWindow *ev_window, const char *uri) if (ev_window->priv->document) g_object_unref (ev_window->priv->document); ev_window->priv->document = document; + + ev_view_set_document (EV_VIEW (ev_window->priv->view), + document); } else { GtkWidget *dialog; @@ -708,9 +713,9 @@ ev_window_init (EvWindow *ev_window) GtkActionGroup *action_group; GtkAccelGroup *accel_group; GError *error = NULL; + GtkWidget *scrolled_window; GtkWidget *menubar; GtkWidget *toolbar; - GtkWidget *darea; ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window); @@ -769,11 +774,17 @@ ev_window_init (EvWindow *ev_window) gtk_paned_add1 (GTK_PANED (ev_window->priv->hpaned), ev_window->priv->sidebar); - /* Stub widget, for now */ - darea = gtk_drawing_area_new (); - gtk_widget_show (darea); + 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); gtk_paned_add2 (GTK_PANED (ev_window->priv->hpaned), - darea); + scrolled_window); + + ev_window->priv->view = ev_view_new (); + gtk_widget_show (ev_window->priv->view); + gtk_container_add (GTK_CONTAINER (scrolled_window), + ev_window->priv->view); ev_window->priv->statusbar = gtk_statusbar_new (); gtk_widget_show (ev_window->priv->statusbar); |