Merge branch 'master' of https://github.com/Infragistics/DataSource-Reference-Implementations

Author: gmurray81

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

@@ -286,7 +286,14 @@
                                Margin="5" 
                                GroupByAreaLocation="None">
             <igDP:XamDataPresenter.FieldLayoutSettings>
-                <igDP:FieldLayoutSettings FilterEvaluationMode="UseCollectionView"/>
+                <igDP:FieldLayoutSettings FilterEvaluationMode="UseCollectionView" RecordSelectorNumberType="RecordIndex">
+                    <igDP:FieldLayoutSettings.HeaderPrefixAreaStyle>
+                        <Style TargetType="igDP:RecordPrefixArea">
+                            <Setter Property="Content" Value="Rec #"/>
+                            <Setter Property="HorizontalAlignment" Value="Center"/>
+                        </Style>
+                    </igDP:FieldLayoutSettings.HeaderPrefixAreaStyle>
+                </igDP:FieldLayoutSettings>
             </igDP:XamDataPresenter.FieldLayoutSettings>
 
             <igDP:XamDataPresenter.FieldSettings>

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

@@ -26,7 +26,7 @@ public MainWindow()
 
 			// Initialize the list of themes and select 'Office2013'.
 			this.cboThemes.ItemsSource		= Infragistics.Windows.Themes.ThemeManager.GetThemes();
-			this.cboThemes.SelectedValue	= "RoyalDark";
+			this.cboThemes.SelectedValue	= "Office2013";
 
 			// Initialize the list of XamBusyIndicator Animations.
 			this.cboBusyIndicatorAnimations.ItemsSource		= typeof(BusyAnimations).GetFields(BindingFlags.Public | BindingFlags.Static).Select((prop) => prop.Name).ToArray();

DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/SampleViewModel.cs

@@ -81,8 +81,8 @@ public DataSourceConfigurationInfo CurrentDataSourceConfigurationInfo
 							BaseUri				= this._currentDataSourceConfigurationInfo.BaseUri,
 							EntitySet			= this._currentDataSourceConfigurationInfo.EntitySet,
 							FieldsRequested		= this._currentDataSourceConfigurationInfo.FieldsRequested,
-							PageSizeRequested	= Convert.ToInt32(this.PageSizeRequested),
-							MaxCachedPages		= Convert.ToInt32(this.MaxCachedPages)
+							PageSizeRequested	= this.PageSizeRequested,
+							MaxCachedPages		= this.MaxCachedPages
 						};
 				}
 			}