From 8ee27b8c5bb7e1ae660eb32788a4119e20114f85 Mon Sep 17 00:00:00 2001 From: xuewei Date: Mon, 17 Oct 2022 15:02:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E4=BB=BB=E5=8A=A1=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=9C=BA=EF=BC=8C=E5=88=99=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 12 +----------- package.nls.json | 4 +++- package.nls.zh-cn.json | 4 +++- src/DistBuildHostManager.ts | 1 + src/DistBuildTreeView.ts | 11 ++++++++++- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index a0cb4be..ef835fc 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "kylin-code-dist-compile", "description": "dist compile", "publisher": "kylinos", - "version": "0.0.1-alpha.20221014", + "version": "0.0.1-alpha.20221017", "engines": { "vscode": "^1.68.0" }, @@ -100,16 +100,6 @@ "command": "distbuild.setting", "when": "view == distbuildtree && viewItem != distbuild.state", "group": "inline@0" - }, - { - "command": "distbuild.run", - "when": "view == distbuildtree && viewItem == distbuild.host.state.stop", - "group": "inline@1" - }, - { - "command": "distbuild.stop", - "when": "view == distbuildtree && viewItem == distbuild.host.state.run", - "group": "inline@1" } ] }, diff --git a/package.nls.json b/package.nls.json index 39a0af1..0897d5e 100644 --- a/package.nls.json +++ b/package.nls.json @@ -71,5 +71,7 @@ "sshclient.reinit.failed": "Compilation host reinit failed: {0}", "extensions.system.support": "Currently, only linux is supported", "treeview.add.compiler.failed": "Not found compiler! please install gcc or clang.", - "treeview.add.distcc.failed": "Cannot find distributes compilation program 'distcc'." + "treeview.add.distcc.failed": "Cannot find distributes compilation program 'distcc'.", + "treeview.run.addbutton": "Add now", + "treeview.run.laterbutton": "Later" } \ No newline at end of file diff --git a/package.nls.zh-cn.json b/package.nls.zh-cn.json index 43b8f39..92f1029 100644 --- a/package.nls.zh-cn.json +++ b/package.nls.zh-cn.json @@ -72,5 +72,7 @@ "sshclient.reinit.failed": "编译主机重新初始化失败: {0}", "extensions.system.support": "目前,插件只支持linux", "treeview.add.compiler.failed": "系统没有安装任何编译器,请安装gcc或者clang编译器", - "treeview.add.distcc.failed": "未找到分布式编译程序:'distcc'." + "treeview.add.distcc.failed": "未找到分布式编译程序:'distcc'.", + "treeview.run.addbutton": "立即添加", + "treeview.run.laterbutton": "稍后" } \ No newline at end of file diff --git a/src/DistBuildHostManager.ts b/src/DistBuildHostManager.ts index aa4f339..01eb5eb 100644 --- a/src/DistBuildHostManager.ts +++ b/src/DistBuildHostManager.ts @@ -359,6 +359,7 @@ export class DistBuildHostManager { }, this) if (promises.length === 0) { rej(localize('treeview.disthost.empty')) + return } Promise.all(promises).then((hostKeys) => { res(hostKeys) diff --git a/src/DistBuildTreeView.ts b/src/DistBuildTreeView.ts index 9ea9002..b243689 100644 --- a/src/DistBuildTreeView.ts +++ b/src/DistBuildTreeView.ts @@ -155,7 +155,16 @@ export class DistBuildTreeView implements vscode.TreeDataProvider { - vscode.window.showErrorMessage(localize('treeview.add.startdisthost.failed', reason)) + if (reason === localize('treeview.disthost.empty')) { + vscode.window.showInformationMessage(reason, localize('treeview.run.addbutton'), localize('treeview.run.laterbutton')).then(val => { + if (val === localize('treeview.run.addbutton')) { + vscode.commands.executeCommand('distbuild.addHost'); + } + }) + } else { + + vscode.window.showErrorMessage(reason) + } }) } if (code === 104) {