From 8aabbe7d5ef979d538996a7dd8a245f77b15ed51 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Tue, 21 Dec 2004 22:21:16 +0000 Subject: initial sidebar boilerplate. Tue Dec 21 17:20:16 2004 Jonathan Blandford * shell/ev-sidebar.[ch]: initial sidebar boilerplate. --- diff --git a/ChangeLog b/ChangeLog index 6c4ea85..def529d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Dec 21 17:20:16 2004 Jonathan Blandford + + * shell/ev-sidebar.[ch]: initial sidebar boilerplate. + Tue Dec 21 16:30:58 2004 Owen Taylor * pdf/**: Import of xpdf code from gpdf. diff --git a/shell/Makefile.am b/shell/Makefile.am index 10e4930..876da85 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -15,6 +15,8 @@ evince_SOURCES= \ ev-application.h \ ev-window.c \ ev-window.h \ + ev-sidebar.c \ + ev-sidebar.h \ main.c \ $(NULL) diff --git a/shell/ev-window.c b/shell/ev-window.c index 7dad330..ca753bf 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -27,20 +27,10 @@ #endif #include "ev-window.h" +#include "ev-sidebar.h" -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include @@ -59,6 +49,8 @@ enum { struct _EvWindowPrivate { GtkWidget *main_box; + GtkWidget *hpaned; + GtkWidget *sidebar; GtkWidget *bonobo_widget; GtkUIManager *ui_manager; GtkWidget *statusbar; @@ -637,6 +629,7 @@ ev_window_init (EvWindow *ev_window) GError *error = NULL; GtkWidget *menubar; GtkWidget *toolbar; + GtkWidget *darea; ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window); @@ -684,6 +677,24 @@ ev_window_init (EvWindow *ev_window) gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), toolbar, FALSE, FALSE, 0); + /* Add the main area */ + ev_window->priv->hpaned = gtk_hpaned_new (); + gtk_widget_show (ev_window->priv->hpaned); + gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), ev_window->priv->hpaned, + 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); + + /* Stub widget, for now */ + darea = gtk_drawing_area_new (); + gtk_widget_show (darea); + gtk_paned_add2 (GTK_PANED (ev_window->priv->hpaned), + darea); + + 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), -- cgit v0.9.1