psppire-var-sheet: Rename references to the icons for align, measure and role icons

diff --git a/src/ui/gui/psppire-dictview.c b/src/ui/gui/psppire-dictview.c
index 83f679e40d444c873ae4e2c9c4f96a41a8fb22aa..23073a5f264821036208c0bc2d2057c471e21249 100644 (file)
--- a/src/ui/gui/psppire-dictview.c
+++ b/src/ui/gui/psppire-dictview.c
@@ -355,9 +355,9 @@ get_var_measurement_stock_id (enum fmt_type type, enum measure measure)
     case FMT_CAT_STRING:
       switch (measure)
        {
-       case MEASURE_NOMINAL: return "variable-string-nominal";
-       case MEASURE_ORDINAL: return "variable-string-ordinal";
-       case MEASURE_SCALE:   return "variable-string-scale";
+       case MEASURE_NOMINAL: return "measure-string-nominal";
+       case MEASURE_ORDINAL: return "measure-string-ordinal";
+       case MEASURE_SCALE:   return "role-none";
         case n_MEASURES: break;
        }
       break;
@@ -366,9 +366,9 @@ get_var_measurement_stock_id (enum fmt_type type, enum measure measure)
     case FMT_CAT_TIME:
       switch (measure)
         {
-        case MEASURE_NOMINAL: return "variable-date-nominal";
-        case MEASURE_ORDINAL: return "variable-date-ordinal";
-        case MEASURE_SCALE:   return "variable-date-scale";
+        case MEASURE_NOMINAL: return "measure-date-nominal";
+        case MEASURE_ORDINAL: return "measure-date-ordinal";
+        case MEASURE_SCALE:   return "measure-date-scale";
         case n_MEASURES: break;
         }
       break;
@@ -376,9 +376,9 @@ get_var_measurement_stock_id (enum fmt_type type, enum measure measure)
     default:
       switch (measure)
         {
-        case MEASURE_NOMINAL: return "variable-nominal";
-        case MEASURE_ORDINAL: return "variable-ordinal";
-        case MEASURE_SCALE:   return "variable-scale";
+        case MEASURE_NOMINAL: return "measure-nominal";
+        case MEASURE_ORDINAL: return "measure-ordinal";
+        case MEASURE_SCALE:   return "measure-scale";
         case n_MEASURES: break;
        }
       break;

diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c
index 5cd839651b9ccebcb8ba8a8cffca963a6163b64e..bb2c56ba7aa9ee27257cf2470b57d2efe53fee19 100644 (file)
--- a/src/ui/gui/psppire-var-sheet.c
+++ b/src/ui/gui/psppire-var-sheet.c
@@ -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 ("");
     }
@@ -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,