mirror of
https://github.com/ArduPilot/ardupilot.git
synced 2026-11-15 21:05:40 +08:00
APM Planner
ConfigPlanner translation fix UI language changing issue
This commit is contained in:
1 parent
f43f5900bc
commit
bbbf1c7002
5 files changed
+239
-7
No files matched your search
@@ -163,7 +163,7 @@ namespace ArdupilotMega.Arduino
|
||||
{
|
||||
serialPort.Close();
|
||||
//HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Enum\USB\VID_2341&PID_0010\640333439373519060F0\Device Parameters
|
||||
if (!MainV2.MONO && !Thread.CurrentThread.CurrentUICulture.IsChildOf(CultureInfoEx.GetCultureInfo("zh-Hans")))
|
||||
if (!MainV2.MONO && !Thread.CurrentThread.CurrentCulture.IsChildOf(CultureInfoEx.GetCultureInfo("zh-Hans")))
|
||||
{
|
||||
ObjectQuery query = new ObjectQuery("SELECT * FROM Win32_SerialPort"); // Win32_USBControllerDevice
|
||||
ManagementObjectSearcher searcher = new ManagementObjectSearcher(query);
|
||||
|
||||
@@ -704,6 +704,9 @@
|
||||
<EmbeddedResource Include="GCSViews\ConfigurationView\ConfigPlanner.resx">
|
||||
<DependentUpon>ConfigPlanner.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="GCSViews\ConfigurationView\ConfigPlanner.zh-Hans.resx">
|
||||
<DependentUpon>ConfigPlanner.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="GCSViews\ConfigurationView\ConfigRadioInput.es-ES.resx">
|
||||
<DependentUpon>ConfigRadioInput.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
|
||||
@@ -151,7 +151,10 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
|
||||
}
|
||||
|
||||
private void CMB_language_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
{
|
||||
if (startup)
|
||||
return;
|
||||
|
||||
MainV2.instance.changelanguage((CultureInfo)CMB_language.SelectedItem);
|
||||
|
||||
#if !DEBUG
|
||||
@@ -492,7 +495,7 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
|
||||
break;
|
||||
}
|
||||
}
|
||||
CMB_language.SelectedIndexChanged += CMB_language_SelectedIndexChanged;
|
||||
//CMB_language.SelectedIndexChanged += CMB_language_SelectedIndexChanged;
|
||||
|
||||
startup = false;
|
||||
}
|
||||
|
||||
@@ -1268,7 +1268,7 @@
|
||||
<value>BUT_Joystick</value>
|
||||
</data>
|
||||
<data name=">>BUT_Joystick.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4498.31567, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4507.18015, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_Joystick.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
@@ -1295,7 +1295,7 @@
|
||||
<value>BUT_videostop</value>
|
||||
</data>
|
||||
<data name=">>BUT_videostop.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4498.31567, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4507.18015, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_videostop.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
@@ -1322,7 +1322,7 @@
|
||||
<value>BUT_videostart</value>
|
||||
</data>
|
||||
<data name=">>BUT_videostart.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4498.31567, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4507.18015, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_videostart.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
@@ -1397,6 +1397,6 @@
|
||||
<value>ConfigPlanner</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4498.31567, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.BackstageView.BackStageViewContentPanel, ArdupilotMegaPlanner, Version=1.1.4507.18015, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
</root>
|
||||
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user