Skip to content

Commit 7a8a30f

Browse files
HUSSAR-mtrelaHUSSAR-mtrela
authored
Merge pull request #72 from Infragistics/mdd-update-tags-2
Mdd update tags 2
2 parents 71f00aa + 90972ff commit 7a8a30f

9 files changed

Lines changed: 33 additions & 55 deletions

File tree

‎Examples/Infragistics.SamplesBrowser.WPF/Properties/Resources.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Examples/Infragistics.SamplesBrowser.WPF/Properties/Resources.ja.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
<value>Infragistics WPF サンプル</value>
216216
</data>
217217
<data name="SampleStatusCTP" xml:space="preserve">
218-
<value>CTP</value>
218+
<value>PREVIEW</value>
219219
</data>
220220
<data name="SampleStatusNew" xml:space="preserve">
221221
<value>NEW</value>

‎Examples/Infragistics.SamplesBrowser.WPF/Properties/Resources.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@
165165
Would you like to get it now?</value>
166166
</data>
167167
<data name="SampleStatusCTP" xml:space="preserve">
168-
<value>CTP</value>
168+
<value>PREVIEW</value>
169169
</data>
170170
<data name="SampleStatusNew" xml:space="preserve">
171171
<value>NEW</value>
172172
</data>
173173
<data name="SampleStatusUpdated" xml:space="preserve">
174-
<value>UPD</value>
174+
<value>UPDATED</value>
175175
</data>
176176
<data name="SampleStatusBeta" xml:space="preserve">
177177
<value>BETA</value>

