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=6fc42c1a36922e8df114c6c6a181ca2f3e4e61ba;hb=a6f1c88d9d4dee24e1f79048c8a5d8274f68c405;hp=02e880db365bf86c8cd3ad987d08e89d809fd503;hpb=a1c7615c39c76a0aa0ab0b7bfb42d56e020173a8;p=pspp

diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c
index 02e880db36..6fc42c1a36 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
@@ -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,9 @@ 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 ("");
     }
@@ -340,12 +334,12 @@ get_var_role_stock_id (enum var_role role)
 {
   switch (role)
     {
-    case ROLE_INPUT: return "variable-role-input";
-    case ROLE_OUTPUT: return "variable-role-target";
-    case ROLE_BOTH: return "variable-role-both";
-    case ROLE_NONE: return "variable-role-none";
-    case ROLE_PARTITION: return "variable-role-partition";
-    case ROLE_SPLIT: return "variable-role-split";
+    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 ("");
     }
@@ -457,7 +451,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,
@@ -1276,7 +1270,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);
         }
     }
@@ -1393,15 +1387,15 @@ psppire_var_sheet_init (PsppireVarSheet *obj)
                     alignment_to_string (ALIGN_RIGHT), ALIGN_RIGHT,
                     NULL);
 
-  add_combo_column (obj, VS_MEASURE, _("Measure"), 12, measure_to_stock_id,
+  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, role_to_stock_id,
+  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,