Fossil SCM
[202edc2c1c]: Make `th1-setup` a textarea in settings UI. Fixed by making it a versionable setting (just as "tcl-setup", for consistancy) and moving it to the second column of the setup page.
Commit
28429acb2b337d9dadc3458035f2f71b33c5e2c2
Parent
60f669e937698c1…
2 files changed
+2
-2
+11
-1
M
src/db.c
+2
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -2157,13 +2157,13 @@ | ||
| 2157 | 2157 | { "ssh-command", 0, 40, 0, "" }, |
| 2158 | 2158 | { "ssl-ca-location",0, 40, 0, "" }, |
| 2159 | 2159 | { "ssl-identity", 0, 40, 0, "" }, |
| 2160 | 2160 | #ifdef FOSSIL_ENABLE_TCL |
| 2161 | 2161 | { "tcl", 0, 0, 0, "off" }, |
| 2162 | - { "tcl-setup", 0, 40, 0, "" }, | |
| 2162 | + { "tcl-setup", 0, 40, 1, "" }, | |
| 2163 | 2163 | #endif |
| 2164 | - { "th1-setup", 0, 40, 0, "" }, | |
| 2164 | + { "th1-setup", 0, 40, 1, "" }, | |
| 2165 | 2165 | { "th1-uri-regexp",0, 40, 0, "" }, |
| 2166 | 2166 | { "web-browser", 0, 32, 0, "" }, |
| 2167 | 2167 | { "white-foreground", 0, 0, 0, "off" }, |
| 2168 | 2168 | { 0,0,0,0,0 } |
| 2169 | 2169 | }; |
| 2170 | 2170 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2157,13 +2157,13 @@ | |
| 2157 | { "ssh-command", 0, 40, 0, "" }, |
| 2158 | { "ssl-ca-location",0, 40, 0, "" }, |
| 2159 | { "ssl-identity", 0, 40, 0, "" }, |
| 2160 | #ifdef FOSSIL_ENABLE_TCL |
| 2161 | { "tcl", 0, 0, 0, "off" }, |
| 2162 | { "tcl-setup", 0, 40, 0, "" }, |
| 2163 | #endif |
| 2164 | { "th1-setup", 0, 40, 0, "" }, |
| 2165 | { "th1-uri-regexp",0, 40, 0, "" }, |
| 2166 | { "web-browser", 0, 32, 0, "" }, |
| 2167 | { "white-foreground", 0, 0, 0, "off" }, |
| 2168 | { 0,0,0,0,0 } |
| 2169 | }; |
| 2170 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2157,13 +2157,13 @@ | |
| 2157 | { "ssh-command", 0, 40, 0, "" }, |
| 2158 | { "ssl-ca-location",0, 40, 0, "" }, |
| 2159 | { "ssl-identity", 0, 40, 0, "" }, |
| 2160 | #ifdef FOSSIL_ENABLE_TCL |
| 2161 | { "tcl", 0, 0, 0, "off" }, |
| 2162 | { "tcl-setup", 0, 40, 1, "" }, |
| 2163 | #endif |
| 2164 | { "th1-setup", 0, 40, 1, "" }, |
| 2165 | { "th1-uri-regexp",0, 40, 0, "" }, |
| 2166 | { "web-browser", 0, 32, 0, "" }, |
| 2167 | { "white-foreground", 0, 0, 0, "off" }, |
| 2168 | { 0,0,0,0,0 } |
| 2169 | }; |
| 2170 |
+11
-1
| --- src/setup.c | ||
| +++ src/setup.c | ||
| @@ -1269,15 +1269,25 @@ | ||
| 1269 | 1269 | entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name, |
| 1270 | 1270 | pSet->var!=0 ? pSet->var : pSet->name, |
| 1271 | 1271 | (char*)pSet->def, 0); |
| 1272 | 1272 | @ <br /> |
| 1273 | 1273 | } |
| 1274 | + } | |
| 1275 | + for(pSet=ctrlSettings; pSet->name!=0; pSet++){ | |
| 1276 | + if( pSet->width!=0 && pSet->versionable && sqlite3_strglob("*glob", pSet->name) ){ | |
| 1277 | + int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0; | |
| 1278 | + @<b>%s(pSet->name)</b> (v)<br /> | |
| 1279 | + textarea_attribute("", /*rows*/ 3, /*cols*/ 35, pSet->name, | |
| 1280 | + pSet->var!=0 ? pSet->var : pSet->name, | |
| 1281 | + (char*)pSet->def, hasVersionableValue); | |
| 1282 | + @ <br /> | |
| 1283 | + } | |
| 1274 | 1284 | } |
| 1275 | 1285 | @ </td><td style="width:50px;"></td><td valign="top"> |
| 1276 | 1286 | for(pSet=ctrlSettings; pSet->name!=0; pSet++){ |
| 1277 | 1287 | int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0; |
| 1278 | - if( pSet->width!=0 && pSet->versionable){ | |
| 1288 | + if( pSet->width!=0 && !sqlite3_strglob("*glob", pSet->name)){ | |
| 1279 | 1289 | @<b>%s(pSet->name)</b> (v)<br /> |
| 1280 | 1290 | textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name, |
| 1281 | 1291 | pSet->var!=0 ? pSet->var : pSet->name, |
| 1282 | 1292 | (char*)pSet->def, hasVersionableValue); |
| 1283 | 1293 | @<br /> |
| 1284 | 1294 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -1269,15 +1269,25 @@ | |
| 1269 | entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name, |
| 1270 | pSet->var!=0 ? pSet->var : pSet->name, |
| 1271 | (char*)pSet->def, 0); |
| 1272 | @ <br /> |
| 1273 | } |
| 1274 | } |
| 1275 | @ </td><td style="width:50px;"></td><td valign="top"> |
| 1276 | for(pSet=ctrlSettings; pSet->name!=0; pSet++){ |
| 1277 | int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0; |
| 1278 | if( pSet->width!=0 && pSet->versionable){ |
| 1279 | @<b>%s(pSet->name)</b> (v)<br /> |
| 1280 | textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name, |
| 1281 | pSet->var!=0 ? pSet->var : pSet->name, |
| 1282 | (char*)pSet->def, hasVersionableValue); |
| 1283 | @<br /> |
| 1284 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -1269,15 +1269,25 @@ | |
| 1269 | entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name, |
| 1270 | pSet->var!=0 ? pSet->var : pSet->name, |
| 1271 | (char*)pSet->def, 0); |
| 1272 | @ <br /> |
| 1273 | } |
| 1274 | } |
| 1275 | for(pSet=ctrlSettings; pSet->name!=0; pSet++){ |
| 1276 | if( pSet->width!=0 && pSet->versionable && sqlite3_strglob("*glob", pSet->name) ){ |
| 1277 | int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0; |
| 1278 | @<b>%s(pSet->name)</b> (v)<br /> |
| 1279 | textarea_attribute("", /*rows*/ 3, /*cols*/ 35, pSet->name, |
| 1280 | pSet->var!=0 ? pSet->var : pSet->name, |
| 1281 | (char*)pSet->def, hasVersionableValue); |
| 1282 | @ <br /> |
| 1283 | } |
| 1284 | } |
| 1285 | @ </td><td style="width:50px;"></td><td valign="top"> |
| 1286 | for(pSet=ctrlSettings; pSet->name!=0; pSet++){ |
| 1287 | int hasVersionableValue = db_get_do_versionable(pSet->name, NULL)!=0; |
| 1288 | if( pSet->width!=0 && !sqlite3_strglob("*glob", pSet->name)){ |
| 1289 | @<b>%s(pSet->name)</b> (v)<br /> |
| 1290 | textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name, |
| 1291 | pSet->var!=0 ? pSet->var : pSet->name, |
| 1292 | (char*)pSet->def, hasVersionableValue); |
| 1293 | @<br /> |
| 1294 |