Updates images for the settings editor

src/ui/config.ts

@@ -1,5 +1,97 @@
 'use strict';
 
+export interface Config {
+    blame: {
+        avatars: boolean;
+        compact: boolean;
+        dateFormat: string | null;
+        format: string;
+        heatmap: {
+            enabled: boolean;
+            location: 'left' | 'right';
+        };
+        highlight: {
+            enabled: boolean;
+            locations: HighlightLocations[];
+        };
+        ignoreWhitespace: boolean;
+        separateLines: boolean;
+        toggleMode: AnnotationsToggleMode;
+    };
+    currentLine: {
+        scrollable: boolean;
+        dateFormat: string | null;
+        enabled: boolean;
+        format: string;
+    };
+    codeLens: CodeLensConfig;
+    debug: boolean;
+    defaultDateFormat: string | null;
+    defaultDateStyle: DateStyle;
+    defaultGravatarsStyle: GravatarDefaultStyle;
+    heatmap: {
+        ageThreshold: number;
+        coldColor: string;
+        hotColor: string;
+        toggleMode: AnnotationsToggleMode;
+    };
+    hovers: {
+        annotations: {
+            changes: boolean;
+            details: boolean;
+            enabled: boolean;
+            over: 'line' | 'annotation';
+        };
+        currentLine: {
+            changes: boolean;
+            details: boolean;
+            enabled: boolean;
+            over: 'line' | 'annotation';
+        };
+        avatars: boolean;
+        enabled: boolean;
+    };
+    insiders: boolean;
+    keymap: KeyMap;
+    menus: boolean | MenuConfig;
+    mode: {
+        active: string;
+        statusBar: {
+            enabled: boolean;
+            alignment: 'left' | 'right';
+        };
+    };
+    modes: { [key: string]: ModeConfig };
+    outputLevel: LogLevel;
+    recentChanges: {
+        highlight: {
+            locations: HighlightLocations[];
+        };
+        toggleMode: AnnotationsToggleMode;
+    };
+    remotes: RemotesConfig[];
+    showWhatsNewAfterUpgrades: boolean;
+    statusBar: {
+        alignment: 'left' | 'right';
+        command: StatusBarCommand;
+        dateFormat: string | null;
+        enabled: boolean;
+        format: string;
+        reduceFlicker: boolean;
+    };
+    strings: {
+        codeLens: {
+            unsavedChanges: {
+                recentChangeAndAuthors: string;
+                recentChangeOnly: string;
+                authorsOnly: string;
+            };
+        };
+    };
+    views: ViewsConfig;
+    advanced: AdvancedConfig;
+}
+
 export enum AnnotationsToggleMode {
     File = 'file',
     Window = 'window'
@@ -14,12 +106,6 @@ export enum CodeLensCommand {
     ToggleFileBlame = 'gitlens.toggleFileBlame'
 }
 
-export interface CodeLensLanguageScope {
-    language: string | undefined;
-    scopes?: CodeLensScopes[];
-    symbolScopes?: string[];
-}
-
 export enum CodeLensScopes {
     Document = 'document',
     Containers = 'containers',
@@ -39,17 +125,6 @@ export enum DateStyle {
     Relative = 'relative'
 }
 
-export enum ViewBranchesLayout {
-    List = 'list',
-    Tree = 'tree'
-}
-
-export enum ViewFilesLayout {
-    Auto = 'auto',
-    List = 'list',
-    Tree = 'tree'
-}
-
 export enum FileAnnotationType {
     Blame = 'blame',
     Heatmap = 'heatmap',
@@ -95,6 +170,17 @@ export enum StatusBarCommand {
     ToggleFileBlame = 'gitlens.toggleFileBlame'
 }
 
+export enum ViewBranchesLayout {
+    List = 'list',
+    Tree = 'tree'
+}
+
+export enum ViewFilesLayout {
+    Auto = 'auto',
+    List = 'list',
+    Tree = 'tree'
+}
+
 export interface AdvancedConfig {
     blame: {
         customArguments: string[] | null;
@@ -142,31 +228,16 @@ export interface CodeLensConfig {
     symbolScopes: string[];
 }
 
-export interface ViewsConfig {
-    avatars: boolean;
-    fileHistory: FileHistoryViewConfig;
-    files: {
-        layout: ViewFilesLayout;
-        compact: boolean;
-        threshold: number;
-    };
-    commitFileFormat: string;
-    commitFormat: string;
-    compare: CompareViewConfig;
-    // dateFormat: string | null;
-    defaultItemLimit: number;
-    lineHistory: LineHistoryViewConfig;
-    repositories: RepositoriesViewConfig;
-    search: SearchViewConfig;
-    stashFileFormat: string;
-    stashFormat: string;
-    statusFileFormat: string;
+export interface CodeLensLanguageScope {
+    language: string | undefined;
+    scopes?: CodeLensScopes[];
+    symbolScopes?: string[];
 }
 
-export interface ViewsFilesConfig {
-    compact: boolean;
-    layout: ViewFilesLayout;
-    threshold: number;
+export interface CompareViewConfig {
+    enabled: boolean;
+    files: ViewsFilesConfig;
+    location: 'explorer' | 'gitlens' | 'scm';
 }
 
 export interface FileHistoryViewConfig {
@@ -221,25 +292,6 @@ export interface ModeConfig {
     views?: boolean;
 }
 
-export interface RepositoriesViewConfig {
-    autoRefresh: boolean;
-    autoReveal: boolean;
-    branches: {
-        layout: ViewBranchesLayout;
-    };
-    enabled: boolean;
-    files: ViewsFilesConfig;
-    includeWorkingTree: boolean;
-    location: 'explorer' | 'gitlens' | 'scm';
-    showTrackingBranch: boolean;
-}
-
-export interface CompareViewConfig {
-    enabled: boolean;
-    files: ViewsFilesConfig;
-    location: 'explorer' | 'gitlens' | 'scm';
-}
-
 export interface RemotesConfig {
     domain: string;
     name?: string;
@@ -260,100 +312,48 @@ export interface RemotesUrlsConfig {
     fileRange: string;
 }
 
+export interface RepositoriesViewConfig {
+    autoRefresh: boolean;
+    autoReveal: boolean;
+    branches: {
+        layout: ViewBranchesLayout;
+    };
+    enabled: boolean;
+    files: ViewsFilesConfig;
+    includeWorkingTree: boolean;
+    location: 'explorer' | 'gitlens' | 'scm';
+    showTrackingBranch: boolean;
+}
+
 export interface SearchViewConfig {
     enabled: boolean;
     files: ViewsFilesConfig;
     location: 'explorer' | 'gitlens' | 'scm';
 }
 
-export interface Config {
-    blame: {
-        avatars: boolean;
+export interface ViewsConfig {
+    avatars: boolean;
+    fileHistory: FileHistoryViewConfig;
+    files: {
+        layout: ViewFilesLayout;
         compact: boolean;
-        dateFormat: string | null;
-        format: string;
-        heatmap: {
-            enabled: boolean;
-            location: 'left' | 'right';
-        };
-        highlight: {
-            enabled: boolean;
-            locations: HighlightLocations[];
-        };
-        ignoreWhitespace: boolean;
-        separateLines: boolean;
-        toggleMode: AnnotationsToggleMode;
-    };
-    currentLine: {
-        scrollable: boolean;
-        dateFormat: string | null;
-        enabled: boolean;
-        format: string;
-    };
-    codeLens: CodeLensConfig;
-    debug: boolean;
-    defaultDateFormat: string | null;
-    defaultDateStyle: DateStyle;
-    defaultGravatarsStyle: GravatarDefaultStyle;
-    heatmap: {
-        ageThreshold: number;
-        coldColor: string;
-        hotColor: string;
-        toggleMode: AnnotationsToggleMode;
-    };
-    hovers: {
-        annotations: {
-            changes: boolean;
-            details: boolean;
-            enabled: boolean;
-            over: 'line' | 'annotation';
-        };
-        currentLine: {
-            changes: boolean;
-            details: boolean;
-            enabled: boolean;
-            over: 'line' | 'annotation';
-        };
-        avatars: boolean;
-        enabled: boolean;
-    };
-    insiders: boolean;
-    keymap: KeyMap;
-    menus: boolean | MenuConfig;
-    mode: {
-        active: string;
-        statusBar: {
-            enabled: boolean;
-            alignment: 'left' | 'right';
-        };
-    };
-    modes: { [key: string]: ModeConfig };
-    outputLevel: LogLevel;
-    recentChanges: {
-        highlight: {
-            locations: HighlightLocations[];
-        };
-        toggleMode: AnnotationsToggleMode;
-    };
-    remotes: RemotesConfig[];
-    showWhatsNewAfterUpgrades: boolean;
-    statusBar: {
-        alignment: 'left' | 'right';
-        command: StatusBarCommand;
-        dateFormat: string | null;
-        enabled: boolean;
-        format: string;
-        reduceFlicker: boolean;
-    };
-    strings: {
-        codeLens: {
-            unsavedChanges: {
-                recentChangeAndAuthors: string;
-                recentChangeOnly: string;
-                authorsOnly: string;
-            };
-        };
+        threshold: number;
     };
-    views: ViewsConfig;
-    advanced: AdvancedConfig;
+    commitFileFormat: string;
+    commitFormat: string;
+    compare: CompareViewConfig;
+    // dateFormat: string | null;
+    defaultItemLimit: number;
+    lineHistory: LineHistoryViewConfig;
+    repositories: RepositoriesViewConfig;
+    search: SearchViewConfig;
+    stashFileFormat: string;
+    stashFormat: string;
+    statusFileFormat: string;
+}
+
+export interface ViewsFilesConfig {
+    compact: boolean;
+    layout: ViewFilesLayout;
+    threshold: number;
 }

src/ui/settings/index.html

@@ -658,22 +658,22 @@
                                 <div class="section__preview">
                                     <img
                                         class="image__preview hidden"
-                                        src="{{root}}/images/settings/repositories-explorer.png"
+                                        src="{{root}}/images/settings/view-repositories.png"
                                         data-visibility="views.repositories.enabled &amp; views.repositories.files.layout !tree"
                                     />
                                     <img
                                         class="image__preview hidden"
-                                        src="{{root}}/images/settings/repositories-explorer-tree-compact.png"
+                                        src="{{root}}/images/settings/view-repositories-tree-compact.png"
                                         data-visibility="views.repositories.enabled &amp; views.repositories.files.layout =tree &amp; views.repositories.files.compact"
                                     />
                                     <img
                                         class="image__preview hidden"
-                                        src="{{root}}/images/settings/repositories-explorer-tree.png"
+                                        src="{{root}}/images/settings/view-repositories-tree.png"
                                         data-visibility="views.repositories.enabled &amp; views.repositories.files.layout =tree &amp; views.repositories.files.compact =false"
                                     />
                                     <img
                                         class="image__preview--overlay hidden"
-                                        src="{{root}}/images/settings/repositories-explorer-avatars.png"
+                                        src="{{root}}/images/settings/view-repositories-avatars.png"
                                         data-visibility="views.repositories.enabled &amp; views.avatars"
                                     />
                                 </div>
@@ -755,12 +755,12 @@
                                 <div class="section__preview">
                                     <img
                                         class="image__preview hidden"
-                                        src="{{root}}/images/settings/file-history-explorer.png"
+                                        src="{{root}}/images/settings/view-file-history.png"
                                         data-visibility="views.fileHistory.enabled"
                                     />
                                     <img
                                         class="image__preview--overlay hidden"
-                                        src="{{root}}/images/settings/file-history-explorer-avatars.png"
+                                        src="{{root}}/images/settings/view-file-history-avatars.png"
                                         data-visibility="views.fileHistory.enabled &amp; views.fileHistory.avatars"
                                     />
                                 </div>
@@ -831,12 +831,12 @@
                                 <div class="section__preview">
                                     <img
                                         class="image__preview hidden"
-                                        src="{{root}}/images/settings/line-history-explorer.png"
+                                        src="{{root}}/images/settings/view-line-history.png"
                                         data-visibility="views.lineHistory.enabled"
                                     />
                                     <img
                                         class="image__preview--overlay hidden"
-                                        src="{{root}}/images/settings/line-history-explorer-avatars.png"
+                                        src="{{root}}/images/settings/view-line-history-avatars.png"
                                         data-visibility="views.lineHistory.enabled &amp; views.lineHistory.avatars"
                                     />
                                 </div>
@@ -941,23 +941,23 @@
                                 <div class="section__preview">
                                     <img
                                         class="image__preview hidden"
-                                        src="{{root}}/images/settings/compare-view.png"
-                                        data-visibility="views.compare.files.layout !tree"
+                                        src="{{root}}/images/settings/view-compare.png"
+                                        data-visibility="views.compare.enabled &amp; views.compare.files.layout !tree"
                                     />
                                     <img
                                         class="image__preview hidden"
-                                        src="{{root}}/images/settings/compare-view-tree-compact.png"
-                                        data-visibility="views.compare.files.layout =tree &amp; views.compare.files.compact"
+                                        src="{{root}}/images/settings/view-compare-tree-compact.png"
+                                        data-visibility="views.compare.enabled &amp; views.compare.files.layout =tree &amp; views.compare.files.compact"
                                     />
                                     <img
                                         class="image__preview hidden"
-                                        src="{{root}}/images/settings/compare-view-tree.png"
-                                        data-visibility="views.compare.files.layout =tree &amp; views.compare.files.compact =false"
+                                        src="{{root}}/images/settings/view-compare-tree.png"
+                                        data-visibility="views.compare.enabled &amp; views.compare.files.layout =tree &amp; views.compare.files.compact =false"
                                     />
                                     <img
                                         class="image__preview--overlay hidden"
-                                        src="{{root}}/images/settings/compare-view-avatars.png"
-                                        data-visibility="views.avatars"
+                                        src="{{root}}/images/settings/view-compare-avatars.png"
+                                        data-visibility="views.compare.enabled &amp; views.avatars"
                                     />
                                 </div>
                                 <p class="settings-group__hint">
@@ -1071,23 +1071,23 @@
                                 <div class="section__preview">
                                     <img
                                         class="image__preview hidden"
-                                        src="{{root}}/images/settings/search-view.png"
-                                        data-visibility="views.search.files.layout !tree"
+                                        src="{{root}}/images/settings/view-search.png"
+                                        data-visibility="views.search.enabled &amp; views.search.files.layout !tree"
                                     />
                                     <img
                                         class="image__preview hidden"
-                                        src="{{root}}/images/settings/search-view-tree-compact.png"
-                                        data-visibility="views.search.files.layout =tree &amp; views.search.files.compact"
+                                        src="{{root}}/images/settings/view-search-tree-compact.png"
+                                        data-visibility="views.search.enabled &amp; views.search.files.layout =tree &amp; views.search.files.compact"
                                     />
                                     <img
                                         class="image__preview hidden"
-                                        src="{{root}}/images/settings/search-view-tree.png"
-                                        data-visibility="views.search.files.layout =tree &amp; views.search.files.compact =false"
+                                        src="{{root}}/images/settings/view-search-tree.png"
+                                        data-visibility="views.search.enabled &amp; views.search.files.layout =tree &amp; views.search.files.compact =false"
                                     />
                                     <img
                                         class="image__preview--overlay hidden"
-                                        src="{{root}}/images/settings/search-view-avatars.png"
-                                        data-visibility="views.avatars"
+                                        src="{{root}}/images/settings/view-search-avatars.png"
+                                        data-visibility="views.search.enabled &amp; views.avatars"
                                     />
                                 </div>
                                 <p class="settings-group__hint">