Skip to content

Commit caf7e47

Browse files
jogibear9988jogibear9988
committed
Update to ToolKit v2.1
1 parent 9a05263 commit caf7e47

File tree

349 files changed

+24816
-2694
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

349 files changed

+24816
-2694
lines changed

‎Libs/READ_ME.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
The file Xceed.Wpf.Samples.SampleData.dll has been created from Xceed.Silverlight.Samples.SampleData.dll of the Silverlight ListBox.
2+
Only the Silverlight has been changed to Wpf.

‎Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ This program is provided to you under the terms of the Microsoft Public
1414
1515
***********************************************************************************/
1616

17+
#pragma warning disable 0436
1718
[assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
19+
#pragma warning restore 0436
1820

1921
internal static class _XceedVersionInfo
2022
{
2123
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
22-
public const string BaseVersion = "2.0";
24+
public const string BaseVersion = "2.1";
2325
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
2426
public const string Version = BaseVersion +
2527
".0.0";

‎Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml

+26-42
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121

2222

23-
<LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor1Key}"
23+
<LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor1}"
2424
StartPoint="0,0"
2525
EndPoint="1,0">
2626
<LinearGradientBrush.GradientStops>
@@ -29,13 +29,13 @@
2929
</LinearGradientBrush.GradientStops>
3030
</LinearGradientBrush>
3131

32-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor2Key}"
32+
<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor2}"
3333
Color="White"/>
3434

35-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor3Key}"
35+
<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor3}"
3636
Color="Black"/>
3737

38-
<LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor4Key}"
38+
<LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor4}"
3939
StartPoint="0,0"
4040
EndPoint="0,1">
4141
<LinearGradientBrush.GradientStops>
@@ -44,11 +44,11 @@
4444
</LinearGradientBrush.GradientStops>
4545
</LinearGradientBrush>
4646

47-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor5Key}"
47+
<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor5}"
4848
Color="#898C95"/>
4949

5050

51-
<LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor6Key}"
51+
<LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor6}"
5252
StartPoint="0,0"
5353
EndPoint="0,1">
5454
<LinearGradientBrush.GradientStops>
@@ -57,7 +57,7 @@
5757
</LinearGradientBrush.GradientStops>
5858
</LinearGradientBrush>
5959

60-
<LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor7Key}"
60+
<LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor7}"
6161
StartPoint="0,0"
6262
EndPoint="0,1">
6363
<LinearGradientBrush.GradientStops>
@@ -66,86 +66,70 @@
6666
</LinearGradientBrush.GradientStops>
6767
</LinearGradientBrush>
6868

69-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor8Key}"
69+
<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor8}"
7070
Color="#D2E6FA"/>
7171

72-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor9Key}"
72+
<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor9}"
7373
Color="#FFF5F4EA"/>
7474

75-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor10Key}"
75+
<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor10}"
7676
Color="Black"/>
7777

78-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor11Key}"
78+
<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor11}"
7979
Color="#FFBBC0C7" />
8080

81-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor12Key}"
81+
<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor12}"
8282
Color="#555564"/>
8383

84-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor13Key}"
84+
<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor13}"
8585
Color="White"/>
8686

87-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor14Key}"
87+
<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor14}"
8888
Color="#69A1BF"/>
8989

90-
<LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor15Key}"
90+
<LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor15}"
9191
StartPoint="0,0"
9292
EndPoint="0,1">
9393
<GradientStop Color="#8FADCE" Offset="0" />
9494
<GradientStop Color="#BDD3EF" Offset="1" />
9595
</LinearGradientBrush>
9696

9797

98-
<LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor16Key}"
98+
<LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor16}"
9999
StartPoint="0,0"
100100
EndPoint="0,1">
101101
<GradientStop Color="#B7CAE0" Offset="0" />
102102
<GradientStop Color="#E8F0FF" Offset="1" />
103103
</LinearGradientBrush>
104-
<LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor17Key}"
104+
<LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor17}"
105105
StartPoint="0,0"
106106
EndPoint="0,1">
107107
<GradientStop Color="#F7FCFE" Offset="0" />
108108
<GradientStop Color="#81D0F1" Offset="1" />
109109
</LinearGradientBrush>
110-
<!--
111-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor18Key}"
112-
Color="Black"/>
113110

114-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor20Key}"
115-
Color="White"/>
116-
117-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor21Key}"
118-
Color="White"/>
119-
120-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor22Key}"
121-
Color="Black"/>
122-
123-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor23Key}"
124-
Color="Black"/>-->
125-
126-
127-
<LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor24Key}" StartPoint="0,0" EndPoint="0,1">
111+
<LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor24}" StartPoint="0,0" EndPoint="0,1">
128112
<GradientStop Color="#FBFCFC" Offset="0" />
129113
<GradientStop Color="#D7DCE4" Offset="0.5" />
130114
<GradientStop Color="#CED4DF" Offset="0.5" />
131115
<GradientStop Color="#CED4DF" Offset="1" />
132116
</LinearGradientBrush>
133117

134-
<LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor25Key}" StartPoint="0,0" EndPoint="0,1">
118+
<LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor25}" StartPoint="0,0" EndPoint="0,1">
135119
<GradientStop Color="#FFFCF2" Offset="0" />
136120
<GradientStop Color="#FFEDBA" Offset="0.5" />
137121
<GradientStop Color="#FFE8A6" Offset="0.5" />
138122
<GradientStop Color="#FFE8A6" Offset="1" />
139123
</LinearGradientBrush>
140124

141-
<LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor26Key}"
125+
<LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor26}"
142126
StartPoint="0,0"
143127
EndPoint="0,1">
144128
<GradientStop Color="#F2F2F2" Offset="0" />
145129
<GradientStop Color="#CFCFCF" Offset="1" />
146130
</LinearGradientBrush>
147131

148-
<LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor27Key}"
132+
<LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor27}"
149133
StartPoint="0,0"
150134
EndPoint="0,1">
151135
<GradientStop Color="#A7D9F5" Offset="0" />
@@ -154,18 +138,18 @@
154138
<GradientStop Color="#FAFDFE" Offset="1" />
155139
</LinearGradientBrush>
156140

157-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor28Key}"
141+
<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor28}"
158142
Color="White"/>
159143

160-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor30Key}"
144+
<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor30}"
161145
Color="#CED4DF"/>
162146

163-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor31Key}"
147+
<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor31}"
164148
Color="#FFE8A6"/>
165149

166-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor32Key}"
150+
<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor32}"
167151
Color="#3C7FB1"/>
168152

169-
<SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor33Key}"
153+
<SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor33}"
170154
Color="#3D5277"/>
171155
</ResourceDictionary>

0 commit comments

Comments
 (0)