Fossil SCM

[202edc2c1c]: Make 'th1-setup' a textarea in settings UI.

jan.nijtmans 2014-02-24 09:26 UTC branch-1.28
Commit cec85224c146f902213e68230b61315bc0f5f78e
Parent cba5a0b9885426a…
6 files changed +49 -47 +49 -47 +49 -47 +13 -4 +13 -4 +13 -4
~ src/db.c ~ src/db.c ~ src/db.c ~ src/setup.c ~ src/setup.c ~ src/setup.c
M src/db.c
+49 -47
--- src/db.c
+++ src/db.c
@@ -2099,66 +2099,68 @@
20992099
 */
21002100
 #if INTERFACE
21012101
 struct stControlSettings {
21022102
 char const *name; /* Name of the setting */
21032103
 char const *var; /* Internal variable name used by db_set() */
2104
- int width; /* Width of display. 0 for boolean values */
2104
+ int width; /* Width of display. 0 for boolean values. */
21052105
 int versionable; /* Is this setting versionable? */
2106
+ int forceTextArea; /* Force using a text area for display? */
21062107
 char const *def; /* Default value */
21072108
 };
21082109
 #endif /* INTERFACE */
21092110
 struct stControlSettings const ctrlSettings[] = {
2110
- { "access-log", 0, 0, 0, "off" },
2111
- { "allow-symlinks",0, 0, 1, "off" },
2112
- { "auto-captcha", "autocaptcha", 0, 0, "on" },
2113
- { "auto-hyperlink",0, 0, 0, "on", },
2114
- { "auto-shun", 0, 0, 0, "on" },
2115
- { "autosync", 0, 0, 0, "on" },
2116
- { "binary-glob", 0, 40, 1, "" },
2117
- { "clearsign", 0, 0, 0, "off" },
2118
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__DARWIN__) || defined(__APPLE__)
2119
- { "case-sensitive",0, 0, 0, "off" },
2111
+ { "access-log", 0, 0, 0, 0, "off" },
2112
+ { "allow-symlinks", 0, 0, 1, 0, "off" },
2113
+ { "auto-captcha", "autocaptcha", 0, 0, 0, "on" },
2114
+ { "auto-hyperlink", 0, 0, 0, 0, "on", },
2115
+ { "auto-shun", 0, 0, 0, 0, "on" },
2116
+ { "autosync", 0, 0, 0, 0, "on" },
2117
+ { "binary-glob", 0, 40, 1, 0, "" },
2118
+ { "clearsign", 0, 0, 0, 0, "off" },
2119
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__DARWIN__) || \
2120
+ defined(__APPLE__)
2121
+ { "case-sensitive", 0, 0, 0, 0, "off" },
21202122
 #else
2121
- { "case-sensitive",0, 0, 0, "on" },
2123
+ { "case-sensitive", 0, 0, 0, 0, "on" },
21222124
 #endif
2123
- { "clean-glob", 0, 40, 1, "" },
2124
- { "crnl-glob", 0, 40, 1, "" },
2125
- { "default-perms", 0, 16, 0, "u" },
2126
- { "diff-binary", 0, 0, 0, "on" },
2127
- { "diff-command", 0, 40, 0, "" },
2128
- { "dont-push", 0, 0, 0, "off" },
2129
- { "editor", 0, 32, 0, "" },
2130
- { "empty-dirs", 0, 40, 1, "" },
2131
- { "encoding-glob", 0, 40, 1, "" },
2132
- { "gdiff-command", 0, 40, 0, "gdiff" },
2133
- { "gmerge-command",0, 40, 0, "" },
2134
- { "http-port", 0, 16, 0, "8080" },
2135
- { "https-login", 0, 0, 0, "off" },
2136
- { "ignore-glob", 0, 40, 1, "" },
2137
- { "keep-glob", 0, 40, 1, "" },
2138
- { "localauth", 0, 0, 0, "off" },
2139
- { "main-branch", 0, 40, 0, "trunk" },
2140
- { "manifest", 0, 0, 1, "off" },
2141
- { "max-upload", 0, 25, 0, "250000" },
2142
- { "mtime-changes", 0, 0, 0, "on" },
2143
- { "pgp-command", 0, 40, 0, "gpg --clearsign -o " },
2144
- { "proxy", 0, 32, 0, "off" },
2145
- { "relative-paths",0, 0, 0, "on" },
2146
- { "repo-cksum", 0, 0, 0, "on" },
2147
- { "self-register", 0, 0, 0, "off" },
2148
- { "ssh-command", 0, 40, 0, "" },
2149
- { "ssl-ca-location",0, 40, 0, "" },
2150
- { "ssl-identity", 0, 40, 0, "" },
2125
+ { "clean-glob", 0, 40, 1, 0, "" },
2126
+ { "crnl-glob", 0, 40, 1, 0, "" },
2127
+ { "default-perms", 0, 16, 0, 0, "u" },
2128
+ { "diff-binary", 0, 0, 0, 0, "on" },
2129
+ { "diff-command", 0, 40, 0, 0, "" },
2130
+ { "dont-push", 0, 0, 0, 0, "off" },
2131
+ { "editor", 0, 32, 0, 0, "" },
2132
+ { "empty-dirs", 0, 40, 1, 0, "" },
2133
+ { "encoding-glob", 0, 40, 1, 0, "" },
2134
+ { "gdiff-command", 0, 40, 0, 0, "gdiff" },
2135
+ { "gmerge-command", 0, 40, 0, 0, "" },
2136
+ { "http-port", 0, 16, 0, 0, "8080" },
2137
+ { "https-login", 0, 0, 0, 0, "off" },
2138
+ { "ignore-glob", 0, 40, 1, 0, "" },
2139
+ { "keep-glob", 0, 40, 1, 0, "" },
2140
+ { "localauth", 0, 0, 0, 0, "off" },
2141
+ { "main-branch", 0, 40, 0, 0, "trunk" },
2142
+ { "manifest", 0, 0, 1, 0, "off" },
2143
+ { "max-upload", 0, 25, 0, 0, "250000" },
2144
+ { "mtime-changes", 0, 0, 0, 0, "on" },
2145
+ { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " },
2146
+ { "proxy", 0, 32, 0, 0, "off" },
2147
+ { "relative-paths", 0, 0, 0, 0, "on" },
2148
+ { "repo-cksum", 0, 0, 0, 0, "on" },
2149
+ { "self-register", 0, 0, 0, 0, "off" },
2150
+ { "ssh-command", 0, 40, 0, 0, "" },
2151
+ { "ssl-ca-location", 0, 40, 0, 0, "" },
2152
+ { "ssl-identity", 0, 40, 0, 0, "" },
21512153
 #ifdef FOSSIL_ENABLE_TCL
2152
- { "tcl", 0, 0, 0, "off" },
2153
- { "tcl-setup", 0, 40, 0, "" },
2154
+ { "tcl", 0, 0, 0, 0, "off" },
2155
+ { "tcl-setup", 0, 40, 0, 1, "" },
21542156
 #endif
2155
- { "th1-setup", 0, 40, 0, "" },
2156
- { "th1-uri-regexp",0, 40, 0, "" },
2157
- { "web-browser", 0, 32, 0, "" },
2158
- { "white-foreground", 0, 0, 0, "off" },
2159
- { 0,0,0,0,0 }
2157
+ { "th1-setup", 0, 40, 0, 1, "" },
2158
+ { "th1-uri-regexp", 0, 40, 0, 0, "" },
2159
+ { "web-browser", 0, 32, 0, 0, "" },
2160
+ { "white-foreground", 0, 0, 0, 0, "off" },
2161
+ { 0,0,0,0,0,0 }
21602162
 };
