Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from WPFDevelopersOrg:master #103

Merged
merged 43 commits into from
Jul 9, 2023
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
a080083
Merge pull request #52 from WPFDevelopersOrg/master
yanjinhuagood Jul 3, 2023
459ec06
Update BaseControl.cs
yanjinhuagood Jul 9, 2023
9c0dd49
update Mask control
yanjinhuagood Jul 9, 2023
a780bcd
Update ControlsHelper.cs
yanjinhuagood Jul 9, 2023
038057d
Update WindowHelpers.cs
yanjinhuagood Jul 9, 2023
951e73e
Update Styles.CheckBox.xaml
yanjinhuagood Jul 9, 2023
7097b8a
Update Styles.ComboBox.xaml
yanjinhuagood Jul 9, 2023
38659fb
Update Styles.DataGrid.xaml
yanjinhuagood Jul 9, 2023
5d8a179
Update Styles.Label.xaml
yanjinhuagood Jul 9, 2023
71f9457
Update Styles.RadioButton.xaml
yanjinhuagood Jul 9, 2023
3724c1e
Update BreadCrumbBar.xaml
yanjinhuagood Jul 9, 2023
be638fc
update in Loading
yanjinhuagood Jul 9, 2023
71d9f63
Update NormalLoading.cs
yanjinhuagood Jul 9, 2023
4e5ab6c
Update Badge.cs
yanjinhuagood Jul 9, 2023
0ab85b8
Update ControlBasic.xaml
yanjinhuagood Jul 9, 2023
fb652f7
add in Message control
yanjinhuagood Jul 9, 2023
1688de3
Create Message.xaml
yanjinhuagood Jul 9, 2023
1df0e89
Update LoadingExample.xaml
yanjinhuagood Jul 9, 2023
576ddea
Update BreatheLightExample.xaml
yanjinhuagood Jul 9, 2023
d49819f
Update in BasicControlsExample.xaml
yanjinhuagood Jul 9, 2023
d44285a
Create in Message Example
yanjinhuagood Jul 9, 2023
8f42b75
Update BadgeExample.xaml
yanjinhuagood Jul 9, 2023
d742bb4
Update in Window
yanjinhuagood Jul 9, 2023
8cb19da
Update MainWindow.xaml
yanjinhuagood Jul 9, 2023
190954a
Update MenuEnum.cs
yanjinhuagood Jul 9, 2023
da66b7e
Update MainVM.cs
yanjinhuagood Jul 9, 2023
d89d963
Update Generic.xaml
yanjinhuagood Jul 9, 2023
37d992f
Update WPFDevelopers.Net40.csproj
yanjinhuagood Jul 9, 2023
f31576e
Update Theme.xaml
yanjinhuagood Jul 9, 2023
b7d69a2
Update WPFDevelopers.Net45x.csproj
yanjinhuagood Jul 9, 2023
a4bf0e4
Update WPFDevelopers.Samples.Shared.projitems
yanjinhuagood Jul 9, 2023
e87b2f2
Update WPFDevelopers.Samples40.csproj
yanjinhuagood Jul 9, 2023
f05e996
Update WPFDevelopers.Samples45x.csproj
yanjinhuagood Jul 9, 2023
c17c534
Update WPFDevelopers.SamplesCode.csproj
yanjinhuagood Jul 9, 2023
2f3d931
Update Theme40.txt
yanjinhuagood Jul 9, 2023
d53db43
Update Theme45x.txt
yanjinhuagood Jul 9, 2023
ad70e38
Update WPFDevelopers.Shared.projitems
yanjinhuagood Jul 9, 2023
25a50d5
Update NoChromeWindow.xaml
yanjinhuagood Jul 9, 2023
c09e19a
Update NoneNoChromeWindow.xaml
yanjinhuagood Jul 9, 2023
a6fdb62
Update WPFDevelopers.SamplesCode.csproj
yanjinhuagood Jul 9, 2023
b65b8d2
Merge pull request #55 from WPFDevelopersOrg/dev
yanjinhuagood Jul 9, 2023
49b7c16
Update README.md
yanjinhuagood Jul 9, 2023
6fc9e90
Update README-zh.md
yanjinhuagood Jul 9, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update WPFDevelopers.Shared.projitems
  • Loading branch information
yanjinhuagood committed Jul 9, 2023
commit ad70e388baa69a4d9aa24603bae32b51da88af66
9 changes: 9 additions & 0 deletions src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,16 @@
<Compile Include="$(MSBuildThisFileDirectory)Controls\BreadCrumbBar\BreadCrumbBar.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Controls\BreadCrumbBar\BreadCrumbBarItem.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Controls\CropImage\CropImage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Controls\Message\Message.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Controls\Message\MessageAdorner.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Controls\Message\MessageListBox.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Controls\Message\MessageListBoxItem.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Controls\MultiSelectionSearchComboBox\MultiSelectListBox.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Controls\MultiSelectionSearchComboBox\MultiSelectSearchComboBox.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Converts\BreadCrumbBarConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Converts\DatePickerToCurrentConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Helpers\DatePickerHelper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Helpers\ListBoxItemExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Helpers\ScrollIntoView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Controls\AnimationAudio\AnimationAudio.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Controls\AnimationAudio\AudioWindow.cs" />
Expand Down Expand Up @@ -425,6 +430,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Themes\Message.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Themes\MultiSelectComboBox.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
Expand Down