Disobedience choose 'select all' now only selects tracks (and

deselects directories).

diff --git a/disobedience/choose-menu.c b/disobedience/choose-menu.c
index 460acc772db1431e06e27315947345fdc26937e7..4063c272a88588a118a9c9e2a8639028f949aa23 100644 (file)
--- a/disobedience/choose-menu.c
+++ b/disobedience/choose-menu.c
@@ -52,13 +52,89 @@ static struct choosedata **choose_get_selected(int *nselected) {
   return v->vec;
 }
 
+/** @brief Recursion step for choose_get_visible()
+ * @param parent A visible node, or NULL for the root
+ * @param cdv Visible nodes accumulated here
+ */
+static void choose_visible_recurse(GtkTreeIter *parent,
+                                   void (*callback)(GtkTreeIter *it,
+                                                    struct choosedata *cd,
+                                                    void *userdata),
+                                   void *userdata) {
+  struct choosedata *cd;
+  int expanded;
+  if(parent) {
+    cd = choose_iter_to_data(parent);
+    callback(parent, cd, userdata);
+    if(cd->type != CHOOSE_DIRECTORY)
+      /* Only directories can be expanded so we can avoid the more
+       * expensive test below */
+      return;
+    GtkTreePath *parent_path
+      = gtk_tree_model_get_path(GTK_TREE_MODEL(choose_store),
+                                parent);
+    expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(choose_view),
+                                          parent_path);
+    gtk_tree_path_free(parent_path);
+  } else
+    expanded = 1;
+  /* See if parent is expanded */
+  if(expanded) {
+    /* Parent is expanded, visit all its children */
+    GtkTreeIter it[1];
+    gboolean itv = gtk_tree_model_iter_children(GTK_TREE_MODEL(choose_store),
+                                                it,
+                                                parent);
+    while(itv) {
+      choose_visible_recurse(it, callback, userdata);
+      itv = gtk_tree_model_iter_next(GTK_TREE_MODEL(choose_store), it);
+    }
+  }
+}
+
+static void choose_visible_visit(void (*callback)(GtkTreeIter *it,
+                                                  struct choosedata *cd,
+                                                  void *userdata),
+                                 void *userdata) {
+  choose_visible_recurse(NULL, callback, userdata);
+}
+
+static void count_choosedatas(struct choosedata **cds,
+                              int counts[2]) {
+  struct choosedata *cd;
+  counts[CHOOSE_FILE] = counts[CHOOSE_DIRECTORY] = 0;
+  while((cd = *cds++))
+    ++counts[cd->type];
+}
+
+
+static void choose_selectall_sensitive_callback
+    (GtkTreeIter attribute((unused)) *it,
+     struct choosedata *cd,
+     void *userdata) {
+  if(cd->type == CHOOSE_FILE)
+    ++*(int *)userdata;
+}
+
 static int choose_selectall_sensitive(void attribute((unused)) *extra) {
-  return TRUE;
+  int files = 0;
+  choose_visible_visit(choose_selectall_sensitive_callback, &files);
+  return files > 0;
 }
-  
+
+static void choose_selectall_activate_callback
+    (GtkTreeIter *it,
+     struct choosedata *cd,
+     void attribute((unused)) *userdata) {
+  if(cd->type == CHOOSE_FILE)
+    gtk_tree_selection_select_iter(choose_selection, it);
+  else
+    gtk_tree_selection_unselect_iter(choose_selection, it);
+}
+
 static void choose_selectall_activate(GtkMenuItem attribute((unused)) *item,
                                       gpointer attribute((unused)) userdata) {
-  gtk_tree_selection_select_all(choose_selection);
+  choose_visible_visit(choose_selectall_activate_callback, 0);
 }
   
 static int choose_selectnone_sensitive(void attribute((unused)) *extra) {
@@ -71,10 +147,8 @@ static void choose_selectnone_activate(GtkMenuItem attribute((unused)) *item,
 }
   
 static int choose_play_sensitive(void attribute((unused)) *extra) {
-  struct choosedata *cd, **cdp = choose_get_selected(NULL);
-  int counts[2] = { 0, 0 };
-  while((cd = *cdp++))
-    ++counts[cd->type];
+  int counts[2];
+  count_choosedatas(choose_get_selected(NULL), counts);
   return !counts[CHOOSE_DIRECTORY] && counts[CHOOSE_FILE];
 }
 

diff --git a/disobedience/choose.c b/disobedience/choose.c
index a505478bb907fe45c6975fad076cf3f29e8d7529..27ba940b25464b14eb6bcbc0d78ca0555a7bac7b 100644 (file)
--- a/disobedience/choose.c
+++ b/disobedience/choose.c
@@ -68,6 +68,14 @@ struct choosedata *choose_iter_to_data(GtkTreeIter *iter) {
   return cd;
 }
 
+struct choosedata *choose_path_to_data(GtkTreePath *path) {
+  GtkTreeIter it[1];
+  gboolean itv = gtk_tree_model_get_iter(GTK_TREE_MODEL(choose_store),
+                                         it, path);
+  assert(itv);
+  return choose_iter_to_data(it);
+}
+
 /** @brief Remove node @p it and all its children
  * @param Iterator, updated to point to next
  * @return True if iterator remains valid

diff --git a/disobedience/choose.h b/disobedience/choose.h
index cb968c5a5a62959fec58cba1f4d987133430d1ef..56964d9edb4333bc276b17b8b51ecd0c6a4a804f 100644 (file)
--- a/disobedience/choose.h
+++ b/disobedience/choose.h
@@ -50,6 +50,7 @@ extern GtkTreeSelection *choose_selection;
 extern const struct tabtype choose_tabtype;
 
 struct choosedata *choose_iter_to_data(GtkTreeIter *iter);
+struct choosedata *choose_path_to_data(GtkTreePath *path);
 gboolean choose_button_event(GtkWidget *widget,
                              GdkEventButton *event,
                              gpointer user_data);

diff --git a/disobedience/menu.c b/disobedience/menu.c
index abe7005686e6e48c326b11807d3c9b4d4abd4d04..73f09091fe4b3f1d231b24c022ae0e4f58590672 100644 (file)
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -414,8 +414,6 @@ GtkWidget *menubar(GtkWidget *w) {
   
   GtkWidget *edit_widget = gtk_item_factory_get_widget(mainmenufactory,
                                                        "<GdisorderMain>/Edit");
-  fprintf(stderr, "edit is a %s\n",
-          GTK_OBJECT_TYPE_NAME(edit_widget));
   g_signal_connect(edit_widget, "show", G_CALLBACK(edit_menu_show), 0);
   
   event_register("rights-changed", menu_rights_changed, 0);