1

ke.sun
Commit 2a6014dc 由 ke.sun 编写于 2018-04-03 17:11:09 +0800
source/ACSingleStore/ACSingleStore.csproj
source/ACSingleStore/FrmBase.Designer.cs
source/ACSingleStore/FrmBase.cs
source/DeviceLibrary/CSmc.dll
source/DeviceLibrary/DeviceLibrary.csproj
source/DeviceLibrary/cdio.dll
--- a/source/ACSingleStore/ACSingleStore.csproj
查看文件 @2a6014d
+++ b/source/ACSingleStore/ACSingleStore.csproj
查看文件 @2a6014d
@@ -33,18 +33,9 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="IrisSkin4">
-      <HintPath>..\..\..\TSA-V\dll\IrisSkin4.dll</HintPath>
-    </Reference>
    <Reference Include="log4net">
      <HintPath>..\..\dll\log4net.dll</HintPath>
    </Reference>
-    <Reference Include="MetroFramework">
-      <HintPath>..\packages\MetroFramework-1.3.0.0.1.3.0.0\lib\MetroFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="MetroFramework.Design">
-      <HintPath>..\packages\MetroFramework-1.3.0.0.1.3.0.0\lib\MetroFramework.Design.dll</HintPath>
-    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
@@ -127,216 +118,76 @@
    <None Include="Skins\back\DeepCyan.ssk" />
    <None Include="Skins\back\DeepGreen.ssk" />
    <None Include="Skins\back\DeepOrange.ssk" />
-    <None Include="Skins\Calmness.ssk">
+    <None Include="Skins\Calmness.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\CalmnessColor1.ssk" />
-    </None>
+    <None Include="Skins\CalmnessColor2.ssk" />
-    <None Include="Skins\CalmnessColor1.ssk">
+    <None Include="Skins\DiamondBlue.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\DiamondGreen.ssk" />
-    </None>
+    <None Include="Skins\DiamondOlive.ssk" />
-    <None Include="Skins\CalmnessColor2.ssk">
+    <None Include="Skins\DiamondPurple.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\DiamondRed.ssk" />
-    </None>
+    <None Include="Skins\Eighteen.ssk" />
-    <None Include="Skins\DiamondBlue.ssk">
+    <None Include="Skins\EighteenColor1.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\EighteenColor2.ssk" />
-    </None>
+    <None Include="Skins\Emerald.ssk" />
-    <None Include="Skins\DiamondGreen.ssk">
+    <None Include="Skins\EmeraldColor1.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\EmeraldColor2.ssk" />
-    </None>
+    <None Include="Skins\EmeraldColor3.ssk" />
-    <None Include="Skins\DiamondOlive.ssk">
+    <None Include="Skins\GlassBrown.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\GlassGreen.ssk" />
-    </None>
+    <None Include="Skins\GlassOrange.ssk" />
-    <None Include="Skins\DiamondPurple.ssk">
+    <None Include="Skins\Longhorn.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\MacOS.ssk" />
-    </None>
+    <None Include="Skins\Midsummer.ssk" />
-    <None Include="Skins\DiamondRed.ssk">
+    <None Include="Skins\MidsummerColor1.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\MidsummerColor2.ssk" />
-    </None>
+    <None Include="Skins\MidsummerColor3.ssk" />
-    <None Include="Skins\Eighteen.ssk">
+    <None Include="Skins\mp10.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\mp10green.ssk" />
-    </None>
+    <None Include="Skins\mp10maroon.ssk" />
-    <None Include="Skins\EighteenColor1.ssk">
+    <None Include="Skins\mp10mulberry.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\mp10pink.ssk" />
-    </None>
+    <None Include="Skins\mp10purple.ssk" />
-    <None Include="Skins\EighteenColor2.ssk">
+    <None Include="Skins\MSN.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\office2007.ssk" />
-    </None>
+    <None Include="Skins\OneBlue.ssk" />
-    <None Include="Skins\Emerald.ssk">
+    <None Include="Skins\OneCyan.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\OneGreen.ssk" />
-    </None>
+    <None Include="Skins\OneOrange.ssk" />
-    <None Include="Skins\EmeraldColor1.ssk">
+    <None Include="Skins\Page.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\PageColor1.ssk" />
-    </None>
+    <None Include="Skins\PageColor2.ssk" />
-    <None Include="Skins\EmeraldColor2.ssk">
+    <None Include="Skins\RealOne.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\Silver.ssk" />
-    </None>
+    <None Include="Skins\SilverColor1.ssk" />
-    <None Include="Skins\EmeraldColor3.ssk">
+    <None Include="Skins\SilverColor2.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\SportsBlack.ssk" />
-    </None>
+    <None Include="Skins\SportsBlue.ssk" />
-    <None Include="Skins\GlassBrown.ssk">
+    <None Include="Skins\SportsCyan.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\SportsGreen.ssk" />
-    </None>
+    <None Include="Skins\SportsOrange.ssk" />
-    <None Include="Skins\GlassGreen.ssk">
+    <None Include="Skins\SteelBlack.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\SteelBlue.ssk" />
-    </None>
+    <None Include="Skins\vista1.ssk" />
-    <None Include="Skins\GlassOrange.ssk">
+    <None Include="Skins\vista1_green.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\Vista2_color1.ssk" />
-    </None>
+    <None Include="Skins\Vista2_color2.ssk" />
-    <None Include="Skins\Longhorn.ssk">
+    <None Include="Skins\Vista2_color3.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\Vista2_color4.ssk" />
-    </None>
+    <None Include="Skins\Vista2_color5.ssk" />
-    <None Include="Skins\MacOS.ssk">
+    <None Include="Skins\Vista2_color6.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\Vista2_color7.ssk" />
-    </None>
+    <None Include="Skins\Warm.ssk" />
-    <None Include="Skins\Midsummer.ssk">
+    <None Include="Skins\WarmColor1.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\WarmColor2.ssk" />
-    </None>
+    <None Include="Skins\WarmColor3.ssk" />
-    <None Include="Skins\MidsummerColor1.ssk">
+    <None Include="Skins\Wave.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\WaveColor1.ssk" />
-    </None>
+    <None Include="Skins\WaveColor2.ssk" />
-    <None Include="Skins\MidsummerColor2.ssk">
+    <None Include="Skins\XPBlue.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="Skins\XPGreen.ssk" />
-    </None>
+    <None Include="Skins\XPOrange.ssk" />
-    <None Include="Skins\MidsummerColor3.ssk">
+    <None Include="Skins\XPSilver.ssk" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\mp10.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\mp10green.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\mp10maroon.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\mp10mulberry.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\mp10pink.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\mp10purple.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\MSN.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\office2007.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\OneBlue.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\OneCyan.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\OneGreen.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\OneOrange.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\Page.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\PageColor1.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\PageColor2.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\RealOne.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\Silver.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\SilverColor1.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\SilverColor2.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\SportsBlack.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\SportsBlue.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\SportsCyan.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\SportsGreen.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\SportsOrange.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\SteelBlack.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\SteelBlue.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\vista1.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\vista1_green.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\Vista2_color1.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\Vista2_color2.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\Vista2_color3.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\Vista2_color4.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\Vista2_color5.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\Vista2_color6.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\Vista2_color7.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\Warm.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\WarmColor1.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\WarmColor2.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\WarmColor3.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\Wave.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\WaveColor1.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\WaveColor2.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\XPBlue.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\XPGreen.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\XPOrange.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Skins\XPSilver.ssk">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
  </ItemGroup>
  <ItemGroup>
    <None Include="App.config">

