Commit 5bc945e

committed

remove sketchbook mainmenu item

1 parent 8b0d663 commit 5bc945eCopy full SHA for 5bc945e

File tree

2 files changed

+19

-10

lines changed

arduino-ide-extension/src/browser/widgets/sketchbook
- sketchbook-tree-model.ts
- sketchbook-widget-contribution.ts

2 files changed

+19

-10

lines changed

`‎arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-tree-model.ts‎`

Lines changed: 14 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ import { CommandRegistry } from '@theia/core/lib/common/command';`
`13`	`13`
`14`	`14`	`@injectable()`
`15`	`15`	`export class SketchbookTreeModel extends FileTreeModel {`
`16`		`-`
`17`	`16`	`@inject(FileService)`
`18`	`17`	`protected readonly fileService: FileService;`
`19`	`18`
`@@ -34,43 +33,50 @@ export class SketchbookTreeModel extends FileTreeModel {`
`34`	`33`
`35`	`34`	`async updateRoot(): Promise<void> {`
`36`	`35`	`const config = await this.configService.getConfiguration();`
`37`		`- const fileStat = await this.fileService.resolve(new URI(config.sketchDirUri));`
`38`		`- const showAllFiles = this.arduinoPreferences['arduino.sketchbook.showAllFiles'];`
	`36`	`+ const fileStat = await this.fileService.resolve(`
	`37`	`+ new URI(config.sketchDirUri)`
	`38`	`+ );`
	`39`	`+ const showAllFiles =`
	`40`	`+ this.arduinoPreferences['arduino.sketchbook.showAllFiles'];`
`39`	`41`	`this.tree.root = SketchbookTree.RootNode.create(fileStat, showAllFiles);`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`// selectNode gets called when the user single-clicks on an item`
`43`	`45`	`// when this happens, we want to open the file if it belongs to the currently open sketch`
`44`	`46`	`async selectNode(node: Readonly<SelectableTreeNode>): Promise<void> {`
`45`		`-`
`46`	`47`	`super.selectNode(node);`
`47`	`48`	`if (FileNode.is(node)) {`
`48`		`- open(this.openerService,node.uri);`
	`49`	`+ this.open(node.uri);`
`49`	`50`	`}`
	`51`	`+ }`
`50`	`52`
	`53`	`+ protected open(uri: URI): void {`
	`54`	`+ open(this.openerService, uri);`
`51`	`55`	`}`
`52`	`56`
`53`	`57`	`protected async doOpenNode(node: TreeNode): Promise<void> {`
`54`	`58`	`// if it's a sketch dir, or a file from another sketch, open in new window`
`55`	`59`	`if (!(await this.isFileInsideCurrentSketch(node))) {`
`56`	`60`	`const sketchRoot = this.recursivelyFindSketchRoot(node);`
`57`	`61`	`if (sketchRoot) {`
`58`		`- this.commandRegistry.executeCommand(SketchbookCommands.OPEN_NEW_WINDOW.id, { node: sketchRoot })`
	`62`	`+ this.commandRegistry.executeCommand(`
	`63`	`+ SketchbookCommands.OPEN_NEW_WINDOW.id,`
	`64`	`+ { node: sketchRoot }`
	`65`	`+ );`
`59`	`66`	`}`
`60`	`67`	`return;`
`61`	`68`	`}`
`62`	`69`
`63`	`70`	`if (node.visible === false) {`
`64`	`71`	`return;`
`65`	`72`	`} else if (FileNode.is(node)) {`
`66`		`- open(this.openerService,node.uri);`
	`73`	`+ this.open(node.uri);`
`67`	`74`	`} else {`
`68`	`75`	`super.doOpenNode(node);`
`69`	`76`	`}`
`70`	`77`	`}`
`71`	`78`
`72`	`79`	`private async isFileInsideCurrentSketch(node: TreeNode): Promise<boolean> {`
`73`		`-`
`74`	`80`	`// it's a directory, not a file`
`75`	`81`	`if (!FileNode.is(node)) {`
`76`	`82`	`return false;`
`@@ -85,7 +91,6 @@ export class SketchbookTreeModel extends FileTreeModel {`
`85`	`91`	`}`
`86`	`92`
`87`	`93`	`protected recursivelyFindSketchRoot(node: TreeNode): TreeNode \| false {`
`88`		`-`
`89`	`94`	`if (node && SketchbookTree.SketchDirNode.is(node)) {`
`90`	`95`	`return node;`
`91`	`96`	`}`
`@@ -97,5 +102,4 @@ export class SketchbookTreeModel extends FileTreeModel {`
`97`	`102`	`// can't find a root, return false`
`98`	`103`	`return false;`
`99`	`104`	`}`
`100`		`-`
`101`	`105`	`}`

`‎arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-widget-contribution.ts‎`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,11 @@ export class SketchbookWidgetContribution extends AbstractViewContribution<Sketc`
`140`	`140`	`registerMenus(registry: MenuModelRegistry): void {`
`141`	`141`	`super.registerMenus(registry);`
`142`	`142`
	`143`	`+ // unregister main menu action`
	`144`	`+ registry.unregisterMenuAction({`
	`145`	`+ commandId: 'arduino-sketchbook-widget:toggle',`
	`146`	`+ });`
	`147`	`+`
`143`	`148`	`registry.registerMenuAction(SKETCHBOOK__CONTEXT__MAIN_GROUP, {`
`144`	`149`	`commandId: SketchbookCommands.REVEAL_IN_FINDER.id,`
`145`	`150`	`label: SketchbookCommands.REVEAL_IN_FINDER.label,`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 5bc945e

File tree

2 files changed

2 files changed

`‎arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-tree-model.ts‎`

`‎arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-widget-contribution.ts‎`

0 commit comments