Commit 477bf116 刘韬

1

1 个父辈 a8914816
{
"CurrentProjectSetting": null
}
\ No newline at end of file
{
"ExpandedNodes": [
""
],
"SelectedNode": "\\FaceControl.sln",
"PreviewInSolutionExplorer": false
}
\ No newline at end of file
此文件类型无法预览
......@@ -336,7 +336,7 @@ namespace Asa.FaceControl
g.CompositingQuality = CompositingQuality.HighQuality;
g.InterpolationMode = InterpolationMode.HighQualityBicubic;
g.Clear(BackColor); //背景
if (Enabled)
DrawEnabled(g);
else
......
......@@ -117,7 +117,7 @@ namespace Asa.FaceControl
protected override void DrawEnabled(Graphics g)
{
base.DrawEnabled(g);
if (_bmp != null)
{
RectangleF destRect = new RectangleF(Offset.X, Offset.Y, _bmp.Width * zoom / 100f, _bmp.Height * zoom / 100f);
......
......@@ -392,7 +392,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy "$(TargetPath)" "C:\Neotel\DLL\$(ProjectName)\$(TargetFileName)"
copy "$(TargetDir)$(TargetName).pdb" "C:\Neotel\DLL\$(ProjectName)\$(TargetName).pdb"</PostBuildEvent>
<PostBuildEvent>rem copy "$(TargetPath)" "C:\Neotel\DLL\$(ProjectName)\$(TargetFileName)"
rem copy "$(TargetDir)$(TargetName).pdb" "C:\Neotel\DLL\$(ProjectName)\$(TargetName).pdb"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
......@@ -13,12 +13,12 @@ namespace Asa.FaceControl
private readonly DialogResult[] dialog;
private readonly FaceButton[] button;
public FaceMessageBox(string title, string text, MessageBoxButtons button)
public FaceMessageBox(string title, string text, MessageBoxButtons button, bool topmost=false)
{
InitializeComponent();
ctlClose.Click += CtlClose_Click;
CanResize = false;
this.TopMost = topmost;
dialog = new DialogResult[3];
this.button = new FaceButton[3] { BtnOne, BtnTwo, BtnThree };
BtnOne.Click += BtnMessage_Click;
......
......@@ -3,6 +3,7 @@ using System.Xml;
using System.Windows.Forms;
using System.Collections.Generic;
using System.Drawing;
using System.Diagnostics;
namespace Asa.FaceControl
{
......@@ -202,9 +203,11 @@ namespace Asa.FaceControl
foreach (Control cc in ctl.Controls)
{
if (cc.Name == "") continue;
int idx = langForm[langIndex].ControlLang.FindIndex(s => s.Name == cc.Name);
if (idx > -1)
{
//Debugger.Break();
cc.Text = langForm[langIndex].ControlLang[idx].Text;
if (cc is FacePanel)
((FacePanel)cc).TitleFont = langForm[langIndex].ControlLang[idx].Font;
......
c119d35507cdf3dbdd61dbcb4425317d50b7ddca
19ff165678f65fb2c1dde1a4024f6df4c1c8a31e
......@@ -81,3 +81,46 @@ C:\Neotel\Program\FaceControl\FaceControl\obj\Debug\FaceControl.csproj.CopyCompl
C:\Neotel\Program\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceLoading.resources
C:\Neotel\Program\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceLoadBox.resources
C:\Neotel\Program\FaceControl\FaceControl\obj\Debug\FaceControl.csproj.AssemblyReference.cache
D:\rick\vs\FaceControl\FaceControl\bin\Debug\Asa.Face.Control.dll
D:\rick\vs\FaceControl\FaceControl\bin\Debug\Asa.Face.Control.pdb
D:\rick\vs\FaceControl\FaceControl\bin\Debug\log4net.dll
D:\rick\vs\FaceControl\FaceControl\bin\Debug\log4net.xml
D:\rick\vs\FaceControl\FaceControl\obj\Debug\FaceControl.csproj.AssemblyReference.cache
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.ControlBase.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FormBase.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceLabel.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceButton.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceTextBox.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.CtlDel.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.CtlQuery.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceCheckBox.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceRadioBox.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.CtlScrollUp.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.CtlScrollDown.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceScrollBar.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.CtlBar.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceListBox.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.CtlComboArrow.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceComboBox.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.CtlNumericDown.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.CtlNumericUp.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceNumericUpDown.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FacePanel.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FacePictureBox.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FacePasswordLock.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceLoading.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceLoadBox.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceFormFixed.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceInputBox.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceMessageBox.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.CtlClose.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.CtlMax.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.CtlMin.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceFormNormal.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.PanelBase.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.Resource1.resources
D:\rick\vs\FaceControl\FaceControl\obj\Debug\FaceControl.csproj.GenerateResource.cache
D:\rick\vs\FaceControl\FaceControl\obj\Debug\FaceControl.csproj.CoreCompileInputs.cache
D:\rick\vs\FaceControl\FaceControl\obj\Debug\FaceControl.csproj.CopyComplete
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.Face.Control.dll
D:\rick\vs\FaceControl\FaceControl\obj\Debug\Asa.Face.Control.pdb
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!