--- a/source/ACSingleStore/FrmBase.Designer.cs
查看文件 @2a6014d
+++ b/source/ACSingleStore/FrmBase.Designer.cs
查看文件 @2a6014d
@@ -29,17 +29,9 @@
        private void InitializeComponent()
        {
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBase));
-            this.skinEngine1 = new Sunisoft.IrisSkin.SkinEngine();
            this.SuspendLayout();
-            // 
-            // skinEngine1
-            // 
-            this.skinEngine1.@__DrawButtonFocusRectangle = true;
-            this.skinEngine1.DisabledButtonTextColor = System.Drawing.Color.Gray;
-            this.skinEngine1.DisabledMenuFontColor = System.Drawing.SystemColors.GrayText;
-            this.skinEngine1.InactiveCaptionColor = System.Drawing.SystemColors.InactiveCaptionText;
-            this.skinEngine1.SerialNumber = "";
-            this.skinEngine1.SkinFile = null;
            // 
            // FrmBase
            // 
@@ -57,6 +49,5 @@
        #endregion
-        private Sunisoft.IrisSkin.SkinEngine skinEngine1;
    }
 }
\ No newline at end of file
--- a/source/ACSingleStore/FrmBase.cs
查看文件 @2a6014d
+++ b/source/ACSingleStore/FrmBase.cs
查看文件 @2a6014d
@@ -16,7 +16,7 @@ namespace OnlineStore.ACSingleStore
        public FrmBase()
        {
            InitializeComponent();
-            skinEngine1.SkinAllForm = false;
+            //skinEngine1.SkinAllForm = false;
        }
        public void SetSkin(FrmBase preCon)
        { 

--- a/source/DeviceLibrary/CSmc.dll deleted 100644 → 0
查看文件 @87d0f92
+++ b/source/DeviceLibrary/CSmc.dll deleted 100644 → 0
查看文件 @87d0f92
--- a/source/DeviceLibrary/DeviceLibrary.csproj
查看文件 @2a6014d
+++ b/source/DeviceLibrary/DeviceLibrary.csproj
查看文件 @2a6014d
@@ -36,12 +36,6 @@
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="AxInterop.ActProgTypeLib">
-      <HintPath>..\dll\AxInterop.ActProgTypeLib.dll</HintPath>
-    </Reference>
-    <Reference Include="AxInterop.ActUtlTypeLib">
-      <HintPath>..\dll\AxInterop.ActUtlTypeLib.dll</HintPath>
-    </Reference>
    <Reference Include="halcondotnet">
      <HintPath>C:\Program Files\MVTec\HALCON-12.0\bin\dotnet35\halcondotnet.dll</HintPath>
    </Reference>
@@ -49,9 +43,6 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\dll\log4net.dll</HintPath>
    </Reference>
-    <Reference Include="mdbsmnglib">
-      <HintPath>..\dll\mdbsmng\mdbsmnglib.dll</HintPath>
-    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
    <Reference Include="System.Drawing" />
@@ -96,12 +87,6 @@
    </Compile>
  </ItemGroup>
  <ItemGroup>
-    <Content Include="cdio.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="CSmc.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
    <Content Include="halcon.dll">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>

--- a/source/DeviceLibrary/cdio.dll deleted 100644 → 0
查看文件 @87d0f92
+++ b/source/DeviceLibrary/cdio.dll deleted 100644 → 0
查看文件 @87d0f92