diff --git a/CHANGELOG.md b/CHANGELOG.md index f9032cb..1739ce4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Change Log All notable changes to the "vscode-maven" extension will be documented in this file. +## 0.19.0 +- Add inline action buttons in Maven explorer. + ## 0.18.2 #### Fixed - Typo in Hover information. [#368](https://github.com/microsoft/vscode-maven/issues/368) diff --git a/package.json b/package.json index c666fe2..bbcd70a 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,11 @@ { "command": "maven.project.openPom", "title": "%contributes.commands.maven.project.openPom%", - "category": "Maven" + "category": "Maven", + "icon": { + "light": "resources/icons/light/go-to-file.svg", + "dark": "resources/icons/dark/go-to-file.svg" + } }, { "command": "maven.archetype.generate", @@ -373,6 +377,11 @@ "when": "view == mavenProjects && viewItem == MavenProject", "group": "0-pom@0" }, + { + "command": "maven.project.openPom", + "when": "view == mavenProjects && viewItem == MavenProject", + "group": "inline" + }, { "command": "maven.plugin.execute", "when": "view == mavenProjects && viewItem == PluginGoal", @@ -396,7 +405,7 @@ { "command": "maven.explorer.refresh", "when": "view == mavenProjects && viewItem == Menu", - "group": "1@1" + "group": "inline" } ] }, diff --git a/resources/icons/dark/add.svg b/resources/icons/dark/add.svg index 974aff2..4d93893 100644 --- a/resources/icons/dark/add.svg +++ b/resources/icons/dark/add.svg @@ -1,3 +1,3 @@ - - - \ No newline at end of file + + + diff --git a/resources/icons/dark/extensions.svg b/resources/icons/dark/extensions.svg new file mode 100644 index 0000000..224a3c3 --- /dev/null +++ b/resources/icons/dark/extensions.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/dark/folder-opened.svg b/resources/icons/dark/folder-opened.svg new file mode 100644 index 0000000..eead6ab --- /dev/null +++ b/resources/icons/dark/folder-opened.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/dark/folder.svg b/resources/icons/dark/folder.svg index 13b18d1..43d454e 100644 --- a/resources/icons/dark/folder.svg +++ b/resources/icons/dark/folder.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/resources/icons/dark/go-to-file.svg b/resources/icons/dark/go-to-file.svg new file mode 100644 index 0000000..ed302ae --- /dev/null +++ b/resources/icons/dark/go-to-file.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/dark/refresh.svg b/resources/icons/dark/refresh.svg index d79fdaa..0442b2a 100644 --- a/resources/icons/dark/refresh.svg +++ b/resources/icons/dark/refresh.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + diff --git a/resources/icons/light/add.svg b/resources/icons/light/add.svg index cb45a3b..01a9de7 100644 --- a/resources/icons/light/add.svg +++ b/resources/icons/light/add.svg @@ -1,3 +1,3 @@ - - - \ No newline at end of file + + + diff --git a/resources/icons/light/extensions.svg b/resources/icons/light/extensions.svg new file mode 100644 index 0000000..bfec445 --- /dev/null +++ b/resources/icons/light/extensions.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/light/folder-opened.svg b/resources/icons/light/folder-opened.svg new file mode 100644 index 0000000..e24daff --- /dev/null +++ b/resources/icons/light/folder-opened.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/light/folder.svg b/resources/icons/light/folder.svg index 3d64ae7..8daecda 100644 --- a/resources/icons/light/folder.svg +++ b/resources/icons/light/folder.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/resources/icons/light/go-to-file.svg b/resources/icons/light/go-to-file.svg new file mode 100644 index 0000000..392a840 --- /dev/null +++ b/resources/icons/light/go-to-file.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/light/refresh.svg b/resources/icons/light/refresh.svg index e034574..8ade09d 100644 --- a/resources/icons/light/refresh.svg +++ b/resources/icons/light/refresh.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + diff --git a/src/explorer/model/MavenProject.ts b/src/explorer/model/MavenProject.ts index c6024f3..9cec4ac 100644 --- a/src/explorer/model/MavenProject.ts +++ b/src/explorer/model/MavenProject.ts @@ -89,7 +89,6 @@ export class MavenProject implements ITreeItem { dark: getPathToExtensionRoot("resources", "icons", "dark", iconFile) }; treeItem.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed; - treeItem.command = { title: "open pom", command: "maven.project.openPom", arguments: [this] }; return treeItem; } diff --git a/src/explorer/model/PluginsMenu.ts b/src/explorer/model/PluginsMenu.ts index b9c9043..bc6d671 100644 --- a/src/explorer/model/PluginsMenu.ts +++ b/src/explorer/model/PluginsMenu.ts @@ -2,6 +2,7 @@ // Licensed under the MIT license. import * as vscode from "vscode"; +import { getPathToExtensionRoot } from "../../utils/contextUtils"; import { mavenExplorerProvider } from "../mavenExplorerProvider"; import { ITreeItem } from "./ITreeItem"; import { MavenPlugin } from "./MavenPlugin"; @@ -20,13 +21,12 @@ export class PluginsMenu extends Menu implements ITreeItem { } public getTreeItem(): vscode.TreeItem | Thenable { - return new vscode.TreeItem(this._name, vscode.TreeItemCollapsibleState.Collapsed); - // const treeItem: vscode.TreeItem = new vscode.TreeItem(this._name, vscode.TreeItemCollapsibleState.Collapsed); - // treeItem.iconPath = { - // light: Utils.getResourcePath("light", "pluginMenu.svg"), - // dark: Utils.getResourcePath("dark", "pluginMenu.svg") - // }; - // return treeItem; + const treeItem: vscode.TreeItem = new vscode.TreeItem(this._name, vscode.TreeItemCollapsibleState.Collapsed); + treeItem.iconPath = { + light: getPathToExtensionRoot("resources", "icons", "light", "extensions.svg"), + dark: getPathToExtensionRoot("resources", "icons", "dark", "extensions.svg") + }; + return treeItem; } public async refresh(): Promise {