X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-var-sheet.c;h=b5f305cee38c25c7a08e45cc354fb2560ae12d31;hb=1076f8e88e2eee1bc780edd9d79d696a38af936d;hp=970da7dfbcb491c81ce21e3f0ee5a3cb38c51189;hpb=9d1bfb34842de4a129140622ee3d800297c0e69d;p=pspp diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c index 970da7dfbc..b5f305cee3 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 Free Software Foundation, Inc. + Copyright (C) 2008, 2009, 2011, 2012, 2013 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 @@ -29,6 +29,7 @@ #include "ui/gui/psppire-data-editor.h" #include "ui/gui/psppire-data-window.h" #include "ui/gui/psppire-dialog-action-var-info.h" +#include "ui/gui/psppire-dictview.h" #include "ui/gui/psppire-empty-list-store.h" #include "ui/gui/psppire-marshal.h" #include "ui/gui/val-labs-dialog.h" @@ -53,7 +54,8 @@ enum vs_column VS_MISSING, VS_COLUMNS, VS_ALIGN, - VS_MEASURE + VS_MEASURE, + VS_ROLE }; G_DEFINE_TYPE (PsppireVarSheet, psppire_var_sheet, PSPP_TYPE_SHEET_VIEW); @@ -273,6 +275,21 @@ on_var_column_edited (GtkCellRendererText *cell, else if (!strcmp (new_text, measure_to_string (MEASURE_SCALE))) var_set_measure (var, MEASURE_SCALE); break; + + 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_BOTH))) + var_set_role (var, ROLE_BOTH); + else if (!strcmp (new_text, var_role_to_string (ROLE_NONE))) + var_set_role (var, ROLE_NONE); + else if (!strcmp (new_text, var_role_to_string (ROLE_PARTITION))) + var_set_role (var, ROLE_PARTITION); + else if (!strcmp (new_text, var_role_to_string (ROLE_SPLIT))) + var_set_role (var, ROLE_SPLIT); + break; } } @@ -292,6 +309,25 @@ render_popup_cell (PsppSheetViewColumn *tree_column, NULL); } +const char * +get_var_align_stock_id (const struct variable *var) +{ + switch (var_get_alignment (var)) + { + case ALIGN_LEFT: + return GTK_STOCK_JUSTIFY_LEFT; + + case ALIGN_CENTRE: + return GTK_STOCK_JUSTIFY_CENTER; + + case ALIGN_RIGHT: + return GTK_STOCK_JUSTIFY_RIGHT; + + default: + g_return_val_if_reached (""); + } +} + static void render_var_cell (PsppSheetViewColumn *tree_column, GtkCellRenderer *cell, @@ -311,14 +347,19 @@ render_var_cell (PsppSheetViewColumn *tree_column, if (row >= psppire_dict_get_var_cnt (var_sheet->dict)) { - g_object_set (cell, - "text", "", - "editable", column_id == VS_NAME, - NULL); - if (column_id == VS_WIDTH - || column_id == VS_DECIMALS - || column_id == VS_COLUMNS) - g_object_set (cell, "adjustment", NULL, NULL); + if (GTK_IS_CELL_RENDERER_TEXT (cell)) + { + g_object_set (cell, + "text", "", + "editable", column_id == VS_NAME, + NULL); + if (column_id == VS_WIDTH + || column_id == VS_DECIMALS + || column_id == VS_COLUMNS) + g_object_set (cell, "adjustment", NULL, NULL); + } + else + g_object_set (cell, "stock-id", "", NULL); return; } @@ -407,15 +448,30 @@ render_var_cell (PsppSheetViewColumn *tree_column, break; case VS_ALIGN: - g_object_set (cell, - "text", alignment_to_string (var_get_alignment (var)), - "editable", TRUE, - NULL); + if (GTK_IS_CELL_RENDERER_TEXT (cell)) + g_object_set (cell, + "text", alignment_to_string (var_get_alignment (var)), + "editable", TRUE, + NULL); + else + g_object_set (cell, "stock-id", get_var_align_stock_id (var), NULL); break; case VS_MEASURE: + if (GTK_IS_CELL_RENDERER_TEXT (cell)) + g_object_set (cell, + "text", measure_to_string (var_get_measure (var)), + "editable", TRUE, + NULL); + else + g_object_set (cell, "stock-id", + psppire_dict_view_get_var_measurement_stock_id (var), + NULL); + break; + + case VS_ROLE: g_object_set (cell, - "text", measure_to_string (var_get_measure (var)), + "text", var_role_to_string (var_get_role (var)), "editable", TRUE, NULL); break; @@ -453,8 +509,8 @@ on_type_click (PsppireCellRendererButton *cell, 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); + + var_set_width_and_formats (var, fmt_var_width (&format), &format, &format); } static void @@ -1179,6 +1235,7 @@ psppire_var_sheet_init (PsppireVarSheet *obj) { PsppSheetView *sheet_view = PSPP_SHEET_VIEW (obj); PsppSheetViewColumn *column; + GtkCellRenderer *cell; GtkAction *action; GList *list; @@ -1218,16 +1275,37 @@ psppire_var_sheet_init (PsppireVarSheet *obj) add_spin_column (obj, VS_COLUMNS, _("Columns"), 3); - add_combo_column (obj, VS_ALIGN, _("Align"), 6, - alignment_to_string (ALIGN_LEFT), ALIGN_LEFT, - alignment_to_string (ALIGN_CENTRE), ALIGN_CENTRE, - alignment_to_string (ALIGN_RIGHT), ALIGN_RIGHT, - NULL); - - add_combo_column (obj, VS_MEASURE, _("Measure"), 10, - measure_to_string (MEASURE_NOMINAL), MEASURE_NOMINAL, - measure_to_string (MEASURE_ORDINAL), MEASURE_ORDINAL, - measure_to_string (MEASURE_SCALE), MEASURE_SCALE, + column + = add_combo_column (obj, VS_ALIGN, _("Align"), 8, + 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); + + column + = add_combo_column (obj, VS_MEASURE, _("Measure"), 12, + 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_ROLE, _("Role"), 12, + var_role_to_string (ROLE_INPUT), ROLE_INPUT, + var_role_to_string (ROLE_OUTPUT), ROLE_OUTPUT, + var_role_to_string (ROLE_BOTH), ROLE_BOTH, + var_role_to_string (ROLE_NONE), ROLE_NONE, + var_role_to_string (ROLE_PARTITION), ROLE_PARTITION, + var_role_to_string (ROLE_SPLIT), ROLE_SPLIT, NULL); pspp_sheet_view_set_rubber_banding (sheet_view, TRUE); @@ -1288,7 +1366,9 @@ refresh_model (PsppireVarSheet *var_sheet) } static void -on_var_changed (PsppireDict *dict, glong row, PsppireVarSheet *var_sheet) +on_var_changed (PsppireDict *dict, glong row, + guint what, const struct variable *oldvar, + PsppireVarSheet *var_sheet) { PsppireEmptyListStore *store;