diff --git a/src/WPFDevelopers.Net40/Themes/Generic.xaml b/src/WPFDevelopers.Net40/Themes/Generic.xaml
index 2847a498..04a35980 100644
--- a/src/WPFDevelopers.Net40/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Generic.xaml
@@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:control="clr-namespace:WPFDevelopers.Controls"
xmlns:converts="clr-namespace:WPFDevelopers.Converts"
+ xmlns:resx="clr-namespace:WPFDevelopers"
xmlns:shell="clr-namespace:Microsoft.Windows.Shell"
xmlns:wd="clr-namespace:WPFDevelopers.Net40">
@@ -74,7 +75,8 @@
Padding="0"
Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}"
IsTabStop="False"
- Style="{DynamicResource WD.WindowButtonStyle}">
+ Style="{DynamicResource WD.WindowButtonStyle}"
+ ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
+ Style="{DynamicResource WD.WindowButtonStyle}"
+ ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
+ Style="{DynamicResource WD.WindowButtonStyle}"
+ ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
+
#AA000000
#909399
@@ -145,6 +145,8 @@
6
6
+
+
0,0,0,2
-
-
-
+
+
+
-
-
+
+
@@ -346,26 +348,26 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -772,23 +774,23 @@
-
-
@@ -860,7 +862,7 @@
-
+
@@ -940,9 +942,9 @@
-
+
-
+
@@ -1401,14 +1403,28 @@
-
-
+
@@ -2973,6 +2992,8 @@
+
+
@@ -2986,10 +3007,11 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
@@ -346,26 +348,26 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -773,23 +775,23 @@
-
-
@@ -861,7 +863,7 @@
-
+
@@ -941,9 +943,9 @@
-
+
-
+
@@ -1402,14 +1404,28 @@
-
-
+
@@ -2974,6 +2993,8 @@
+
+
@@ -2987,10 +3008,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/AcrylicBlurWindowExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/AcrylicBlurWindowExample.xaml
index f0ae2710..7b853af8 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/AcrylicBlurWindowExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/AcrylicBlurWindowExample.xaml
@@ -4,13 +4,13 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
- xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
mc:Ignorable="d" WindowStartupLocation="CenterScreen"
ResizeMode="CanMinimize"
Title="Login" Height="350" Width="400">
-
-
-
+
+
+
@@ -33,8 +33,8 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ VerticalAlignment="Bottom"
+ Content="进入直播"
+ Style="{StaticResource WD.PrimaryButton}" />
+
+
+
-
-
- XXXYYY
-
- 正在直播
-
-
-
+ VerticalAlignment="Bottom"
+ Content="进入直播"
+ Style="{StaticResource WD.PrimaryButton}" />
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- WPF开发者
-
- 正在直播
-
-
-
-
-
+
+
+ WPF开发者
+
+ 正在直播
+
+
+
+
+
-
-
+
+
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BubblleControlExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BubblleControlExample.xaml
index 76b3fd87..ce14c814 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BubblleControlExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BubblleControlExample.xaml
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
@@ -13,8 +13,8 @@
-
-
+
+
WPF
ASP.NET
@@ -26,11 +26,11 @@
WinForm
UWP
-
-
+
+
-
+
@@ -94,7 +94,7 @@
-
+
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CarouselExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CarouselExample.xaml
index 7e18545e..198b3012 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CarouselExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CarouselExample.xaml
@@ -4,18 +4,18 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
- xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicBarChartExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartBarExample.xaml.cs
similarity index 81%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/BasicBarChartExample.xaml.cs
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/ChartBarExample.xaml.cs
index 04e7bdc0..c5b48bfd 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicBarChartExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartBarExample.xaml.cs
@@ -1,23 +1,14 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
-using System.Text;
using System.Windows;
using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
namespace WPFDevelopers.Samples.ExampleViews
{
///
- /// BasicBarChartExample.xaml 的交互逻辑
+ /// ChartBarExample.xaml 的交互逻辑
///
- public partial class BasicBarChartExample : UserControl
+ public partial class ChartBarExample : UserControl
{
public IEnumerable> SeriesModels
{
@@ -26,7 +17,7 @@ public IEnumerable> SeriesModels
}
public static readonly DependencyProperty SeriesModelsProperty =
- DependencyProperty.Register("SeriesModels", typeof(IEnumerable>), typeof(BasicBarChartExample), new PropertyMetadata(null));
+ DependencyProperty.Register("SeriesModels", typeof(IEnumerable>), typeof(ChartBarExample), new PropertyMetadata(null));
Dictionary>> keyValues = new Dictionary>>();
@@ -36,9 +27,9 @@ public string KeyBarChart
set { SetValue(KeyBarChartProperty, value); }
}
public static readonly DependencyProperty KeyBarChartProperty =
- DependencyProperty.Register("KeyBarChart", typeof(string), typeof(BasicBarChartExample), new PropertyMetadata(null));
+ DependencyProperty.Register("KeyBarChart", typeof(string), typeof(ChartBarExample), new PropertyMetadata(null));
private int _index = 0;
- public BasicBarChartExample()
+ public ChartBarExample()
{
InitializeComponent();
var Models1 = new[]
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml
new file mode 100644
index 00000000..26a69c63
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml.cs
new file mode 100644
index 00000000..6da42b8a
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml.cs
@@ -0,0 +1,62 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+ ///
+ /// ChartLineExample.xaml 的交互逻辑
+ ///
+ public partial class ChartLineExample : UserControl
+ {
+ public IEnumerable> Datas
+ {
+ get { return (IEnumerable>)GetValue(DatasProperty); }
+ set { SetValue(DatasProperty, value); }
+ }
+
+ public static readonly DependencyProperty DatasProperty =
+ DependencyProperty.Register("Datas", typeof(IEnumerable>), typeof(ChartLineExample), new PropertyMetadata(null));
+
+ private Dictionary>> keyValues = new Dictionary>>();
+ private int _index = 0;
+ public ChartLineExample()
+ {
+ InitializeComponent();
+ var models1 = new[]
+ {
+ new KeyValuePair("Mon", 120),
+ new KeyValuePair("Tue", 530),
+ new KeyValuePair("Wed", 1060),
+ new KeyValuePair("Thu", 140),
+ new KeyValuePair("Fri", 8000) ,
+ new KeyValuePair("Sat", 200) ,
+ new KeyValuePair("Sun", 300) ,
+ };
+ var models2 = new[]
+ {
+ new KeyValuePair("（1）月", 120),
+ new KeyValuePair("（2）月", 170),
+ new KeyValuePair("（3）月", 30),
+ new KeyValuePair("（4）月", 200),
+ new KeyValuePair("（5）月", 100) ,
+ new KeyValuePair("（6）月", 180) ,
+ new KeyValuePair("（7）月", 90) ,
+ };
+ keyValues.Add("1", models1);
+ keyValues.Add("2", models2);
+ Datas = models1;
+ }
+
+ private void Button_Click(object sender, RoutedEventArgs e)
+ {
+ _index++;
+ if (_index >= keyValues.Count)
+ {
+ _index = 0;
+ }
+ Datas = keyValues.ToList()[_index].Value;
+ }
+ }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml
similarity index 75%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml
index 3b7c834c..705ce488 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml
@@ -1,12 +1,12 @@
@@ -40,12 +40,12 @@
FontSize="18"
FontWeight="Black"
Foreground="#2B579A"
- Text="{Binding NowPlayerName, RelativeSource={RelativeSource AncestorType=local:RadarChartExample}}" />
+ Text="{Binding NowPlayerName, RelativeSource={RelativeSource AncestorType=local:ChartRadarExample}}" />
-
+ Datas="{Binding Datas, RelativeSource={RelativeSource AncestorType=local:ChartRadarExample}}" />
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml.cs
similarity index 69%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml.cs
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml.cs
index b7837dc4..d946a885 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml.cs
@@ -10,17 +10,19 @@
namespace WPFDevelopers.Samples.ExampleViews
{
///
- /// RadarChartExample.xaml 的交互逻辑
+ /// ChartRadarExample.xaml 的交互逻辑
///
- public partial class RadarChartExample : UserControl
+ public partial class ChartRadarExample : UserControl
{
- public ObservableCollection RadarModels
+ public IEnumerable> Datas
{
- get { return (ObservableCollection)GetValue(RadarModelsProperty); }
- set { SetValue(RadarModelsProperty, value); }
+ get { return (IEnumerable>)GetValue(DatasProperty); }
+ set { SetValue(DatasProperty, value); }
}
- public static readonly DependencyProperty RadarModelsProperty =
- DependencyProperty.Register("RadarModels", typeof(ObservableCollection), typeof(RadarChartExample), new PropertyMetadata(null));
+
+ public static readonly DependencyProperty DatasProperty =
+ DependencyProperty.Register("Datas", typeof(IEnumerable>), typeof(ChartRadarExample), new PropertyMetadata(null));
+
List Players = new List();
private int NowPlayerIndex = 0;
public string NowPlayerName
@@ -29,23 +31,22 @@ public string NowPlayerName
set { SetValue(NowPlayerNameProperty, value); }
}
public static readonly DependencyProperty NowPlayerNameProperty =
- DependencyProperty.Register("NowPlayerName", typeof(string), typeof(RadarChartExample), new PropertyMetadata(null));
+ DependencyProperty.Register("NowPlayerName", typeof(string), typeof(ChartRadarExample), new PropertyMetadata(null));
- List> collectionList = new List>();
- public RadarChartExample()
+ List>> collectionList = new List>>();
+ public ChartRadarExample()
{
InitializeComponent();
- RadarModels = new ObservableCollection();
Player theShy = new Player()
{
姓名 = "The Shy",
- 击杀 = 80,
- 助攻 = 50,
+ 击杀 = 800,
+ 助攻 = 500,
物理 = 90,
- 生存 = 10,
- 金钱 = 60,
- 防御 = 30,
- 魔法 = 30
+ 生存 = 120,
+ 金钱 = 360,
+ 防御 = 230,
+ 魔法 = 130
};
Player xiaoHu = new Player()
{
@@ -77,7 +78,7 @@ public RadarChartExample()
物理 = 80,
生存 = 70,
金钱 = 80,
- 防御 = 80,
+ 防御 = 100,
魔法 = 30
};
Players.AddRange(new[] { theShy, xiaoHu, yinHang, flandre });
@@ -88,14 +89,14 @@ public RadarChartExample()
foreach (var player in Players)
{
- var collectionpPayer = new ObservableCollection();
+ var collectionpPayer = new List>();
Array.ForEach(pArray, p =>
{
- collectionpPayer.Add(new RadarModel { Text = $"{p.Name}（{(int)p.GetValue(player, null)}分）", ValueMax = (int)p.GetValue(player, null) });
+ collectionpPayer.Add(new KeyValuePair( $"{p.Name}（{(int)p.GetValue(player, null)}分）", (int)p.GetValue(player, null)));
});
collectionList.Add(collectionpPayer);
}
- RadarModels = collectionList[0];
+ Datas = collectionList[0];
NowPlayerName = Players[0].姓名;
}
@@ -106,7 +107,7 @@ private void Button_Click(object sender, RoutedEventArgs e)
{
NowPlayerIndex = 0;
}
- RadarModels = collectionList[NowPlayerIndex];
+ Datas = collectionList[NowPlayerIndex];
NowPlayerName = Players[NowPlayerIndex].姓名;
}
}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChatEmojiExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChatEmojiExample.xaml
index 6ea48ee2..45552b88 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChatEmojiExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChatEmojiExample.xaml
@@ -6,7 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d">
@@ -87,7 +87,7 @@
-
+
-
+
-
+
-
+
diff --git a/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml b/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
index 0cfe0a2d..29f60eda 100644
--- a/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
+++ b/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
@@ -2,7 +2,8 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:WPFDevelopers.Controls"
- xmlns:helpers="clr-namespace:WPFDevelopers.Helpers">
+ xmlns:helpers="clr-namespace:WPFDevelopers.Helpers"
+ xmlns:resx="clr-namespace:WPFDevelopers">
@@ -79,7 +80,7 @@
x:Name="PART_RadioButtonRectangle"
Margin="4,0"
Style="{DynamicResource WD.PathRadioButton}"
- ToolTip="方框">
+ ToolTip="{Binding [Rectangle], Source={x:Static resx:LanguageManager.Instance}}">
+ ToolTip="{Binding [Ellipse], Source={x:Static resx:LanguageManager.Instance}}">
+ ToolTip="{Binding [Arrow], Source={x:Static resx:LanguageManager.Instance}}">
+ ToolTip="{Binding [Ink], Source={x:Static resx:LanguageManager.Instance}}">
+ ToolTip="{Binding [Text], Source={x:Static resx:LanguageManager.Instance}}">
+ ToolTip="{Binding [Save], Source={x:Static resx:LanguageManager.Instance}}">
+ ToolTip="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}">
+ ToolTip="{Binding [Complete], Source={x:Static resx:LanguageManager.Instance}}">
WPFDevelopers
+
+
+
+
+
+
@@ -37,13 +43,17 @@
+
+
+
+
@@ -54,7 +64,7 @@
-
+
@@ -81,10 +91,9 @@
-
+
-
@@ -113,8 +122,7 @@
-
-
+
@@ -149,6 +157,7 @@
+
@@ -523,10 +532,6 @@
MSBuild:Compile
Designer
-
- MSBuild:Compile
- Designer
-
MSBuild:Compile
Designer
@@ -561,6 +566,9 @@
+
+
+
diff --git a/src/WPFDevelopers.sln b/src/WPFDevelopers.sln
index 9bd16c28..4014fd8b 100644
--- a/src/WPFDevelopers.sln
+++ b/src/WPFDevelopers.sln
@@ -80,6 +80,8 @@ Global
{88DD2697-4DF1-40DC-B33B-DE1FD9846800} = {2C729CA5-1110-40DA-8EF4-2A7549072C53}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
+ RESX_SaveFilesImmediatelyUponChange = False
+ RESX_NeutralResourcesLanguage = zh-CN
SolutionGuid = {641F8D5D-5514-4C9A-9FAB-7FAF38D9C008}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution