psppire.xml: Add PsppireAcr and PsppireValChooser

[pspp] / src / ui / gui / psppire-data-sheet.c

diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index 4b7df0dc287f5919b4b69a00e988976397ea9746..feb64b1aab51d07dcea862d94f11de89ad2eb508 100644 (file)
--- a/src/ui/gui/psppire-data-sheet.c
+++ b/src/ui/gui/psppire-data-sheet.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2017  John Darrington
+   Copyright (C) 2017, 2019  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -163,6 +163,10 @@ create_data_row_header_popup_menu (PsppireDataSheet *sheet)
 {
   GtkWidget *menu = gtk_menu_new ();
 
+  /* gtk_menu_shell_append does not sink/ref this object,
+     so we must do it ourselves (and remember to unref it).  */
+  g_object_ref_sink (menu);
+
   GtkWidget *item =
     gtk_menu_item_new_with_mnemonic  (_("_Insert Case"));
 
@@ -206,25 +210,39 @@ show_cases_column_popup (PsppireDataSheet *sheet, int column, guint button, guin
   gtk_menu_popup_at_pointer (GTK_MENU (sheet->data_sheet_cases_column_popup), NULL);
 }
 
-static void
-insert_new_variable (PsppireDataSheet *sheet)
+/* Insert a new variable before the variable at POSN.  */
+void
+psppire_data_sheet_insert_new_variable_at_posn (PsppireDataSheet *sheet,
+                                               gint posn)
 {
   PsppireDataStore *data_store = NULL;
   g_object_get (sheet, "data-model", &data_store, NULL);
 
-  gint posn = GPOINTER_TO_INT (g_object_get_data
-                               (G_OBJECT (sheet->data_sheet_cases_column_popup),
-                                "item"));
-
   const struct variable *v = psppire_dict_insert_variable (data_store->dict,
                                                           posn, NULL);
 
   psppire_data_store_insert_value (data_store, var_get_width(v),
                                   var_get_case_index (v));
 
+  ssw_sheet_scroll_to (SSW_SHEET (sheet), posn, -1);
+
   gtk_widget_queue_draw (GTK_WIDGET (sheet));
 }
 
+static void
+insert_new_variable (PsppireDataSheet *sheet)
+{
+  PsppireDataStore *data_store = NULL;
+  g_object_get (sheet, "data-model", &data_store, NULL);
+
+  gint posn = GPOINTER_TO_INT (g_object_get_data
+                               (G_OBJECT (sheet->data_sheet_cases_column_popup),
+                                "item"));
+
+  psppire_data_sheet_insert_new_variable_at_posn (sheet, posn);
+}
+
+
 static void
 set_menu_items_sensitivity (PsppireDataSheet *sheet, gpointer selection, gpointer p)
 {
@@ -251,27 +269,38 @@ set_menu_items_sensitivity (PsppireDataSheet *sheet, gpointer selection, gpointe
                            whole_column_selected);
 }
 
-static void
-delete_variables (PsppireDataSheet *sheet)
+void
+psppire_data_sheet_delete_variables (PsppireDataSheet *sheet)
 {
   SswRange *range = SSW_SHEET(sheet)->selection;
 
   PsppireDataStore *data_store = NULL;
   g_object_get (sheet, "data-model", &data_store, NULL);
 
+  if (range->start_x > range->end_x)
+    {
+      gint temp = range->start_x;
+      range->start_x = range->end_x;
+      range->end_x = temp;
+    }
+
   psppire_dict_delete_variables (data_store->dict, range->start_x,
                                 (range->end_x - range->start_x + 1));
 
+  ssw_sheet_scroll_to (SSW_SHEET (sheet), range->start_x, -1);
+
   gtk_widget_queue_draw (GTK_WIDGET (sheet));
 }
 
-
-
 static GtkWidget *
 create_data_column_header_popup_menu (PsppireDataSheet *sheet)
 {
   GtkWidget *menu = gtk_menu_new ();
 
+  /* gtk_menu_shell_append does not sink/ref this object,
+     so we must do it ourselves (and remember to unref it).  */
+  g_object_ref_sink (menu);
+
   GtkWidget *item =
     gtk_menu_item_new_with_mnemonic  (_("_Insert Variable"));
   g_signal_connect_swapped (item, "activate", G_CALLBACK (insert_new_variable),
@@ -284,7 +313,7 @@ create_data_column_header_popup_menu (PsppireDataSheet *sheet)
   sheet->data_clear_variables_menu_item =
     gtk_menu_item_new_with_mnemonic  (_("Cl_ear Variables"));
   g_signal_connect_swapped (sheet->data_clear_variables_menu_item, "activate",
-                           G_CALLBACK (delete_variables),
+                           G_CALLBACK (psppire_data_sheet_delete_variables),
                            sheet);
   gtk_widget_set_sensitive (sheet->data_clear_variables_menu_item, FALSE);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), sheet->data_clear_variables_menu_item);
@@ -319,16 +348,26 @@ G_DEFINE_TYPE (PsppireDataSheet, psppire_data_sheet, SSW_TYPE_SHEET)
 static GObjectClass * parent_class = NULL;
 static gboolean dispose_has_run = FALSE;
 
+static void
+psppire_data_sheet_finalize (GObject *obj)
+{
+  /* Chain up to the parent class */
+  G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
 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;
 
   dispose_has_run = TRUE;
 
+  g_object_unref (sheet->data_sheet_cases_column_popup);
+  g_object_unref (sheet->data_sheet_cases_row_popup);
+
   /* Chain up to the parent class */
   G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
@@ -338,6 +377,7 @@ psppire_data_sheet_class_init (PsppireDataSheetClass *class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   object_class->dispose = psppire_data_sheet_dispose;
+  object_class->finalize = psppire_data_sheet_finalize;
 
   parent_class = g_type_class_peek_parent (class);
 }
@@ -395,15 +435,15 @@ resize_display_width (PsppireDict *dict, gint pos, gint size, gpointer user_data
   PangoContext *context = gtk_widget_create_pango_context (GTK_WIDGET (sheet));
   PangoLayout *layout = pango_layout_new (context);
   PangoRectangle rect;
-  
+
   pango_layout_set_text (layout, "M", 1);
   pango_layout_get_extents (layout, NULL, &rect);
-  
+
   gdouble width_of_M = rect.width / (gdouble) PANGO_SCALE;
-  
+
   g_object_unref (G_OBJECT (layout));
   g_object_unref (G_OBJECT (context));
-  
+
   gint Ms = round ((size / width_of_M) - 0.25);
   struct variable *var = psppire_dict_get_variable (dict, pos);
   g_return_val_if_fail (var, TRUE);