Skip to content

Commit 64ca82e

Browse files
d13d13
committed
Updates Views settings
- Restores the Commit Graph date-style hints - Merges the split Views settings descriptors into one array
1 parent d764b5a commit 64ca82e

3 files changed

Lines changed: 270 additions & 254 deletions

File tree

‎src/webviews/apps/settings/categories/index.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@ import { annotationsCategories } from './annotations.js';
44
import { editorCategories } from './editor.js';
55
import { generalCategories } from './general.js';
66
import { integrationsCategories } from './integrations.js';
7-
import { views1Categories } from './views1.js';
8-
import { views2Categories } from './views2.js';
7+
import { viewsCategories } from './views.js';
98

109
/** All categories, in nav order (group order: Annotations, In-editor, Views, Integrations, Editing, General). */
1110
export const settingsCategories: readonly SettingsCategory[] = [
1211
...annotationsCategories,
1312
...editorCategories,
14-
...views1Categories,
15-
...views2Categories,
13+
...viewsCategories,
1614
...integrationsCategories,
1715
...generalCategories,
1816
];

src/webviews/apps/settings/categories/views1.ts renamed to src/webviews/apps/settings/categories/views.ts

Lines changed: 268 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-template-curly-in-string -- descriptor data contains literal GitLens format tokens */
22
import type { SettingsCategory } from '../model.js';
33

