From d74c2d6c8d637d07e251183f50c02d949b497859 Mon Sep 17 00:00:00 2001 From: Lucy Zhang Date: Wed, 17 Jul 2019 16:47:54 -0700 Subject: [PATCH] Added icons in book tree view (#6404) * add icons * added icon files * fixed icon paths * moved icons into object initializer --- .../notebook/resources/dark/book_inverse.svg | 11 +++++++ .../notebook/resources/dark/link_inverse.svg | 3 ++ .../resources/dark/markdown_inverse.svg | 5 +++ .../resources/dark/notebook_inverse.svg | 4 +++ extensions/notebook/resources/light/book.svg | 7 ++++ extensions/notebook/resources/light/link.svg | 3 ++ .../notebook/resources/light/markdown.svg | 8 +++++ .../notebook/resources/light/notebook.svg | 7 ++++ extensions/notebook/src/book/bookTreeItem.ts | 3 +- extensions/notebook/src/book/bookTreeView.ts | 33 ++++++++++++++++--- extensions/notebook/src/extension.ts | 2 +- 11 files changed, 79 insertions(+), 7 deletions(-) create mode 100644 extensions/notebook/resources/dark/book_inverse.svg create mode 100644 extensions/notebook/resources/dark/link_inverse.svg create mode 100644 extensions/notebook/resources/dark/markdown_inverse.svg create mode 100644 extensions/notebook/resources/dark/notebook_inverse.svg create mode 100644 extensions/notebook/resources/light/book.svg create mode 100644 extensions/notebook/resources/light/link.svg create mode 100644 extensions/notebook/resources/light/markdown.svg create mode 100644 extensions/notebook/resources/light/notebook.svg diff --git a/extensions/notebook/resources/dark/book_inverse.svg b/extensions/notebook/resources/dark/book_inverse.svg new file mode 100644 index 0000000000..464b3d228b --- /dev/null +++ b/extensions/notebook/resources/dark/book_inverse.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/extensions/notebook/resources/dark/link_inverse.svg b/extensions/notebook/resources/dark/link_inverse.svg new file mode 100644 index 0000000000..8e968dbbc0 --- /dev/null +++ b/extensions/notebook/resources/dark/link_inverse.svg @@ -0,0 +1,3 @@ + + + diff --git a/extensions/notebook/resources/dark/markdown_inverse.svg b/extensions/notebook/resources/dark/markdown_inverse.svg new file mode 100644 index 0000000000..0edd6b6ca0 --- /dev/null +++ b/extensions/notebook/resources/dark/markdown_inverse.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/extensions/notebook/resources/dark/notebook_inverse.svg b/extensions/notebook/resources/dark/notebook_inverse.svg new file mode 100644 index 0000000000..841199cf11 --- /dev/null +++ b/extensions/notebook/resources/dark/notebook_inverse.svg @@ -0,0 +1,4 @@ + + + + diff --git a/extensions/notebook/resources/light/book.svg b/extensions/notebook/resources/light/book.svg new file mode 100644 index 0000000000..bae52cfcc8 --- /dev/null +++ b/extensions/notebook/resources/light/book.svg @@ -0,0 +1,7 @@ + + Artboard 10 + + + + + diff --git a/extensions/notebook/resources/light/link.svg b/extensions/notebook/resources/light/link.svg new file mode 100644 index 0000000000..7384cd51d2 --- /dev/null +++ b/extensions/notebook/resources/light/link.svg @@ -0,0 +1,3 @@ + + + diff --git a/extensions/notebook/resources/light/markdown.svg b/extensions/notebook/resources/light/markdown.svg new file mode 100644 index 0000000000..e329910a6f --- /dev/null +++ b/extensions/notebook/resources/light/markdown.svg @@ -0,0 +1,8 @@ + + Artboard 60 + + + + + + diff --git a/extensions/notebook/resources/light/notebook.svg b/extensions/notebook/resources/light/notebook.svg new file mode 100644 index 0000000000..2711d10b2a --- /dev/null +++ b/extensions/notebook/resources/light/notebook.svg @@ -0,0 +1,7 @@ + + Artboard 20 + + + + + diff --git a/extensions/notebook/src/book/bookTreeItem.ts b/extensions/notebook/src/book/bookTreeItem.ts index be22d53f73..86fb760a3c 100644 --- a/extensions/notebook/src/book/bookTreeItem.ts +++ b/extensions/notebook/src/book/bookTreeItem.ts @@ -31,7 +31,7 @@ export class BookTreeItem extends vscode.TreeItem { private _nextUri: string; public command: vscode.Command; - constructor(public book: BookTreeItemFormat) { + constructor(public book: BookTreeItemFormat, icons: any) { super(book.title, vscode.TreeItemCollapsibleState.Collapsed); if (book.type === BookTreeItemType.Book) { @@ -41,6 +41,7 @@ export class BookTreeItem extends vscode.TreeItem { this.setPageVariables(); this.setCommand(); } + this.iconPath = icons; } private setPageVariables() { diff --git a/extensions/notebook/src/book/bookTreeView.ts b/extensions/notebook/src/book/bookTreeView.ts index 88bfcfc4b3..95d4b7050f 100644 --- a/extensions/notebook/src/book/bookTreeView.ts +++ b/extensions/notebook/src/book/bookTreeView.ts @@ -20,13 +20,15 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider = this._onDidChangeTreeData.event; private _tableOfContentsPath: string[]; private _allNotebooks = new Map(); + private _extensionContext: vscode.ExtensionContext; - constructor(private workspaceRoot: string) { + constructor(private workspaceRoot: string, extensionContext: vscode.ExtensionContext) { if (workspaceRoot !== '') { this._tableOfContentsPath = this.getTocFiles(this.workspaceRoot); let bookOpened: boolean = this._tableOfContentsPath && this._tableOfContentsPath.length > 0; vscode.commands.executeCommand('setContext', 'bookOpened', bookOpened); } + this._extensionContext = extensionContext; } private getTocFiles(dir: string): string[] { @@ -107,7 +109,12 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider { - const bookTreeViewProvider = new BookTreeViewProvider(vscode.workspace.rootPath || ''); + const bookTreeViewProvider = new BookTreeViewProvider(vscode.workspace.rootPath || '', extensionContext); extensionContext.subscriptions.push(vscode.window.registerTreeDataProvider('bookTreeView', bookTreeViewProvider)); extensionContext.subscriptions.push(azdata.nb.registerNavigationProvider(bookTreeViewProvider)); extensionContext.subscriptions.push(vscode.commands.registerCommand('bookTreeView.openNotebook', (resource) => bookTreeViewProvider.openNotebook(resource)));