21612163
21622164
 /*
21632165
 ** COMMAND: settings
21642166
 ** COMMAND: unset*
21652167
--- src/db.c
+++ src/db.c
@@ -2099,66 +2099,68 @@
2099 */
2100 #if INTERFACE
2101 struct stControlSettings {
2102 char const *name; /* Name of the setting */
2103 char const *var; /* Internal variable name used by db_set() */
2104 int width; /* Width of display. 0 for boolean values */
2105 int versionable; /* Is this setting versionable? */
 
2106 char const *def; /* Default value */
2107 };
2108 #endif /* INTERFACE */
2109 struct stControlSettings const ctrlSettings[] = {
2110 { "access-log", 0, 0, 0, "off" },
2111 { "allow-symlinks",0, 0, 1, "off" },
2112 { "auto-captcha", "autocaptcha", 0, 0, "on" },
2113 { "auto-hyperlink",0, 0, 0, "on", },
2114 { "auto-shun", 0, 0, 0, "on" },
2115 { "autosync", 0, 0, 0, "on" },
2116 { "binary-glob", 0, 40, 1, "" },
2117 { "clearsign", 0, 0, 0, "off" },
2118 #if defined(_WIN32) || defined(__CYGWIN__) || defined(__DARWIN__) || defined(__APPLE__)
2119 { "case-sensitive",0, 0, 0, "off" },
 
2120 #else
2121 { "case-sensitive",0, 0, 0, "on" },
2122 #endif
2123 { "clean-glob", 0, 40, 1, "" },
2124 { "crnl-glob", 0, 40, 1, "" },
2125 { "default-perms", 0, 16, 0, "u" },
2126 { "diff-binary", 0, 0, 0, "on" },
2127 { "diff-command", 0, 40, 0, "" },
2128 { "dont-push", 0, 0, 0, "off" },
2129 { "editor", 0, 32, 0, "" },
2130 { "empty-dirs", 0, 40, 1, "" },
2131 { "encoding-glob", 0, 40, 1, "" },
2132 { "gdiff-command", 0, 40, 0, "gdiff" },
2133 { "gmerge-command",0, 40, 0, "" },
2134 { "http-port", 0, 16, 0, "8080" },
2135 { "https-login", 0, 0, 0, "off" },
2136 { "ignore-glob", 0, 40, 1, "" },
2137 { "keep-glob", 0, 40, 1, "" },
2138 { "localauth", 0, 0, 0, "off" },
2139 { "main-branch", 0, 40, 0, "trunk" },
2140 { "manifest", 0, 0, 1, "off" },
2141 { "max-upload", 0, 25, 0, "250000" },
2142 { "mtime-changes", 0, 0, 0, "on" },
2143 { "pgp-command", 0, 40, 0, "gpg --clearsign -o " },
2144 { "proxy", 0, 32, 0, "off" },
2145 { "relative-paths",0, 0, 0, "on" },
2146 { "repo-cksum", 0, 0, 0, "on" },
2147 { "self-register", 0, 0, 0, "off" },
2148 { "ssh-command", 0, 40, 0, "" },
2149 { "ssl-ca-location",0, 40, 0, "" },
2150 { "ssl-identity", 0, 40, 0, "" },
2151 #ifdef FOSSIL_ENABLE_TCL
2152 { "tcl", 0, 0, 0, "off" },
2153 { "tcl-setup", 0, 40, 0, "" },
2154 #endif
2155 { "th1-setup", 0, 40, 0, "" },
2156 { "th1-uri-regexp",0, 40, 0, "" },
2157 { "web-browser", 0, 32, 0, "" },
2158 { "white-foreground", 0, 0, 0, "off" },
2159 { 0,0,0,0,0 }
2160 };
2161
2162 /*
2163 ** COMMAND: settings
2164 ** COMMAND: unset*
2165
--- src/db.c
+++ src/db.c
@@ -2099,66 +2099,68 @@
2099 */
2100 #if INTERFACE
2101 struct stControlSettings {
2102 char const *name; /* Name of the setting */
2103 char const *var; /* Internal variable name used by db_set() */
2104 int width; /* Width of display. 0 for boolean values. */
2105 int versionable; /* Is this setting versionable? */
2106 int forceTextArea; /* Force using a text area for display? */
2107 char const *def; /* Default value */
2108 };
2109 #endif /* INTERFACE */
2110 struct stControlSettings const ctrlSettings[] = {
2111 { "access-log", 0, 0, 0, 0, "off" },
2112 { "allow-symlinks", 0, 0, 1, 0, "off" },
2113 { "auto-captcha", "autocaptcha", 0, 0, 0, "on" },
2114 { "auto-hyperlink", 0, 0, 0, 0, "on", },
2115 { "auto-shun", 0, 0, 0, 0, "on" },
2116 { "autosync", 0, 0, 0, 0, "on" },
2117 { "binary-glob", 0, 40, 1, 0, "" },
2118 { "clearsign", 0, 0, 0, 0, "off" },
2119 #if defined(_WIN32) || defined(__CYGWIN__) || defined(__DARWIN__) || \
2120 defined(__APPLE__)
2121 { "case-sensitive", 0, 0, 0, 0, "off" },
2122 #else
2123 { "case-sensitive", 0, 0, 0, 0, "on" },
2124 #endif
2125 { "clean-glob", 0, 40, 1, 0, "" },
2126 { "crnl-glob", 0, 40, 1, 0, "" },
2127 { "default-perms", 0, 16, 0, 0, "u" },
2128 { "diff-binary", 0, 0, 0, 0, "on" },
2129 { "diff-command", 0, 40, 0, 0, "" },
2130 { "dont-push", 0, 0, 0, 0, "off" },
2131 { "editor", 0, 32, 0, 0, "" },
2132 { "empty-dirs", 0, 40, 1, 0, "" },
2133 { "encoding-glob", 0, 40, 1, 0, "" },
2134 { "gdiff-command", 0, 40, 0, 0, "gdiff" },
2135 { "gmerge-command", 0, 40, 0, 0, "" },
2136 { "http-port", 0, 16, 0, 0, "8080" },
2137 { "https-login", 0, 0, 0, 0, "off" },
2138 { "ignore-glob", 0, 40, 1, 0, "" },
2139 { "keep-glob", 0, 40, 1, 0, "" },
2140 { "localauth", 0, 0, 0, 0, "off" },
2141 { "main-branch", 0, 40, 0, 0, "trunk" },
2142 { "manifest", 0, 0, 1, 0, "off" },
2143 { "max-upload", 0, 25, 0, 0, "250000" },
2144 { "mtime-changes", 0, 0, 0, 0, "on" },
2145 { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " },
2146 { "proxy", 0, 32, 0, 0, "off" },
2147 { "relative-paths", 0, 0, 0, 0, "on" },
2148 { "repo-cksum", 0, 0, 0, 0, "on" },
2149 { "self-register", 0, 0, 0, 0, "off" },
2150 { "ssh-command", 0, 40, 0, 0, "" },
2151 { "ssl-ca-location", 0, 40, 0, 0, "" },
2152 { "ssl-identity", 0, 40, 0, 0, "" },
2153 #ifdef FOSSIL_ENABLE_TCL
2154 { "tcl", 0, 0, 0, 0, "off" },
2155 { "tcl-setup", 0, 40, 0, 1, "" },
2156 #endif
2157 { "th1-setup", 0, 40, 0, 1, "" },
2158 { "th1-uri-regexp", 0, 40, 0, 0, "" },
2159 { "web-browser", 0, 32, 0, 0, "" },
2160 { "white-foreground", 0, 0, 0, 0, "off" },
2161 { 0,0,0,0,0,0 }
2162 };
2163
2164 /*
2165 ** COMMAND: settings
2166 ** COMMAND: unset*
2167
M src/db.c
+49 -47
--- src/db.c
+++ src/db.c
@@ -2099,66 +2099,68 @@
20992099
 */
21002100
 #if INTERFACE
21012101
 struct stControlSettings {
21022102
 char const *name; /* Name of the setting */
21032103
 char const *var; /* Internal variable name used by db_set() */
2104
- int width; /* Width of display. 0 for boolean values */
2104
+ int width; /* Width of display. 0 for boolean values. */
21052105
 int versionable; /* Is this setting versionable? */
2106
+ int forceTextArea; /* Force using a text area for display? */
21062107
 char const *def; /* Default value */
21072108
 };
21082109
 #endif /* INTERFACE */
21092110
 struct stControlSettings const ctrlSettings[] = {
2110
- { "access-log", 0, 0, 0, "off" },
2111
- { "allow-symlinks",0, 0, 1, "off" },
2112
- { "auto-captcha", "autocaptcha", 0, 0, "on" },
2113
- { "auto-hyperlink",0, 0, 0, "on", },
2114
- { "auto-shun", 0, 0, 0, "on" },
2115
- { "autosync", 0, 0, 0, "on" },
2116
- { "binary-glob", 0, 40, 1, "" },
2117
- { "clearsign", 0, 0, 0, "off" },
2118
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__DARWIN__) || defined(__APPLE__)
2119
- { "case-sensitive",0, 0, 0, "off" },
2111
+ { "access-log", 0, 0, 0, 0, "off" },
2112
+ { "allow-symlinks", 0, 0, 1, 0, "off" },
2113
+ { "auto-captcha", "autocaptcha", 0, 0, 0, "on" },
2114
+ { "auto-hyperlink", 0, 0, 0, 0, "on", },
2115
+ { "auto-shun", 0, 0, 0, 0, "on" },
2116
+ { "autosync", 0, 0, 0, 0, "on" },
2117
+ { "binary-glob", 0, 40, 1, 0, "" },
2118
+ { "clearsign", 0, 0, 0, 0, "off" },
2119
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__DARWIN__) || \
2120
+ defined(__APPLE__)
2121
+ { "case-sensitive", 0, 0, 0, 0, "off" },
21202122
 #else
