Skip to content

Commit d2ed52f

Browse files
committed
Standardize naming in status bar items
1 parent daeedf4 commit d2ed52f

File tree

9 files changed

+34
-28
lines changed

9 files changed

+34
-28
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,6 @@
3535
],
3636
"typescript.updateImportsOnFileMove.enabled": "always",
3737
"workbench.editor.enablePreview": true,
38-
"iis.configDir": ""
38+
"iis.configDir": "",
39+
"idf.pythonInstallPath": "/opt/homebrew/bin/python3"
3940
}

l10n/bundle.l10n.es.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@
174174
"Build Project": "Proyecto de construcción",
175175
"ESP-IDF Size": "Tamaño ESP-IDF",
176176
"Full Clean": "limpieza completa",
177-
"ESP-IDF: Select Flash Method": "ESP-IDF: seleccione el método Flash",
177+
"Select Flash Method": "Seleccione el método Flash",
178178
"Flash Device": "Dispositivo flash",
179179
"Erase Flash": "Borrar flash",
180180
"Monitor Device": "Monitorear dispositivo",
181-
"ESP-IDF: Build, Flash and Monitor": "ESP-IDF: construir, flashear y monitorear",
181+
"Build, Flash and Monitor": "Construir, flashear y monitorear",
182182
"Debug": "Depurar",
183-
"[OpenOCD Server]": "[Servidor OpenOCD]",
183+
"OpenOCD Server": "Servidor OpenOCD",
184184
"Open ESP-IDF Terminal": "Abrir terminal ESP-IDF",
185185
"Open Classic Menuconfig Terminal": "Abrir terminal de configuración clásica",
186186
"Doctor Command": "Comando médico",
@@ -243,5 +243,6 @@
243243
"Would you like to reload the window to activate the clangd extension?": "¿Le gustaría recargar la ventana para activar la extensión clangd?",
244244
"Reload": "Recargar",
245245
"Later": "Más tarde",
246-
"Failed to install clangd extension. You can install it manually from the Extensions marketplace.": "Error al instalar la extensión clangd. Puede instalarla manualmente desde el marketplace de extensiones."
246+
"Failed to install clangd extension. You can install it manually from the Extensions marketplace.": "Error al instalar la extensión clangd. Puede instalarla manualmente desde el marketplace de extensiones.",
247+
"Launch Debug": "Iniciar depuración"
247248
}

l10n/bundle.l10n.pt.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,13 @@
175175
"Build Project": "Construir projeto",
176176
"ESP-IDF Size": "Tamanho ESP-IDF",
177177
"Full Clean": "Limpeza completa",
178-
"ESP-IDF: Select Flash Method": "ESP-IDF: Selecione o método Flash",
178+
"Select Flash Method": "Selecione o método Flash",
179179
"Flash Device": "Dispositivo flash",
180180
"Erase Flash": "Apagar Flash",
181181
"Monitor Device": "Dispositivo monitor",
182-
"ESP-IDF: Build, Flash and Monitor": "ESP-IDF: construir, atualizar e monitorar",
182+
"Build, Flash and Monitor": "Construir, atualizar e monitorar",
183183
"Debug": "Depurar",
184-
"[OpenOCD Server]": "[Servidor OpenOCD]",
184+
"OpenOCD Server": "Servidor OpenOCD",
185185
"Open ESP-IDF Terminal": "Abra o terminal ESP-IDF",
186186
"Open Classic Menuconfig Terminal": "Abrir terminal de configuração clássica",
187187
"Doctor Command": "Comando Médico",
@@ -244,5 +244,6 @@
244244
"Would you like to reload the window to activate the clangd extension?": "Gostaria de reabrir a janela para ativar a extensão clangd?",
245245
"Reload": "Reabrir",
246246
"Later": "Mais tarde",
247-
"Failed to install clangd extension. You can install it manually from the Extensions marketplace.": "Falha ao instalar a extensão clangd. Você pode instalá-la manualmente no marketplace de extensões."
247+
"Failed to install clangd extension. You can install it manually from the Extensions marketplace.": "Falha ao instalar a extensão clangd. Você pode instalá-la manualmente no marketplace de extensões.",
248+
"Launch Debug": "Iniciar depuração"
248249
}

