X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-sheet.c;h=970da7dfbcb491c81ce21e3f0ee5a3cb38c51189;hb=fc3f48c05a02829466ab0dc472c96be3e14259e3;hp=037af7b93ec90a0f11d0ed1b28b1addbeb780a2d;hpb=0fe886a656b0ee57b4d542b7c16b3c56288b6fc6;p=pspp diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c index 037af7b93e..970da7dfbc 100644 --- a/src/ui/gui/psppire-var-sheet.c +++ b/src/ui/gui/psppire-var-sheet.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2011, 2012 Free Software Foundation, Inc. + Copyright (C) 2008, 2009, 2011, 2012 Free Software Foundation, Inc. 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 @@ -31,8 +31,8 @@ #include "ui/gui/psppire-dialog-action-var-info.h" #include "ui/gui/psppire-empty-list-store.h" #include "ui/gui/psppire-marshal.h" -#include "ui/gui/psppire-var-store.h" #include "ui/gui/val-labs-dialog.h" +#include "ui/gui/var-type-dialog.h" #include "ui/gui/var-display.h" #include "ui/gui/var-type-dialog.h" @@ -225,8 +225,8 @@ on_var_column_edited (GtkCellRendererText *cell, format = *var_get_print_format (var); fmt_change_width (&format, width, var_sheet->format_use); - var_set_print_format (var, &format); var_set_width (var, fmt_var_width (&format)); + var_set_both_formats (var, &format); } break; @@ -342,16 +342,10 @@ render_var_cell (PsppSheetViewColumn *tree_column, break; case VS_WIDTH: - { - int step = fmt_step_width (print->type); - if (var_is_numeric (var)) - set_spin_cell (cell, print->w, - fmt_min_width (print->type, var_sheet->format_use), - fmt_max_width (print->type, var_sheet->format_use), - step); - else - set_spin_cell (cell, print->w, 0, 0, step); - } + set_spin_cell (cell, print->w, + fmt_min_width (print->type, var_sheet->format_use), + fmt_max_width (print->type, var_sheet->format_use), + fmt_step_width (print->type)); break; case VS_DECIMALS: @@ -392,6 +386,7 @@ render_var_cell (PsppSheetViewColumn *tree_column, free (vstr); g_object_set (cell, "text", text, NULL); + free (text); free (labels); } break; @@ -449,8 +444,17 @@ on_type_click (PsppireCellRendererButton *cell, gchar *path, PsppireVarSheet *var_sheet) { - var_sheet->var_type_dialog->pv = path_string_to_variable (var_sheet, path); - var_type_dialog_show (var_sheet->var_type_dialog); + GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (var_sheet)); + struct fmt_spec format; + struct variable *var; + + var = path_string_to_variable (var_sheet, path); + g_return_if_fail (var != NULL); + + format = *var_get_print_format (var); + psppire_var_type_dialog_run (GTK_WINDOW (toplevel), &format); + var_set_width (var, fmt_var_width (&format)); + var_set_both_formats (var, &format); } static void @@ -458,9 +462,19 @@ on_value_labels_click (PsppireCellRendererButton *cell, gchar *path, PsppireVarSheet *var_sheet) { - struct variable *var = path_string_to_variable (var_sheet, path); - val_labs_dialog_set_target_variable (var_sheet->val_labs_dialog, var); - val_labs_dialog_show (var_sheet->val_labs_dialog); + GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (var_sheet)); + struct val_labs *labels; + struct variable *var; + + var = path_string_to_variable (var_sheet, path); + g_return_if_fail (var != NULL); + + labels = psppire_val_labs_dialog_run (GTK_WINDOW (toplevel), var); + if (labels) + { + var_set_value_labels (var, labels); + val_labs_destroy (labels); + } } static void @@ -468,9 +482,16 @@ on_missing_values_click (PsppireCellRendererButton *cell, gchar *path, PsppireVarSheet *var_sheet) { - var_sheet->missing_val_dialog->pv = path_string_to_variable (var_sheet, - path); - missing_val_dialog_show (var_sheet->missing_val_dialog); + GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (var_sheet)); + struct missing_values mv; + struct variable *var; + + var = path_string_to_variable (var_sheet, path); + g_return_if_fail (var != NULL); + + psppire_missing_val_dialog_run (GTK_WINDOW (toplevel), var, &mv); + var_set_missing_values (var, &mv); + mv_destroy (&mv); } static gint @@ -736,6 +757,7 @@ on_query_var_tooltip (GtkWidget *widget, gint wx, gint wy, gtk_tooltip_set_text (tooltip, ds_cstr (&s)); ds_destroy (&s); + free (labels); return TRUE; } @@ -895,61 +917,48 @@ psppire_var_sheet_get_property (GObject *object, } static void -psppire_var_sheet_realize (GtkWidget *w) +psppire_var_sheet_dispose (GObject *obj) { - PsppireVarSheet *var_sheet = PSPPIRE_VAR_SHEET (w); - GtkWindow *toplevel; - - GTK_WIDGET_CLASS (psppire_var_sheet_parent_class)->realize (w); + PsppireVarSheet *var_sheet = PSPPIRE_VAR_SHEET (obj); + int i; - toplevel = GTK_WINDOW (gtk_widget_get_toplevel (w)); - var_sheet->val_labs_dialog = val_labs_dialog_create (toplevel); - var_sheet->missing_val_dialog = missing_val_dialog_create (toplevel); - var_sheet->var_type_dialog = var_type_dialog_create (toplevel); -} + if (var_sheet->dispose_has_run) + return; -static void -psppire_var_sheet_destroy (GtkObject *obj) -{ - PsppireVarSheet *var_sheet = PSPPIRE_VAR_SHEET (obj); + var_sheet->dispose_has_run = TRUE; - GTK_OBJECT_CLASS (psppire_var_sheet_parent_class)->destroy (obj); + for (i = 0; i < PSPPIRE_VAR_SHEET_N_SIGNALS; i++) + if ( var_sheet->dict_signals[i]) + g_signal_handler_disconnect (var_sheet->dict, + var_sheet->dict_signals[i]); - psppire_var_sheet_set_dictionary (var_sheet, NULL); + if (var_sheet->dict) + g_object_unref (var_sheet->dict); + + if (var_sheet->uim) + g_object_unref (var_sheet->uim); - if (var_sheet->val_labs_dialog) - { - g_object_unref (var_sheet->val_labs_dialog); - var_sheet->val_labs_dialog = NULL; - } + /* These dialogs are not GObjects (although they should be!) + But for now, unreffing them only causes a GCritical Error + so comment them out for now. (and accept the memory leakage) - if (var_sheet->missing_val_dialog) - { - g_object_unref (var_sheet->missing_val_dialog); - var_sheet->missing_val_dialog = NULL; - } + g_object_unref (var_sheet->val_labs_dialog); + g_object_unref (var_sheet->missing_val_dialog); + g_object_unref (var_sheet->var_type_dialog); + */ - if (var_sheet->var_type_dialog) - { - g_object_unref (var_sheet->var_type_dialog); - var_sheet->var_type_dialog = NULL; - } + G_OBJECT_CLASS (psppire_var_sheet_parent_class)->dispose (obj); } static void psppire_var_sheet_class_init (PsppireVarSheetClass *class) { GObjectClass *gobject_class = G_OBJECT_CLASS (class); - GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (class); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); GParamSpec *pspec; gobject_class->set_property = psppire_var_sheet_set_property; gobject_class->get_property = psppire_var_sheet_get_property; - - widget_class->realize = psppire_var_sheet_realize; - - gtk_object_class->destroy = psppire_var_sheet_destroy; + gobject_class->dispose = psppire_var_sheet_dispose; g_signal_new ("var-double-clicked", G_OBJECT_CLASS_TYPE (gobject_class), @@ -1045,6 +1054,16 @@ psppire_var_sheet_row_number_double_clicked (PsppireCellRendererButton *button, gtk_tree_path_free (path); } +static void +psppire_var_sheet_variables_column_clicked (PsppSheetViewColumn *column, + PsppireVarSheet *var_sheet) +{ + PsppSheetView *sheet_view = PSPP_SHEET_VIEW (var_sheet); + PsppSheetSelection *selection = pspp_sheet_view_get_selection (sheet_view); + + pspp_sheet_selection_select_all (selection); +} + static PsppSheetViewColumn * make_row_number_column (PsppireVarSheet *var_sheet) { @@ -1059,9 +1078,14 @@ make_row_number_column (PsppireVarSheet *var_sheet) column = pspp_sheet_view_column_new_with_attributes (_("Variable"), renderer, NULL); + pspp_sheet_view_column_set_clickable (column, TRUE); pspp_sheet_view_column_set_cell_data_func ( column, renderer, render_row_number_cell, var_sheet, NULL); pspp_sheet_view_column_set_fixed_width (column, 50); + g_signal_connect (column, "clicked", + G_CALLBACK (psppire_var_sheet_variables_column_clicked), + var_sheet); + return column; } @@ -1159,13 +1183,15 @@ psppire_var_sheet_init (PsppireVarSheet *obj) GList *list; obj->dict = NULL; - obj->format_use = PSPPIRE_TYPE_FMT_USE; + obj->format_use = FMT_FOR_OUTPUT; obj->may_create_vars = TRUE; obj->may_delete_vars = TRUE; obj->scroll_to_bottom_signal = 0; obj->container = NULL; + obj->dispose_has_run = FALSE; + obj->uim = NULL; pspp_sheet_view_append_column (sheet_view, make_row_number_column (obj)); @@ -1261,6 +1287,20 @@ refresh_model (PsppireVarSheet *var_sheet) } } +static void +on_var_changed (PsppireDict *dict, glong row, PsppireVarSheet *var_sheet) +{ + PsppireEmptyListStore *store; + + g_return_if_fail (dict == var_sheet->dict); + + store = PSPPIRE_EMPTY_LIST_STORE (pspp_sheet_view_get_model ( + PSPP_SHEET_VIEW (var_sheet))); + g_return_if_fail (store != NULL); + + psppire_empty_list_store_row_changed (store, row); +} + static void on_var_inserted (PsppireDict *dict, glong row, PsppireVarSheet *var_sheet) { @@ -1310,26 +1350,19 @@ void psppire_var_sheet_set_dictionary (PsppireVarSheet *var_sheet, PsppireDict *dict) { - enum { - BACKEND_CHANGED, - VARIABLE_INSERTED, - VARIABLE_DELETED, - N_SIGNALS - }; - if (var_sheet->dict != NULL) { - if (var_sheet->dict_signals) - { - int i; - - for (i = 0; i < N_SIGNALS; i++) - g_signal_handler_disconnect (var_sheet->dict, - var_sheet->dict_signals[i]); + int i; + + for (i = 0; i < PSPPIRE_VAR_SHEET_N_SIGNALS; i++) + { + if (var_sheet->dict_signals[i]) + g_signal_handler_disconnect (var_sheet->dict, + var_sheet->dict_signals[i]); + + var_sheet->dict_signals[i] = 0; + } - g_free (var_sheet->dict_signals); - var_sheet->dict_signals = NULL; - } g_object_unref (var_sheet->dict); } @@ -1339,21 +1372,23 @@ psppire_var_sheet_set_dictionary (PsppireVarSheet *var_sheet, { g_object_ref (dict); - var_sheet->dict_signals = g_malloc0 ( - N_SIGNALS * sizeof *var_sheet->dict_signals); - - var_sheet->dict_signals[BACKEND_CHANGED] + var_sheet->dict_signals[PSPPIRE_VAR_SHEET_BACKEND_CHANGED] = g_signal_connect (dict, "backend-changed", G_CALLBACK (on_backend_changed), var_sheet); - var_sheet->dict_signals[VARIABLE_DELETED] + var_sheet->dict_signals[PSPPIRE_VAR_SHEET_VARIABLE_CHANGED] + = g_signal_connect (dict, "variable-changed", + G_CALLBACK (on_var_changed), var_sheet); + + var_sheet->dict_signals[PSPPIRE_VAR_SHEET_VARIABLE_DELETED] = g_signal_connect (dict, "variable-inserted", G_CALLBACK (on_var_inserted), var_sheet); - var_sheet->dict_signals[VARIABLE_INSERTED] + var_sheet->dict_signals[PSPPIRE_VAR_SHEET_VARIABLE_INSERTED] = g_signal_connect (dict, "variable-deleted", G_CALLBACK (on_var_deleted), var_sheet); } + refresh_model (var_sheet); } @@ -1425,8 +1460,14 @@ psppire_var_sheet_goto_variable (PsppireVarSheet *var_sheet, int dict_index) GtkUIManager * psppire_var_sheet_get_ui_manager (PsppireVarSheet *var_sheet) { - return GTK_UI_MANAGER (get_object_assert (var_sheet->builder, - "var_sheet_uim", - GTK_TYPE_UI_MANAGER)); + if (var_sheet->uim == NULL) + { + var_sheet->uim = GTK_UI_MANAGER (get_object_assert (var_sheet->builder, + "var_sheet_uim", + GTK_TYPE_UI_MANAGER)); + g_object_ref (var_sheet->uim); + } + + return var_sheet->uim; }