X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fui%2Fgui%2Fpsppire-data-sheet.c;h=089ab8f4795c5a8cf365fdd4f29c8c138fc88670;hb=b5a56f8d1592fd0d9bf981d71e28851c4e733fef;hp=f9800a501bab93b8b0ee19a29257b789c952962a;hpb=f7a3ebdcf1f308496cbf94d7e102d89f5648e9d7;p=pspp

diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index f9800a501b..089ab8f479 100644
--- a/src/ui/gui/psppire-data-sheet.c
+++ b/src/ui/gui/psppire-data-sheet.c
@@ -30,7 +30,7 @@
 static void
 do_sort (PsppireDataSheet *sheet, GtkSortType order)
 {
-  JmdRange *range = JMD_SHEET(sheet)->selection;
+  SswRange *range = SSW_SHEET(sheet)->selection;
 
   PsppireDataStore *data_store = NULL;
   g_object_get (sheet, "data-model", &data_store, NULL);
@@ -102,16 +102,9 @@ change_data_value (PsppireDataSheet *sheet, gint col, gint row, GValue *value)
   value_destroy_from_variant (&v, vrnt);
 }
 
-static gchar *
-data_store_value_to_string (JmdSheet *data_sheet, PsppireDataStore *store, gint col, gint row, const GValue *v)
-{
-  return psppire_data_store_value_to_string (store, col, row, v);
-}
-
 gboolean myreversefunc (GtkTreeModel *model, gint col, gint row, const gchar *in,
 		    GValue *out);
 
-
 
 
 static void
@@ -155,7 +148,7 @@ insert_new_case (PsppireDataSheet *sheet)
 static void
 delete_cases (PsppireDataSheet *sheet)
 {
-  JmdRange *range = JMD_SHEET(sheet)->selection;
+  SswRange *range = SSW_SHEET(sheet)->selection;
 
   PsppireDataStore *data_store = NULL;
   g_object_get (sheet, "data-model", &data_store, NULL);
@@ -236,7 +229,7 @@ insert_new_variable (PsppireDataSheet *sheet)
 static void
 set_menu_items_sensitivity (PsppireDataSheet *sheet, gpointer selection, gpointer p)
 {
-  JmdRange *range = selection;
+  SswRange *range = selection;
 
   PsppireDataStore *data_store = NULL;
   g_object_get (sheet, "data-model", &data_store, NULL);
@@ -262,7 +255,7 @@ set_menu_items_sensitivity (PsppireDataSheet *sheet, gpointer selection, gpointe
 static void
 delete_variables (PsppireDataSheet *sheet)
 {
-  JmdRange *range = JMD_SHEET(sheet)->selection;
+  SswRange *range = SSW_SHEET(sheet)->selection;
 
   PsppireDataStore *data_store = NULL;
   g_object_get (sheet, "data-model", &data_store, NULL);
@@ -322,7 +315,7 @@ create_data_column_header_popup_menu (PsppireDataSheet *sheet)
 
 
 
-G_DEFINE_TYPE (PsppireDataSheet, psppire_data_sheet, JMD_TYPE_SHEET)
+G_DEFINE_TYPE (PsppireDataSheet, psppire_data_sheet, SSW_TYPE_SHEET)
 
 static GObjectClass * parent_class = NULL;
 static gboolean dispose_has_run = FALSE;
@@ -330,7 +323,7 @@ static gboolean dispose_has_run = FALSE;
 static void
 psppire_data_sheet_dispose (GObject *obj)
 {
-  PsppireDataSheet *sheet = PSPPIRE_DATA_SHEET (obj);
+  //  PsppireDataSheet *sheet = PSPPIRE_DATA_SHEET (obj);
 
   if (dispose_has_run)
     return;
@@ -355,7 +348,7 @@ psppire_data_sheet_new (void)
 {
   GObject *obj =
     g_object_new (PSPPIRE_TYPE_DATA_SHEET,
-		  "forward-conversion", data_store_value_to_string,
+		  "forward-conversion", psppire_data_store_value_to_string,
 		  "reverse-conversion", myreversefunc,
 		  NULL);
 
@@ -372,6 +365,29 @@ set_dictionary (PsppireDataSheet *sheet)
   g_object_set (sheet, "hmodel", store->dict, NULL);
 }
 
+static void
+move_variable (PsppireDataSheet *sheet, gint from, gint to, gpointer ud)
+{
+  PsppireDataStore *data_store = NULL;
+  g_object_get (sheet, "data-model", &data_store, NULL);
+
+  if (data_store == NULL)
+    return;
+
+  PsppireDict *dict = data_store->dict;
+  struct variable *var = psppire_dict_get_variable (dict, from);
+
+  if (var == NULL)
+    return;
+  gint new_pos = to;
+  /* The index refers to the final position, so if the source
+     is less than the destination, then we must subtract 1, to
+     account for the position vacated by the source */
+  if (from < to)
+    new_pos--;
+  dict_reorder_var (dict->dict, var, new_pos);
+}
+
 static void
 psppire_data_sheet_init (PsppireDataSheet *sheet)
 {
@@ -395,4 +411,6 @@ psppire_data_sheet_init (PsppireDataSheet *sheet)
 
   g_signal_connect (sheet, "notify::data-model",
 		    G_CALLBACK (set_dictionary), NULL);
+
+  g_signal_connect (sheet, "column-moved", G_CALLBACK (move_variable), NULL);
 }