wlxsp
/
test1
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Removes settings.mode — always show all settings

main
Eric Amodio 5 years ago
parent
825e3d937a
commit
268f459b2c
3 changed files with 77 additions and 177 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -1
      README.md
  2. +0
    -14
      package.json
  3. +77
    -162
      src/webviews/apps/settings/index.html

+ 0
- 1
README.md View File

@ -677,7 +677,6 @@ GitLens is highly customizable and provides many configuration settings to allow
| `gitlens.liveshare.allowGuestAccess` | Specifies whether to allow guest access to GitLens features when using Visual Studio Live Share |
| `gitlens.menus` | Specifies which commands will be added to which menus |
| `gitlens.outputLevel` | Specifies how much (if any) output will be sent to the GitLens output channel |
| `gitlens.settings.mode` | Specifies the display mode of the interactive settings editor<br /><br />`simple` - only displays common settings<br />`advanced` - displays all settings |
| `gitlens.showWhatsNewAfterUpgrades` | Specifies whether to show What's New after upgrading to new feature releases |
### Current Line Blame Settings [#](#current-line-blame-settings- 'Current Line Blame Settings')

+ 0
- 14
package.json View File

@ -1175,20 +1175,6 @@
"markdownDescription": "Specifies user-defined remote (code-hosting) services or custom domains for built-in remote services",
"scope": "resource"
},
"gitlens.settings.mode": {
"type": "string",
"default": "simple",
"enum": [
"simple",
"advanced"
],
"enumDescriptions": [
"Only displays common settings",
"Displays all settings"
],
"markdownDescription": "Specifies the display mode of the interactive settings editor",
"scope": "window"
},
"gitlens.showWhatsNewAfterUpgrades": {
"type": "boolean",
"default": true,

+ 77
- 162
src/webviews/apps/settings/index.html View File

@ -38,15 +38,9 @@
</div>
<div class="page-header__toolbar">
<div class="settings-scope hidden">
<label for="scopes">Save to</label>
<label for="scopes">Save Settings to</label>
<select id="scopes" name="scope"> </select>
</div>
<div class="settings-mode">
<select class="setting" id="settings.mode" name="settings.mode">
<option value="simple">Simple</option>
<option value="advanced">Advanced</option>
</select>
</div>
</div>
</div>
<p class="page-header__subtitle">
@ -344,8 +338,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.editor"
>
<input
@ -360,8 +353,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.editor"
>
<input
@ -376,8 +368,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.editor"
>
<input
@ -392,8 +383,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.editor"
>
<input
@ -408,8 +398,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.editor"
>
<input
@ -424,8 +413,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.editor"
>
<input
@ -453,8 +441,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.editorTab"
>
<input
@ -469,8 +456,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.editorTab"
>
<input
@ -485,8 +471,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.editorTab"
>
<input
@ -501,8 +486,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.editorTab"
>
<input
@ -530,8 +514,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.editorGroup"
>
<input
@ -546,8 +529,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.editorGroup"
>
<input
@ -577,8 +559,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.explorer"
>
<input
@ -593,8 +574,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.explorer"
>
<input
@ -609,8 +589,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.explorer"
>
<input
@ -625,8 +604,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.explorer"
>
<input
@ -656,8 +634,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.scmGroup"
>
<input
@ -674,8 +651,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.scmGroup"
>
<input
@ -692,8 +668,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.scmGroup"
>
<input
@ -708,8 +683,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.scmGroup"
>
<input
@ -739,8 +713,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.scmItem"
>
<input
@ -755,8 +728,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.scmItem"
>
<input
@ -771,8 +743,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.scmItem"
>
<input
@ -787,8 +758,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.scmItem"
>
<input
@ -803,8 +773,7 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
data-visibility="settings.mode =advanced"
class="settings-group__setting nowrap ml-4"
data-enablement="menus.scmItem"
>
<input
@ -864,9 +833,8 @@
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="currentLine.enabled"
data-visibility="settings.mode =advanced"
>
<label for="currentLine.format">Annotation&nbsp;format</label>
<input
@ -956,9 +924,8 @@
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="currentLine.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -971,7 +938,7 @@
Include the annotation when scrolling the editor horizontally
</label>
</div>
<p class="setting__hint ml-3 hidden" data-visibility="settings.mode =advanced">
<p class="setting__hint ml-3">
When enabled the annotation can be scrolled into view when it is outside the
viewport
</p>
@ -1040,10 +1007,7 @@
</select>
</div>
<div
class="settings-group__setting nowrap hidden"
data-visibility="settings.mode =advanced"
>
<div class="settings-group__setting nowrap">
<label for="blame.format">Annotation&nbsp;format</label>
<input
class="setting"
@ -1148,9 +1112,8 @@
</p>
<div
class="settings-group__setting ml-2 hidden"
class="settings-group__setting ml-2"
data-enablement="blame.heatmap.enabled"
data-visibility="settings.mode =advanced"
disabled
>
<label for="blame.heatmap.location">Position the heatmap on the</label>
@ -1165,10 +1128,7 @@
</select>
</div>
<div
class="settings-group__setting nowrap hidden"
data-visibility="settings.mode =advanced"
>
<div class="settings-group__setting nowrap">
<input
class="setting"
id="blame.avatars"
@ -1178,10 +1138,7 @@
<label for="blame.avatars">Add author avatars in the gutter</label>
</div>
<div
class="settings-group__setting nowrap hidden"
data-visibility="settings.mode =advanced"
>
<div class="settings-group__setting nowrap">
<input
class="setting"
id="blame.compact"
@ -1190,7 +1147,7 @@
/>
<label for="blame.compact">Use compact view</label>
</div>
<p class="setting__hint hidden" data-visibility="settings.mode =advanced">
<p class="setting__hint">
Compacts (deduplicates) matching adjacent blame annotations
</p>
@ -1207,9 +1164,8 @@
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="blame.highlight.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -1223,9 +1179,8 @@
<label for="blame.highlight.locations">Add gutter highlight</label>
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="blame.highlight.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -1239,9 +1194,8 @@
<label for="blame.highlight.locations-1">Add line highlight</label>
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="blame.highlight.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -1371,9 +1325,8 @@
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="hovers.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -1420,7 +1373,7 @@
<div
class="settings-group__setting ml-4 hidden"
data-visibility="currentLine.enabled &amp; settings.mode =advanced"
data-visibility="currentLine.enabled"
data-enablement="hovers.enabled &amp; hovers.currentLine.enabled"
>
<label for="hovers.currentLine.over">Shown when over the</label>
@ -1437,7 +1390,7 @@
<div
class="settings-group__setting ml-4 hidden"
data-visibility="currentLine.enabled =false &amp; settings.mode =advanced"
data-visibility="currentLine.enabled =false"
data-enablement="hovers.enabled &amp; hovers.currentLine.enabled &amp; currentLine.enabled"
>
<label for="hovers.currentLine.over">Shown when over the</label>
@ -1453,9 +1406,8 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
class="settings-group__setting nowrap ml-4"
data-enablement="hovers.enabled &amp; hovers.currentLine.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -1468,9 +1420,8 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
class="settings-group__setting nowrap ml-4"
data-enablement="hovers.enabled &amp; hovers.currentLine.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -1618,9 +1569,8 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
class="settings-group__setting nowrap ml-4"
data-enablement="hovers.enabled &amp; hovers.annotations.enabled"
data-visibility="settings.mode =advanced"
>
<label for="hovers.annotations.over">Shown when over the</label>
<select
@ -1635,9 +1585,8 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
class="settings-group__setting nowrap ml-4"
data-enablement="hovers.enabled &amp; hovers.annotations.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -1650,9 +1599,8 @@
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
class="settings-group__setting nowrap ml-4"
data-enablement="hovers.enabled &amp; hovers.annotations.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -1760,9 +1708,8 @@
</label>
</div>
<div
class="settings-group__setting ml-4 hidden"
class="settings-group__setting ml-4"
data-enablement="codeLens.enabled &amp; codeLens.recentChange.enabled"
data-visibility="settings.mode =advanced"
>
<label for="codeLens.recentChange.command">When clicked</label>
<select
@ -1806,9 +1753,8 @@
</label>
</div>
<div
class="settings-group__setting ml-4 hidden"
class="settings-group__setting ml-4"
data-enablement="codeLens.enabled &amp; codeLens.authors.enabled"
data-visibility="settings.mode =advanced"
>
<label for="codeLens.authors.command">When clicked</label>
<select
@ -1839,16 +1785,14 @@
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="codeLens.enabled"
data-visibility="settings.mode =advanced"
>
<label class="non-interactive">Add code lens to the following scopes</label>
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
class="settings-group__setting nowrap ml-4"
data-enablement="codeLens.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -1864,9 +1808,8 @@
>
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
class="settings-group__setting nowrap ml-4"
data-enablement="codeLens.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -1883,9 +1826,8 @@
</label>
</div>
<div
class="settings-group__setting nowrap ml-4 hidden"
class="settings-group__setting nowrap ml-4"
data-enablement="codeLens.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -2071,10 +2013,7 @@
</select>
</div>
<div
class="settings-group__setting nowrap hidden"
data-visibility="settings.mode =advanced"
>
<div class="settings-group__setting nowrap">
<input
class="setting"
id="recentChanges.highlight.locations"
@ -2086,10 +2025,7 @@
<label for="recentChanges.highlight.locations">Add gutter highlight</label>
</div>
<div
class="settings-group__setting nowrap hidden"
data-visibility="settings.mode =advanced"
>
<div class="settings-group__setting nowrap">
<input
class="setting"
id="recentChanges.highlight.locations-1"
@ -2101,10 +2037,7 @@
<label for="recentChanges.highlight.locations-1">Add line highlight</label>
</div>
<div
class="settings-group__setting nowrap hidden"
data-visibility="settings.mode =advanced"
>
<div class="settings-group__setting nowrap">
<input
class="setting"
id="recentChanges.highlight.locations-2"
@ -2195,9 +2128,8 @@
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="statusBar.enabled"
data-visibility="settings.mode =advanced"
>
<label for="statusBar.format">Annotation&nbsp;format</label>
<input
@ -2300,9 +2232,8 @@
</div>
<div
class="settings-group__setting ml-2 hidden"
class="settings-group__setting ml-2"
data-enablement="statusBar.enabled"
data-visibility="settings.mode =advanced"
>
<label for="statusBar.command">When clicked</label>
<select
@ -2337,9 +2268,8 @@
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="statusBar.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -2352,7 +2282,7 @@
>Reduce flashing when updating the annotation</label
>
</div>
<p class="setting__hint ml-3 hidden" data-visibility="settings.mode =advanced">
<p class="setting__hint ml-3">
Avoids clearing the previous blame information when changing lines to reduce
status bar "flashing"
</p>
@ -2441,9 +2371,8 @@
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="views.repositories.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -2469,9 +2398,8 @@
</div>
<div
class="settings-group__setting ml-2 hidden"
class="settings-group__setting ml-2"
data-enablement="views.repositories.enabled"
data-visibility="settings.mode =advanced"
>
<label for="views.repositories.branches.layout">Layout branches</label>
<select
@ -2486,9 +2414,8 @@
</div>
<div
class="settings-group__setting ml-2 hidden"
class="settings-group__setting ml-2"
data-enablement="views.repositories.enabled"
data-visibility="settings.mode =advanced"
>
<label for="views.repositories.files.layout">Layout files</label>
<select
@ -2504,15 +2431,14 @@
</div>
<p
class="setting__hint ml-3 hidden"
data-visibility="views.repositories.files.layout =auto &amp; settings.mode =advanced"
data-visibility="views.repositories.files.layout =auto"
>
Chooses the best layout based on the number of files at each nesting level
</p>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="views.repositories.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -2523,14 +2449,13 @@
/>
<label for="views.repositories.files.compact">Use compact file layout</label>
</div>
<p class="setting__hint ml-3 hidden" data-visibility="settings.mode =advanced">
<p class="setting__hint ml-3">
Compacts (flattens) unnecessary nesting when using a tree layouts
</p>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="views.repositories.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -2543,9 +2468,8 @@
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="views.repositories.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -2560,9 +2484,8 @@
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="views.repositories.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -2663,9 +2586,8 @@
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="views.fileHistory.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -2741,9 +2663,8 @@
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="views.lineHistory.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -2816,9 +2737,8 @@
</div>
<div
class="settings-group__setting ml-2 hidden"
class="settings-group__setting ml-2"
data-enablement="views.search.enabled"
data-visibility="settings.mode =advanced"
>
<label for="views.search.files.layout">Layout files</label>
<select
@ -2834,9 +2754,8 @@
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="views.search.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -2847,14 +2766,13 @@
/>
<label for="views.search.files.compact">Use compact file layout</label>
</div>
<p class="setting__hint ml-3 hidden" data-visibility="settings.mode =advanced">
<p class="setting__hint ml-3">
Compacts (flattens) unnecessary nesting when using a tree layouts
</p>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="views.search.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -2950,9 +2868,8 @@
</div>
<div
class="settings-group__setting ml-2 hidden"
class="settings-group__setting ml-2"
data-enablement="views.compare.enabled"
data-visibility="settings.mode =advanced"
>
<label for="views.compare.files.layout">Layout files</label>
<select
@ -2968,9 +2885,8 @@
</div>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="views.compare.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"
@ -2981,14 +2897,13 @@
/>
<label for="views.compare.files.compact">Use compact file layout</label>
</div>
<p class="setting__hint ml-3 hidden" data-visibility="settings.mode =advanced">
<p class="setting__hint ml-3">
Compacts (flattens) unnecessary nesting when using a tree layouts
</p>
<div
class="settings-group__setting nowrap ml-2 hidden"
class="settings-group__setting nowrap ml-2"
data-enablement="views.compare.enabled"
data-visibility="settings.mode =advanced"
>
<input
class="setting"

Write Preview
Loading…
Cancel
Save