2121
- { "case-sensitive",0, 0, 0, "on" },
2123
+ { "case-sensitive", 0, 0, 0, 0, "on" },
21222124
 #endif
2123
- { "clean-glob", 0, 40, 1, "" },
2124
- { "crnl-glob", 0, 40, 1, "" },
2125
- { "default-perms", 0, 16, 0, "u" },
2126
- { "diff-binary", 0, 0, 0, "on" },
2127
- { "diff-command", 0, 40, 0, "" },
2128
- { "dont-push", 0, 0, 0, "off" },
2129
- { "editor", 0, 32, 0, "" },
2130
- { "empty-dirs", 0, 40, 1, "" },
2131
- { "encoding-glob", 0, 40, 1, "" },
2132
- { "gdiff-command", 0, 40, 0, "gdiff" },
2133
- { "gmerge-command",0, 40, 0, "" },
2134
- { "http-port", 0, 16, 0, "8080" },
2135
- { "https-login", 0, 0, 0, "off" },
2136
- { "ignore-glob", 0, 40, 1, "" },
2137
- { "keep-glob", 0, 40, 1, "" },
2138
- { "localauth", 0, 0, 0, "off" },
2139
- { "main-branch", 0, 40, 0, "trunk" },
2140
- { "manifest", 0, 0, 1, "off" },
2141
- { "max-upload", 0, 25, 0, "250000" },
2142
- { "mtime-changes", 0, 0, 0, "on" },
2143
- { "pgp-command", 0, 40, 0, "gpg --clearsign -o " },
2144
- { "proxy", 0, 32, 0, "off" },
2145
- { "relative-paths",0, 0, 0, "on" },
2146
- { "repo-cksum", 0, 0, 0, "on" },
2147
- { "self-register", 0, 0, 0, "off" },
2148
- { "ssh-command", 0, 40, 0, "" },
2149
- { "ssl-ca-location",0, 40, 0, "" },
2150
- { "ssl-identity", 0, 40, 0, "" },
2125
+ { "clean-glob", 0, 40, 1, 0, "" },
2126
+ { "crnl-glob", 0, 40, 1, 0, "" },
2127
+ { "default-perms", 0, 16, 0, 0, "u" },
2128
+ { "diff-binary", 0, 0, 0, 0, "on" },
2129
+ { "diff-command", 0, 40, 0, 0, "" },
2130
+ { "dont-push", 0, 0, 0, 0, "off" },
2131
+ { "editor", 0, 32, 0, 0, "" },
2132
+ { "empty-dirs", 0, 40, 1, 0, "" },
2133
+ { "encoding-glob", 0, 40, 1, 0, "" },
2134
+ { "gdiff-command", 0, 40, 0, 0, "gdiff" },
2135
+ { "gmerge-command", 0, 40, 0, 0, "" },
2136
+ { "http-port", 0, 16, 0, 0, "8080" },
2137
+ { "https-login", 0, 0, 0, 0, "off" },
2138
+ { "ignore-glob", 0, 40, 1, 0, "" },
2139
+ { "keep-glob", 0, 40, 1, 0, "" },
2140
+ { "localauth", 0, 0, 0, 0, "off" },
2141
+ { "main-branch", 0, 40, 0, 0, "trunk" },
2142
+ { "manifest", 0, 0, 1, 0, "off" },
2143
+ { "max-upload", 0, 25, 0, 0, "250000" },
2144
+ { "mtime-changes", 0, 0, 0, 0, "on" },
2145
+ { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " },
2146
+ { "proxy", 0, 32, 0, 0, "off" },
2147
+ { "relative-paths", 0, 0, 0, 0, "on" },
2148
+ { "repo-cksum", 0, 0, 0, 0, "on" },
2149
+ { "self-register", 0, 0, 0, 0, "off" },
2150
+ { "ssh-command", 0, 40, 0, 0, "" },
2151
+ { "ssl-ca-location", 0, 40, 0, 0, "" },
2152
+ { "ssl-identity", 0, 40, 0, 0, "" },
21512153
 #ifdef FOSSIL_ENABLE_TCL
2152
- { "tcl", 0, 0, 0, "off" },
2153
- { "tcl-setup", 0, 40, 0, "" },
2154
+ { "tcl", 0, 0, 0, 0, "off" },
2155
+ { "tcl-setup", 0, 40, 0, 1, "" },
21542156
 #endif
2155
- { "th1-setup", 0, 40, 0, "" },
2156
- { "th1-uri-regexp",0, 40, 0, "" },
2157
- { "web-browser", 0, 32, 0, "" },
2158
- { "white-foreground", 0, 0, 0, "off" },
2159
- { 0,0,0,0,0 }
2157
+ { "th1-setup", 0, 40, 0, 1, "" },
2158
+ { "th1-uri-regexp", 0, 40, 0, 0, "" },
2159
+ { "web-browser", 0, 32, 0, 0, "" },
2160
+ { "white-foreground", 0, 0, 0, 0, "off" },
2161
+ { 0,0,0,0,0,0 }
21602162
 };
21612163
21622164
 /*
21632165
 ** COMMAND: settings
21642166
 ** COMMAND: unset*
21652167
--- src/db.c
+++ src/db.c
@@ -2099,66 +2099,68 @@
2099 */
2100 #if INTERFACE
2101 struct stControlSettings {
2102 char const *name; /* Name of the setting */
2103 char const *var; /* Internal variable name used by db_set() */
2104 int width; /* Width of display. 0 for boolean values */
2105 int versionable; /* Is this setting versionable? */
 
2106 char const *def; /* Default value */
2107 };
2108 #endif /* INTERFACE */
2109 struct stControlSettings const ctrlSettings[] = {
2110 { "access-log", 0, 0, 0, "off" },
2111 { "allow-symlinks",0, 0, 1, "off" },
2112 { "auto-captcha", "autocaptcha", 0, 0, "on" },
2113 { "auto-hyperlink",0, 0, 0, "on", },
2114 { "auto-shun", 0, 0, 0, "on" },
2115 { "autosync", 0, 0, 0, "on" },
2116 { "binary-glob", 0, 40, 1, "" },
2117 { "clearsign", 0, 0, 0, "off" },
2118 #if defined(_WIN32) || defined(__CYGWIN__) || defined(__DARWIN__) || defined(__APPLE__)
2119 { "case-sensitive",0, 0, 0, "off" },
 
2120 #else
2121 { "case-sensitive",0, 0, 0, "on" },
2122 #endif
2123 { "clean-glob", 0, 40, 1, "" },
2124 { "crnl-glob", 0, 40, 1, "" },
2125 { "default-perms", 0, 16, 0, "u" },
2126 { "diff-binary", 0, 0, 0, "on" },
2127 { "diff-command", 0, 40, 0, "" },
2128 { "dont-push", 0, 0, 0, "off" },
2129 { "editor", 0, 32, 0, "" },
2130 { "empty-dirs", 0, 40, 1, "" },
2131 { "encoding-glob", 0, 40, 1, "" },
2132 { "gdiff-command", 0, 40, 0, "gdiff" },
2133 { "gmerge-command",0, 40, 0, "" },
2134 { "http-port", 0, 16, 0, "8080" },
2135 { "https-login", 0, 0, 0, "off" },
2136 { "ignore-glob", 0, 40, 1, "" },
2137 { "keep-glob", 0, 40, 1, "" },
2138 { "localauth", 0, 0, 0, "off" },
2139 { "main-branch", 0, 40, 0, "trunk" },
2140 { "manifest", 0, 0, 1, "off" },
2141 { "max-upload", 0, 25, 0, "250000" },
2142 { "mtime-changes", 0, 0, 0, "on" },
2143 { "pgp-command", 0, 40, 0, "gpg --clearsign -o " },
2144 { "proxy", 0, 32, 0, "off" },
2145 { "relative-paths",0, 0, 0, "on" },
2146 { "repo-cksum", 0, 0, 0, "on" },
2147 { "self-register", 0, 0, 0, "off" },
2148 { "ssh-command", 0, 40, 0, "" },
2149 { "ssl-ca-location",0, 40, 0, "" },
2150 { "ssl-identity", 0, 40, 0, "" },
2151 #ifdef FOSSIL_ENABLE_TCL
2152 { "tcl", 0, 0, 0, "off" },
2153 { "tcl-setup", 0, 40, 0, "" },
2154 #endif
2155 { "th1-setup", 0, 40, 0, "" },
2156 { "th1-uri-regexp",0, 40, 0, "" },
2157 { "web-browser", 0, 32, 0, "" },
2158 { "white-foreground", 0, 0, 0, "off" },
2159 { 0,0,0,0,0 }
2160 };
2161
2162 /*
2163 ** COMMAND: settings
2164 ** COMMAND: unset*
2165
--- src/db.c
+++ src/db.c
@@ -2099,66 +2099,68 @@
2099 */
2100 #if INTERFACE
2101 struct stControlSettings {
2102 char const *name; /* Name of the setting */
2103 char const *var; /* Internal variable name used by db_set() */
2104 int width; /* Width of display. 0 for boolean values. */
2105 int versionable; /* Is this setting versionable? */
2106 int forceTextArea; /* Force using a text area for display? */
2107 char const *def; /* Default value */
2108 };
2109 #endif /* INTERFACE */
2110 struct stControlSettings const ctrlSettings[] = {
2111 { "access-log", 0, 0, 0, 0, "off" },
2112 { "allow-symlinks", 0, 0, 1, 0, "off" },
2113 { "auto-captcha", "autocaptcha", 0, 0, 0, "on" },
2114 { "auto-hyperlink", 0, 0, 0, 0, "on", },
2115 { "auto-shun", 0, 0, 0, 0, "on" },
2116 { "autosync", 0, 0, 0, 0, "on" },
2117 { "binary-glob", 0, 40, 1, 0, "" },
2118 { "clearsign", 0, 0, 0, 0, "off" },
2119 #if defined(_WIN32) || defined(__CYGWIN__) || defined(__DARWIN__) || \
2120 defined(__APPLE__)
2121 { "case-sensitive", 0, 0, 0, 0, "off" },
2122 #else
2123 { "case-sensitive", 0, 0, 0, 0, "on" },
2124 #endif
2125 { "clean-glob", 0, 40, 1, 0, "" },
2126 { "crnl-glob", 0, 40, 1, 0, "" },
2127 { "default-perms", 0, 16, 0, 0, "u" },
2128 { "diff-binary", 0, 0, 0, 0, "on" },
2129 { "diff-command", 0, 40, 0, 0, "" },
2130 { "dont-push", 0, 0, 0, 0, "off" },
2131 { "editor", 0, 32, 0, 0, "" },
2132 { "empty-dirs", 0, 40, 1, 0, "" },
2133 { "encoding-glob", 0, 40, 1, 0, "" },
2134 { "gdiff-command", 0, 40, 0, 0, "gdiff" },
2135 { "gmerge-command", 0, 40, 0, 0, "" },
2136 { "http-port", 0, 16, 0, 0, "8080" },
2137 { "https-login", 0, 0, 0, 0, "off" },
2138 { "ignore-glob", 0, 40, 1, 0, "" },
2139 { "keep-glob", 0, 40, 1, 0, "" },
2140 { "localauth", 0, 0, 0, 0, "off" },
2141 { "main-branch", 0, 40, 0, 0, "trunk" },
2142 { "manifest", 0, 0, 1, 0, "off" },
2143 { "max-upload", 0, 25, 0, 0, "250000" },
2144 { "mtime-changes", 0, 0, 0, 0, "on" },
2145 { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " },
2146 { "proxy", 0, 32, 0, 0, "off" },
2147 { "relative-paths", 0, 0, 0, 0, "on" },
2148 { "repo-cksum", 0, 0, 0, 0, "on" },
2149 { "self-register", 0, 0, 0, 0, "off" },
2150 { "ssh-command", 0, 40, 0, 0, "" },
2151 { "ssl-ca-location", 0, 40, 0, 0, "" },
2152 { "ssl-identity", 0, 40, 0, 0, "" },
2153 #ifdef FOSSIL_ENABLE_TCL
2154 { "tcl", 0, 0, 0, 0, "off" },
2155 { "tcl-setup", 0, 40, 0, 1, "" },
2156 #endif
2157 { "th1-setup", 0, 40, 0, 1, "" },
2158 { "th1-uri-regexp", 0, 40, 0, 0, "" },
2159 { "web-browser", 0, 32, 0, 0, "" },
2160 { "white-foreground", 0, 0, 0, 0, "off" },
2161 { 0,0,0,0,0,0 }
2162 };
2163
2164 /*
2165 ** COMMAND: settings
2166 ** COMMAND: unset*
2167
M src/db.c
+49 -47
--- src/db.c
+++ src/db.c
@@ -2099,66 +2099,68 @@
20992099
 */
21002100
 #if INTERFACE
21012101
 struct stControlSettings {
21022102
 char const *name; /* Name of the setting */
21032103
 char const *var; /* Internal variable name used by db_set() */
2104
- int width; /* Width of display. 0 for boolean values */
2104
+ int width; /* Width of display. 0 for boolean values. */
21052105
 int versionable; /* Is this setting versionable? */
2106
+ int forceTextArea; /* Force using a text area for display? */
21062107
 char const *def; /* Default value */
21072108
 };
21082109
 #endif /* INTERFACE */
21092110
 struct stControlSettings const ctrlSettings[] = {
2110
- { "access-log", 0, 0, 0, "off" },
2111
- { "allow-symlinks",0, 0, 1, "off" },
2112
- { "auto-captcha", "autocaptcha", 0, 0, "on" },
2113
- { "auto-hyperlink",0, 0, 0, "on", },
2114
- { "auto-shun", 0, 0, 0, "on" },
2115
- { "autosync", 0, 0, 0, "on" },
2116
- { "binary-glob", 0, 40, 1, "" },
2117
- { "clearsign", 0, 0, 0, "off" },
2118
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__DARWIN__) || defined(__APPLE__)
2119
- { "case-sensitive",0, 0, 0, "off" },
2111
+ { "access-log", 0, 0, 0, 0, "off" },
2112
+ { "allow-symlinks", 0, 0, 1, 0, "off" },
2113
+ { "auto-captcha", "autocaptcha", 0, 0, 0, "on" },
2114
+ { "auto-hyperlink", 0, 0, 0, 0, "on", },
2115
+ { "auto-shun", 0, 0, 0, 0, "on" },
2116
+ { "autosync", 0, 0, 0, 0, "on" },
2117
+ { "binary-glob", 0, 40, 1, 0, "" },
2118
+ { "clearsign", 0, 0, 0, 0, "off" },
2119
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__DARWIN__) || \
2120
+ defined(__APPLE__)
2121
+ { "case-sensitive", 0, 0, 0, 0, "off" },
21202122
 #else
