diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | shell/ev-sidebar-attachments.c | 4 | ||||
| -rw-r--r-- | shell/ev-window.c | 24 |
3 files changed, 20 insertions, 18 deletions
@@ -1,8 +1,13 @@ +2006-05-11 Nickolay V. Shmyrev <nshmyrev@yandex.ru> + + * shell/ev-sidebar-attachments.c: (ev_sidebar_attachments_init): + * shell/ev-window.c: (ev_window_init): + + Show attachments page. + 2006-05-10 Nickolay V. Shmyrev <nshmyrev@yandex.ru> * po/POTFILES.in: - * properties/Makefile.am: - * shell/Makefile.am: * shell/ev-attachment-bar.c: * shell/ev-attachment-bar.h: * shell/ev-sidebar-attachments.c: @@ -29,7 +34,6 @@ (setup_sidebar_from_metadata), (ev_window_setup_document), (ev_window_sidebar_current_page_changed_cb), (attachment_bar_menu_popup_cb), (ev_window_init): - * thumbnailer/Makefile.am: Move attachments bar to sidebar. diff --git a/shell/ev-sidebar-attachments.c b/shell/ev-sidebar-attachments.c index aac63cf..1533dc8 100644 --- a/shell/ev-sidebar-attachments.c +++ b/shell/ev-sidebar-attachments.c @@ -521,12 +521,10 @@ ev_sidebar_attachments_init (EvSidebarAttachments *ev_attachbar) gtk_container_add (GTK_CONTAINER (swindow), ev_attachbar->priv->icon_view); - gtk_widget_show (ev_attachbar->priv->icon_view); gtk_container_add (GTK_CONTAINER (ev_attachbar), swindow); - gtk_widget_show (swindow); - + gtk_widget_show_all (GTK_WIDGET (ev_attachbar)); /* Icon Theme */ ev_attachbar->priv->icon_theme = gtk_icon_theme_get_default (); g_signal_connect_swapped (G_OBJECT (ev_attachbar->priv->icon_theme), diff --git a/shell/ev-window.c b/shell/ev-window.c index 1bfb26f..1cd024d 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -3582,11 +3582,15 @@ ev_window_init (EvWindow *ev_window) /* Stub sidebar, for now */ - sidebar_widget = ev_sidebar_thumbnails_new (); - ev_window->priv->sidebar_thumbs = sidebar_widget; + sidebar_widget = ev_sidebar_links_new (); + ev_window->priv->sidebar_links = sidebar_widget; g_signal_connect (sidebar_widget, - "notify::main-widget", - G_CALLBACK (sidebar_page_main_widget_update_cb), + "notify::model", + G_CALLBACK (sidebar_widget_model_set), + ev_window); + g_signal_connect (sidebar_widget, + "link_activated", + G_CALLBACK (sidebar_links_link_activated_cb), ev_window); sidebar_page_main_widget_update_cb (G_OBJECT (sidebar_widget), NULL, ev_window); gtk_widget_show (sidebar_widget); @@ -3602,15 +3606,11 @@ ev_window_init (EvWindow *ev_window) ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar), sidebar_widget); - sidebar_widget = ev_sidebar_links_new (); - ev_window->priv->sidebar_links = sidebar_widget; - g_signal_connect (sidebar_widget, - "notify::model", - G_CALLBACK (sidebar_widget_model_set), - ev_window); + sidebar_widget = ev_sidebar_thumbnails_new (); + ev_window->priv->sidebar_thumbs = sidebar_widget; g_signal_connect (sidebar_widget, - "link_activated", - G_CALLBACK (sidebar_links_link_activated_cb), + "notify::main-widget", + G_CALLBACK (sidebar_page_main_widget_update_cb), ev_window); sidebar_page_main_widget_update_cb (G_OBJECT (sidebar_widget), NULL, ev_window); gtk_widget_show (sidebar_widget); |