Fossil SCM

Rework style.c to use new line continuation feature of translate.c

andygoth 2016-11-05 06:38 trunk
Commit 9c211011190bde9aeaac04040d41ac8c637c2e49
Parent e193e21be335c5e…
1 file changed +34 -41
~ src/style.c
M src/style.c
+34 -41
--- src/style.c
+++ src/style.c
@@ -545,72 +545,65 @@
545545
 zDisabled = "";
546546
 cgi_tag_query_parameter(zQPN);
547547
 }
548548
 switch( aSubmenuCtrl[i].eType ){
549549
 case FF_ENTRY:
550
- cgi_printf(
551
- "<span class='submenuctrl'>"
552
- "&nbsp;%h<input type='text' name='%s' value='%h'%s",
553
- aSubmenuCtrl[i].zLabel, zQPN, PD(zQPN, ""), zDisabled
554
- );
550
+ @ <span class='submenuctrl'>\
551
+ @ &nbsp;%h(aSubmenuCtrl[i].zLabel)\
552
+ @ <input type='text' name='%s(zQPN)' value='%h(PD(zQPN, ""))' \
555553
 if( aSubmenuCtrl[i].iSize<0 ){
556
- cgi_printf(" size='%d'", -aSubmenuCtrl[i].iSize);
554
+ @ size='%d(-aSubmenuCtrl[i].iSize)' \
557555
 }else if( aSubmenuCtrl[i].iSize>0 ){
558
- cgi_printf(
559
- " size='%d' maxlength='%d'",
560
- aSubmenuCtrl[i].iSize, aSubmenuCtrl[i].iSize
561
- );
556
+ @ size='%d(aSubmenuCtrl[i].iSize)' \
557
+ @ maxlength='%d(aSubmenuCtrl[i].iSize)' \
562558
 }
563
- @ onchange='gebi("f01").submit();'></span>
559
+ @ onchange='gebi("f01").submit();'%s(zDisabled)></span>
564560
 break;
565561
 case FF_MULTI: {
566562
 int j;
567563
 const char *zVal = P(zQPN);
568564
 if( aSubmenuCtrl[i].zLabel ){
569
- cgi_printf("&nbsp;%h", aSubmenuCtrl[i].zLabel);
565
+ @ &nbsp;%h(aSubmenuCtrl[i].zLabel)\
570566
 }
571
- cgi_printf(
572
- "<select class='submenuctrl' size='1' name='%s'%s "
573
- "onchange='gebi(\"f01\").submit();'>\n",
574
- zQPN, zDisabled
575
- );
567
+ @ <select class='submenuctrl' size='1' name='%s(zQPN)' \
568
+ @ onchange='gebi("f01").submit();'%s(zDisabled)>
576569
 for(j=0; j<aSubmenuCtrl[i].iSize*2; j+=2){
577570
 const char *zQPV = aSubmenuCtrl[i].azChoice[j];
578
- cgi_printf(
579
- "<option value='%h'%s>%h</option>\n",
580
- zQPV,
581
- fossil_strcmp(zVal,zQPV)==0 ? " selected" : "",
582
- aSubmenuCtrl[i].azChoice[j+1]
583
- );
571
+ @ <option value='%h(zQPV)'\
572
+ if( fossil_strcmp(zVal, zQPV)==0 ){
573
+ @ selected\
574
+ }
575
+ @ >%h(aSubmenuCtrl[i].azChoice[j+1])</option>
584576
 }
585577
 @ </select>
586578
 break;
587579
 }
588580
 case FF_BINARY: {
589581
 int isTrue = PB(zQPN);
590
- cgi_printf(
591
- "<select class='submenuctrl' size='1' name='%s'%s "
592
- "onchange='gebi(\"f01\").submit();'>\n",
593
- zQPN, zDisabled
594
- );
595
- cgi_printf(
596
- "<option value='1'%s>%h</option>\n",
597
- isTrue ? " selected":"", aSubmenuCtrl[i].zLabel
598
- );
599
- cgi_printf(
600
- "<option value='0'%s>%h</option>\n",
601
- (!isTrue) ? " selected":"", aSubmenuCtrl[i].zFalse
602
- );
582
+ @ <select class='submenuctrl' size='1' name='%s(zQPN)' \
583
+ @ onchange='gebi("f01").submit();'%s(zDisabled)>
584
+ @ <option value='1'\
585
+ if( isTrue ){
586
+ @ selected\
587
+ }
588
+ @ >%h(aSubmenuCtrl[i].zLabel)</option>
589
+ @ <option value='0'\
590
+ if( !isTrue ){
591
+ @ selected\
592
+ }
593
+ @ >%h(aSubmenuCtrl[i].zFalse)</option>
603594
 @ </select>
604595
 break;
605596
 }
606597
 case FF_CHECKBOX:
607
- cgi_printf(
608
- "<label class='submenuctrl'><input type='checkbox' name='%s' "
609
- "value='1'%s%s onchange='gebi(\"f01\").submit();'>%s</label>\n",
610
- zQPN, PB(zQPN) ? " checked" : "", zDisabled, aSubmenuCtrl[i].zLabel
611
- );
598
+ @ <label class='submenuctrl'>\
599
+ @ <input type='checkbox' name='%s(zQPN)' value='1' \
600
+ if( PB(zQPN) ){
601
+ @ checked \
602
+ }
603
+ @ onchange='gebi("f01").submit();'%s(zDisabled)>\
604
+ @ %h(aSubmenuCtrl[i].zLabel)</label>
612605
 break;
613606
 }