l10n/bundle.l10n.ru.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,13 @@
175175
"Build Project": "Сборка проекта",
176176
"ESP-IDF Size": "Размер ESP-IDF",
177177
"Full Clean": "Полная очистка",
178-
"ESP-IDF: Select Flash Method": "ESP-IDF: выбор метода прошивки",
178+
"Select Flash Method": "Выбор метода прошивки",
179179
"Flash Device": "Прошивка",
180180
"Erase Flash": "Стереть Flash",
181181
"Monitor Device": "Монитор IDF",
182-
"ESP-IDF: Build, Flash and Monitor": "ESP-IDF: сборка, прошивка и мониторинг",
182+
"Build, Flash and Monitor": "Сборка, прошивка и мониторинг",
183183
"Debug": "Отладка",
184-
"[OpenOCD Server]": "[Сервер OpenOCD]",
184+
"OpenOCD Server": "Сервер OpenOCD",
185185
"Open ESP-IDF Terminal": "Открыть терминал ESP-IDF",
186186
"Open Classic Menuconfig Terminal": "Открыть классический терминал конфигурации",
187187
"Doctor Command": "Команда 'Доктор'",
@@ -244,5 +244,6 @@
244244
"Would you like to reload the window to activate the clangd extension?": "Хотите перезагрузить окно для активации расширения clangd?",
245245
"Reload": "Перезагрузить",
246246
"Later": "Позже",
247-
"Failed to install clangd extension. You can install it manually from the Extensions marketplace.": "Не удалось установить расширение clangd. Вы можете установить его вручную из маркетплейса расширений."
247+
"Failed to install clangd extension. You can install it manually from the Extensions marketplace.": "Не удалось установить расширение clangd. Вы можете установить его вручную из маркетплейса расширений.",
248+
"Launch Debug": "Запуск отладки"
248249
}

l10n/bundle.l10n.zh-CN.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,13 @@
175175
"Build Project": "构建项目",
176176
"ESP-IDF Size": "ESP-IDF 二进制文件大小分析",
177177
"Full Clean": "彻底清理",
178-
"ESP-IDF: Select Flash Method": "ESP-IDF:选择烧录方式",
178+
"Select Flash Method": "选择烧录方式",
179179
"Flash Device": "烧录项目",
180180
"Erase Flash": "擦除设备 flash 数据",
181181
"Monitor Device": "监视设备",
182-
"ESP-IDF: Build, Flash and Monitor": "ESP-IDF:构建、烧录和监视",
182+
"Build, Flash and Monitor": "构建、烧录和监视",
183183
"Debug": "调试",
184-
"[OpenOCD Server]": "[OpenOCD 服务器]",
184+
"OpenOCD Server": "OpenOCD 服务器",
185185
"Open ESP-IDF Terminal": "打开 ESP-IDF 终端",
186186
"Open Classic Menuconfig Terminal": "打开经典菜单配置终端",
187187
"Doctor Command": "诊断命令",
@@ -244,5 +244,6 @@
244244
"Would you like to reload the window to activate the clangd extension?": "您是否要重新加载窗口以激活 clangd 扩展?",
245245
"Reload": "重新加载",
246246
"Later": "稍后",
247-
"Failed to install clangd extension. You can install it manually from the Extensions marketplace.": "安装 clangd 扩展失败。您可以从扩展市场手动安装它。"
247+
"Failed to install clangd extension. You can install it manually from the Extensions marketplace.": "安装 clangd 扩展失败。您可以从扩展市场手动安装它。",
248+
"Launch Debug": "启动调试"
248249
}

package.nls.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,5 +204,6 @@
204204
"viewContainer.title": "ESP-IDF: Explorer",
205205
"viewWelcome.idfPartitionExplorer": "Show the partition list from your device with the option to flash binaries (.bin) to the selected partition.\n\nSelect your device serial port and click Refresh Partition Table.",
206206
"viewWelcome.idfSearchResults": "On any opened file editor, select some text, right click and select ESP-IDF: Search in Documentation to get matching results here.\n\nResults are based on your current VS Code language and idf.espIdfPath version (latest otherwise).",
207-
"viewWelcome.peripheralView": "Show peripheral registers from SVD files defined in ESP-IDF SVD file path (idf.svdFilePath) configuration setting during active debug session."
207+
"viewWelcome.peripheralView": "Show peripheral registers from SVD files defined in ESP-IDF SVD file path (idf.svdFilePath) configuration setting during active debug session.",
208+
"Launch Debug": "Launch Debug"
208209
}

