ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added icons in book tree view (#6404)

Browse Source 
* add icons

* added icon files

* fixed icon paths

* moved icons into object initializer
This commit is contained in:
Lucy Zhang
2019-07-17 16:47:54 -07:00
committed by GitHub
parent 089d7cb9f4
commit d74c2d6c8d
11 changed files with 79 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/notebook/src/book/bookTreeItem.ts
View File

@@ -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() {

33
extensions/notebook/src/book/bookTreeView.ts
View File

@@ -20,13 +20,15 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
readonly onDidChangeTreeData: vscode.Event<BookTreeItem | undefined> = this._onDidChangeTreeData.event;
private _tableOfContentsPath: string[];
private _allNotebooks = new Map<string, BookTreeItem>();
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<BookTreeIte
tableOfContents: this.flattenArray(tableOfContents),
page: tableOfContents,
type: BookTreeItemType.Book
});
},
{
light: this._extensionContext.asAbsolutePath('resources/light/book.svg'),
dark: this._extensionContext.asAbsolutePath('resources/dark/book_inverse.svg')
}
);
books.push(book);
} catch (e) {
vscode.window.showErrorMessage(localize('openConfigFileError', 'Open file {0} failed: {1}',
@@ -129,7 +136,13 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
tableOfContents: tableOfContents,
page: sections[i],
type: BookTreeItemType.ExternalLink
});
},
{
light: this._extensionContext.asAbsolutePath('resources/light/link.svg'),
dark: this._extensionContext.asAbsolutePath('resources/dark/link_inverse.svg')
}
);
notebooks.push(externalLink);
} else {
let pathToNotebook = path.join(root, 'content', sections[i].url.concat('.ipynb'));
@@ -143,7 +156,12 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
tableOfContents: tableOfContents,
page: sections[i],
type: BookTreeItemType.Notebook
});
},
{
light: this._extensionContext.asAbsolutePath('resources/light/notebook.svg'),
dark: this._extensionContext.asAbsolutePath('resources/dark/notebook_inverse.svg')
}
);
notebooks.push(notebook);
this._allNotebooks.set(pathToNotebook, notebook);
} else if (fs.existsSync(pathToMarkdown)) {
@@ -153,7 +171,12 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
tableOfContents: tableOfContents,
page: sections[i],
type: BookTreeItemType.Markdown
});
},
{
light: this._extensionContext.asAbsolutePath('resources/light/markdown.svg'),
dark: this._extensionContext.asAbsolutePath('resources/dark/markdown_inverse.svg')
}
);
notebooks.push(markdown);
} else {
vscode.window.showErrorMessage(localize('missingFileError', 'Missing file : {0}', sections[i].title));

2
extensions/notebook/src/extension.ts
View File

@@ -28,7 +28,7 @@ type ChooseCellType = { label: string, id: CellType };
export async function activate(extensionContext: vscode.ExtensionContext): Promise<IExtensionApi> {
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)));