From 443dedd8326946817e621cc185654b4b2d960402 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Sun, 12 Dec 2021 11:55:38 +0100 Subject: [PATCH] ui/lang: Improved localization and interface glitches of GDB provider ui --- .../builtin/source/content/providers/gdb_provider.cpp | 6 +++--- plugins/builtin/source/lang/de_DE.cpp | 10 ++++------ plugins/builtin/source/lang/en_US.cpp | 10 ++++------ plugins/builtin/source/lang/it_IT.cpp | 10 ++++------ plugins/builtin/source/lang/zh_CN.cpp | 10 ++++------ 5 files changed, 19 insertions(+), 27 deletions(-) diff --git a/plugins/builtin/source/content/providers/gdb_provider.cpp b/plugins/builtin/source/content/providers/gdb_provider.cpp index 3f4fd97cc..3cc5ddae1 100644 --- a/plugins/builtin/source/content/providers/gdb_provider.cpp +++ b/plugins/builtin/source/content/providers/gdb_provider.cpp @@ -122,7 +122,7 @@ namespace hex::plugin::builtin::prv { bool GDBProvider::isAvailable() const { - return true; + return this->m_socket.isConnected(); } bool GDBProvider::isReadable() const { @@ -300,8 +300,8 @@ namespace hex::plugin::builtin::prv { void GDBProvider::drawLoadInterface() { - ImGui::InputText("hex.builtin.view.gdb.ip"_lang, this->m_ipAddress.data(), this->m_ipAddress.capacity(), ImGuiInputTextFlags_CallbackEdit, ImGui::UpdateStringSizeCallback, &this->m_ipAddress); - ImGui::InputInt("hex.builtin.view.gdb.port"_lang, &this->m_port, 0, 0); + ImGui::InputText("hex.builtin.provider.gdb.ip"_lang, this->m_ipAddress.data(), this->m_ipAddress.capacity(), ImGuiInputTextFlags_CallbackEdit, ImGui::UpdateStringSizeCallback, &this->m_ipAddress); + ImGui::InputInt("hex.builtin.provider.gdb.port"_lang, &this->m_port, 0, 0); if (this->m_port < 0) this->m_port = 0; diff --git a/plugins/builtin/source/lang/de_DE.cpp b/plugins/builtin/source/lang/de_DE.cpp index 2db2f0070..103b4de18 100644 --- a/plugins/builtin/source/lang/de_DE.cpp +++ b/plugins/builtin/source/lang/de_DE.cpp @@ -335,12 +335,8 @@ namespace hex::plugin::builtin { { "hex.builtin.view.store.loading", "Store inhalt wird geladen..." }, { "hex.builtin.view.diff.name", "Diffing" }, - { "hex.builtin.view.gdb.name", "GDB Provider" }, - { "hex.builtin.view.gdb.settings", "Einstellungen" }, - { "hex.builtin.view.gdb.ip", "IP Adresse" }, - { "hex.builtin.view.gdb.port", "Port" }, - { "hex.builtin.view.gdb.connect", "Verbinden" }, - { "hex.builtin.view.gdb.disconnect", "Trennen" }, + { "hex.builtin.view.provider_settings.name", "Provider Einstellungen" }, + { "hex.builtin.view.provider_settings.load_popup", "Provider öffnen" }, { "hex.builtin.command.calc.desc", "Rechner" }, { "hex.builtin.command.cmd.desc", "Command" }, @@ -681,6 +677,8 @@ namespace hex::plugin::builtin { { "hex.builtin.provider.gdb", "GDB Server Provider" }, { "hex.builtin.provider.gdb.name", "GDB Server <{0}:{1}>" }, { "hex.builtin.provider.gdb.server", "Server" }, + { "hex.builtin.provider.gdb.ip", "IP Adresse" }, + { "hex.builtin.provider.gdb.port", "Port" }, { "hex.builtin.provider.disk", "Datenträger Provider" }, { "hex.builtin.provider.disk.selected_disk", "Datenträger" }, { "hex.builtin.provider.disk.disk_size", "Datenträgergrösse" }, diff --git a/plugins/builtin/source/lang/en_US.cpp b/plugins/builtin/source/lang/en_US.cpp index 141ff0a5b..ec65b8af5 100644 --- a/plugins/builtin/source/lang/en_US.cpp +++ b/plugins/builtin/source/lang/en_US.cpp @@ -338,12 +338,8 @@ namespace hex::plugin::builtin { { "hex.builtin.view.store.loading", "Loading store content..." }, { "hex.builtin.view.diff.name", "Diffing" }, - { "hex.builtin.view.gdb.name", "GDB Provider" }, - { "hex.builtin.view.gdb.settings", "Settings" }, - { "hex.builtin.view.gdb.ip", "IP Address" }, - { "hex.builtin.view.gdb.port", "Port" }, - { "hex.builtin.view.gdb.connect", "Connect" }, - { "hex.builtin.view.gdb.disconnect", "Disconnect" }, + { "hex.builtin.view.provider_settings.name", "Provider Settings" }, + { "hex.builtin.view.provider_settings.load_popup", "Open Provider" }, { "hex.builtin.command.calc.desc", "Calculator" }, { "hex.builtin.command.cmd.desc", "Command" }, @@ -684,6 +680,8 @@ namespace hex::plugin::builtin { { "hex.builtin.provider.gdb", "GDB Server Provider" }, { "hex.builtin.provider.gdb.name", "GDB Server <{0}:{1}>" }, { "hex.builtin.provider.gdb.server", "Server" }, + { "hex.builtin.provider.gdb.ip", "IP Address" }, + { "hex.builtin.provider.gdb.port", "Port" }, { "hex.builtin.provider.disk", "Raw Disk Provider" }, { "hex.builtin.provider.disk.selected_disk", "Disk" }, { "hex.builtin.provider.disk.disk_size", "Disk Size" }, diff --git a/plugins/builtin/source/lang/it_IT.cpp b/plugins/builtin/source/lang/it_IT.cpp index 1b50b3b6e..0b420df1c 100644 --- a/plugins/builtin/source/lang/it_IT.cpp +++ b/plugins/builtin/source/lang/it_IT.cpp @@ -332,12 +332,8 @@ namespace hex::plugin::builtin { { "hex.builtin.view.store.loading", "Caricamento del content store..." }, //{ "hex.builtin.view.diff.name", "Diffing" }, - //{ "hex.builtin.view.gdb.name", "GDB Provider" }, - //{ "hex.builtin.view.gdb.settings", "Settings" }, - //{ "hex.builtin.view.gdb.ip", "IP Address" }, - //{ "hex.builtin.view.gdb.port", "Port" }, - //{ "hex.builtin.view.gdb.connect", "Connect" }, - //{ "hex.builtin.view.gdb.disconnect", "Disconnect" }, + //{ "hex.builtin.view.provider_settings.name", "Provider Settings" }, + //{ "hex.builtin.view.provider_settings.load_popup", "Open Provider" }, { "hex.builtin.command.calc.desc", "Calcolatrice" }, { "hex.builtin.command.cmd.desc", "Comando" }, @@ -678,6 +674,8 @@ namespace hex::plugin::builtin { //{ "hex.builtin.provider.gdb", "GDB Server Provider" }, //{ "hex.builtin.provider.gdb.name", "GDB Server <{0}:{1}>" }, //{ "hex.builtin.provider.gdb.server", "Server" }, + //{ "hex.builtin.provider.gdb.ip", "IP Address" }, + //{ "hex.builtin.provider.gdb.port", "Port" }, //{ "hex.builtin.provider.disk", "Raw Disk Provider" }, //{ "hex.builtin.provider.disk.selected_disk", "Disk" }, //{ "hex.builtin.provider.disk.disk_size", "Disk Size" }, diff --git a/plugins/builtin/source/lang/zh_CN.cpp b/plugins/builtin/source/lang/zh_CN.cpp index 4378f086f..7401661c7 100644 --- a/plugins/builtin/source/lang/zh_CN.cpp +++ b/plugins/builtin/source/lang/zh_CN.cpp @@ -333,12 +333,8 @@ namespace hex::plugin::builtin { { "hex.builtin.view.store.loading", "正在加载仓库内容..." }, { "hex.builtin.view.diff.name", "差异" }, - //{ "hex.builtin.view.gdb.name", "GDB Provider" }, - //{ "hex.builtin.view.gdb.settings", "Settings" }, - //{ "hex.builtin.view.gdb.ip", "IP Address" }, - //{ "hex.builtin.view.gdb.port", "Port" }, - //{ "hex.builtin.view.gdb.connect", "Connect" }, - //{ "hex.builtin.view.gdb.disconnect", "Disconnect" }, + //{ "hex.builtin.view.provider_settings.name", "Provider Settings" }, + //{ "hex.builtin.view.provider_settings.load_popup", "Open Provider" }, { "hex.builtin.command.calc.desc", "计算器" }, { "hex.builtin.command.cmd.desc", "指令" }, @@ -680,6 +676,8 @@ namespace hex::plugin::builtin { //{ "hex.builtin.provider.gdb", "GDB Server Provider" }, //{ "hex.builtin.provider.gdb.name", "GDB Server <{0}:{1}>" }, //{ "hex.builtin.provider.gdb.server", "Server" }, + //{ "hex.builtin.provider.gdb.ip", "IP Address" }, + //{ "hex.builtin.provider.gdb.port", "Port" }, //{ "hex.builtin.provider.disk", "Raw Disk Provider" }, //{ "hex.builtin.provider.disk.selected_disk", "Disk" }, //{ "hex.builtin.provider.disk.disk_size", "Disk Size" },