X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-sheet.c;h=66a95deeed2ad4831cd712d6b016600fcbe6f38a;hb=6e80abcaeb7c361477eff4b8a578e54f1def81c4;hp=e0f104db1448c4e061b5aff7d5e2a710341653b5;hpb=e339b2ca72d77a076566856e9357781d49cd983c;p=pspp diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c index e0f104db14..66a95deeed 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) 2008, 2009, 2011, 2012, 2013 Free Software Foundation, Inc. + Copyright (C) 2008, 2009, 2011, 2012, 2013, 2014 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 @@ -195,7 +195,7 @@ on_var_column_edited (GtkCellRendererText *cell, { gtk_widget_queue_resize (GTK_WIDGET (var_sheet)); var_sheet->scroll_to_bottom_signal = - g_signal_connect (var_sheet, "size-request", + g_signal_connect (var_sheet, "size-allocate", G_CALLBACK (scroll_to_bottom), NULL); } } @@ -252,7 +252,7 @@ on_var_column_edited (GtkCellRendererText *cell, break; case VS_LABEL: - var_set_label (var, new_text, false); + var_set_label (var, new_text); break; case VS_VALUES: @@ -286,8 +286,8 @@ on_var_column_edited (GtkCellRendererText *cell, case VS_ROLE: if (!strcmp (new_text, var_role_to_string (ROLE_INPUT))) var_set_role (var, ROLE_INPUT); - else if (!strcmp (new_text, var_role_to_string (ROLE_OUTPUT))) - var_set_role (var, ROLE_OUTPUT); + else if (!strcmp (new_text, var_role_to_string (ROLE_TARGET))) + var_set_role (var, ROLE_TARGET); else if (!strcmp (new_text, var_role_to_string (ROLE_BOTH))) var_set_role (var, ROLE_BOTH); else if (!strcmp (new_text, var_role_to_string (ROLE_NONE))) @@ -321,15 +321,25 @@ get_var_align_stock_id (enum alignment alignment) { switch (alignment) { - case ALIGN_LEFT: - return GTK_STOCK_JUSTIFY_LEFT; - - case ALIGN_CENTRE: - return GTK_STOCK_JUSTIFY_CENTER; - - case ALIGN_RIGHT: - return GTK_STOCK_JUSTIFY_RIGHT; + case ALIGN_LEFT: return "align-left"; + case ALIGN_CENTRE: return "align-center"; + case ALIGN_RIGHT: return "align-right"; + default: + g_return_val_if_reached (""); + } +} +const char * +get_var_role_stock_id (enum var_role role) +{ + switch (role) + { + case ROLE_INPUT: return "role-input"; + case ROLE_TARGET: return "role-target"; + case ROLE_BOTH: return "role-both"; + case ROLE_NONE: return "role-none"; + case ROLE_PARTITION: return "role-partition"; + case ROLE_SPLIT: return "role-split"; default: g_return_val_if_reached (""); } @@ -352,6 +362,7 @@ render_var_cell (PsppSheetViewColumn *tree_column, "column-number")) - 1; row = GPOINTER_TO_INT (iter->user_data); + gtk_cell_renderer_set_visible (cell, true); if (row >= psppire_dict_get_var_cnt (var_sheet->dict)) { if (GTK_IS_CELL_RENDERER_TEXT (cell)) @@ -366,7 +377,9 @@ render_var_cell (PsppSheetViewColumn *tree_column, g_object_set (cell, "adjustment", NULL, NULL); } else - g_object_set (cell, "stock-id", "", NULL); + { + gtk_cell_renderer_set_visible (cell, false); + } return; } @@ -441,7 +454,7 @@ render_var_cell (PsppSheetViewColumn *tree_column, case VS_MISSING: { - char *text = missing_values_to_string (var_sheet->dict, var, NULL); + char *text = missing_values_to_string (var, NULL); g_object_set (cell, "text", text, "editable", FALSE, @@ -483,10 +496,14 @@ render_var_cell (PsppSheetViewColumn *tree_column, break; case VS_ROLE: - g_object_set (cell, - "text", var_role_to_string (var_get_role (var)), - "editable", TRUE, - NULL); + if (GTK_IS_CELL_RENDERER_TEXT (cell)) + g_object_set (cell, + "text", var_role_to_string (var_get_role (var)), + "editable", TRUE, + NULL); + else + g_object_set (cell, "stock-id", + get_var_role_stock_id (var_get_role (var)), NULL); break; } } @@ -571,8 +588,9 @@ get_string_width (PsppSheetView *treeview, GtkCellRenderer *renderer, g_object_set (G_OBJECT (renderer), PSPPIRE_IS_CELL_RENDERER_BUTTON (renderer) ? "label" : "text", string, (void *) NULL); - gtk_cell_renderer_get_size (renderer, GTK_WIDGET (treeview), - NULL, NULL, NULL, &width, NULL); + + gtk_cell_renderer_get_preferred_width (renderer, GTK_WIDGET (treeview), NULL, &width); + return width; } @@ -657,12 +675,18 @@ alignment_to_stock_id (enum fmt_type type, int alignment) return get_var_align_stock_id (alignment); } +static const char * +role_to_stock_id (enum fmt_type type, int role) +{ + return get_var_role_stock_id (role); +} + static void -render_measure (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - GtkTreeModel *tree_model, - GtkTreeIter *iter, - gpointer data) +render_var_pixbuf (GtkCellLayout *cell_layout, + GtkCellRenderer *cell, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) { const char *(*value_to_stock_id) (enum fmt_type, int value); enum fmt_type type = GPOINTER_TO_INT (data); @@ -698,18 +722,19 @@ on_combo_editing_started (GtkCellRenderer *renderer, "value-to-stock-id", value_to_stock_id); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (editable), cell, FALSE); gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (editable), cell, - render_measure, + render_var_pixbuf, GINT_TO_POINTER (format->type), NULL); } } -static PsppSheetViewColumn * +static void add_combo_column (PsppireVarSheet *var_sheet, enum vs_column column_id, const char *title, int width, const char *(*value_to_stock_id) (enum fmt_type, int value), ...) { + PsppSheetViewColumn *column; GtkCellRenderer *cell; GtkListStore *store; const char *name; @@ -742,7 +767,13 @@ add_combo_column (PsppireVarSheet *var_sheet, enum vs_column column_id, var_sheet); } - return add_var_sheet_column (var_sheet, cell, column_id, title, width); + column = add_var_sheet_column (var_sheet, cell, column_id, title, width); + + cell = gtk_cell_renderer_pixbuf_new (); + g_object_set (cell, "width", 16, "height", 16, NULL); + pspp_sheet_view_column_pack_end (column, cell, FALSE); + pspp_sheet_view_column_set_cell_data_func ( + column, cell, render_var_cell, var_sheet, NULL); } static void @@ -1083,6 +1114,9 @@ psppire_var_sheet_dispose (GObject *obj) g_object_unref (var_sheet->var_type_dialog); */ + g_object_unref (var_sheet->builder); + + G_OBJECT_CLASS (psppire_var_sheet_parent_class)->dispose (obj); } @@ -1243,7 +1277,7 @@ on_edit_clear_variables (GtkAction *action, PsppireVarSheet *var_sheet) for (i = 1; i <= range_set_node_get_width (node); i++) { unsigned long row = range_set_node_get_end (node) - i; - if (row >= 0 && row < psppire_dict_get_var_cnt (dict)) + if (row < psppire_dict_get_var_cnt (dict)) psppire_dict_delete_variables (dict, row, 1); } } @@ -1315,7 +1349,6 @@ psppire_var_sheet_init (PsppireVarSheet *obj) { PsppSheetView *sheet_view = PSPP_SHEET_VIEW (obj); PsppSheetViewColumn *column; - GtkCellRenderer *cell; GtkAction *action; GList *list; @@ -1355,33 +1388,21 @@ psppire_var_sheet_init (PsppireVarSheet *obj) add_spin_column (obj, VS_COLUMNS, _("Columns"), 3); - column - = add_combo_column (obj, VS_ALIGN, _("Align"), 8, alignment_to_stock_id, - alignment_to_string (ALIGN_LEFT), ALIGN_LEFT, - alignment_to_string (ALIGN_CENTRE), ALIGN_CENTRE, - alignment_to_string (ALIGN_RIGHT), ALIGN_RIGHT, - NULL); - cell = gtk_cell_renderer_pixbuf_new (); - g_object_set (cell, "width", 16, "height", 16, NULL); - pspp_sheet_view_column_pack_end (column, cell, FALSE); - pspp_sheet_view_column_set_cell_data_func ( - column, cell, render_var_cell, obj, NULL); + add_combo_column (obj, VS_ALIGN, _("Align"), 8, alignment_to_stock_id, + alignment_to_string (ALIGN_LEFT), ALIGN_LEFT, + alignment_to_string (ALIGN_CENTRE), ALIGN_CENTRE, + alignment_to_string (ALIGN_RIGHT), ALIGN_RIGHT, + NULL); - column - = add_combo_column (obj, VS_MEASURE, _("Measure"), 12, measure_to_stock_id, - measure_to_string (MEASURE_NOMINAL), MEASURE_NOMINAL, - measure_to_string (MEASURE_ORDINAL), MEASURE_ORDINAL, - measure_to_string (MEASURE_SCALE), MEASURE_SCALE, - NULL); - cell = gtk_cell_renderer_pixbuf_new (); - g_object_set (cell, "width", 16, "height", 16, NULL); - pspp_sheet_view_column_pack_end (column, cell, FALSE); - pspp_sheet_view_column_set_cell_data_func ( - column, cell, render_var_cell, obj, NULL); + add_combo_column (obj, VS_MEASURE, _("Measure"), 11, measure_to_stock_id, + measure_to_string (MEASURE_NOMINAL), MEASURE_NOMINAL, + measure_to_string (MEASURE_ORDINAL), MEASURE_ORDINAL, + measure_to_string (MEASURE_SCALE), MEASURE_SCALE, + NULL); - add_combo_column (obj, VS_ROLE, _("Role"), 12, NULL, + add_combo_column (obj, VS_ROLE, _("Role"), 11, role_to_stock_id, var_role_to_string (ROLE_INPUT), ROLE_INPUT, - var_role_to_string (ROLE_OUTPUT), ROLE_OUTPUT, + var_role_to_string (ROLE_TARGET), ROLE_TARGET, var_role_to_string (ROLE_BOTH), ROLE_BOTH, var_role_to_string (ROLE_NONE), ROLE_NONE, var_role_to_string (ROLE_PARTITION), ROLE_PARTITION,