[bijiben] Toolbar: do not show sensitive buttons when trash is empty



commit 42f19285d1fbb159bb1669b652e1fc04981b43a7
Author: Pierre-Yves Luyten <py luyten fr>
Date:   Thu Mar 6 22:13:55 2014 +0100

    Toolbar: do not show sensitive buttons when trash is empty

 src/bjb-controller.c   |   22 +++++++++++-----------
 src/bjb-main-toolbar.c |    6 ++++++
 2 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/src/bjb-controller.c b/src/bjb-controller.c
index c9e8d55..b328f16 100644
--- a/src/bjb-controller.c
+++ b/src/bjb-controller.c
@@ -468,17 +468,6 @@ update_controller_callback (GList *result,
     return;
   }
 
-  switch (self->priv->group)
-  {
-    case BIJI_ARCHIVED_ITEMS:
-      bjb_window_base_switch_to (priv->window, BJB_WINDOW_BASE_ARCHIVE_VIEW);
-      break;
-
-    default:
-      break;
-  }
-
-
   sort_items (&result);
   i = 0;
 
@@ -502,6 +491,17 @@ update_controller_callback (GList *result,
 
   priv->items_to_show = g_list_reverse (priv->items_to_show);
   update (self);
+
+  switch (self->priv->group)
+  {
+    case BIJI_ARCHIVED_ITEMS:
+      bjb_window_base_switch_to (priv->window, BJB_WINDOW_BASE_ARCHIVE_VIEW);
+      break;
+
+    default:
+      break;
+  }
+
 }
 
 
diff --git a/src/bjb-main-toolbar.c b/src/bjb-main-toolbar.c
index 56b048f..da70acc 100644
--- a/src/bjb-main-toolbar.c
+++ b/src/bjb-main-toolbar.c
@@ -282,6 +282,9 @@ update_selection_buttons (BjbController *controller,
   if (priv->list)
     gtk_widget_set_sensitive (priv->list, some_item_is_visible);
 
+  if (priv->empty_bin)
+    gtk_widget_set_sensitive (priv->empty_bin, some_item_is_visible);
+
   gtk_widget_set_sensitive (priv->select, some_item_is_visible);
 }
 
@@ -588,6 +591,9 @@ populate_bar_for_trash (BjbMainToolbar *self)
   gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (self), TRUE);
 
   /* Watch for main view changing */
+  update_selection_buttons (
+    priv->controller, bjb_controller_shows_item (priv->controller),
+    FALSE,priv);
   connect_main_view_handlers (self);
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]