[Graveman-cvs] Changes to graveman/current/src/callbacks.c

[sylvain cresto]

Index: graveman/current/src/callbacks.c
diff -u graveman/current/src/callbacks.c:1.41 
graveman/current/src/callbacks.c:1.42
--- graveman/current/src/callbacks.c:1.41       Wed May  4 01:31:06 2005
+++ graveman/current/src/callbacks.c    Tue May 10 01:30:35 2005
@@ -224,17 +224,14 @@
 }
 
 /* developper tout le contenu de l'arbre */
-void gtk_data_expandelement(GtkWidget *btn, gpointer Adata)
+void gtk_data_expandelement(GtkWidget *Abtn, gpointer Adata)
 {
   Tgrave *Lg = (Tgrave *)Adata;
-  GtkTreeView *Lliste = GTK_TREE_VIEW(sc_grave_get_data(Lg, "_current_list"));
-  GtkTreePath *Lpath = NULL;
+  GtkTreeView *Llist = GTK_TREE_VIEW(sc_grave_get_data(Lg, "_current_list"));
 
-  gtk_tree_view_get_cursor(Lliste, &Lpath, NULL);
-  if (!Lpath) return;
+  if (!GTK_IS_TREE_VIEW(Llist)) return;
 
-  gtk_tree_view_expand_row(Lliste, Lpath, TRUE);
-  gtk_tree_path_free(Lpath);
+  expand_list_icons(Llist, TRUE);
 }
 
 /* renommer un element (fichier ou repertoire) */
@@ -1309,6 +1306,10 @@
       gtk_data_addfile(NULL, Lg);
       return TRUE;
     }
+  } else if (Aevent->keyval == GDK_plus) {
+    /* appuis sur la touche plus */
+  } else if (Aevent->keyval == GDK_minus) {
+    /* appuis sur la touche moins */
   }
 
   return FALSE;
@@ -2073,6 +2074,33 @@
   gtk_widget_set_sensitive(GTK_WIDGET(Lspin), ! Lact);
 }
 
+/* gestion des tris */
+void gtk_data_asksort(GtkWidget *Abtn, gpointer Adata)
+{
+  Tgrave *Lg = (Tgrave *)Adata;
+  GtkTreeView *Lliste = GTK_TREE_VIEW(sc_grave_get_data(Lg, "_current_list"));
+  GtkTreeModel *Ltreemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(Lliste));
+  GtkTreeSortable *Lsort = NULL;
+  gint Lcolid;
+  GtkSortType Lorder;
+  const gchar *Lname;
+
+  if (!GTK_IS_WIDGET(Abtn) || !GTK_IS_WIDGET(Lliste)) return;
+  Lsort = GTK_TREE_SORTABLE(Ltreemodel);
+
+  if ((!(Lname = gtk_widget_get_name(Abtn))) || strlen(Lname)<10) return;
+
+/*  if (!gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE(Lmodel), 
&Lcolid, &Lorder)) return;*/
+  if (strstr(Lname, "_name")) {
+    gtk_tree_sortable_set_sort_column_id(Lsort, 2, GTK_SORT_ASCENDING);
+  } else if (strstr(Lname, "_size")) {
+    gtk_tree_sortable_set_sort_column_id(Lsort, 3, GTK_SORT_ASCENDING);
+  } else {
+    gtk_tree_sortable_set_sort_column_id(Lsort, 0, GTK_SORT_ASCENDING);
+  }
+
+}
+
 /* definir/enlever l'image de boot */
 #if 0
 void gtk_def_imageboot(GtkWidget *Abtn, gpointer Adata)