Skip to content

Commit 8ce2f7d

Browse files
JMJM
authored andcommitted
Sample app tweaks
1 parent 924f13f commit 8ce2f7d

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/MainWindow.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<Style x:Key="LabelText" TargetType="TextBlock">
4444
<Setter Property="FontWeight" Value="Bold"/>
4545
<Setter Property="Margin" Value="0,3"/>
46+
<Setter Property="VerticalAlignment" Value="Center"/>
4647
</Style>
4748

4849
<Style x:Key="ColorPicker" TargetType="igControls:XamColorPicker">
@@ -75,6 +76,7 @@
7576
<Setter Property="Foreground" Value="Black"/>
7677
<Setter Property="FontSize" Value="14"/>
7778
<Setter Property="Margin" Value="0,2"/>
79+
<Setter Property="VerticalAlignment" Value="Center"/>
7880
</Style>
7981
</StackPanel.Resources>
8082

@@ -154,7 +156,7 @@
154156
<igControls:XamColorPicker Grid.Row="2" Grid.Column="1" Style="{StaticResource ColorPicker}" SelectedColor="{Binding ElementName=dataPresenter1, Mode=TwoWay, Path=(igDP:XamDataPresenter.FieldLayoutSettings).DynamicDataPendingForegroundBrush, Converter={StaticResource colorToBrushConverter}}"/>
155157

156158
<TextBlock Grid.Row="3" Grid.Column="0" Text="SHOW CUSTOM TEMPLATE" Style="{StaticResource LabelText}"/>
157-
<CheckBox x:Name="chkShowProgressBar" Grid.Row="3" Grid.Column="1" Margin="0,2" IsChecked="False" Style="{StaticResource CheckBoxText}" Checked="chkShowProgressBar_Checked" Unchecked="chkShowProgressBar_Checked"/>
159+
<CheckBox x:Name="chkShowCustomTemplate" Grid.Row="3" Grid.Column="1" Margin="0,2" IsChecked="False" Style="{StaticResource CheckBoxText}" Checked="chkShowCustomTemplate_Checked" Unchecked="chkShowCustomTemplate_Checked"/>
158160
</Grid>
159161

160162
<!-- Filter Settings -->

DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/MainWindow.xaml.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ private void cboOdataSources_SelectionChanged(object sender, SelectionChangedEve
172172
}
173173
#endregion //cboOdataSources_SelectionChanged
174174

175+
#region cboRecordFilterLogicalOperator_SelectionChanged
175176
private void cboRecordFilterLogicalOperator_SelectionChanged(object sender, SelectionChangedEventArgs e)
176177
{
177178
if (null == this.dataPresenter1)
@@ -188,11 +189,12 @@ private void cboRecordFilterLogicalOperator_SelectionChanged(object sender, Sele
188189
break;
189190
}
190191
}
192+
#endregion //cboRecordFilterLogicalOperator_SelectionChanged
191193

192-
#region chkShowProgressBar_Checked
193-
private void chkShowProgressBar_Checked(object sender, RoutedEventArgs e)
194+
#region chkShowCustomTemplate_Checked
195+
private void chkShowCustomTemplate_Checked(object sender, RoutedEventArgs e)
194196
{
195-
if (this.chkShowProgressBar.IsChecked.Value)
197+
if (this.chkShowCustomTemplate.IsChecked.Value)
196198
{
197199
FrameworkElementFactory fef = new FrameworkElementFactory(typeof(ProgressBar));
198200
fef.SetValue(ProgressBar.IsIndeterminateProperty, true);
@@ -205,7 +207,7 @@ private void chkShowProgressBar_Checked(object sender, RoutedEventArgs e)
205207
else
206208
this.dataPresenter1.FieldLayoutSettings.DynamicDataPendingContentTemplate = null;
207209
}
208-
#endregion //chkShowProgressBar_Checked
210+
#endregion //chkShowCustomTemplate_Checked
209211

210212
#region numDesiredPageSize_EditModeEnded
211213
private void numDesiredPageSize_EditModeEnded(object sender, Infragistics.Windows.Editors.Events.EditModeEndedEventArgs e)

0 commit comments

Comments
 (0)