‎Examples/Infragistics.SamplesBrowser.WPF/SamplesBrowserWindow.xaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -296,16 +296,16 @@
296296
</DataTemplate>
297297
<DataTemplate x:Key="CtpReleaseIconTemplate">
298298
<Grid Width="Auto" Height="17" Margin="{StaticResource StatusIconOuterMargin}" ToolTip="{Binding Source={StaticResource Strings}, Path=CtpIcon_ToolTip}">
299-
<Rectangle RadiusY="2" RadiusX="2" Fill="{StaticResource CtpReleaseIconBackgroundBrush}" SnapsToDevicePixels="True"/>
299+
<Rectangle RadiusY="2" RadiusX="2" Fill="DodgerBlue" SnapsToDevicePixels="True"/>
300300
<TextBlock FontSize="9" TextAlignment="Center" Foreground="{StaticResource LightForegroundBrush}" Text="{Binding Source={StaticResource Strings}, Path=SampleStatusCTP}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="{StaticResource StatusIconInnerMargin}"/>
301301
</Grid>
302302
</DataTemplate>
303-
<DataTemplate x:Key="BetaReleaseIconTemplate">
303+
<!--<DataTemplate x:Key="BetaReleaseIconTemplate">
304304
<Grid Width="Auto" Height="17" Margin="{StaticResource StatusIconOuterMargin}" ToolTip="{Binding Source={StaticResource Strings}, Path=CtpIcon_ToolTip}">
305305
<Rectangle RadiusY="2" RadiusX="2" Fill="DodgerBlue" SnapsToDevicePixels="True"/>
306306
<TextBlock FontSize="9" TextAlignment="Center" Foreground="{StaticResource LightForegroundBrush}" Text="{Binding Source={StaticResource Strings}, Path=SampleStatusBeta}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="{StaticResource StatusIconInnerMargin}"/>
307307
</Grid>
308-
</DataTemplate>
308+
</DataTemplate>-->
309309
<HierarchicalDataTemplate DataType="{x:Type vm:ControlViewModel}" ItemsSource="{Binding Path=Children, Mode=OneTime}">
310310
<DockPanel Height="32" Margin="2,0" LastChildFill="False">
311311
<!--<Image x:Name="img" DockPanel.Dock="Left" Margin="0,0,4,0" Source="{Binding Path=Icon, Mode=OneTime}" Width="32" Height="32"/>-->
@@ -316,8 +316,8 @@
316316
<TextBlock Text="{Binding Path=Name, Mode=OneTime}" Foreground="{StaticResource ForegroundBrush}" VerticalAlignment="Center" DockPanel.Dock="Left"/>
317317
<ContentPresenter ContentTemplate="{StaticResource UpdatedReleaseIconTemplate}" DockPanel.Dock="Left" Margin="0,0,0,0" Visibility="{Binding Path=IsUpdated, Converter={StaticResource BoolToVisConv}}"/>
318318
<ContentPresenter ContentTemplate="{StaticResource NewReleaseIconTemplate}" DockPanel.Dock="Left" Margin="0,0,0,0" Visibility="{Binding Path=IsNew, Converter={StaticResource BoolToVisConv}}"/>
319-
<ContentPresenter ContentTemplate="{StaticResource CtpReleaseIconTemplate}" DockPanel.Dock="Left" Margin="0,0,0,0" Visibility="{Binding Path=IsCtp, Converter={StaticResource BoolToVisConv}}"/>
320-
<ContentPresenter ContentTemplate="{StaticResource BetaReleaseIconTemplate}" DockPanel.Dock="Left" Margin="0,0,0,0" Visibility="{Binding Path=IsBETA, Converter={StaticResource BoolToVisConv}}"/>
319+
<ContentPresenter ContentTemplate="{StaticResource CtpReleaseIconTemplate}" DockPanel.Dock="Left" Margin="0,0,0,0" Visibility="{Binding Path=IsPreview, Converter={StaticResource BoolToVisConv}}"/>
320+
<!--<ContentPresenter ContentTemplate="{StaticResource BetaReleaseIconTemplate}" DockPanel.Dock="Left" Margin="0,0,0,0" Visibility="{Binding Path=IsBETA, Converter={StaticResource BoolToVisConv}}"/>-->
321321
</DockPanel>
322322
</HierarchicalDataTemplate>
323323
<!-- This template is applied to SubCategoryViewModel and SampleViewModel objects. -->
@@ -330,8 +330,8 @@
330330
<TextBlock Text="{Binding Path=Name, Mode=OneTime}" Foreground="{StaticResource ForegroundBrush}" VerticalAlignment="Center" DockPanel.Dock="Left"/>
331331
<ContentPresenter ContentTemplate="{StaticResource UpdatedReleaseIconTemplate}" DockPanel.Dock="Left" Visibility="{Binding Path=IsUpdated, Converter={StaticResource BoolToVisConv}}"/>
332332
<ContentPresenter ContentTemplate="{StaticResource NewReleaseIconTemplate}" DockPanel.Dock="Left" Visibility="{Binding Path=IsNew, Converter={StaticResource BoolToVisConv}}"/>
333-
<ContentPresenter ContentTemplate="{StaticResource CtpReleaseIconTemplate}" DockPanel.Dock="Left" Margin="0,0,0,0" Visibility="{Binding Path=IsCtp, Converter={StaticResource BoolToVisConv}}"/>
334-
<ContentPresenter ContentTemplate="{StaticResource BetaReleaseIconTemplate}" DockPanel.Dock="Left" Margin="0,0,0,0" Visibility="{Binding Path=IsBETA, Converter={StaticResource BoolToVisConv}}"/>
333+
<ContentPresenter ContentTemplate="{StaticResource CtpReleaseIconTemplate}" DockPanel.Dock="Left" Margin="0,0,0,0" Visibility="{Binding Path=IsPreview, Converter={StaticResource BoolToVisConv}}"/>
334+
<!--<ContentPresenter ContentTemplate="{StaticResource BetaReleaseIconTemplate}" DockPanel.Dock="Left" Margin="0,0,0,0" Visibility="{Binding Path=IsBETA, Converter={StaticResource BoolToVisConv}}"/>-->
335335
</DockPanel>
336336
</HierarchicalDataTemplate>
337337
</TreeView.Resources>

‎Examples/Infragistics.SamplesBrowser.WPF/TableOfContents.xml‎

-60 Bytes
Binary file not shown.

‎Examples/Infragistics.SamplesBrowser.WPF/TableOfContentsCrossShema.xsd‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,8 @@
233233
</xs:simpleType>
234234
<xs:simpleType name="statusEnum">
235235
<xs:restriction base="xs:string">
236-
<xs:enumeration value="CTP" />
237-
<xs:enumeration value="UPD" />
238-
<xs:enumeration value="BETA" />
236+
<xs:enumeration value="PREVIEW" />
237+
<xs:enumeration value="UPDATED" />
239238
<xs:enumeration value="NEW" />
240239
</xs:restriction>
241240
</xs:simpleType>

‎Examples/Infragistics.SamplesBrowser.WPF/ViewModel/TableOfContentsViewModel.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,11 +264,11 @@ private int SortTocItems(TocItemViewModel toc1, TocItemViewModel toc2)
264264
if (toc1.IsUpdated != toc2.IsUpdated)
265265
return toc1.IsUpdated ? -1 : 1;
266266

267-
if (toc1.IsCtp != toc2.IsCtp)
268-
return toc1.IsCtp ? -1 : 1;
267+
if (toc1.IsPreview != toc2.IsPreview)
268+
return toc1.IsPreview ? -1 : 1;
269269

