Fossil SCM

Change the name of "Normal View" to "Modern View". Add the "View" modifier to all choices in the view mode selector, to help make it clear what the selector is for.

drh 2017-11-29 11:46 UTC sticky-timeline-style
Commit 2a8598f9879d31476d89881345bd4bb5a8f8a769b4cfffc0d434dcca395b5fc6
Parent 59980b6082f7ffe…
2 files changed +2 -2 +8 -8
~ src/style.c ~ src/timeline.c
M src/style.c
+2 -2
--- src/style.c
+++ src/style.c
@@ -831,19 +831,19 @@
831831
 },
832832
 { "span.timelineEllipsis",
833833
 "The ellipsis mark at the end of a compact comment in a timeline",
834834
 @ cursor: pointer;
835835
 },
836
- { ".timelineNormalCell, .timelineColumnarCell, .timelineDetailCell",
836
+ { ".timelineModernCell, .timelineColumnarCell, .timelineDetailCell",
837837
 "The entry details for a normal timeline",
838838
 @ vertical-align: top;
839839
 @ text-align: left;
840840
 @ padding: 0.75em;
841841
 @ border: 1px #ccc solid;
842842
 @ border-radius: 1em;
843843
 },
844
- { ".timelineNormalDetail",
844
+ { ".timelineModernDetail",
845845
 "Detail text for a normal timeline display",
846846
 @ font-size: 80%;
847847
 @ text-align: right;
848848
 @ float: right;
849849
 @ opacity: 0.75;
850850
--- src/style.c
+++ src/style.c
@@ -831,19 +831,19 @@
831 },
832 { "span.timelineEllipsis",
833 "The ellipsis mark at the end of a compact comment in a timeline",
834 @ cursor: pointer;
835 },
836 { ".timelineNormalCell, .timelineColumnarCell, .timelineDetailCell",
837 "The entry details for a normal timeline",
838 @ vertical-align: top;
839 @ text-align: left;
840 @ padding: 0.75em;
841 @ border: 1px #ccc solid;
842 @ border-radius: 1em;
843 },
844 { ".timelineNormalDetail",
845 "Detail text for a normal timeline display",
846 @ font-size: 80%;
847 @ text-align: right;
848 @ float: right;
849 @ opacity: 0.75;
850
--- src/style.c
+++ src/style.c
@@ -831,19 +831,19 @@
831 },
832 { "span.timelineEllipsis",
833 "The ellipsis mark at the end of a compact comment in a timeline",
834 @ cursor: pointer;
835 },
836 { ".timelineModernCell, .timelineColumnarCell, .timelineDetailCell",
837 "The entry details for a normal timeline",
838 @ vertical-align: top;
839 @ text-align: left;
840 @ padding: 0.75em;
841 @ border: 1px #ccc solid;
842 @ border-radius: 1em;
843 },
844 { ".timelineModernDetail",
845 "Detail text for a normal timeline display",
846 @ font-size: 80%;
847 @ text-align: right;
848 @ float: right;
849 @ opacity: 0.75;
850
M src/timeline.c
+8 -8
--- src/timeline.c
+++ src/timeline.c
@@ -105,11 +105,11 @@
105105
 #define TIMELINE_UNHIDE 0x0200 /* Unhide check-ins with "hidden" tag */
106106
 #define TIMELINE_SHOWRID 0x0400 /* Show RID values in addition to UUIDs */
107107
 #define TIMELINE_BISECT 0x0800 /* Show supplimental bisect information */
108108
 #define TIMELINE_COMPACT 0x1000 /* Use the "compact" view style */
109109
 #define TIMELINE_VERBOSE 0x2000 /* Use the "detailed" view style */
110
-#define TIMELINE_NORMAL 0x4000 /* Use the "normal" view style */
110
+#define TIMELINE_MODERN 0x4000 /* Use the "normal" view style */
111111
 #define TIMELINE_COLUMNAR 0x8000 /* Use the "columns view style */
112112
 #endif
113113
114114
 /*
115115
 ** Hash a string and use the hash to determine a background color.
@@ -270,11 +270,11 @@
270270
 }else if( tmFlags & TIMELINE_COMPACT ){
271271
 zStyle = "Compact";
272272
 }else if( tmFlags & TIMELINE_VERBOSE ){
273273
 zStyle = "Verbose";
274274
 }else{
275
- zStyle = "Normal";
275
+ zStyle = "Modern";
276276
 }
277277
 zDateFmt = P("datefmt");
278278
 if( zDateFmt ) dateFormat = atoi(zDateFmt);
279279
 if( tmFlags & TIMELINE_GRAPH ){
280280
 pGraph = graph_init();
@@ -1586,11 +1586,11 @@
15861586
 ** rel Show related check-ins as well as those matching t=TAG
15871587
 ** mionly Limit rel to show ancestors but not descendants
15881588
 ** ms=MATCHSTYLE Set tag match style to EXACT, GLOB, LIKE, REGEXP
15891589
 ** u=USER Only show items associated with USER
15901590
 ** y=TYPE 'ci', 'w', 't', 'e', or 'all'.
1591
-** ss=VIEWSTYLE c: "compact" v: "verbose" n: "normal" j: "columnar"
1591
+** ss=VIEWSTYLE c: "Compact" v: "Verbose" m: "Modern" j: "Columnar"
15921592
 ** ng No Graph.
15931593
 ** nd Do not highlight the focus check-in
15941594
 ** v Show details of files changed
15951595
 ** f=CHECKIN Show family (immediate parents and children) of CHECKIN
15961596
 ** from=CHECKIN Path from...
@@ -1667,14 +1667,14 @@
16671667
 char *zNewerButton = 0; /* URL for Newer button at the top */
16681668
 int selectedRid = -9999999; /* Show a highlight on this RID */
16691669
 int disableY = 0; /* Disable type selector on submenu */
16701670
 char cViewStyle; /* Overall style of the page */
16711671
 static const char *azViewStyles[] = {
1672
- "n", "Normal",
1673
- "c", "Compact",
1674
- "v", "Verbose",
1675
- "j", "Columnar",
1672
+ "m", "Modern View",
1673
+ "c", "Compact View",
1674
+ "v", "Verbose View",
1675
+ "j", "Columnar View",
16761676
 };
16771677
16781678
 /* Set number of rows to display */
16791679
 cookie_parse(DISPLAY_SETTINGS_COOKIE);
16801680
 cookie_read_parameter("n","n");
@@ -1775,11 +1775,11 @@
17751775
 }
17761776
 switch( cViewStyle ){
17771777
 case 'c': tmFlags |= TIMELINE_COMPACT; break;
17781778
 case 'v': tmFlags |= TIMELINE_VERBOSE; break;
17791779
 case 'j': tmFlags |= TIMELINE_COLUMNAR; break;
1780
- default: tmFlags |= TIMELINE_NORMAL; break;
1780
+ default: tmFlags |= TIMELINE_MODERN; break;
17811781
 }
17821782
 if( zType[0]=='a' ){
17831783
 tmFlags |= TIMELINE_BRIEF | TIMELINE_GRAPH;
17841784
 }else{
17851785
 tmFlags |= TIMELINE_GRAPH;
17861786
--- src/timeline.c
+++ src/timeline.c
@@ -105,11 +105,11 @@
105 #define TIMELINE_UNHIDE 0x0200 /* Unhide check-ins with "hidden" tag */
106 #define TIMELINE_SHOWRID 0x0400 /* Show RID values in addition to UUIDs */
107 #define TIMELINE_BISECT 0x0800 /* Show supplimental bisect information */
108 #define TIMELINE_COMPACT 0x1000 /* Use the "compact" view style */
109 #define TIMELINE_VERBOSE 0x2000 /* Use the "detailed" view style */
110 #define TIMELINE_NORMAL 0x4000 /* Use the "normal" view style */
111 #define TIMELINE_COLUMNAR 0x8000 /* Use the "columns view style */
112 #endif
113
114 /*
115 ** Hash a string and use the hash to determine a background color.
@@ -270,11 +270,11 @@
270 }else if( tmFlags & TIMELINE_COMPACT ){
271 zStyle = "Compact";
272 }else if( tmFlags & TIMELINE_VERBOSE ){
273 zStyle = "Verbose";
274 }else{
275 zStyle = "Normal";
276 }
277 zDateFmt = P("datefmt");
278 if( zDateFmt ) dateFormat = atoi(zDateFmt);
279 if( tmFlags & TIMELINE_GRAPH ){
280 pGraph = graph_init();
@@ -1586,11 +1586,11 @@
1586 ** rel Show related check-ins as well as those matching t=TAG
1587 ** mionly Limit rel to show ancestors but not descendants
1588 ** ms=MATCHSTYLE Set tag match style to EXACT, GLOB, LIKE, REGEXP
1589 ** u=USER Only show items associated with USER
1590 ** y=TYPE 'ci', 'w', 't', 'e', or 'all'.
1591 ** ss=VIEWSTYLE c: "compact" v: "verbose" n: "normal" j: "columnar"
1592 ** ng No Graph.
1593 ** nd Do not highlight the focus check-in
1594 ** v Show details of files changed
1595 ** f=CHECKIN Show family (immediate parents and children) of CHECKIN
1596 ** from=CHECKIN Path from...
@@ -1667,14 +1667,14 @@
1667 char *zNewerButton = 0; /* URL for Newer button at the top */
1668 int selectedRid = -9999999; /* Show a highlight on this RID */
1669 int disableY = 0; /* Disable type selector on submenu */
1670 char cViewStyle; /* Overall style of the page */
1671 static const char *azViewStyles[] = {
1672 "n", "Normal",
1673 "c", "Compact",
1674 "v", "Verbose",
1675 "j", "Columnar",
1676 };
1677
1678 /* Set number of rows to display */
1679 cookie_parse(DISPLAY_SETTINGS_COOKIE);
1680 cookie_read_parameter("n","n");
@@ -1775,11 +1775,11 @@
1775 }
1776 switch( cViewStyle ){
1777 case 'c': tmFlags |= TIMELINE_COMPACT; break;
1778 case 'v': tmFlags |= TIMELINE_VERBOSE; break;
1779 case 'j': tmFlags |= TIMELINE_COLUMNAR; break;
1780 default: tmFlags |= TIMELINE_NORMAL; break;
1781 }
1782 if( zType[0]=='a' ){
1783 tmFlags |= TIMELINE_BRIEF | TIMELINE_GRAPH;
1784 }else{
1785 tmFlags |= TIMELINE_GRAPH;
1786
--- src/timeline.c
+++ src/timeline.c
@@ -105,11 +105,11 @@
105 #define TIMELINE_UNHIDE 0x0200 /* Unhide check-ins with "hidden" tag */
106 #define TIMELINE_SHOWRID 0x0400 /* Show RID values in addition to UUIDs */
107 #define TIMELINE_BISECT 0x0800 /* Show supplimental bisect information */
108 #define TIMELINE_COMPACT 0x1000 /* Use the "compact" view style */
109 #define TIMELINE_VERBOSE 0x2000 /* Use the "detailed" view style */
110 #define TIMELINE_MODERN 0x4000 /* Use the "normal" view style */
111 #define TIMELINE_COLUMNAR 0x8000 /* Use the "columns view style */
112 #endif
113
114 /*
115 ** Hash a string and use the hash to determine a background color.
@@ -270,11 +270,11 @@
270 }else if( tmFlags & TIMELINE_COMPACT ){
271 zStyle = "Compact";
272 }else if( tmFlags & TIMELINE_VERBOSE ){
273 zStyle = "Verbose";
274 }else{
275 zStyle = "Modern";
276 }
277 zDateFmt = P("datefmt");
278 if( zDateFmt ) dateFormat = atoi(zDateFmt);
279 if( tmFlags & TIMELINE_GRAPH ){
280 pGraph = graph_init();
@@ -1586,11 +1586,11 @@
1586 ** rel Show related check-ins as well as those matching t=TAG
1587 ** mionly Limit rel to show ancestors but not descendants
1588 ** ms=MATCHSTYLE Set tag match style to EXACT, GLOB, LIKE, REGEXP
1589 ** u=USER Only show items associated with USER
1590 ** y=TYPE 'ci', 'w', 't', 'e', or 'all'.
1591 ** ss=VIEWSTYLE c: "Compact" v: "Verbose" m: "Modern" j: "Columnar"
1592 ** ng No Graph.
1593 ** nd Do not highlight the focus check-in
1594 ** v Show details of files changed
1595 ** f=CHECKIN Show family (immediate parents and children) of CHECKIN
1596 ** from=CHECKIN Path from...
@@ -1667,14 +1667,14 @@
1667 char *zNewerButton = 0; /* URL for Newer button at the top */
1668 int selectedRid = -9999999; /* Show a highlight on this RID */
1669 int disableY = 0; /* Disable type selector on submenu */
1670 char cViewStyle; /* Overall style of the page */
1671 static const char *azViewStyles[] = {
1672 "m", "Modern View",
1673 "c", "Compact View",
1674 "v", "Verbose View",
1675 "j", "Columnar View",
1676 };
1677
1678 /* Set number of rows to display */
1679 cookie_parse(DISPLAY_SETTINGS_COOKIE);
1680 cookie_read_parameter("n","n");
@@ -1775,11 +1775,11 @@
1775 }
1776 switch( cViewStyle ){
1777 case 'c': tmFlags |= TIMELINE_COMPACT; break;
1778 case 'v': tmFlags |= TIMELINE_VERBOSE; break;
1779 case 'j': tmFlags |= TIMELINE_COLUMNAR; break;
1780 default: tmFlags |= TIMELINE_MODERN; break;
1781 }
1782 if( zType[0]=='a' ){
1783 tmFlags |= TIMELINE_BRIEF | TIMELINE_GRAPH;
1784 }else{
1785 tmFlags |= TIMELINE_GRAPH;
1786

Keyboard Shortcuts

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