2121
- { "case-sensitive",0, 0, 0, "on" },
2123
+ { "case-sensitive", 0, 0, 0, 0, "on" },
21222124
 #endif
2123
- { "clean-glob", 0, 40, 1, "" },
2124
- { "crnl-glob", 0, 40, 1, "" },
2125
- { "default-perms", 0, 16, 0, "u" },
2126
- { "diff-binary", 0, 0, 0, "on" },
2127
- { "diff-command", 0, 40, 0, "" },
2128
- { "dont-push", 0, 0, 0, "off" },
2129
- { "editor", 0, 32, 0, "" },
2130
- { "empty-dirs", 0, 40, 1, "" },
2131
- { "encoding-glob", 0, 40, 1, "" },
2132
- { "gdiff-command", 0, 40, 0, "gdiff" },
2133
- { "gmerge-command",0, 40, 0, "" },
2134
- { "http-port", 0, 16, 0, "8080" },
2135
- { "https-login", 0, 0, 0, "off" },
2136
- { "ignore-glob", 0, 40, 1, "" },
2137
- { "keep-glob", 0, 40, 1, "" },
2138
- { "localauth", 0, 0, 0, "off" },
2139
- { "main-branch", 0, 40, 0, "trunk" },
2140
- { "manifest", 0, 0, 1, "off" },
2141
- { "max-upload", 0, 25, 0, "250000" },
2142
- { "mtime-changes", 0, 0, 0, "on" },
2143
- { "pgp-command", 0, 40, 0, "gpg --clearsign -o " },
2144
- { "proxy", 0, 32, 0, "off" },
2145
- { "relative-paths",0, 0, 0, "on" },
2146
- { "repo-cksum", 0, 0, 0, "on" },
2147
- { "self-register", 0, 0, 0, "off" },
2148
- { "ssh-command", 0, 40, 0, "" },
2149
- { "ssl-ca-location",0, 40, 0, "" },
2150
- { "ssl-identity", 0, 40, 0, "" },
2125
+ { "clean-glob", 0, 40, 1, 0, "" },
2126
+ { "crnl-glob", 0, 40, 1, 0, "" },
2127
+ { "default-perms", 0, 16, 0, 0, "u" },
2128
+ { "diff-binary", 0, 0, 0, 0, "on" },
2129
+ { "diff-command", 0, 40, 0, 0, "" },
2130
+ { "dont-push", 0, 0, 0, 0, "off" },
2131
+ { "editor", 0, 32, 0, 0, "" },
2132
+ { "empty-dirs", 0, 40, 1, 0, "" },
2133
+ { "encoding-glob", 0, 40, 1, 0, "" },
2134
+ { "gdiff-command", 0, 40, 0, 0, "gdiff" },
2135
+ { "gmerge-command", 0, 40, 0, 0, "" },
2136
+ { "http-port", 0, 16, 0, 0, "8080" },
2137
+ { "https-login", 0, 0, 0, 0, "off" },
2138
+ { "ignore-glob", 0, 40, 1, 0, "" },
2139
+ { "keep-glob", 0, 40, 1, 0, "" },
2140
+ { "localauth", 0, 0, 0, 0, "off" },
2141
+ { "main-branch", 0, 40, 0, 0, "trunk" },
2142
+ { "manifest", 0, 0, 1, 0, "off" },
2143
+ { "max-upload", 0, 25, 0, 0, "250000" },
2144
+ { "mtime-changes", 0, 0, 0, 0, "on" },
2145
+ { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " },
2146
+ { "proxy", 0, 32, 0, 0, "off" },
2147
+ { "relative-paths", 0, 0, 0, 0, "on" },
2148
+ { "repo-cksum", 0, 0, 0, 0, "on" },
2149
+ { "self-register", 0, 0, 0, 0, "off" },
2150
+ { "ssh-command", 0, 40, 0, 0, "" },
2151
+ { "ssl-ca-location", 0, 40, 0, 0, "" },
2152
+ { "ssl-identity", 0, 40, 0, 0, "" },
21512153
 #ifdef FOSSIL_ENABLE_TCL
2152
- { "tcl", 0, 0, 0, "off" },
2153
- { "tcl-setup", 0, 40, 0, "" },
2154
+ { "tcl", 0, 0, 0, 0, "off" },
2155
+ { "tcl-setup", 0, 40, 0, 1, "" },
21542156
 #endif
2155
- { "th1-setup", 0, 40, 0, "" },
2156
- { "th1-uri-regexp",0, 40, 0, "" },
2157
- { "web-browser", 0, 32, 0, "" },
2158
- { "white-foreground", 0, 0, 0, "off" },
2159
- { 0,0,0,0,0 }
2157
+ { "th1-setup", 0, 40, 0, 1, "" },
2158
+ { "th1-uri-regexp", 0, 40, 0, 0, "" },
2159
+ { "web-browser", 0, 32, 0, 0, "" },
2160
+ { "white-foreground", 0, 0, 0, 0, "off" },
2161
+ { 0,0,0,0,0,0 }
21602162
 };
