Fossil SCM

Fix for [2cfd96b2ba]: Improve ignore-glob. This changes the UI regarding versionable settings with a string value to use a multi-line input field. Already looks quite good, but feedback on layout perfectioning appreciated!

jan.nijtmans 2013-03-31 18:56 trunk merge
Commit bc047d1e3d3946fa6006c539828f31ed6631c188
Parent f9d4e0853b66502…
2 files changed +13 -7 +13 -7
~ src/setup.c ~ src/setup.c
M src/setup.c
+13 -7
--- src/setup.c
+++ src/setup.c
@@ -1197,19 +1197,25 @@
11971197
 }
11981198
 }
11991199
 }
12001200
 @ </td><td style="width:50px;"></td><td valign="top">
12011201
 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1202
- if( pSet->width!=0 ){
1203
- entry_attribute(pSet->name, /*pSet->width*/ 40, pSet->name,
1202
+ if( pSet->width!=0 && !pSet->versionable){
1203
+ entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name,
1204
+ pSet->var!=0 ? pSet->var : pSet->name,
1205
+ (char*)pSet->def);
1206
+ @ <br />
1207
+ }
1208
+ }
1209
+ @ </td><td style="width:50px;"></td><td valign="top">
1210
+ for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1211
+ if( pSet->width!=0 && pSet->versionable){
1212
+ @<b>%s(pSet->name)</b> (v)<br />
1213
+ textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name,
12041214
 pSet->var!=0 ? pSet->var : pSet->name,
12051215
 (char*)pSet->def);
1206
- if( pSet->versionable ){
1207
- @ (v)<br />
1208
- } else {
1209
- @ <br />
1210
- }
1216
+ @<br />
12111217
 }
12121218
 }
12131219
 @ </td></tr></table>
12141220
 @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
12151221
 @ </div></form>
12161222
--- src/setup.c
+++ src/setup.c
@@ -1197,19 +1197,25 @@
1197 }
1198 }
1199 }
1200 @ </td><td style="width:50px;"></td><td valign="top">
1201 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1202 if( pSet->width!=0 ){
1203 entry_attribute(pSet->name, /*pSet->width*/ 40, pSet->name,
 
 
 
 
 
 
 
 
 
 
1204 pSet->var!=0 ? pSet->var : pSet->name,
1205 (char*)pSet->def);
1206 if( pSet->versionable ){
1207 @ (v)<br />
1208 } else {
1209 @ <br />
1210 }
1211 }
1212 }
1213 @ </td></tr></table>
1214 @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1215 @ </div></form>
1216
--- src/setup.c
+++ src/setup.c
@@ -1197,19 +1197,25 @@
1197 }
1198 }
1199 }
1200 @ </td><td style="width:50px;"></td><td valign="top">
1201 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1202 if( pSet->width!=0 && !pSet->versionable){
1203 entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name,
1204 pSet->var!=0 ? pSet->var : pSet->name,
1205 (char*)pSet->def);
1206 @ <br />
1207 }
1208 }
1209 @ </td><td style="width:50px;"></td><td valign="top">
1210 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1211 if( pSet->width!=0 && pSet->versionable){
1212 @<b>%s(pSet->name)</b> (v)<br />
1213 textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name,
1214 pSet->var!=0 ? pSet->var : pSet->name,
1215 (char*)pSet->def);
1216 @<br />
 
 
 
 
1217 }
1218 }
1219 @ </td></tr></table>
1220 @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1221 @ </div></form>
1222
M src/setup.c
+13 -7
--- src/setup.c
+++ src/setup.c
@@ -1197,19 +1197,25 @@
11971197
 }
11981198
 }
11991199
 }
12001200
 @ </td><td style="width:50px;"></td><td valign="top">
12011201
 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1202
- if( pSet->width!=0 ){
1203
- entry_attribute(pSet->name, /*pSet->width*/ 40, pSet->name,
1202
+ if( pSet->width!=0 && !pSet->versionable){
1203
+ entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name,
1204
+ pSet->var!=0 ? pSet->var : pSet->name,
1205
+ (char*)pSet->def);
1206
+ @ <br />
1207
+ }
1208
+ }
1209
+ @ </td><td style="width:50px;"></td><td valign="top">
1210
+ for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1211
+ if( pSet->width!=0 && pSet->versionable){
1212
+ @<b>%s(pSet->name)</b> (v)<br />
1213
+ textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name,
12041214
 pSet->var!=0 ? pSet->var : pSet->name,
12051215
 (char*)pSet->def);
1206
- if( pSet->versionable ){
1207
- @ (v)<br />
1208
- } else {
1209
- @ <br />
1210
- }
1216
+ @<br />
12111217
 }
12121218
 }
12131219
 @ </td></tr></table>
12141220
 @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
12151221
 @ </div></form>
12161222
--- src/setup.c
+++ src/setup.c
@@ -1197,19 +1197,25 @@
1197 }
1198 }
1199 }
1200 @ </td><td style="width:50px;"></td><td valign="top">
1201 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1202 if( pSet->width!=0 ){
1203 entry_attribute(pSet->name, /*pSet->width*/ 40, pSet->name,
 
 
 
 
 
 
 
 
 
 
1204 pSet->var!=0 ? pSet->var : pSet->name,
1205 (char*)pSet->def);
1206 if( pSet->versionable ){
1207 @ (v)<br />
1208 } else {
1209 @ <br />
1210 }
1211 }
1212 }
1213 @ </td></tr></table>
1214 @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1215 @ </div></form>
1216
--- src/setup.c
+++ src/setup.c
@@ -1197,19 +1197,25 @@
1197 }
1198 }
1199 }
1200 @ </td><td style="width:50px;"></td><td valign="top">
1201 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1202 if( pSet->width!=0 && !pSet->versionable){
1203 entry_attribute(pSet->name, /*pSet->width*/ 25, pSet->name,
1204 pSet->var!=0 ? pSet->var : pSet->name,
1205 (char*)pSet->def);
1206 @ <br />
1207 }
1208 }
1209 @ </td><td style="width:50px;"></td><td valign="top">
1210 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
1211 if( pSet->width!=0 && pSet->versionable){
1212 @<b>%s(pSet->name)</b> (v)<br />
1213 textarea_attribute("", /*rows*/ 3, /*cols*/ 20, pSet->name,
1214 pSet->var!=0 ? pSet->var : pSet->name,
1215 (char*)pSet->def);
1216 @<br />
 
 
 
 
1217 }
1218 }
1219 @ </td></tr></table>
1220 @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
1221 @ </div></form>
1222

Keyboard Shortcuts

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