4-
export const views1Categories: SettingsCategory[] = [
4+
export const viewsCategories: SettingsCategory[] = [
55
{
66
id: 'commit-graph',
77
settingsSearch: 'gitlens.graph',
@@ -104,6 +104,28 @@ export const views1Categories: SettingsCategory[] = [
104104
valueOn: 'relative',
105105
valueOff: 'absolute',
106106
},
107+
// Mirrors the effective date style — explicit `graph.dateStyle`, or the
108+
// inherited `defaultDateStyle` when it's left unset (null)
109+
{
110+
kind: 'info',
111+
text: 'Shows some dates relatively, e.g. 1 day ago',
112+
visibleWhen: 'graph.dateStyle =relative',
113+
},
114+
{
115+
kind: 'info',
116+
text: 'Shows some dates relatively, e.g. 1 day ago',
117+
visibleWhen: 'graph.dateStyle =null & defaultDateStyle =relative',
118+
},
119+
{
120+
kind: 'info',
121+
text: 'Shows dates absolutely, using the date format below',
122+
visibleWhen: 'graph.dateStyle =absolute',
123+
},
124+
{
125+
kind: 'info',
126+
text: 'Shows dates absolutely, using the date format below',
127+
visibleWhen: 'graph.dateStyle =null & defaultDateStyle =absolute',
128+
},
107129
{
108130
kind: 'text',
109131
key: 'graph.dateFormat',
@@ -692,4 +714,249 @@ export const views1Categories: SettingsCategory[] = [
692714
},
693715
],
694716
},
717+
{
718+
id: 'commit-details-view',
719+
settingsSearch: 'gitlens.views.commitDetails or gitlens.views',
720+
name: 'Inspect view',
721+
group: 'Views',
722+
icon: 'gl-commit-view',
723+
hint: 'Adds an [Inspect view](command:gitlens.showCommitDetailsView) to see rich details for a commit',
724+
learnMoreUrl: 'https://help.gitkraken.com/gitlens/gitlens-features/#commit-details-view',
725+
controls: [
726+
{
727+
kind: 'check',
728+
key: 'views.commitDetails.autolinks.enabled',
729+
label: 'Show autolinks in commit messages',
730+
},
731+
{
732+
kind: 'check',
733+
key: 'views.commitDetails.autolinks.enhanced',
734+
label: 'Enhance autolinks with remote details',
735+
hint: 'Requires a connection to a supported remote service (e.g. GitHub)',
736+
enabledWhen: 'views.commitDetails.autolinks.enabled',
737+
indent: true,
738+
},
739+
{
740+
kind: 'check',
741+
key: 'views.commitDetails.pullRequests.enabled',
742+
label: 'Show the Pull Request (if any) that introduced the commit',
743+
hint: 'Requires a connection to a supported remote service (e.g. GitHub)',
744+
},
745+
{
746+
kind: 'select',
747+
key: 'views.commitDetails.files.layout',
748+
label: 'Layout files',
749+
hint: 'Chooses the best layout based on the number of files at each nesting level',
750+
options: [
751+
{ value: 'auto', label: 'automatically' },
752+
{ value: 'list', label: 'as a list' },
753+
{ value: 'tree', label: 'as a tree' },
754+
],
755+
},
756+
{
757+
kind: 'check',
758+
key: 'views.commitDetails.files.compact',
759+
label: 'Use compact file layout',
760+
hint: 'Compacts (flattens) unnecessary nesting when using a tree layouts',
761+
},
762+
{
763+
kind: 'check',
764+
key: 'views.commitDetails.avatars',
765+
label: 'Use author avatars',
766+
},
767+
],
768+
},
769+
{
770+
id: 'contributors-view',
771+
settingsSearch: 'gitlens.views.contributors or gitlens.views',
772+
name: 'Contributors view',
773+
group: 'Views',
774+
icon: 'gl-contributors-view',
775+
hint: 'Adds a [Contributors view](command:gitlens.showContributorsView), hidden by default, to visualize, navigate, and explore contributors',
776+
learnMoreUrl: 'https://help.gitkraken.com/gitlens/side-bar/#contributors-view',
777+
controls: [
778+
{
779+
kind: 'check',
780+
key: 'views.contributors.showAllBranches',
781+
label: 'Show commits from all branches',
782+
},
783+
{
784+
kind: 'check',
785+
key: 'views.contributors.pullRequests.enabled',
786+
label: 'Show associated pull requests',
787+
hint: 'Requires a connection to a supported remote service (e.g. GitHub)',
788+
},
789+
{
790+
kind: 'check',
791+
key: 'views.contributors.pullRequests.showForCommits',
792+
label: 'Show the pull request that introduced each commit',
793+
enabledWhen: 'views.contributors.pullRequests.enabled',
794+
indent: true,
795+
},
796+
{
797+
kind: 'select',
798+
key: 'views.contributors.files.layout',
799+
label: 'Layout files',
800+
hint: 'Chooses the best layout based on the number of files at each nesting level',
801+
options: [
802+
{ value: 'auto', label: 'automatically' },
803+
{ value: 'list', label: 'as a list' },
804+
{ value: 'tree', label: 'as a tree' },
805+
],
806+
},
807+
{
808+
kind: 'select',
809+
key: 'views.contributors.files.icon',
810+
label: 'File icons',
811+
options: [
812+
{ value: 'type', label: 'show file type (default)' },
813+
{ value: 'status', label: 'show file status' },
814+
],
815+
},
816+
{
817+
kind: 'check',
818+
key: 'views.contributors.files.compact',
819+
label: 'Use compact file layout',
820+
hint: 'Compacts (flattens) unnecessary nesting when using a tree layouts',
821+
},
822+
{
823+
kind: 'check',
824+
key: 'views.contributors.avatars',
825+
label: 'Use author avatars',
826+
},
827+
],
828+
},
829+
{
830+
id: 'file-history-view',
831+
settingsSearch: 'gitlens.views.fileHistory or gitlens.views',
832+
name: 'File History view',
833+
group: 'Views',
834+
icon: 'gl-history-view',
835+
hint: 'Adds a [File History view](command:gitlens.showFileHistoryView) to visualize, navigate, and explore the revision history of the current file, a specified file or folder, or just the selected lines of the current file',
836+
learnMoreUrl: 'https://help.gitkraken.com/gitlens/side-bar/#file-history-view',
837+
controls: [
838+
{
839+
kind: 'check',
840+
key: 'views.fileHistory.avatars',
841+
label: 'Use author avatars',
842+
},
843+
{
844+
kind: 'info',
845+
text: 'Applies only when showing folder history:',
846+
},
847+
{
848+
kind: 'check',
849+
key: 'views.fileHistory.pullRequests.enabled',
850+
label: 'Show associated pull requests',
851+
hint: 'Requires a connection to a supported remote service (e.g. GitHub)',
852+
indent: true,
853+
},
854+
{
855+
kind: 'check',
856+
key: 'views.fileHistory.pullRequests.showForCommits',
857+
label: 'Show the pull request that introduced each commit',
858+
enabledWhen: 'views.fileHistory.pullRequests.enabled',
859+
indent: true,
860+
},
861+
{
862+
kind: 'select',
863+
key: 'views.fileHistory.files.layout',
864+
label: 'Layout files',
865+
hint: 'Chooses the best layout based on the number of files at each nesting level',
866+
options: [
867+
{ value: 'auto', label: 'automatically' },
868+
{ value: 'list', label: 'as a list' },
869+
{ value: 'tree', label: 'as a tree' },
870+
],
871+
indent: true,
872+
},
873+
{
874+
kind: 'select',
875+
key: 'views.fileHistory.files.icon',
876+
label: 'File icons',
877+
options: [
878+
{ value: 'type', label: 'show file type (default)' },
879+
{ value: 'status', label: 'show file status' },
880+
],
881+
indent: true,
882+
},
883+
{
884+
kind: 'check',
885+
key: 'views.fileHistory.files.compact',
886+
label: 'Use compact file layout',
887+
hint: 'Compacts (flattens) unnecessary nesting when using a tree layouts',
888+
indent: true,
889+
},
890+
],
891+
},
892+
{
893+
id: 'line-history-view',
894+
settingsSearch: 'gitlens.views.lineHistory or gitlens.views',
895+
name: 'Line History view',
896+
group: 'Views',
897+
icon: 'gl-history-view',
898+
hint: 'Adds a [Line History view](command:gitlens.showLineHistoryView), hidden by default, to visualize, navigate, and explore the revision history of the selected lines of current file',
899+
learnMoreUrl: 'https://help.gitkraken.com/gitlens/side-bar/#line-history-view',
900+
controls: [
901+
{
902+
kind: 'check',
903+
key: 'views.lineHistory.avatars',
904+
label: 'Use author avatars',
905+
},
906+
],
907+
},
908+
{
909+
id: 'search-compare-view',
910+
settingsSearch: 'gitlens.views.searchAndCompare or gitlens.views',
911+
name: 'Search & Compare view',
912+
group: 'Views',
913+
icon: 'gl-search-view',
914+
hint: 'Adds a [Search & Compare view](command:gitlens.showSearchAndCompareView) to search and explore commit histories by message, author, files, id, etc, or visualize comparisons between branches, tags, commits, and more',
915+
learnMoreUrl: 'https://help.gitkraken.com/gitlens/side-bar/#search-compare-view',
916+
controls: [
917+
{
918+
kind: 'check',
919+
key: 'views.searchAndCompare.pullRequests.enabled',
920+
label: 'Show associated pull requests',
921+
hint: 'Requires a connection to a supported remote service (e.g. GitHub)',
922+
},
923+
{
924+
kind: 'check',
925+
key: 'views.searchAndCompare.pullRequests.showForCommits',
926+
label: 'Show the pull request that introduced each commit',
927+
enabledWhen: 'views.searchAndCompare.pullRequests.enabled',
928+
indent: true,
929+
},
930+
{
931+
kind: 'select',
932+
key: 'views.searchAndCompare.files.layout',
933+
label: 'Layout files',
934+
options: [
935+
{ value: 'auto', label: 'automatically' },
936+
{ value: 'list', label: 'as a list' },
937+
{ value: 'tree', label: 'as a tree' },
938+
],
939+
},
940+
{
941+
kind: 'select',
942+
key: 'views.searchAndCompare.files.icon',
943+
label: 'File icons',
944+
options: [
945+
{ value: 'type', label: 'show file type (default)' },
946+
{ value: 'status', label: 'show file status' },
947+
],
948+
},
949+
{
950+
kind: 'check',
951+
key: 'views.searchAndCompare.files.compact',
952+
label: 'Use compact file layout',
953+
hint: 'Compacts (flattens) unnecessary nesting when using a tree layouts',
954+
},
955+
{
956+
kind: 'check',
957+
key: 'views.searchAndCompare.avatars',
958+
label: 'Use author avatars',
959+
},
960+
],
961+
},
695962
];

0 commit comments

Comments
 (0)