21612163
21622164
 /*
21632165
 ** COMMAND: settings
21642166
 ** COMMAND: unset*
21652167
--- src/db.c
+++ src/db.c
@@ -2099,66 +2099,68 @@
2099 */
2100 #if INTERFACE
2101 struct stControlSettings {
2102 char const *name; /* Name of the setting */
2103 char const *var; /* Internal variable name used by db_set() */
2104 int width; /* Width of display. 0 for boolean values */
2105 int versionable; /* Is this setting versionable? */
 
2106 char const *def; /* Default value */
2107 };
2108 #endif /* INTERFACE */
2109 struct stControlSettings const ctrlSettings[] = {
2110 { "access-log", 0, 0, 0, "off" },
2111 { "allow-symlinks",0, 0, 1, "off" },
2112 { "auto-captcha", "autocaptcha", 0, 0, "on" },
2113 { "auto-hyperlink",0, 0, 0, "on", },
2114 { "auto-shun", 0, 0, 0, "on" },
2115 { "autosync", 0, 0, 0, "on" },
2116 { "binary-glob", 0, 40, 1, "" },
2117 { "clearsign", 0, 0, 0, "off" },
2118 #if defined(_WIN32) || defined(__CYGWIN__) || defined(__DARWIN__) || defined(__APPLE__)
2119 { "case-sensitive",0, 0, 0, "off" },
 
2120 #else
2121 { "case-sensitive",0, 0, 0, "on" },
2122 #endif
2123 { "clean-glob", 0, 40, 1, "" },
2124 { "crnl-glob", 0, 40, 1, "" },
2125 { "default-perms", 0, 16, 0, "u" },
2126 { "diff-binary", 0, 0, 0, "on" },
2127 { "diff-command", 0, 40, 0, "" },
2128 { "dont-push", 0, 0, 0, "off" },
2129 { "editor", 0, 32, 0, "" },
2130 { "empty-dirs", 0, 40, 1, "" },
2131 { "encoding-glob", 0, 40, 1, "" },
2132 { "gdiff-command", 0, 40, 0, "gdiff" },
2133 { "gmerge-command",0, 40, 0, "" },
2134 { "http-port", 0, 16, 0, "8080" },
2135 { "https-login", 0, 0, 0, "off" },
2136 { "ignore-glob", 0, 40, 1, "" },
2137 { "keep-glob", 0, 40, 1, "" },
2138 { "localauth", 0, 0, 0, "off" },
2139 { "main-branch", 0, 40, 0, "trunk" },
2140 { "manifest", 0, 0, 1, "off" },
2141 { "max-upload", 0, 25, 0, "250000" },
2142 { "mtime-changes", 0, 0, 0, "on" },
2143 { "pgp-command", 0, 40, 0, "gpg --clearsign -o " },
2144 { "proxy", 0, 32, 0, "off" },
2145 { "relative-paths",0, 0, 0, "on" },
2146 { "repo-cksum", 0, 0, 0, "on" },
2147 { "self-register", 0, 0, 0, "off" },
2148 { "ssh-command", 0, 40, 0, "" },
2149 { "ssl-ca-location",0, 40, 0, "" },
2150 { "ssl-identity", 0, 40, 0, "" },
2151 #ifdef FOSSIL_ENABLE_TCL
2152 { "tcl", 0, 0, 0, "off" },
2153 { "tcl-setup", 0, 40, 0, "" },
2154 #endif
2155 { "th1-setup", 0, 40, 0, "" },
2156 { "th1-uri-regexp",0, 40, 0, "" },
2157 { "web-browser", 0, 32, 0, "" },
2158 { "white-foreground", 0, 0, 0, "off" },
2159 { 0,0,0,0,0 }
2160 };
2161
2162 /*
2163 ** COMMAND: settings
2164 ** COMMAND: unset*
2165
--- src/db.c
+++ src/db.c
@@ -2099,66 +2099,68 @@
2099 */
2100 #if INTERFACE
2101 struct stControlSettings {
2102 char const *name; /* Name of the setting */
2103 char const *var; /* Internal variable name used by db_set() */
2104 int width; /* Width of display. 0 for boolean values. */
2105 int versionable; /* Is this setting versionable? */
2106 int forceTextArea; /* Force using a text area for display? */
2107 char const *def; /* Default value */
2108 };
2109 #endif /* INTERFACE */
2110 struct stControlSettings const ctrlSettings[] = {
2111 { "access-log", 0, 0, 0, 0, "off" },
2112 { "allow-symlinks", 0, 0, 1, 0, "off" },
2113 { "auto-captcha", "autocaptcha", 0, 0, 0, "on" },
2114 { "auto-hyperlink", 0, 0, 0, 0, "on", },
2115 { "auto-shun", 0, 0, 0, 0, "on" },
2116 { "autosync", 0, 0, 0, 0, "on" },
2117 { "binary-glob", 0, 40, 1, 0, "" },
2118 { "clearsign", 0, 0, 0, 0, "off" },
2119 #if defined(_WIN32) || defined(__CYGWIN__) || defined(__DARWIN__) || \
2120 defined(__APPLE__)
2121 { "case-sensitive", 0, 0, 0, 0, "off" },
2122 #else
2123 { "case-sensitive", 0, 0, 0, 0, "on" },
2124 #endif
2125 { "clean-glob", 0, 40, 1, 0, "" },
2126 { "crnl-glob", 0, 40, 1, 0, "" },
2127 { "default-perms", 0, 16, 0, 0, "u" },
2128 { "diff-binary", 0, 0, 0, 0, "on" },
2129 { "diff-command", 0, 40, 0, 0, "" },
2130 { "dont-push", 0, 0, 0, 0, "off" },
2131 { "editor", 0, 32, 0, 0, "" },
2132 { "empty-dirs", 0, 40, 1, 0, "" },
2133 { "encoding-glob", 0, 40, 1, 0, "" },
2134 { "gdiff-command", 0, 40, 0, 0, "gdiff" },
2135 { "gmerge-command", 0, 40, 0, 0, "" },
2136 { "http-port", 0, 16, 0, 0, "8080" },
2137 { "https-login", 0, 0, 0, 0, "off" },
2138 { "ignore-glob", 0, 40, 1, 0, "" },
2139 { "keep-glob", 0, 40, 1, 0, "" },
2140 { "localauth", 0, 0, 0, 0, "off" },
2141 { "main-branch", 0, 40, 0, 0, "trunk" },
2142 { "manifest", 0, 0, 1, 0, "off" },
2143 { "max-upload", 0, 25, 0, 0, "250000" },
2144 { "mtime-changes", 0, 0, 0, 0, "on" },
2145 { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " },
2146 { "proxy", 0, 32, 0, 0, "off" },
2147 { "relative-paths", 0, 0, 0, 0, "on" },
2148 { "repo-cksum", 0, 0, 0, 0, "on" },
2149 { "self-register", 0, 0, 0, 0, "off" },
2150 { "ssh-command", 0, 40, 0, 0, "" },
2151 { "ssl-ca-location", 0, 40, 0, 0, "" },
2152 { "ssl-identity", 0, 40, 0, 0, "" },
2153 #ifdef FOSSIL_ENABLE_TCL
2154 { "tcl", 0, 0, 0, 0, "off" },
2155 { "tcl-setup", 0, 40, 0, 1, "" },
2156 #endif
2157 { "th1-setup", 0, 40, 0, 1, "" },
2158 { "th1-uri-regexp", 0, 40, 0, 0, "" },
2159 { "web-browser", 0, 32, 0, 0, "" },
2160 { "white-foreground", 0, 0, 0, 0, "off" },
2161 { 0,0,0,0,0,0 }
2162 };
2163
2164 /*
2165 ** COMMAND: settings
2166 ** COMMAND: unset*
2167
M src/setup.c
+13 -4
--- src/setup.c
+++ src/setup.c
@@ -1263,32 +1263,41 @@
12631263
 } else {
12641264
 @ <br />
12651265
 }
12661266
 }
12671267
 }
1268
+ @ <br /><input type="submit" name="submit" value="Apply Changes" />
12681269
 @ </td><td style="width:50px;"></td><td valign="top">
12691270
 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1270
- if( pSet->width!=0 && !pSet->versionable){
1271
+ if( pSet->width!=0 && !pSet->versionable && !pSet->forceTextArea ){
12711272
 entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name,
12721273
 pSet->var!=0 ? pSet->var : pSet->name,
12731274
 (char*)pSet->def, 0);
12741275
 @ <br />
12751276
 }
1277
+ }
1278
+ for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1279
+ if( pSet->width!=0 && !pSet->versionable && pSet->forceTextArea ){
1280
+ @<b>%s(pSet->name)</b><br />
1281
+ textarea_attribute("", /*rows*/ 3, /*cols*/ 50, pSet->name,
1282
+ pSet->var!=0 ? pSet->var : pSet->name,
1283
+ (char*)pSet->def, 0);
1284
+ @ <br />
1285
+ }
12761286
 }