src/cmdTreeView/cmdStore.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ export function createCommandDictionary(): Record<
210210
TreeItemCheckboxState.Checked
211211
),
212212
iconId: "star-empty",
213-
tooltip: l10n.t("ESP-IDF: Select Flash Method"),
213+
tooltip: l10n.t("Select Flash Method"),
214214
},
215215
[CommandKeys.SelectSerialPort]: {
216216
checkboxState: ESP.GlobalConfiguration.store.get<TreeItemCheckboxState>(
@@ -290,23 +290,23 @@ export function createCommandDictionary(): Record<
290290
TreeItemCheckboxState.Checked
291291
),
292292
iconId: "flame",
293-
tooltip: l10n.t("ESP-IDF: Build, Flash and Monitor"),
293+
tooltip: l10n.t("Build, Flash and Monitor"),
294294
},
295295
[CommandKeys.OpenOCD]: {
296296
checkboxState: ESP.GlobalConfiguration.store.get<TreeItemCheckboxState>(
297297
CommandKeys.OpenOCD,
298298
TreeItemCheckboxState.Checked
299299
),
300300
iconId: "server-environment",
301-
tooltip: l10n.t("[OpenOCD Server]"),
301+
tooltip: l10n.t("OpenOCD Server"),
302302
},
303303
[CommandKeys.Debug]: {
304304
checkboxState: ESP.GlobalConfiguration.store.get<TreeItemCheckboxState>(
305305
CommandKeys.Debug,
306306
TreeItemCheckboxState.Checked
307307
),
308308
iconId: "debug-alt",
309-
tooltip: l10n.t("Debug"),
309+
tooltip: l10n.t("Launch Debug"),
310310
},
311311
[CommandKeys.IDFTerminal]: {
312312
checkboxState: ESP.GlobalConfiguration.store.get<TreeItemCheckboxState>(

src/espIdf/openOcd/openOcdManager.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,15 +263,15 @@ export class OpenOCDManager extends EventEmitter {
263263
}
264264
this.stop();
265265
});
266-
this.updateStatusText("❇️ ESP-IDF: OpenOCD Server (Running)");
266+
this.updateStatusText("❇️ OpenOCD Server (Running)");
267267
OutputChannel.show();
268268
}
269269

270270
public stop() {
271271
if (this.server && !this.server.killed) {
272272
this.server.kill("SIGKILL");
273273
this.server = undefined;
274-
this.updateStatusText("❌ ESP-IDF: OpenOCD Server (Stopped)");
274+
this.updateStatusText("❌ OpenOCD Server (Stopped)");
275275
const endMsg = "[Stopped] : OpenOCD Server";
276276
OutputChannel.appendLine(endMsg, "OpenOCD");
277277
Logger.info(endMsg);
@@ -288,7 +288,7 @@ export class OpenOCDManager extends EventEmitter {
288288
vscode.StatusBarAlignment.Left,
289289
1
290290
);
291-
this.statusBar.name = this.statusBar.text = "[ESP-IDF: OpenOCD Server]";
291+
this.statusBar.name = this.statusBar.text = "OpenOCD Server";
292292
const commandDictionary = createCommandDictionary();
293293
this.statusBar.tooltip = commandDictionary[CommandKeys.OpenOCD].tooltip;
294294
this.statusBar.command = CommandKeys.OpenOCD;

src/qemu/qemuManager.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ export class QemuManager extends EventEmitter {
215215
const pythonBinPath = await getVirtualEnvPythonPath(workspaceFolder);
216216
this.qemuTerminal.sendText(`${pythonBinPath} ${qemuArgs.join(" ")}`);
217217
this.qemuTerminal.show(true);
218-
this.updateStatusText("❇️ ESP-IDF: QEMU Server (Running)");
218+
this.updateStatusText("❇️ QEMU Server (Running)");
219219
}
220220

221221
public stop() {
@@ -224,7 +224,7 @@ export class QemuManager extends EventEmitter {
224224
this.qemuTerminal.dispose();
225225
this.qemuTerminal = undefined;
226226
}
227-
this.updateStatusText("❌ ESP-IDF: QEMU Server (Stopped)");
227+
this.updateStatusText("❌ QEMU Server (Stopped)");
228228
}
229229

230230
public showOutputChannel(preserveFocus?: boolean) {
@@ -240,7 +240,7 @@ export class QemuManager extends EventEmitter {
240240
StatusBarAlignment.Left,
241241
0
242242
);
243-
this._statusBarItem.name = this._statusBarItem.text = "[ESP-IDF: QEMU]";
243+
this._statusBarItem.name = this._statusBarItem.text = "QEMU";
244244
const commandDictionary = createCommandDictionary();
245245
this._statusBarItem.tooltip =
246246
commandDictionary[CommandKeys.QemuServer].tooltip;

0 commit comments

Comments
 (0)