Simplify type display for help function.

Realign columns slightly, read type name from a table, and display readonly ones (some, like -bm, are explicitly *for* the commandline).
thatch · Sep 9, 2018 · 59bbdf0 · 59bbdf0
1 parent 645143b
commit 59bbdf0
Showing 1 changed file with 13 additions and 18 deletions.
diff --git a/src/setup.c b/src/setup.c
@@ -35,6 +35,16 @@ extern int PannedStat;
 extern int ExpanderStat[G_LAST];
 extern int object_last;
 
+char typenames[16][7] = {
+    "INT",
+    "0/1",
+    "FLOAT",
+    "DOUBLE",
+    "STRING",
+    "INT",
+    "FILE"
+};
+
 PARA_GROUP GROUPS[] = {
 	{"View", ""},
 	{"Tool", ""},
@@ -279,26 +289,11 @@ void SetupShowHelp (void) {
 		char name_str[1024];
 		if (strcmp(PARAMETER[n].group, "Objects") != 0) {
 			if (PARAMETER[n].unit[0] != 0) {
-				snprintf(name_str, sizeof(name_str), "%6s   %s-%s (%s)", PARAMETER[n].unit, _(PARAMETER[n].group), _(PARAMETER[n].name), _(PARAMETER[n].help));
+				snprintf(name_str, sizeof(name_str), "%7s   %s-%s (%s)", PARAMETER[n].unit, _(PARAMETER[n].group), _(PARAMETER[n].name), _(PARAMETER[n].help));
 			} else {
-				snprintf(name_str, sizeof(name_str), "         %s-%s (%s)", _(PARAMETER[n].group), _(PARAMETER[n].name), _(PARAMETER[n].help));
-			}
-			if (PARAMETER[n].readonly == 1) {
-			} else if (PARAMETER[n].type == T_FLOAT) {
-				fprintf(stdout, "%6s FLOAT    %s\n", PARAMETER[n].arg, name_str);
-			} else if (PARAMETER[n].type == T_DOUBLE) {
-				fprintf(stdout, "%6s DOUBLE   %s\n", PARAMETER[n].arg, name_str);
-			} else if (PARAMETER[n].type == T_INT) {
-				fprintf(stdout, "%6s INT      %s\n", PARAMETER[n].arg, name_str);
-			} else if (PARAMETER[n].type == T_SELECT) {
-				fprintf(stdout, "%6s INT      %s\n", PARAMETER[n].arg, name_str);
-			} else if (PARAMETER[n].type == T_BOOL) {
-				fprintf(stdout, "%6s 0/1      %s\n", PARAMETER[n].arg, name_str);
-			} else if (PARAMETER[n].type == T_STRING) {
-				fprintf(stdout, "%6s STRING   %s\n", PARAMETER[n].arg, name_str);
-			} else if (PARAMETER[n].type == T_FILE) {
-				fprintf(stdout, "%6s FILE     %s\n", PARAMETER[n].arg, name_str);
+				snprintf(name_str, sizeof(name_str), "          %s-%s (%s)", _(PARAMETER[n].group), _(PARAMETER[n].name), _(PARAMETER[n].help));
 			}
+            fprintf(stdout, "%7s %-10s %s\n", PARAMETER[n].arg, typenames[PARAMETER[n].type], name_str);
 		}
 	}
 	fprintf(stdout, "\n");