12771287
 @ </td><td style="width:50px;"></td><td valign="top">
12781288
 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1279
- int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0;
1280
- if( pSet->width!=0 && pSet->versionable){
1289
+ if( pSet->width!=0 && pSet->versionable ){
1290
+ int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0;
12811291
 @<b>%s(pSet->name)</b> (v)<br />
12821292
 textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name,
12831293
 pSet->var!=0 ? pSet->var : pSet->name,
12841294
 (char*)pSet->def, hasVersionableValue);
12851295
 @<br />
12861296
 }
12871297
 }
12881298
 @ </td></tr></table>
1289
- @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
12901299
 @ </div></form>
12911300
 @ <p>Settings marked with (v) are 'versionable' and will be overridden
12921301
 @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt>.
12931302
 @ If such a file is present, the corresponding field above is not
12941303
 @ editable.</p><hr /><p>
12951304
--- src/setup.c
+++ src/setup.c
@@ -1263,32 +1263,41 @@
1263 } else {
1264 @ <br />
1265 }
1266 }
1267 }
 
1268 @ </td><td style="width:50px;"></td><td valign="top">
1269 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1270 if( pSet->width!=0 && !pSet->versionable){
1271 entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name,
1272 pSet->var!=0 ? pSet->var : pSet->name,
1273 (char*)pSet->def, 0);
1274 @ <br />
1275 }
 
 
 
 
 
 
 
 
 
1276 }
1277 @ </td><td style="width:50px;"></td><td valign="top">
1278 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1279 int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0;
1280 if( pSet->width!=0 && pSet->versionable){
1281 @<b>%s(pSet->name)</b> (v)<br />
1282 textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name,
1283 pSet->var!=0 ? pSet->var : pSet->name,
1284 (char*)pSet->def, hasVersionableValue);
1285 @<br />
1286 }
1287 }
1288 @ </td></tr></table>
1289 @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1290 @ </div></form>
1291 @ <p>Settings marked with (v) are 'versionable' and will be overridden
1292 @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt>.
1293 @ If such a file is present, the corresponding field above is not
1294 @ editable.</p><hr /><p>
1295
--- src/setup.c
+++ src/setup.c
@@ -1263,32 +1263,41 @@
1263 } else {
1264 @ <br />
1265 }
1266 }
1267 }
1268 @ <br /><input type="submit" name="submit" value="Apply Changes" />
1269 @ </td><td style="width:50px;"></td><td valign="top">
1270 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1271 if( pSet->width!=0 && !pSet->versionable && !pSet->forceTextArea ){
1272 entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name,
1273 pSet->var!=0 ? pSet->var : pSet->name,
1274 (char*)pSet->def, 0);
1275 @ <br />
1276 }
1277 }
1278 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1279 if( pSet->width!=0 && !pSet->versionable && pSet->forceTextArea ){
1280 @<b>%s(pSet->name)</b><br />
1281 textarea_attribute("", /*rows*/ 3, /*cols*/ 50, pSet->name,
1282 pSet->var!=0 ? pSet->var : pSet->name,
1283 (char*)pSet->def, 0);
1284 @ <br />
1285 }
1286 }
1287 @ </td><td style="width:50px;"></td><td valign="top">
1288 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1289 if( pSet->width!=0 && pSet->versionable ){
1290 int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0;
1291 @<b>%s(pSet->name)</b> (v)<br />
1292 textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name,
1293 pSet->var!=0 ? pSet->var : pSet->name,
1294 (char*)pSet->def, hasVersionableValue);
1295 @<br />
1296 }
1297 }
1298 @ </td></tr></table>
 
1299 @ </div></form>
1300 @ <p>Settings marked with (v) are 'versionable' and will be overridden
1301 @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt>.
1302 @ If such a file is present, the corresponding field above is not
1303 @ editable.</p><hr /><p>
1304
M src/setup.c
+13 -4
--- src/setup.c
+++ src/setup.c
@@ -1263,32 +1263,41 @@
12631263
 } else {
12641264
 @ <br />
12651265
 }
12661266
 }
12671267
 }
1268
+ @ <br /><input type="submit" name="submit" value="Apply Changes" />
12681269
 @ </td><td style="width:50px;"></td><td valign="top">
12691270
 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1270
- if( pSet->width!=0 && !pSet->versionable){
1271
+ if( pSet->width!=0 && !pSet->versionable && !pSet->forceTextArea ){
12711272
 entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name,
12721273
 pSet->var!=0 ? pSet->var : pSet->name,
12731274
 (char*)pSet->def, 0);
12741275
 @ <br />
12751276
 }
1277
+ }
1278
+ for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1279
+ if( pSet->width!=0 && !pSet->versionable && pSet->forceTextArea ){
1280
+ @<b>%s(pSet->name)</b><br />
1281
+ textarea_attribute("", /*rows*/ 3, /*cols*/ 50, pSet->name,
1282
+ pSet->var!=0 ? pSet->var : pSet->name,
1283
+ (char*)pSet->def, 0);
1284
+ @ <br />
1285
+ }
12761286
 }
12771287
 @ </td><td style="width:50px;"></td><td valign="top">
12781288
 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1279
- int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0;
1280
- if( pSet->width!=0 && pSet->versionable){
1289
+ if( pSet->width!=0 && pSet->versionable ){
1290
+ int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0;
12811291
 @<b>%s(pSet->name)</b> (v)<br />
12821292
 textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name,
12831293
 pSet->var!=0 ? pSet->var : pSet->name,
12841294
 (char*)pSet->def, hasVersionableValue);
12851295
 @<br />
12861296
 }
12871297
 }
12881298
 @ </td></tr></table>
1289
- @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
12901299
 @ </div></form>
12911300
 @ <p>Settings marked with (v) are 'versionable' and will be overridden
12921301
 @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt>.
12931302
 @ If such a file is present, the corresponding field above is not
12941303
 @ editable.</p><hr /><p>
12951304
--- src/setup.c
+++ src/setup.c
@@ -1263,32 +1263,41 @@
1263 } else {
1264 @ <br />
1265 }
1266 }
1267 }
 
1268 @ </td><td style="width:50px;"></td><td valign="top">
1269 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1270 if( pSet->width!=0 && !pSet->versionable){
1271 entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name,
1272 pSet->var!=0 ? pSet->var : pSet->name,
1273 (char*)pSet->def, 0);
1274 @ <br />
1275 }
 
 
 
 
 
 
 
 
 
