Add icons to webviews (#759)

* Add icons to webviews

* Use class for icon sourcing

- Use the UriIcon constructor to create icon uris

* Remove unused icon

- Removes the search.svg icon, as open-preview.svg was used instead

src/extension.ts

@@ -52,6 +52,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<apiImp
     // assign session watcher setting to global variable
     enableSessionWatcher = util.config().get<boolean>('sessionWatcher');
 
+
     // register commands specified in package.json
     const commands = {
         // create R terminal

src/helpViewer/panel.ts

@@ -4,8 +4,7 @@ import * as vscode from 'vscode';
 import * as cheerio from 'cheerio';
 
 import { HelpFile, RHelp } from '.';
-import { setContext } from '../util';
-
+import { setContext, UriIcon } from '../util';
 
 //// Declaration of interfaces used/implemented by the Help Panel class
 // specified when creating a new help panel
@@ -73,7 +72,6 @@ export class HelpPanel {
 				preserveFocus: preserveFocus
 			};
 			this.panel = vscode.window.createWebviewPanel('rhelp', 'R Help', showOptions, webViewOptions);
-
 			this.initializePanel();
 		}
 
@@ -82,8 +80,9 @@ export class HelpPanel {
 
 		return this.panel.webview;
     }
-
-	private initializePanel(){
+
+	private initializePanel() {
+		this.panel.iconPath = new UriIcon('help');
 		// virtual uris used to access local files
 		this.webviewScriptUri = this.panel.webview.asWebviewUri(this.webviewScriptFile);
 		this.webviewStyleUri = this.panel.webview.asWebviewUri(this.webviewStyleFile);
@@ -109,7 +108,7 @@ export class HelpPanel {
 			void this.setContextValues();
 		});
 	}
-	
+
 
 	public async setContextValues(): Promise<void> {
 		await setContext('r.helpPanel.active', !!this.panel?.active);

src/plotViewer/index.ts

@@ -8,7 +8,7 @@ import * as path from 'path';
 import * as fs from 'fs';
 import * as ejs from 'ejs';
 
-import { config, setContext } from '../util';
+import { config, setContext, UriIcon } from '../util';
 
 import { extensionContext } from '../extension';
 
@@ -272,7 +272,7 @@ export class HttpgdViewer implements IHttpgdViewer {
 
     readonly defaultPreviewPlotLayout: PreviewPlotLayout = 'multirow';
     previewPlotLayout: PreviewPlotLayout;
-    
+
     readonly defaultFullWindow: boolean = false;
     fullWindow: boolean;
 
@@ -480,7 +480,7 @@ export class HttpgdViewer implements IHttpgdViewer {
         };
         this.postWebviewMessage(msg);
     }
-    
+
     public toggleFullWindow(force?: boolean): void {
         this.fullWindow = force ?? !this.fullWindow;
         const msg: ToggleFullWindowMessage = {
@@ -745,6 +745,7 @@ export class HttpgdViewer implements IHttpgdViewer {
             showOptions || this.showOptions,
             this.webviewOptions
         );
+        webviewPanel.iconPath = new UriIcon('graph');
         webviewPanel.onDidDispose(() => this.webviewPanel = undefined);
         webviewPanel.onDidChangeViewState(() => {
             void this.setContextValues();

src/rmarkdown/preview.ts

@@ -8,7 +8,7 @@ import path = require('path');
 import crypto = require('crypto');
 
 
-import { config, doWithProgress, getRpath, readContent, setContext, escapeHtml } from '../util';
+import { config, doWithProgress, getRpath, readContent, setContext, escapeHtml, UriIcon } from '../util';
 import { extensionContext, tmpDir } from '../extension';
 
 class RMarkdownPreview extends vscode.Disposable {
@@ -377,6 +377,7 @@ export class RMarkdownPreviewManager {
     }
 
     private openPreview(outputUri: vscode.Uri, filePath: string, title: string, cp: cp.ChildProcessWithoutNullStreams, viewer: vscode.ViewColumn, resourceViewColumn: vscode.ViewColumn, autoRefresh: boolean): void {
+
         const panel = vscode.window.createWebviewPanel(
             'previewRmd',
             `Preview ${title}`,
@@ -391,6 +392,8 @@ export class RMarkdownPreviewManager {
                 localResourceRoots: [vscode.Uri.file(tmpDir())],
             });
 
+        panel.iconPath = new UriIcon('preview');
+
         // Push the new rmd webview to the open proccesses array,
         // to keep track of running child processes
         // (primarily used in killing the child process, but also