Rearrange choose columns. The track name column is now last by

default so that if it gets too wide you don't lose the others.  It is
also marked as the expander column, so the expander widgets appear in
a more sensible place.

diff --git a/disobedience/choose-search.c b/disobedience/choose-search.c
index c804276d812683dc79f0b85da3cb6c56b3697288..d12a3439ee648e2b90b93fbc0aef7cc61b5251c5 100644 (file)
--- a/disobedience/choose-search.c
+++ b/disobedience/choose-search.c
@@ -190,6 +190,8 @@ static int choose_compare_references(const void *av, const void *bv) {
  *
  * If @p row_align is negative no row alignemt is performed.  Otherwise
  * it must be between 0 (the top) and 1 (the bottom).
  *
  * If @p row_align is negative no row alignemt is performed.  Otherwise
  * it must be between 0 (the top) and 1 (the bottom).

+ *
+ * TODO: if the row is already visible do nothing.

  */
 static int choose_make_path_visible(GtkTreePath *path,
                                     gfloat row_align) {
  */
 static int choose_make_path_visible(GtkTreePath *path,
                                     gfloat row_align) {

diff --git a/disobedience/choose.c b/disobedience/choose.c
index a275fac1c49c25dbc1879c2b8402f9ff3bccb0dd..8813ad345bd117922cacb0d4d1422f35087579f6 100644 (file)
--- a/disobedience/choose.c
+++ b/disobedience/choose.c
@@ -374,18 +374,18 @@ GtkWidget *choose_widget(void) {
   /* Create cell renderers and columns */
   /* TODO use a table */
   {
   /* Create cell renderers and columns */
   /* TODO use a table */
   {

-    GtkCellRenderer *r = gtk_cell_renderer_text_new();
+    GtkCellRenderer *r = gtk_cell_renderer_toggle_new();

     GtkTreeViewColumn *c = gtk_tree_view_column_new_with_attributes
     GtkTreeViewColumn *c = gtk_tree_view_column_new_with_attributes

-      ("Track",
+      ("Queued",

        r,
        r,

-       "text", NAME_COLUMN,
-       "background", BG_COLUMN,
-       "foreground", FG_COLUMN,
+       "active", STATE_COLUMN,
+       "visible", ISFILE_COLUMN,

        (char *)0);
     gtk_tree_view_column_set_resizable(c, TRUE);
     gtk_tree_view_column_set_reorderable(c, TRUE);
        (char *)0);
     gtk_tree_view_column_set_resizable(c, TRUE);
     gtk_tree_view_column_set_reorderable(c, TRUE);

-    g_object_set(c, "expand", TRUE, (char *)0);

     gtk_tree_view_append_column(GTK_TREE_VIEW(choose_view), c);
     gtk_tree_view_append_column(GTK_TREE_VIEW(choose_view), c);

+    g_signal_connect(r, "toggled",
+                     G_CALLBACK(choose_state_toggled), 0);

   }
   {
     GtkCellRenderer *r = gtk_cell_renderer_text_new();
   }
   {
     GtkCellRenderer *r = gtk_cell_renderer_text_new();


@@ -400,18 +400,19 @@ GtkWidget *choose_widget(void) {
     gtk_tree_view_append_column(GTK_TREE_VIEW(choose_view), c);
   }
   {
     gtk_tree_view_append_column(GTK_TREE_VIEW(choose_view), c);
   }
   {

-    GtkCellRenderer *r = gtk_cell_renderer_toggle_new();
+    GtkCellRenderer *r = gtk_cell_renderer_text_new();

     GtkTreeViewColumn *c = gtk_tree_view_column_new_with_attributes
     GtkTreeViewColumn *c = gtk_tree_view_column_new_with_attributes

-      ("Queued",
+      ("Track",

        r,
        r,

-       "active", STATE_COLUMN,
-       "visible", ISFILE_COLUMN,
+       "text", NAME_COLUMN,
+       "background", BG_COLUMN,
+       "foreground", FG_COLUMN,

        (char *)0);
     gtk_tree_view_column_set_resizable(c, TRUE);
     gtk_tree_view_column_set_reorderable(c, TRUE);
        (char *)0);
     gtk_tree_view_column_set_resizable(c, TRUE);
     gtk_tree_view_column_set_reorderable(c, TRUE);

+    g_object_set(c, "expand", TRUE, (char *)0);

     gtk_tree_view_append_column(GTK_TREE_VIEW(choose_view), c);
     gtk_tree_view_append_column(GTK_TREE_VIEW(choose_view), c);

-    g_signal_connect(r, "toggled",
-                     G_CALLBACK(choose_state_toggled), 0);
+    gtk_tree_view_set_expander_column(GTK_TREE_VIEW(choose_view), c);

   }
   
   /* The selection should support multiple things being selected */
   }
   
   /* The selection should support multiple things being selected */