X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-variable-sheet.c;h=486d85c4ca2dd0aa37f1cf6526cc2dbd9ad5bb05;hb=c4bc3574d974d3aaf4d291097c995a31515a308a;hp=32d163f66578a579f16e33a6f9be5ba4fb091041;hpb=ca1382f24fd0a8a90dd65daf98a279d6a549d9da;p=pspp diff --git a/src/ui/gui/psppire-variable-sheet.c b/src/ui/gui/psppire-variable-sheet.c index 32d163f665..486d85c4ca 100644 --- a/src/ui/gui/psppire-variable-sheet.c +++ b/src/ui/gui/psppire-variable-sheet.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2017 John Darrington + Copyright (C) 2017, 2020 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 @@ -48,6 +48,9 @@ set_var_type (PsppireVariableSheet *sheet) struct variable *var = psppire_dict_get_variable (PSPPIRE_DICT (dict), row); + if (var == NULL) + return; + const struct fmt_spec *format = var_get_write_format (var); struct fmt_spec fmt = *format; GtkWindow *win = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sheet))); @@ -69,6 +72,9 @@ set_missing_values (PsppireVariableSheet *sheet) struct variable *var = psppire_dict_get_variable (PSPPIRE_DICT (dict), row); + if (var == NULL) + return; + struct missing_values mv; if (GTK_RESPONSE_OK == psppire_missing_val_dialog_run (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sheet))), @@ -92,6 +98,9 @@ set_value_labels (PsppireVariableSheet *sheet) struct variable *var = psppire_dict_get_variable (PSPPIRE_DICT (dict), row); + if (var == NULL) + return; + struct val_labs *vls = psppire_val_labs_dialog_run (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sheet))), var); @@ -248,6 +257,13 @@ delete_variables (SswSheet *sheet) PsppireDict *dict = NULL; g_object_get (sheet, "data-model", &dict, 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 (dict, range->start_y, (range->end_y - range->start_y + 1)); @@ -259,6 +275,10 @@ create_var_row_header_popup_menu (PsppireVariableSheet *var_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_var), @@ -305,7 +325,7 @@ change_var_property (PsppireVariableSheet *var_sheet, gint col, gint row, const PsppireDict *dict = NULL; g_object_get (var_sheet, "data-model", &dict, NULL); - int n_rows = psppire_dict_get_var_cnt (dict); + int n_rows = psppire_dict_get_n_vars (dict); if (row > n_rows) return; @@ -315,6 +335,8 @@ change_var_property (PsppireVariableSheet *var_sheet, gint col, gint row, const if (NULL == var) var = psppire_dict_insert_variable (dict, row, NULL); + g_return_if_fail (var); + switch (col) { case DICT_TVM_COL_NAME: @@ -425,6 +447,7 @@ psppire_variable_sheet_dispose (GObject *obj) g_object_unref (sheet->value_label_renderer); g_object_unref (sheet->missing_values_renderer); g_object_unref (sheet->var_type_renderer); + g_object_unref (sheet->row_popup); /* Chain up to the parent class */ G_OBJECT_CLASS (parent_class)->dispose (obj); @@ -438,38 +461,47 @@ psppire_variable_sheet_finalize (GObject *object) g_free (sheet->value_label_dispatch); g_free (sheet->missing_values_dispatch); g_free (sheet->var_type_dispatch); - + if (G_OBJECT_CLASS (parent_class)->finalize) (*G_OBJECT_CLASS (parent_class)->finalize) (object); } +static void +psppire_variable_sheet_realize (GtkWidget *widget) +{ + /* This is a kludge. These are properties from the parent class. + They should really be set immediately after initialisation, but there is no + simple way to do that. */ + g_object_set (widget, + "editable", TRUE, + "select-renderer-func", select_renderer_func, + "vertical-draggable", TRUE, + "forward-conversion", var_sheet_data_to_string, + NULL); + + if (GTK_WIDGET_CLASS (parent_class)->realize) + (*GTK_WIDGET_CLASS (parent_class)->realize) (widget); +} + + static void psppire_variable_sheet_class_init (PsppireVariableSheetClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); + object_class->dispose = psppire_variable_sheet_dispose; parent_class = g_type_class_peek_parent (class); + widget_class->realize = psppire_variable_sheet_realize; object_class->finalize = psppire_variable_sheet_finalize; } GtkWidget* psppire_variable_sheet_new (void) { - PsppireVarSheetHeader *vsh = - g_object_new (PSPPIRE_TYPE_VAR_SHEET_HEADER, NULL); - - GObject *obj = - g_object_new (PSPPIRE_TYPE_VARIABLE_SHEET, - "select-renderer-func", select_renderer_func, - "hmodel", vsh, - "forward-conversion", var_sheet_data_to_string, - "editable", TRUE, - "vertical-draggable", TRUE, - NULL); - - return GTK_WIDGET (obj); + return g_object_new (PSPPIRE_TYPE_VARIABLE_SHEET, NULL); } static void @@ -506,7 +538,7 @@ is_printable_key (gint keyval) return FALSE; break; } - + return (0 != gdk_keyval_to_unicode (keyval)); } @@ -540,7 +572,7 @@ on_button_press (GtkWidget *w, GdkEventButton *e, gpointer user_data) d->payload (d->sheet); return TRUE; } - + static void on_edit_start (GtkCellRenderer *renderer, GtkCellEditable *editable, @@ -552,7 +584,7 @@ on_edit_start (GtkCellRenderer *renderer, G_CALLBACK (on_key_press), user_data); g_signal_connect (editable, "button-press-event", G_CALLBACK (on_button_press), user_data); - + } static void @@ -583,9 +615,8 @@ psppire_variable_sheet_init (PsppireVariableSheet *sheet) g_signal_connect_after (sheet->var_type_renderer, "editing-started", G_CALLBACK (on_edit_start), sheet->var_type_dispatch); - - sheet->row_popup = create_var_row_header_popup_menu (sheet); + sheet->row_popup = create_var_row_header_popup_menu (sheet); g_signal_connect (sheet, "selection-changed", G_CALLBACK (set_var_popup_sensitivity), sheet); @@ -598,4 +629,11 @@ psppire_variable_sheet_init (PsppireVariableSheet *sheet) g_signal_connect (sheet, "row-moved", G_CALLBACK (move_variable), NULL); + + PsppireVarSheetHeader *vsh = + g_object_new (PSPPIRE_TYPE_VAR_SHEET_HEADER, NULL); + + g_object_set (sheet, + "hmodel", vsh, + NULL); }