Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

ControlUse/Timeline/TimelineChart.Designer.cs

@@ -1,6 +1,6 @@
 namespace Timeline
 {
-    partial class Timeline
+    partial class TimelineChart
     {
         /// <summary>
         /// Required designer variable.

ControlUse/Timeline/TimelineChart.cs

@@ -17,7 +17,7 @@ using Timeline.Processor;
 
 namespace Timeline
 {
-    public partial class Timeline : UserControl
+    public partial class TimelineChart : UserControl
     {
         #region public properties
         public SolidBrush HoverClickSolidBrush { get; set; }
@@ -39,7 +39,7 @@ namespace Timeline
         private int DistinctItemCount { get; set; }
         private DateTime EndDate { get; set; }
         #endregion
-        public Timeline()
+        public TimelineChart()
         {
             InitializeComponent();
         }

ControlUse/Timeline/Timelines.csproj

@@ -47,18 +47,18 @@
     <Compile Include="Model\HeaderModel.cs" />
     <Compile Include="Model\ItemModel.cs" />
     <Compile Include="Processor\BarChartProcessor.cs" />
-    <Compile Include="Timeline.cs">
+    <Compile Include="TimelineChart.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Timeline.Designer.cs">
-      <DependentUpon>Timeline.cs</DependentUpon>
+    <Compile Include="TimelineChart.Designer.cs">
+      <DependentUpon>TimelineChart.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Timeline.resx">
-      <DependentUpon>Timeline.cs</DependentUpon>
+    <EmbeddedResource Include="TimelineChart.resx">
+      <DependentUpon>TimelineChart.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup />