Commit cde4adc1 刘韬

1

1 个父辈 3f9c25d0
......@@ -123,7 +123,7 @@ namespace AutoScanAndLabel
private void labelVersion_Click(object sender, EventArgs e)
{
ConfigHelper.AdvanceConfigForm.ShowEditDialog();
ConfigHelper.AdvanceConfigForm.ShowEditDialog(this);
}
}
}
......@@ -343,7 +343,7 @@ namespace AutoScanAndLabel
{
Invoke((EventHandler)delegate
{
btn_releaseleftshelf.Text = $"左侧料串等待释放中({timeout / 2})";
btn_releaseleftshelf.Text = string.Format("左侧料串等待释放中({0})", timeout / 2);
});
}
if ((RobotManage.mainMachine.LeftMoveInfo.MoveStep== MoveStep.L20_WaitLabel || RobotManage.mainMachine.LeftMoveInfo.MoveStep== MoveStep.L10_WaitReelPut) && (RobotManage.mainMachine.RightMoveInfo.MoveStep == MoveStep.Wait || RobotManage.mainMachine.RightMoveInfo.MoveStep == MoveStep.REND))
......@@ -389,7 +389,7 @@ namespace AutoScanAndLabel
{
Invoke((EventHandler)delegate
{
btn_releaserightshelf.Text = $"右侧料串等待释放中({timeout / 2})";
btn_releaserightshelf.Text = string.Format("右侧料串等待释放中({0})", timeout / 2);
});
}
}
......
......@@ -60,7 +60,7 @@ namespace AutoScanAndLabel.UC
{
if (listBox1.SelectedIndex < 0)
return;
var rl=MessageBox.Show($"确定要删除:\"{listBox1.SelectedItem}\"?", "警告", MessageBoxButtons.YesNo);
var rl=MessageBox.Show(string.Format("确定要删除:\"{0}\"?", listBox1.SelectedItem), "警告", MessageBoxButtons.YesNo);
if (rl != DialogResult.Yes)
return;
if (listBox1.SelectedIndex == editindex)
......
......@@ -52,6 +52,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="bean\Bean.cs" />
<Compile Include="CodeResourceControl.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Setting_Init.cs" />
<Compile Include="util\ConfigAppSettings.cs" />
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!