270-
if (toc1.IsBETA != toc2.IsBETA)
271-
return toc1.IsBETA ? -1 : 1;
270+
//if (toc1.IsBETA != toc2.IsBETA)
271+
// return toc1.IsBETA ? -1 : 1;
272272
//}
273273

274274
string name1 = toc1.Name ?? string.Empty;

‎Examples/Infragistics.SamplesBrowser.WPF/ViewModel/TocItemViewModel.cs‎

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -75,34 +75,29 @@ public void Initialize(TocItemViewModel parent, double currentVersion)
7575
ReleaseVersion = this.Children.Max(c => c.ReleaseVersion);
7676

7777
var newCount = this.Children.Count(c => c.Status == "NEW");
78-
var ctpCount = this.Children.Count(c => c.Status == "CTP");
79-
var updCount = this.Children.Count(c => c.Status == "UPD");
80-
var betaCount = this.Children.Count(c => c.Status == "BETA");
78+
var ctpCount = this.Children.Count(c => c.Status == "PREVIEW");
79+
var updCount = this.Children.Count(c => c.Status == "UPDATED");
8180

8281
if (newCount == this.Children.Count)
8382
{
8483
Status = "NEW";
8584
}
86-
else if (betaCount == this.Children.Count)
87-
{
88-
Status = "BETA";
89-
}
9085
else if (ctpCount == this.Children.Count)
9186
{
92-
Status = "CTP";
87+
Status = "PREVIEW";
9388
}
9489
else if (updCount == this.Children.Count)
9590
{
96-
Status = "UPD";
91+
Status = "UPDATED";
9792
}
98-
else if (newCount > 0 || updCount > 0 || betaCount > 0)
93+
else if (newCount > 0 || updCount > 0 || ctpCount > 0)
9994
{
100-
Status = "UPD";
95+
Status = "UPDATED";
10196
}
10297
else if (ctpCount > 0)
10398
{
10499
if (ReleaseVersion == currentVersion)
105-
Status = "UPD";
100+
Status = "UPDATED";
106101
else
107102
Status = "OLD";
108103
}
@@ -115,7 +110,7 @@ public void Initialize(TocItemViewModel parent, double currentVersion)
115110
{
116111
if (double.IsNaN(ReleaseVersion))
117112
{
118-
if (Status == "NEW" || Status == "UPD")
113+
if (Status == "NEW" || Status == "UPDATED")
119114
{
120115
ReleaseVersion = currentVersion;
121116
}
@@ -135,7 +130,7 @@ public void Initialize(TocItemViewModel parent, double currentVersion)
135130
}
136131
else
137132
{
138-
if (Status != "NEW" && Status != "CTP" && Status != "UPD" && Status != "OLD" && Status != "BETA")
133+
if (Status != "NEW" && Status != "UPDATED" && Status != "OLD" && Status != "PREVIEW")
139134
{
140135
Status = "ERR";
141136
Debug.WriteLine("WARNING sample has unknown Status attribute: " + info);
@@ -240,7 +235,7 @@ public bool IsUpdated
240235
{
241236
get
242237
{
243-
return Status == "UPD";
238+
return Status == "UPDATED";
244239
}
245240
}
246241

@@ -249,33 +244,17 @@ public bool IsUpdated
249244
#region CTP
250245

251246
/// <summary>
252-
/// Determines whether the control's release is CTP.
247+
/// Determines whether the control's release is PREVIEW.
253248
/// </summary>
254-
public bool IsCtp
249+
public bool IsPreview
255250
{
256251
get
257252
{
258-
return Status == "CTP";
253+
return Status == "PREVIEW";
259254
}
260255
}
261256

262-
#endregion // IsCtp
263-
264-
#region BETA
265-
266-
/// <summary>
267-
/// Determines whether the control's release is BETA.
268-
/// </summary>
269-
public bool IsBETA
270-
{
271-
get
272-
{
273-
return Status == "BETA";
274-
}
275-
}
276-
277-
#endregion // BETA
278-
257+
#endregion
279258

280259
#endregion // Presentation Properties
281260

@@ -303,7 +282,7 @@ protected virtual void OnPropertyChanged(string propertyName)
303282

304283
public override string ToString()
305284
{
306-
return this.Name + " IsNew=" + this.IsNew + " IsCtp=" + this.IsCtp + " IsBETA=" + this.IsBETA + " Status=" + this.Status;
285+
return this.Name + " IsNew=" + this.IsNew + " IsPreview=" + this.IsPreview + " IsUpdated=" + this.IsUpdated + " Status=" + this.Status;
307286
}
308287
}
309288
}

‎Examples/Infragistics.SamplesBrowser.WPF/ja/TableOfContents.xml‎

4 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)