Skip to content

dev pull request master #130

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.

Sign up for GitHub

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

Merged
merged 54 commits into from
Dec 26, 2024
Merged

dev pull request master #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
bebeb49
Update TargetFrameworks.props
yanjinhuagood Nov 19, 2024
f05fb26
Update WPFDevelopers.Net45x.csproj
yanjinhuagood Nov 19, 2024
f1d464f
add in DateRange（#118）
yanjinhuagood Nov 19, 2024
b958ef1
Update PanningItemsExample.xaml.cs
yanjinhuagood Nov 19, 2024
0f4099f
Update ChatEmoji.cs
yanjinhuagood Nov 19, 2024
38702b3
Merge branch 'dev' of https://github.com/WPFDevelopersOrg/WPFDevelope…
yanjinhuagood Nov 19, 2024
b5b5f8f
Merge pull request #121 from WPFDevelopersOrg/master
yanjinhuagood Nov 19, 2024
3946314
Merge branch 'dev' of https://github.com/WPFDevelopersOrg/WPFDevelope…
yanjinhuagood Nov 19, 2024
7e2dc52
Update Styles.ComboBox.xaml
yanjinhuagood Nov 20, 2024
cddd9b4
Update MultiSelectComboBox.xaml
yanjinhuagood Nov 20, 2024
6756382
Update MultiSelectSearchComboBox.xaml
yanjinhuagood Nov 20, 2024
e0516fe
Update DateRangePickerExample.xaml
yanjinhuagood Nov 20, 2024
652f76d
Update MultiSelectComboBoxExample.xaml
yanjinhuagood Nov 20, 2024
a9f5401
Update MultiSelectSearchComboBoxExample.xaml
yanjinhuagood Nov 20, 2024
7617697
Update DateRangePicker.xaml
yanjinhuagood Nov 20, 2024
2a19b98
Update LanguageManager.cs
yanjinhuagood Nov 20, 2024
35608ef
add Language Sample
yanjinhuagood Nov 20, 2024
f29d4a8
Fix issue #123
yanjinhuagood Nov 24, 2024
3fbcc67
Update Styles.Label.xaml
yanjinhuagood Dec 1, 2024
34408a6
Update Resources.cs
yanjinhuagood Dec 1, 2024
be2e961
Update CycleLoading.cs
yanjinhuagood Dec 1, 2024
4a2044c
Create ScaleBase.cs
yanjinhuagood Dec 1, 2024
4c7adc9
Update Ruler.cs
yanjinhuagood Dec 1, 2024
c043df6
Update Thermometer.cs
yanjinhuagood Dec 1, 2024
efc8373
Update ThermometerExample.xaml
yanjinhuagood Dec 1, 2024
abfa577
Update RulerControlExample.xaml.cs
yanjinhuagood Dec 1, 2024
d22e92d
Update RulerControlExample.xaml
yanjinhuagood Dec 1, 2024
29e96ba
Fix issue （#124 ）
yanjinhuagood Dec 1, 2024
3feb946
Fix issue （#116 ）
yanjinhuagood Dec 1, 2024
0f419d4
Fix issue （#124 ）
yanjinhuagood Dec 1, 2024
57318ae
Update ControlsHelper.cs
yanjinhuagood Dec 1, 2024
1925d21
Update MultiSelectComboBoxExample.xaml
yanjinhuagood Dec 1, 2024
01d2fe6
Update MultiSelectSearchComboBox.xaml
yanjinhuagood Dec 1, 2024
0e13e48
Update MultiSelectComboBox.xaml
yanjinhuagood Dec 1, 2024
14aed35
Update WPFDevelopers.Shared.projitems
yanjinhuagood Dec 1, 2024
ca59e41
Update Styles.TabControl.xaml
yanjinhuagood Dec 8, 2024
83e7c06
Fix issue（ #126 ）
yanjinhuagood Dec 8, 2024
721a35d
Fix issue （#126 ）
yanjinhuagood Dec 8, 2024
3fda4b8
Fix issue （#125 ）
yanjinhuagood Dec 17, 2024
e2961ce
Change CircleManu to CircleManu
yanjinhuagood Dec 17, 2024
d7cd8c3
Update Resources.props
yanjinhuagood Dec 17, 2024
2bfd1ac
Update TargetFrameworks.props
yanjinhuagood Dec 17, 2024
263f86c
Update WPFDevelopers.Net45x.csproj
yanjinhuagood Dec 17, 2024
be272b9
Fix issue （#128 ）
yanjinhuagood Dec 17, 2024
01e959c
Update Drawer.cs
yanjinhuagood Dec 17, 2024
68e6068
Fix issue （#128）
yanjinhuagood Dec 17, 2024
c2a0c24
Change CircleManu to CircleManu
yanjinhuagood Dec 17, 2024
66df448
Update IPEditBox.xaml
yanjinhuagood Dec 17, 2024
754a0eb
Update TimePicker.cs
yanjinhuagood Dec 17, 2024
054386b
Update WDMessageBox.cs
yanjinhuagood Dec 17, 2024
26792f8
Fix issue （#129）
yanjinhuagood Dec 19, 2024
9be69cd
Fix issue （#128）
yanjinhuagood Dec 19, 2024
fd1b84e
Update CircleProgressBar.cs
yanjinhuagood Dec 26, 2024
ab44e3b
Fix issue （#127 ）
yanjinhuagood Dec 26, 2024
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
120 changes: 20 additions & 100 deletions src/Resources.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,45 +22,16 @@
<HintPath>..\..\Reference\System.Windows.Interactivity.dll</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
<Resource Include="..\WPFDevelopers.Samples.Shared\WPFDevelopers.ico">
<Link>WPFDevelopers.ico</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\发烧.png">
<Link>Resources\emoji\发烧.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\大笑.png">
<Link>Resources\emoji\大笑.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\得意.png">
<Link>Resources\emoji\得意.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\思考.png">
<Link>Resources\emoji\思考.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\生病.png">
<Link>Resources\emoji\生病.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\破涕为笑.png">
<Link>Resources\emoji\破涕为笑.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Lock.png">
<Link>Resources\Assets\Lock.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Mail.png">
<Link>Resources\Assets\Mail.png</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\emoji\*.png">
<Link>Resources\emoji\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\User.png">
<Link>Resources\Assets\User.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Clear.png">
<Link>Resources\Assets\Clear.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Background.png">
<Link>Resources\Assets\Background.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\Logo.png">
<Link>Resources\Assets\Logo.png</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Assets\*.png">
<Link>Resources\Assets\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Fonts\fixedsys.ttf">
<Link>Resources\Fonts\fixedsys.ttf</Link>
Expand All @@ -71,77 +42,26 @@
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\AnimationNavigationBar3D\background.png">
<Link>Resources\Images\AnimationNavigationBar3D\background.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\0.jpg">
<Link>Resources\Images\Breathe\0.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\1.jpg">
<Link>Resources\Images\Breathe\1.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\2.jpg">
<Link>Resources\Images\Breathe\2.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\Left.jpg">
<Link>Resources\Images\Chat\Left.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\Right.jpg">
<Link>Resources\Images\Chat\Right.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\UserImages\jingtao.png">
<Link>Resources\Images\Chat\UserImages\jingtao.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\UserImages\yanjinhua.png">
<Link>Resources\Images\Chat\UserImages\yanjinhua.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\1.png">
<Link>Resources\Images\CircularMenu\1.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\2.png">
<Link>Resources\Images\CircularMenu\2.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\3.png">
<Link>Resources\Images\CircularMenu\3.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\4.png">
<Link>Resources\Images\CircularMenu\4.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\5.png">
<Link>Resources\Images\CircularMenu\5.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\6.png">
<Link>Resources\Images\CircularMenu\6.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\7.png">
<Link>Resources\Images\CircularMenu\7.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircularMenu\8.png">
<Link>Resources\Images\CircularMenu\8.png</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\0.jpg">
<Link>Resources\Images\Craouse\0.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\1.jpg">
<Link>Resources\Images\Craouse\1.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\2.jpg">
<Link>Resources\Images\Craouse\2.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\3.jpg">
<Link>Resources\Images\Craouse\3.jpg</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\*.jpg">
<Link>Resources\Images\Breathe\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\4.jpg">
<Link>Resources\Images\Craouse\4.jpg</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\*.jpg">
<Link>Resources\Images\Chat\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Crop\0.jpg">
<Link>Resources\Images\Crop\0.jpg</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Chat\UserImages\*.png">
<Link>Resources\Images\Chat\UserImages\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\Eye_50px.png">
<Link>Resources\Images\Passwrod\Eye_50px.png</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\CircleMenu\*.png">
<Link>Resources\Images\CircleMenu\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\Invisible_50px.png">
<Link>Resources\Images\Passwrod\Invisible_50px.png</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Craouse\*.jpg">
<Link>Resources\Images\Craouse\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\Lock_48px.png">
<Link>Resources\Images\Passwrod\Lock_48px.png</Link>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Crop\0.jpg">
<Link>Resources\Images\Crop\0.jpg</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Passwrod\*.png">
<Link>Resources\Images\Passwrod\%(Filename)%(Extension)</Link>
</Resource>
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Snow\SnowTree.png">
<Link>Resources\Images\Snow\SnowTree.png</Link>
Expand Down
35 changes: 35 additions & 0 deletions src/TargetFrameworks.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,39 @@
<PropertyGroup>
<TargetFrameworks>net45;net46;net47;net48;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net47'">
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-windows'">
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PackageReference Include="System.Drawing.Common">
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
</Project>
Loading