Merge pull request #110 from loveyou3thousand/dev

fix up some unfindable files issues

Author: yanjinhuagood

src/WPFDevelopers.Net40/Themes/Theme.xaml

@@ -3,7 +3,6 @@
 	<PropertyGroup>
 		<TargetFramework>net40</TargetFramework>
 		<SignAssembly>True</SignAssembly>
-		<AssemblyOriginatorKeyFile>E:\Code\git\WPFDevelopers\WPFDevelopersMultiple\WPFDevelopers.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
 	<Import Project="..\WPFDevelopers.Shared\WPFDevelopers.Shared.projitems" Label="Shared" />
 	<Import Project="..\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />

src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj

@@ -4,7 +4,6 @@
 	<PropertyGroup>
 		<UseWindowsForms>true</UseWindowsForms>
 		<SignAssembly>True</SignAssembly>
-		<AssemblyOriginatorKeyFile>E:\Code\git\WPFDevelopers\WPFDevelopersMultiple\WPFDevelopers.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
 	<Import Project="..\WPFDevelopers.Shared\WPFDevelopers.Shared.projitems" Label="Shared" />
 	<Import Project="..\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />

src/WPFDevelopers.Net45x/Themes/Theme.xaml

@@ -45,7 +45,7 @@
                     <Border
                         x:Name="PART_Border"
                         Background="{TemplateBinding Background}"
-                        CornerRadius="{TemplateBinding helpers:ControlsHelper.CornerRadius}"
+                        CornerRadius="{TemplateBinding helpers:ElementHelper.CornerRadius}"
                         SnapsToDevicePixels="True"
                         UseLayoutRounding="True">
                         <Grid>

src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj

@@ -30,7 +30,7 @@ Basic\ControlBasic.xaml
 ..\Styles\Styles.TreeView.xaml
 ..\Styles\Styles.MessageBox.xaml
 ..\Styles\Styles.Loading.xaml
-..\Styles\Styles.ThemeControl.xaml
+..\Styles\Styles.Theme.xaml
 ..\Styles\Styles.GridSplitter.xaml
 ..\Styles\Styles.Label.xaml
 ..\Styles\Styles.RepeatButton.xaml

src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml

@@ -30,7 +30,7 @@ Basic\ControlBasic.xaml
 ..\Styles\Styles.TreeView.xaml
 ..\Styles\Styles.MessageBox.xaml
 ..\Styles\Styles.Loading.xaml
-..\Styles\Styles.ThemeControl.xaml
+..\Styles\Styles.Theme.xaml
 ..\Styles\Styles.GridSplitter.xaml
 ..\Styles\Styles.Label.xaml
 ..\Styles\Styles.RepeatButton.xaml

src/WPFDevelopers.Shared/Themes/Theme40.txt

@@ -20,9 +20,12 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\HSB.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\HSL.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\IPEditBox\IPEditBox.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Loadings\LoadingBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Loading\LoadingExt.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Panel\WaterfallPanel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ScreenCut\ScreenCaptureExt.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Theme\Theme.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Theme\ThemeModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TimePicker\TimePicker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TimePicker\TimeSelector.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TimePicker\TimeSelectorItem.cs" />
@@ -53,7 +56,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\Helper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\ImagingHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\WidthHeightToRectConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\PanelHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\TextBoxHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Core\Utilities\FormatExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Languages\Language.Designer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\TextBoxValueChangedEventArgs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\DatePickerHelper.cs" />
@@ -132,8 +137,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Status.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Step\Step.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Step\StepItem.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\ThemeControl\ThemeControl.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\ThemeControl\ThemeModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Thermometer\Thermometer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\VerifyCode\VerifyCode.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\VirtualizingWrapPanel\VirtualizingWrapPanel.cs" />
@@ -376,7 +379,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Styles\Styles.ThemeControl.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)Styles\Styles.Theme.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>