614607
 }
615608
 @ </div>
616609
 if( nSubmenuCtrl ){
617610
--- src/style.c
+++ src/style.c
@@ -545,72 +545,65 @@
545 zDisabled = "";
546 cgi_tag_query_parameter(zQPN);
547 }
548 switch( aSubmenuCtrl[i].eType ){
549 case FF_ENTRY:
550 cgi_printf(
551 "<span class='submenuctrl'>"
552 "&nbsp;%h<input type='text' name='%s' value='%h'%s",
553 aSubmenuCtrl[i].zLabel, zQPN, PD(zQPN, ""), zDisabled
554 );
555 if( aSubmenuCtrl[i].iSize<0 ){
556 cgi_printf(" size='%d'", -aSubmenuCtrl[i].iSize);
557 }else if( aSubmenuCtrl[i].iSize>0 ){
558 cgi_printf(
559 " size='%d' maxlength='%d'",
560 aSubmenuCtrl[i].iSize, aSubmenuCtrl[i].iSize
561 );
562 }
563 @ onchange='gebi("f01").submit();'></span>
564 break;
565 case FF_MULTI: {
566 int j;
567 const char *zVal = P(zQPN);
568 if( aSubmenuCtrl[i].zLabel ){
569 cgi_printf("&nbsp;%h", aSubmenuCtrl[i].zLabel);
570 }
571 cgi_printf(
572 "<select class='submenuctrl' size='1' name='%s'%s "
573 "onchange='gebi(\"f01\").submit();'>\n",
574 zQPN, zDisabled
575 );
576 for(j=0; j<aSubmenuCtrl[i].iSize*2; j+=2){
577 const char *zQPV = aSubmenuCtrl[i].azChoice[j];
578 cgi_printf(
579 "<option value='%h'%s>%h</option>\n",
580 zQPV,
581 fossil_strcmp(zVal,zQPV)==0 ? " selected" : "",
582 aSubmenuCtrl[i].azChoice[j+1]
583 );
584 }
585 @ </select>
586 break;
587 }
588 case FF_BINARY: {
589 int isTrue = PB(zQPN);
590 cgi_printf(
591 "<select class='submenuctrl' size='1' name='%s'%s "
592 "onchange='gebi(\"f01\").submit();'>\n",
593 zQPN, zDisabled
594 );
595 cgi_printf(
596 "<option value='1'%s>%h</option>\n",
597 isTrue ? " selected":"", aSubmenuCtrl[i].zLabel
598 );
599 cgi_printf(
600 "<option value='0'%s>%h</option>\n",
601 (!isTrue) ? " selected":"", aSubmenuCtrl[i].zFalse
602 );
603 @ </select>
604 break;
605 }
606 case FF_CHECKBOX:
607 cgi_printf(
608 "<label class='submenuctrl'><input type='checkbox' name='%s' "
609 "value='1'%s%s onchange='gebi(\"f01\").submit();'>%s</label>\n",
610 zQPN, PB(zQPN) ? " checked" : "", zDisabled, aSubmenuCtrl[i].zLabel
611 );
 
 
612 break;
613 }
614 }
615 @ </div>
616 if( nSubmenuCtrl ){
617
--- src/style.c
+++ src/style.c
@@ -545,72 +545,65 @@
545 zDisabled = "";
546 cgi_tag_query_parameter(zQPN);
547 }
548 switch( aSubmenuCtrl[i].eType ){
549 case FF_ENTRY:
550 @ <span class='submenuctrl'>\
551 @ &nbsp;%h(aSubmenuCtrl[i].zLabel)\
552 @ <input type='text' name='%s(zQPN)' value='%h(PD(zQPN, ""))' \
 
 
553 if( aSubmenuCtrl[i].iSize<0 ){
554 @ size='%d(-aSubmenuCtrl[i].iSize)' \
555 }else if( aSubmenuCtrl[i].iSize>0 ){
556 @ size='%d(aSubmenuCtrl[i].iSize)' \
557 @ maxlength='%d(aSubmenuCtrl[i].iSize)' \
 
 
558 }
559 @ onchange='gebi("f01").submit();'%s(zDisabled)></span>
560 break;
561 case FF_MULTI: {
562 int j;
563 const char *zVal = P(zQPN);
564 if( aSubmenuCtrl[i].zLabel ){
565 @ &nbsp;%h(aSubmenuCtrl[i].zLabel)\
566 }
567 @ <select class='submenuctrl' size='1' name='%s(zQPN)' \
568 @ onchange='gebi("f01").submit();'%s(zDisabled)>
 
 
 
569 for(j=0; j<aSubmenuCtrl[i].iSize*2; j+=2){
570 const char *zQPV = aSubmenuCtrl[i].azChoice[j];
571 @ <option value='%h(zQPV)'\
572 if( fossil_strcmp(zVal, zQPV)==0 ){
573 @ selected\
574 }
575 @ >%h(aSubmenuCtrl[i].azChoice[j+1])</option>
 
576 }
577 @ </select>
578 break;
579 }
580 case FF_BINARY: {
581 int isTrue = PB(zQPN);
582 @ <select class='submenuctrl' size='1' name='%s(zQPN)' \
583 @ onchange='gebi("f01").submit();'%s(zDisabled)>
584 @ <option value='1'\
585 if( isTrue ){
586 @ selected\
587 }
588 @ >%h(aSubmenuCtrl[i].zLabel)</option>
589 @ <option value='0'\
590 if( !isTrue ){
591 @ selected\
592 }
593 @ >%h(aSubmenuCtrl[i].zFalse)</option>
 
594 @ </select>
595 break;
596 }
597 case FF_CHECKBOX:
598 @ <label class='submenuctrl'>\
599 @ <input type='checkbox' name='%s(zQPN)' value='1' \
600 if( PB(zQPN) ){
601 @ checked \
602 }
603 @ onchange='gebi("f01").submit();'%s(zDisabled)>\
604 @ %h(aSubmenuCtrl[i].zLabel)</label>
605 break;
606 }
607 }
608 @ </div>
609 if( nSubmenuCtrl ){
610

Keyboard Shortcuts

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