1276 }
1277 @ </td><td style="width:50px;"></td><td valign="top">
1278 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1279 int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0;
1280 if( pSet->width!=0 && pSet->versionable){
1281 @<b>%s(pSet->name)</b> (v)<br />
1282 textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name,
1283 pSet->var!=0 ? pSet->var : pSet->name,
1284 (char*)pSet->def, hasVersionableValue);
1285 @<br />
1286 }
1287 }
1288 @ </td></tr></table>
1289 @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1290 @ </div></form>
1291 @ <p>Settings marked with (v) are 'versionable' and will be overridden
1292 @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt>.
1293 @ If such a file is present, the corresponding field above is not
1294 @ editable.</p><hr /><p>
1295
--- src/setup.c
+++ src/setup.c
@@ -1263,32 +1263,41 @@
1263 } else {
1264 @ <br />
1265 }
1266 }
1267 }
1268 @ <br /><input type="submit" name="submit" value="Apply Changes" />
1269 @ </td><td style="width:50px;"></td><td valign="top">
1270 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1271 if( pSet->width!=0 && !pSet->versionable && !pSet->forceTextArea ){
1272 entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name,
1273 pSet->var!=0 ? pSet->var : pSet->name,
1274 (char*)pSet->def, 0);
1275 @ <br />
1276 }
1277 }
1278 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1279 if( pSet->width!=0 && !pSet->versionable && pSet->forceTextArea ){
1280 @<b>%s(pSet->name)</b><br />
1281 textarea_attribute("", /*rows*/ 3, /*cols*/ 50, pSet->name,
1282 pSet->var!=0 ? pSet->var : pSet->name,
1283 (char*)pSet->def, 0);
1284 @ <br />
1285 }
1286 }
1287 @ </td><td style="width:50px;"></td><td valign="top">
1288 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1289 if( pSet->width!=0 && pSet->versionable ){
1290 int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0;
1291 @<b>%s(pSet->name)</b> (v)<br />
1292 textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name,
1293 pSet->var!=0 ? pSet->var : pSet->name,
1294 (char*)pSet->def, hasVersionableValue);
1295 @<br />
1296 }
1297 }
1298 @ </td></tr></table>
 
1299 @ </div></form>
1300 @ <p>Settings marked with (v) are 'versionable' and will be overridden
1301 @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt>.
1302 @ If such a file is present, the corresponding field above is not
1303 @ editable.</p><hr /><p>
1304
M src/setup.c
+13 -4
--- src/setup.c
+++ src/setup.c
@@ -1263,32 +1263,41 @@
12631263
 } else {
12641264
 @ <br />
12651265
 }
12661266
 }
12671267
 }
1268
+ @ <br /><input type="submit" name="submit" value="Apply Changes" />
12681269
 @ </td><td style="width:50px;"></td><td valign="top">
12691270
 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1270
- if( pSet->width!=0 && !pSet->versionable){
1271
+ if( pSet->width!=0 && !pSet->versionable && !pSet->forceTextArea ){
12711272
 entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name,
12721273
 pSet->var!=0 ? pSet->var : pSet->name,
12731274
 (char*)pSet->def, 0);
12741275
 @ <br />
12751276
 }
1277
+ }
1278
+ for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1279
+ if( pSet->width!=0 && !pSet->versionable && pSet->forceTextArea ){
1280
+ @<b>%s(pSet->name)</b><br />
1281
+ textarea_attribute("", /*rows*/ 3, /*cols*/ 50, pSet->name,
1282
+ pSet->var!=0 ? pSet->var : pSet->name,
1283
+ (char*)pSet->def, 0);
1284
+ @ <br />
1285
+ }
12761286
 }
12771287
 @ </td><td style="width:50px;"></td><td valign="top">
12781288
 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1279
- int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0;
1280
- if( pSet->width!=0 && pSet->versionable){
1289
+ if( pSet->width!=0 && pSet->versionable ){
1290
+ int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0;
12811291
 @<b>%s(pSet->name)</b> (v)<br />
12821292
 textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name,
12831293
 pSet->var!=0 ? pSet->var : pSet->name,
12841294
 (char*)pSet->def, hasVersionableValue);
12851295
 @<br />
12861296
 }
12871297
 }
12881298
 @ </td></tr></table>
1289
- @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
12901299
 @ </div></form>
12911300
 @ <p>Settings marked with (v) are 'versionable' and will be overridden
12921301
 @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt>.
12931302
 @ If such a file is present, the corresponding field above is not
12941303
 @ editable.</p><hr /><p>
12951304
--- src/setup.c
+++ src/setup.c
@@ -1263,32 +1263,41 @@
1263 } else {
1264 @ <br />
1265 }
1266 }
1267 }
 
1268 @ </td><td style="width:50px;"></td><td valign="top">
1269 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1270 if( pSet->width!=0 && !pSet->versionable){
1271 entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name,
1272 pSet->var!=0 ? pSet->var : pSet->name,
1273 (char*)pSet->def, 0);
1274 @ <br />
1275 }
 
 
 
 
 
 
 
 
 
1276 }
1277 @ </td><td style="width:50px;"></td><td valign="top">
1278 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1279 int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0;
1280 if( pSet->width!=0 && pSet->versionable){
1281 @<b>%s(pSet->name)</b> (v)<br />
1282 textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name,
1283 pSet->var!=0 ? pSet->var : pSet->name,
1284 (char*)pSet->def, hasVersionableValue);
1285 @<br />
1286 }
1287 }
1288 @ </td></tr></table>
1289 @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1290 @ </div></form>
1291 @ <p>Settings marked with (v) are 'versionable' and will be overridden
1292 @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt>.
1293 @ If such a file is present, the corresponding field above is not
1294 @ editable.</p><hr /><p>
1295
--- src/setup.c
+++ src/setup.c
@@ -1263,32 +1263,41 @@
1263 } else {
1264 @ <br />
1265 }
1266 }
1267 }
1268 @ <br /><input type="submit" name="submit" value="Apply Changes" />
1269 @ </td><td style="width:50px;"></td><td valign="top">
1270 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1271 if( pSet->width!=0 && !pSet->versionable && !pSet->forceTextArea ){
1272 entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name,
1273 pSet->var!=0 ? pSet->var : pSet->name,
1274 (char*)pSet->def, 0);
1275 @ <br />
1276 }
1277 }
1278 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1279 if( pSet->width!=0 && !pSet->versionable && pSet->forceTextArea ){
1280 @<b>%s(pSet->name)</b><br />
1281 textarea_attribute("", /*rows*/ 3, /*cols*/ 50, pSet->name,
1282 pSet->var!=0 ? pSet->var : pSet->name,
1283 (char*)pSet->def, 0);
1284 @ <br />
1285 }
1286 }
1287 @ </td><td style="width:50px;"></td><td valign="top">
1288 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1289 if( pSet->width!=0 && pSet->versionable ){
1290 int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0;
1291 @<b>%s(pSet->name)</b> (v)<br />
1292 textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name,
1293 pSet->var!=0 ? pSet->var : pSet->name,
1294 (char*)pSet->def, hasVersionableValue);
1295 @<br />
1296 }
1297 }
1298 @ </td></tr></table>
 
1299 @ </div></form>
1300 @ <p>Settings marked with (v) are 'versionable' and will be overridden
1301 @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt>.
1302 @ If such a file is present, the corresponding field above is not
1303 @ editable.</p><hr /><p>
1304

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button