X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsettings.h;h=cc16576d31054e21670f3a3b42457654399f647e;hb=a49b940e58f148bf111c647d9b4822025636ff80;hp=559f64ebb6d7d3b8d19971b9cceda607c3d3dc54;hpb=196db9f58754f9f42d8679384b610aa41c820cfb;p=pspp

diff --git a/src/data/settings.h b/src/data/settings.h
index 559f64ebb6..cc16576d31 100644
--- a/src/data/settings.h
+++ b/src/data/settings.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2015 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
@@ -102,26 +102,29 @@ void settings_set_format ( const struct fmt_spec *);
 bool settings_get_testing_mode (void);
 void settings_set_testing_mode (bool);
 
-enum settings_var_style
-  {
-    SETTINGS_VAR_STYLE_NAMES,
-    SETTINGS_VAR_STYLE_LABELS,
-    SETTINGS_VAR_STYLE_BOTH
-  };
+int settings_get_fuzzbits (void);
+void settings_set_fuzzbits (int);
 
-enum settings_value_style
+/* Whether to show variable or value labels or the underlying value or variable
+   name. */
+enum settings_value_show
   {
-    SETTINGS_VAL_STYLE_VALUES,
-    SETTINGS_VAL_STYLE_LABELS,
-    SETTINGS_VAL_STYLE_BOTH
+    /* Use higher-level default.
+       In a pivot_value, the default is taken from the pivot_table.
+       In a pivot_table, the default is a global default.
+       As a global default, this is invalid. */
+    SETTINGS_VALUE_SHOW_DEFAULT = 0,
+
+    SETTINGS_VALUE_SHOW_VALUE = 1, /* Show value or variable name only. */
+    SETTINGS_VALUE_SHOW_LABEL = 2, /* Show label only. */
+    SETTINGS_VALUE_SHOW_BOTH = 3,  /* Show both value/name and label. */
   };
 
+enum settings_value_show settings_get_show_values (void);
+enum settings_value_show settings_get_show_variables (void);
 
-enum settings_value_style settings_get_value_style (void);
-enum settings_var_style settings_get_var_style (void);
-
-void settings_set_value_style (enum settings_value_style s);
-void settings_set_var_style (enum settings_value_style s);
+void settings_set_show_values (enum settings_value_show);
+void settings_set_show_variables (enum settings_value_show);
 
 
 enum behavior_mode {