diff options
| author | Wouter Bolsterlee <wbolster@svn.gnome.org> | 2007-05-20 13:49:30 (GMT) |
|---|---|---|
| committer | Wouter Bolsterlee <wbolster@src.gnome.org> | 2007-05-20 13:49:30 (GMT) |
| commit | 2966adf2bcca407400980b57509a2fa74f28fb19 (patch) | |
| tree | 7446350acf6efb572115a08f4040185ff116a436 | |
| parent | c61edaebd96a03fde410690674f3b855f0d971de (diff) | |
Change sidebar ordering. Fixes bug #439939.
2007-05-20 Wouter Bolsterlee <wbolster@svn.gnome.org>
* shell/ev-sidebar.c: (ev_sidebar_add_page):
* shell/ev-window.c:
Change sidebar ordering. Fixes bug #439939.
svn path=/trunk/; revision=2470
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | shell/ev-sidebar.c | 8 | ||||
| -rw-r--r-- | shell/ev-window.c | 22 |
3 files changed, 24 insertions, 13 deletions
@@ -1,3 +1,10 @@ +2007-05-20 Wouter Bolsterlee <wbolster@svn.gnome.org> + + * shell/ev-sidebar.c: (ev_sidebar_add_page): + * shell/ev-window.c: + + Change sidebar ordering. Fixes bug #439939. + 2007-05-20 Marc Brockschmidt he+bugzilla.g@marcbrockschmidt.de * backend/comics/Makefile.am: diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c index 90e8c1d..06a29c7 100644 --- a/shell/ev-sidebar.c +++ b/shell/ev-sidebar.c @@ -451,7 +451,8 @@ ev_sidebar_add_page (EvSidebar *ev_sidebar, gtk_widget_show (menu_item); gtk_menu_shell_append (GTK_MENU_SHELL (ev_sidebar->priv->menu), menu_item); - + + /* Insert and move to end */ gtk_list_store_insert_with_values (GTK_LIST_STORE (ev_sidebar->priv->page_model), &iter, 0, PAGE_COLUMN_TITLE, title, @@ -459,7 +460,10 @@ ev_sidebar_add_page (EvSidebar *ev_sidebar, PAGE_COLUMN_MAIN_WIDGET, main_widget, PAGE_COLUMN_NOTEBOOK_INDEX, index, -1); - + gtk_list_store_move_before(GTK_LIST_STORE(ev_sidebar->priv->page_model), + &iter, NULL); + + /* Set the first item added as active */ gtk_tree_model_get_iter_first (ev_sidebar->priv->page_model, &iter); gtk_tree_model_get (ev_sidebar->priv->page_model, diff --git a/shell/ev-window.c b/shell/ev-window.c index 9615c9a..dbba099 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -5063,6 +5063,17 @@ ev_window_init (EvWindow *ev_window) /* Stub sidebar, for now */ + sidebar_widget = ev_sidebar_thumbnails_new (); + ev_window->priv->sidebar_thumbs = sidebar_widget; + g_signal_connect (sidebar_widget, + "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); + 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, @@ -5088,17 +5099,6 @@ ev_window_init (EvWindow *ev_window) ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar), sidebar_widget); - sidebar_widget = ev_sidebar_thumbnails_new (); - ev_window->priv->sidebar_thumbs = sidebar_widget; - g_signal_connect (sidebar_widget, - "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); - ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar), - sidebar_widget); - ev_window->priv->scrolled_window = GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW, "shadow-type", GTK_SHADOW_IN, |