Fixed icons in tree / stats

Author: mikecentola

src/control.ts

@@ -118,23 +118,10 @@ export class Control {
         );
 
         // Load Stats View
-        Logger.log(`Stats: ${configuration.getParam('views.stats.enabled') ? 'Enabled' : 'Disabled'}`);
-        Logger.log(`Stats AutoRefresh: ${configuration.getParam('views.stats.autoRefresh') ? 'Enabled' : 'Disabled'}`);
+        Logger.log('Loading Stats View...');
+        context.subscriptions.push((this._statsView = new StatsView()));
 
-        if (config.getParam('views.stats.enabled')) {
-            Logger.log('Loading Stats View...');
-            context.subscriptions.push((this._statsView = new StatsView()));
-        } else {
-            let disposable: Disposable;
-            // eslint-disable-next-line prefer-const
-            disposable = configuration.onDidChange(e => {
-                if (configuration.changed(e, 'views.stats.enabled')) {
-                    disposable.dispose();
-                    Logger.log('Loading Stats View...');
-                    context.subscriptions.push((this._statsView = new StatsView()));
-                }
-            });
-        }
+        Logger.log(`Stats AutoRefresh: ${configuration.getParam('views.stats.autoRefresh') ? 'Enabled' : 'Disabled'}`);
 
         // Load Support Heart to Statusbar
         this._statusBarControl.updateStatusBar(

src/util/constants.ts

@@ -46,8 +46,8 @@ export const constants: IConstants = {
     },
     extensionOutputChannelName: gcode.packageJSON.shortName,
     extensionQualifiedId: extensionQualifiedId,
-    gcodeIcon: path.join(__dirname, '..', '..', 'resources', 'icons', 'gcode.svg'),
-    iconsPath: path.join(__dirname, '..', '..', 'resources', 'icons'),
+    gcodeIcon: path.join(__dirname, '..', 'resources', 'icons', 'gcode.svg'),
+    iconsPath: path.join(__dirname, '..', 'resources', 'icons'),
     iconExt: '.svg',
     langId: gcode.packageJSON.contributes.languages[0].id,
     urls: {

src/views/statsView.ts

@@ -4,7 +4,14 @@
  * -------------------------------------------------------------------------------------------- */
 'use strict';
 
-import { commands, ConfigurationChangeEvent, TextDocumentChangeEvent, TreeItemCollapsibleState, window } from 'vscode';
+import {
+    commands,
+    ConfigurationChangeEvent,
+    TextDocumentChangeEvent,
+    ThemeIcon,
+    TreeItemCollapsibleState,
+    window,
+} from 'vscode';
 import { Control } from '../control';
 import { configuration } from '../util/config';
 import { constants, Contexts } from '../util/constants';
@@ -21,7 +28,6 @@ const StatsViewInfo = {
     ViewName: 'Stats',
     Config: {
         AutoRefresh: 'views.stats.autoRefresh',
-        Enabled: 'views.stats.enabled',
         MaxAutoRefresh: 'views.maxAutoRefresh',
     },
     Context: Contexts.ViewsStatsEnabled,
@@ -104,7 +110,7 @@ export class StatsView extends GView<StatsNode> {
         } else {
             void Control.setContext(Contexts.ViewsStatsEnabled, false);
 
-            this._children = [];
+            this._children = [this.placeholder()];
             this._onDidChangeTreeData.fire(undefined);
         }
     }
@@ -122,7 +128,7 @@ export class StatsView extends GView<StatsNode> {
         } else {
             void Control.setContext(Contexts.ViewsStatsEnabled, false);
 
-            this._children = [];
+            this._children = [this.placeholder()];
             this._onDidChangeTreeData.fire(undefined);
         }
     }
@@ -258,4 +264,18 @@ export class StatsView extends GView<StatsNode> {
             return false;
         }
     }
+
+    private placeholder(): StatsNode {
+        const ph = new StatsNode(
+            StatsType.Info,
+            'AutoRefresh is Disabled',
+            undefined,
+            ResourceType.Stats,
+            TreeItemCollapsibleState.None,
+        );
+
+        ph.iconPath = new ThemeIcon('extensions-info-message');
+
+        return ph;
+    }
 }