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

@@ -21,7 +21,7 @@
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "2.4";
+  public const string BaseVersion = "2.5";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
   ".0.0";

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml

@@ -713,6 +713,8 @@
                   Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
       <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}" 
                 Command="{Binding Path=CloseAllButThisCommand}"/>
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAll}"
+                Command="{Binding Path=CloseAllCommand}" />
       <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}" 
                 Command="{Binding Path=FloatCommand}"/>
       <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}" 
@@ -813,7 +815,7 @@
                <Border Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}">
-                  <ContentPresenter Content="{Binding LayoutItem.View.Content, RelativeSource={RelativeSource TemplatedParent}}"
+                  <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
                                     ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
                                     ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
                </Border>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs

@@ -21,7 +21,7 @@
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "2.4";
+  public const string BaseVersion = "2.5";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
   ".0.0";

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml

@@ -716,7 +716,9 @@
                   Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
         <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}" 
                 Command="{Binding Path=CloseAllButThisCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}" 
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAll}"
+                Command="{Binding Path=CloseAllCommand}" />
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}" 
                 Command="{Binding Path=FloatCommand}"/>
         <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}" 
                 Command="{Binding Path=DockAsDocumentCommand}"/>
@@ -815,7 +817,7 @@
                     <Border Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}">
-                     <ContentPresenter Content="{Binding LayoutItem.View.Content, RelativeSource={RelativeSource TemplatedParent}}"
+                     <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
                                        ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
                                        ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
                   </Border>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs

@@ -21,7 +21,7 @@
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "2.4";
+  public const string BaseVersion = "2.5";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
   ".0.0";

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml

@@ -784,7 +784,9 @@
                   Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
         <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}" 
                 Command="{Binding Path=CloseAllButThisCommand}"/>
-        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}" 
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAll}"
+                Command="{Binding Path=CloseAllCommand}" />
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}" 
                 Command="{Binding Path=FloatCommand}"/>
         <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}" 
                 Command="{Binding Path=DockAsDocumentCommand}"/>
@@ -883,7 +885,7 @@
                     <Border Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}">
-                  <ContentPresenter Content="{Binding LayoutItem.View.Content, RelativeSource={RelativeSource TemplatedParent}}"
+                  <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
                                     ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
                                     ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
                </Border>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs

@@ -21,7 +21,7 @@
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "2.4";
+  public const string BaseVersion = "2.5";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
   ".0.0";

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs

@@ -106,6 +106,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         ICommand _defaultFloatCommand;
         ICommand _defaultDockAsDocumentCommand;
         ICommand _defaultCloseAllButThisCommand;
+        ICommand _defaultCloseAllCommand;
         ICommand _defaultActivateCommand;
         ICommand _defaultNewVerticalTabGroupCommand;
         ICommand _defaultNewHorizontalTabGroupCommand;
@@ -118,7 +119,8 @@ namespace Xceed.Wpf.AvalonDock.Controls
             _defaultFloatCommand = new RelayCommand((p) => ExecuteFloatCommand(p), (p) => CanExecuteFloatCommand(p));
             _defaultDockAsDocumentCommand = new RelayCommand((p) => ExecuteDockAsDocumentCommand(p), (p) => CanExecuteDockAsDocumentCommand(p));
             _defaultCloseAllButThisCommand = new RelayCommand((p) => ExecuteCloseAllButThisCommand(p), (p) => CanExecuteCloseAllButThisCommand(p));
-            _defaultActivateCommand = new RelayCommand((p) => ExecuteActivateCommand(p), (p) => CanExecuteActivateCommand(p));
+            _defaultCloseAllCommand = new RelayCommand( ( p ) => ExecuteCloseAllCommand( p ), ( p ) => CanExecuteCloseAllCommand( p ) );
+            _defaultActivateCommand = new RelayCommand( ( p ) => ExecuteActivateCommand( p ), ( p ) => CanExecuteActivateCommand( p ) );
             _defaultNewVerticalTabGroupCommand = new RelayCommand((p) => ExecuteNewVerticalTabGroupCommand(p), (p) => CanExecuteNewVerticalTabGroupCommand(p));
             _defaultNewHorizontalTabGroupCommand = new RelayCommand((p) => ExecuteNewHorizontalTabGroupCommand(p), (p) => CanExecuteNewHorizontalTabGroupCommand(p));
             _defaultMoveToNextTabGroupCommand = new RelayCommand((p) => ExecuteMoveToNextTabGroupCommand(p), (p) => CanExecuteMoveToNextTabGroupCommand(p));
@@ -135,6 +137,8 @@ namespace Xceed.Wpf.AvalonDock.Controls
                 BindingOperations.ClearBinding(this, DockAsDocumentCommandProperty);
             if (CloseAllButThisCommand == _defaultCloseAllButThisCommand)
                 BindingOperations.ClearBinding(this, CloseAllButThisCommandProperty);
+            if( CloseAllCommand == _defaultCloseAllCommand )
+              BindingOperations.ClearBinding( this, CloseAllCommandProperty );
             if (ActivateCommand == _defaultActivateCommand)
                 BindingOperations.ClearBinding(this, ActivateCommandProperty);
             if (NewVerticalTabGroupCommand == _defaultNewVerticalTabGroupCommand)
@@ -157,6 +161,8 @@ namespace Xceed.Wpf.AvalonDock.Controls
                 DockAsDocumentCommand = _defaultDockAsDocumentCommand;
             if (CloseAllButThisCommand == null)
                 CloseAllButThisCommand = _defaultCloseAllButThisCommand;
+            if( CloseAllCommand == null )
+                CloseAllCommand = _defaultCloseAllCommand;
             if (ActivateCommand == null)
                 ActivateCommand = _defaultActivateCommand;
             if (NewVerticalTabGroupCommand == null)
@@ -761,6 +767,75 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
         #endregion
 
+        #region CloseAllCommand
+
+        /// <summary>
+        /// CloseAllCommand Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty CloseAllCommandProperty =
+            DependencyProperty.Register( "CloseAllCommand", typeof( ICommand ), typeof( LayoutItem ),
+                new FrameworkPropertyMetadata( null,
+                    new PropertyChangedCallback( OnCloseAllCommandChanged ),
+                    new CoerceValueCallback( CoerceCloseAllCommandValue ) ) );
+
+        /// <summary>
+        /// Gets or sets the CloseAllCommand property.  This dependency property 
+        /// indicates the 'Close All' command.
+        /// </summary>
+        public ICommand CloseAllCommand
+        {
+          get
+          {
+            return ( ICommand )GetValue( CloseAllCommandProperty );
+          }
+          set
+          {
+            SetValue( CloseAllCommandProperty, value );
+          }
+        }
+
+        /// <summary>
+        /// Handles changes to the CloseAllCommand property.
+        /// </summary>
+        private static void OnCloseAllCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+        {
+          ( ( LayoutItem )d ).OnCloseAllCommandChanged( e );
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the CloseAllCommand property.
+        /// </summary>
+        protected virtual void OnCloseAllCommandChanged( DependencyPropertyChangedEventArgs e )
+        {
+        }
+
+        /// <summary>
+        /// Coerces the CloseAllCommand value.
+        /// </summary>
+        private static object CoerceCloseAllCommandValue( DependencyObject d, object value )
+        {
+          return value;
+        }
+
+        private bool CanExecuteCloseAllCommand( object parameter )
+        {
+          if( LayoutElement == null )
+            return false;
+          var root = LayoutElement.Root;
+          if( root == null )
+            return false;
+
+          return LayoutElement.Root.Manager.Layout.
+              Descendents().OfType<LayoutContent>().Where( d => ( d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow ) ).Any();
+        }
+
+        private void ExecuteCloseAllCommand( object parameter )
+        {
+          LayoutElement.Root.Manager._ExecuteCloseAllCommand( LayoutElement );
+        }
+
+        #endregion
+
         #region ActivateCommand
 
         /// <summary>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs

@@ -53,11 +53,13 @@ namespace Xceed.Wpf.AvalonDock
 
         public DockingManager()
         {
-            Layout = new LayoutRoot() { RootPanel = new LayoutPanel(new LayoutDocumentPaneGroup(new LayoutDocumentPane())) };
-
-
-            this.Loaded += new RoutedEventHandler(DockingManager_Loaded);
-            this.Unloaded += new RoutedEventHandler(DockingManager_Unloaded);
+#if !VS2008
+          Layout = new LayoutRoot() { RootPanel = new LayoutPanel(new LayoutDocumentPaneGroup(new LayoutDocumentPane())) };
+#else
+          this.SetCurrentValue( DockingManager.LayoutProperty, new LayoutRoot() { RootPanel = new LayoutPanel(new LayoutDocumentPaneGroup(new LayoutDocumentPane())) } );
+#endif
+          this.Loaded += new RoutedEventHandler(DockingManager_Loaded);
+          this.Unloaded += new RoutedEventHandler(DockingManager_Unloaded);
         }
 
         #region Layout
@@ -2183,25 +2185,38 @@ namespace Xceed.Wpf.AvalonDock
         {
             foreach (var contentToClose in Layout.Descendents().OfType<LayoutContent>().Where(d => d != contentSelected && (d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow)).ToArray())
             {
-                if (!contentToClose.CanClose)
-                    continue;
-
-                var layoutItem = GetLayoutItemFromModel(contentToClose);
-                if (layoutItem.CloseCommand != null)
-                {
-                    if (layoutItem.CloseCommand.CanExecute(null))
-                        layoutItem.CloseCommand.Execute(null);
-                }
-                else
-                {
-                    if (contentToClose is LayoutDocument)
-                        _ExecuteCloseCommand(contentToClose as LayoutDocument);
-                    else if (contentToClose is LayoutAnchorable)
-                        _ExecuteCloseCommand(contentToClose as LayoutAnchorable);
-                }
+              this.Close( contentToClose );              
             }
         }
 
+        internal void _ExecuteCloseAllCommand( LayoutContent contentSelected )
+        {
+          foreach( var contentToClose in Layout.Descendents().OfType<LayoutContent>().Where( d => ( d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow ) ).ToArray() )
+          {
+            this.Close( contentToClose );
+          }
+        }
+
+        private void Close( LayoutContent contentToClose )
+        {
+          if( !contentToClose.CanClose )
+            return;
+
+          var layoutItem = GetLayoutItemFromModel( contentToClose );
+          if( layoutItem.CloseCommand != null )
+          {
+            if( layoutItem.CloseCommand.CanExecute( null ) )
+              layoutItem.CloseCommand.Execute( null );
+          }
+          else
+          {
+            if( contentToClose is LayoutDocument )
+              _ExecuteCloseCommand( contentToClose as LayoutDocument );
+            else if( contentToClose is LayoutAnchorable )
+              _ExecuteCloseCommand( contentToClose as LayoutAnchorable );
+          }
+        }
+
         #region DocumentContextMenu
 
         /// <summary>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs

@@ -17,7 +17,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.296
+//     Runtime Version:4.0.30319.34014
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -157,6 +157,15 @@ namespace Xceed.Wpf.AvalonDock.Properties {
             }
         }
 
+        /// <summary>
+        ///   Looks up a localized string similar to Close All.
+        /// </summary>
+        public static string Document_CloseAll {
+            get {
+                return ResourceManager.GetString("Document_CloseAll", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to Close All But This.
         /// </summary>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.resx

@@ -1,103 +1,122 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-	<!-- 
-		Microsoft ResX Schema
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
 
-		Version 1.3
-
-		The primary goals of this format is to allow a simple XML format 
-		that is mostly human readable. The generation and parsing of the 
-		various data types are done through the TypeConverter classes 
-		associated with the data types.
-
-		Example:
-
-		... ado.net/XML headers & schema ...
-		<resheader name="resmimetype">text/microsoft-resx</resheader>
-		<resheader name="version">1.3</resheader>
-		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-		<data name="Name1">this is my long string</data>
-		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-			[base64 mime encoded serialized .NET Framework object]
-		</data>
-		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-			[base64 mime encoded string representing a byte array form of the .NET Framework object]
-		</data>
-
-		There are any number of "resheader" rows that contain simple 
-		name/value pairs.
-
-		Each data row contains a name, and value. The row also contains a 
-		type or mimetype. Type corresponds to a .NET class that support 
-		text/value conversion through the TypeConverter architecture. 
-		Classes that don't support this are serialized and stored with the 
-		mimetype set.
-
-		The mimetype is used for serialized objects, and tells the 
-		ResXResourceReader how to depersist the object. This is currently not 
-		extensible. For a given mimetype the value must be set accordingly:
-
-		Note - application/x-microsoft.net.object.binary.base64 is the format 
-		that the ResXResourceWriter will generate, however the reader can 
-		read any of the formats listed below.
-
-		mimetype: application/x-microsoft.net.object.binary.base64
-		value   : The object must be serialized with 
-			: System.Serialization.Formatters.Binary.BinaryFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.soap.base64
-		value   : The object must be serialized with 
-			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.bytearray.base64
-		value   : The object must be serialized into a byte array 
-			: using a System.ComponentModel.TypeConverter
-			: and then encoded with base64 encoding.
-	-->
-	
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-		<xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="data">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="resheader">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" />
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:complexType>
-		</xsd:element>
-	</xsd:schema>
-	<resheader name="resmimetype">
-		<value>text/microsoft-resx</value>
-	</resheader>
-	<resheader name="version">
-		<value>1.3</value>
-	</resheader>
-	<resheader name="reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
   <data name="Anchorable_AutoHide" xml:space="preserve">
     <value>Automatisch im Hintergrund</value>
   </data>
@@ -125,6 +144,9 @@
   <data name="Document_Close" xml:space="preserve">
     <value>Schließen</value>
   </data>
+  <data name="Document_CloseAll" xml:space="preserve">
+    <value>Schließen Sie alle</value>
+  </data>
   <data name="Document_CloseAllButThis" xml:space="preserve">
     <value>Alle ausser diesem schließen</value>
   </data>
@@ -154,6 +176,5 @@
   </data>
   <data name="Window_Restore" xml:space="preserve">
     <value>Wiederherstellen</value>
-  </data>  
-  
-</root>
+  </data>
+</root>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.resx

@@ -144,6 +144,9 @@
   <data name="Document_Close" xml:space="preserve">
     <value>Cerrar</value>
   </data>
+  <data name="Document_CloseAll" xml:space="preserve">
+    <value>Cerca de todo</value>
+  </data>
   <data name="Document_CloseAllButThis" xml:space="preserve">
     <value>Cerrar Todo, Pero Este</value>
   </data>
@@ -174,4 +177,4 @@
   <data name="Window_Restore" xml:space="preserve">
     <value>Restaurar</value>
   </data>
-</root>
+</root>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.resx

@@ -144,6 +144,9 @@
   <data name="Document_Close" xml:space="preserve">
     <value>Fermer</value>
   </data>
+  <data name="Document_CloseAll" xml:space="preserve">
+    <value>Fermer tout</value>
+  </data>
   <data name="Document_CloseAllButThis" xml:space="preserve">
     <value>Fermer Tout Sauf Ceci</value>
   </data>
@@ -174,4 +177,4 @@
   <data name="Window_Restore" xml:space="preserve">
     <value>Restaurer</value>
   </data>
-</root>
+</root>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.resx

@@ -1,103 +1,122 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-	<!-- 
-		Microsoft ResX Schema
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
 
-		Version 1.3
-
-		The primary goals of this format is to allow a simple XML format 
-		that is mostly human readable. The generation and parsing of the 
-		various data types are done through the TypeConverter classes 
-		associated with the data types.
-
-		Example:
-
-		... ado.net/XML headers & schema ...
-		<resheader name="resmimetype">text/microsoft-resx</resheader>
-		<resheader name="version">1.3</resheader>
-		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-		<data name="Name1">this is my long string</data>
-		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-			[base64 mime encoded serialized .NET Framework object]
-		</data>
-		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-			[base64 mime encoded string representing a byte array form of the .NET Framework object]
-		</data>
-
-		There are any number of "resheader" rows that contain simple 
-		name/value pairs.
-
-		Each data row contains a name, and value. The row also contains a 
-		type or mimetype. Type corresponds to a .NET class that support 
-		text/value conversion through the TypeConverter architecture. 
-		Classes that don't support this are serialized and stored with the 
-		mimetype set.
-
-		The mimetype is used for serialized objects, and tells the 
-		ResXResourceReader how to depersist the object. This is currently not 
-		extensible. For a given mimetype the value must be set accordingly:
-
-		Note - application/x-microsoft.net.object.binary.base64 is the format 
-		that the ResXResourceWriter will generate, however the reader can 
-		read any of the formats listed below.
-
-		mimetype: application/x-microsoft.net.object.binary.base64
-		value   : The object must be serialized with 
-			: System.Serialization.Formatters.Binary.BinaryFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.soap.base64
-		value   : The object must be serialized with 
-			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.bytearray.base64
-		value   : The object must be serialized into a byte array 
-			: using a System.ComponentModel.TypeConverter
-			: and then encoded with base64 encoding.
-	-->
-	
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-		<xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="data">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="resheader">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" />
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:complexType>
-		</xsd:element>
-	</xsd:schema>
-	<resheader name="resmimetype">
-		<value>text/microsoft-resx</value>
-	</resheader>
-	<resheader name="version">
-		<value>1.3</value>
-	</resheader>
-	<resheader name="reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
   <data name="Anchorable_AutoHide" xml:space="preserve">
     <value>Automatikus elrejtés</value>
   </data>
@@ -125,6 +144,9 @@
   <data name="Document_Close" xml:space="preserve">
     <value>Bezárás</value>
   </data>
+  <data name="Document_CloseAll" xml:space="preserve">
+    <value>Zárjon be minden</value>
+  </data>
   <data name="Document_CloseAllButThis" xml:space="preserve">
     <value>Ennek kivételével az összes bezárása</value>
   </data>
@@ -155,4 +177,4 @@
   <data name="Window_Restore" xml:space="preserve">
     <value>Visszaállítás</value>
   </data>
-</root>
+</root>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.resx

@@ -144,6 +144,9 @@
   <data name="Document_Close" xml:space="preserve">
     <value>Chiudi</value>
   </data>
+  <data name="Document_CloseAll" xml:space="preserve">
+    <value>Chiudere tutte le</value>
+  </data>
   <data name="Document_CloseAllButThis" xml:space="preserve">
     <value>Chiudi Tutti Tranne Questo</value>
   </data>
@@ -174,4 +177,4 @@
   <data name="Window_Restore" xml:space="preserve">
     <value>Ripristina</value>
   </data>
-</root>
+</root>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.resx

@@ -144,6 +144,9 @@
   <data name="Document_Close" xml:space="preserve">
     <value>Fechar</value>
   </data>
+  <data name="Document_CloseAll" xml:space="preserve">
+    <value>Feche todos os</value>
+  </data>
   <data name="Document_CloseAllButThis" xml:space="preserve">
     <value>Fechar Todos Menos Este</value>
   </data>
@@ -174,4 +177,4 @@
   <data name="Window_Restore" xml:space="preserve">
     <value>Recuperar</value>
   </data>
-</root>
+</root>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.resx

@@ -144,6 +144,9 @@
   <data name="Document_Close" xml:space="preserve">
     <value>Close</value>
   </data>
+  <data name="Document_CloseAll" xml:space="preserve">
+    <value>Close All</value>
+  </data>
   <data name="Document_CloseAllButThis" xml:space="preserve">
     <value>Close All But This</value>
   </data>
@@ -174,4 +177,4 @@
   <data name="Window_Restore" xml:space="preserve">
     <value>Restore</value>
   </data>
-</root>
+</root>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.resx

@@ -144,6 +144,9 @@
   <data name="Document_Close" xml:space="preserve">
     <value>Închide</value>
   </data>
+  <data name="Document_CloseAll" xml:space="preserve">
+    <value>Aproape toate</value>
+  </data>
   <data name="Document_CloseAllButThis" xml:space="preserve">
     <value>Închide tot fără documentul curent</value>
   </data>
@@ -174,4 +177,4 @@
   <data name="Window_Restore" xml:space="preserve">
     <value>Restaurează</value>
   </data>
-</root>
+</root>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.resx

@@ -144,6 +144,9 @@
   <data name="Document_Close" xml:space="preserve">
     <value>Закрыть</value>
   </data>
+  <data name="Document_CloseAll" xml:space="preserve">
+    <value>Закрыть все</value>
+  </data>
   <data name="Document_CloseAllButThis" xml:space="preserve">
     <value>Закрыть Все кроме Этого</value>
   </data>
@@ -174,4 +177,4 @@
   <data name="Window_Restore" xml:space="preserve">
     <value>Восстановить</value>
   </data>
-</root>
+</root>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.resx

@@ -144,6 +144,9 @@
   <data name="Document_Close" xml:space="preserve">
     <value>Stäng</value>
   </data>
+  <data name="Document_CloseAll" xml:space="preserve">
+    <value>Stäng alla</value>
+  </data>
   <data name="Document_CloseAllButThis" xml:space="preserve">
     <value>Stäng alla andra</value>
   </data>
@@ -174,4 +177,4 @@
   <data name="Window_Restore" xml:space="preserve">
     <value>Återställ</value>
   </data>
-</root>
+</root>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.resx

@@ -144,6 +144,9 @@
   <data name="Document_Close" xml:space="preserve">
     <value>关闭</value>
   </data>
+  <data name="Document_CloseAll" xml:space="preserve">
+    <value>關閉所有</value>
+  </data>
   <data name="Document_CloseAllButThis" xml:space="preserve">
     <value>留此，关闭其他</value>
   </data>
@@ -174,4 +177,4 @@
   <data name="Window_Restore" xml:space="preserve">
     <value>恢复</value>
   </data>
-</root>
+</root>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml

@@ -525,11 +525,13 @@
                   Command="{Binding Path=CloseCommand}"
                   Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
         <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}" 
-                Command="{Binding Path=CloseAllButThisCommand}"/>
+                  Command="{Binding Path=CloseAllButThisCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAll}"
+                  Command="{Binding Path=CloseAllCommand}" />
         <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}" 
-                Command="{Binding Path=FloatCommand}"/>
+                  Command="{Binding Path=FloatCommand}"/>
         <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}" 
-                Command="{Binding Path=DockAsDocumentCommand}"/>
+                  Command="{Binding Path=DockAsDocumentCommand}"/>
         <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewHorizontalTabGroup}" 
                 Command="{Binding Path=NewHorizontalTabGroupCommand}"
                 Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
@@ -613,7 +615,7 @@
                     <Border Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}">
-                            <ContentPresenter Content="{Binding LayoutItem.View.Content, RelativeSource={RelativeSource TemplatedParent}}"
+                            <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"
                                               ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
                                               ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
                     </Border>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/OptimizedReadOnlyObservableCollection.cs

@@ -1,69 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections.ObjectModel;
-using System.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  // We re-implement IList and IList<object> to override the implementation of the 
-  // IndexOf and Contains methods to use our optimized way.
-  internal class OptimizedReadOnlyObservableCollection : ReadOnlyObservableCollection<object>, IList, IList<object>
-  {
-    #region CONSTRUCTORS
-
-    public OptimizedReadOnlyObservableCollection( DataGridCollectionViewGroup dataGridCollectionViewGroup )
-      : base( dataGridCollectionViewGroup.ProtectedItems )
-    {
-      if( dataGridCollectionViewGroup == null )
-        throw new ArgumentNullException( "dataGridCollectionViewGroup" );
-
-      m_dataGridCollectionViewGroup = dataGridCollectionViewGroup;
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region "Newed" Methods
-
-    public new int IndexOf( object item )
-    {
-      // The DataGridCollectionViewGroup has been optimized to use the information
-      // stored on the RawItem associated with the data item instead of searching
-      // the item in the list.
-      return m_dataGridCollectionViewGroup.IndexOf( item );
-    }
-
-    public new bool Contains( object item )
-    {
-      // The DataGridCollectionViewGroup has been optimized to use the information
-      // stored on the RawItem associated with the data item instead of searching
-      // the item in the list.
-      return m_dataGridCollectionViewGroup.Contains( item );
-    }
-
-    #endregion "Newed" Methods
-
-    #region PRIVATE FIELDS
-
-    private DataGridCollectionViewGroup m_dataGridCollectionViewGroup;
-
-    #endregion PRIVATE FIELDS
-  }
-}

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs

@@ -19,7 +19,7 @@
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "2.4";
+  public const string BaseVersion = "2.5";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + ".0.0";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.txt

@@ -24,7 +24,7 @@
            The AutoSelectTextBox allows the text content to be selected when the control get the focus. It also allows the Focus navigation behavior within the control to be affected.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <StackPanel>
       <StackPanel.Resources>
          <Style TargetType="{x:Type xctk:AutoSelectTextBox}">
@@ -54,7 +54,7 @@
             </StackPanel>
          </Grid>
       </GroupBox>
-      
+
       <StackPanel>
          <TextBlock Text="Usage:" Style="{StaticResource Header}"/>
          <RichTextBox IsReadOnly="True" BorderThickness="0">
@@ -75,7 +75,7 @@
                </Paragraph>
             </FlowDocument>
          </RichTextBox>
-         
+
          <!-- PHONE NUMBER FIELDS -->         
          <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
             <TextBlock Text="(" VerticalAlignment="Center"/>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.txt

@@ -26,7 +26,7 @@
          The AvalonDock layout system allows developers to create customizable layouts using a window docking system similar to what is found in many popular integrated development environements.
       </Paragraph>
    </local:DemoView.Description>
-      
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.txt

@@ -24,7 +24,7 @@
             This example demonstrates how to create a custom content template by setting the BusyContentTemplate property to an instance of a custom DataTemplate. Take notice of how the default ProgressBar is being hidden by setting the PrgressBarStyle property.  The default OverlayStyle is also being set to a custom style.
         </Paragraph>
     </local:DemoView.Description>
-    
+
     <local:DemoView.Resources>
       <ResourceDictionary>
          <ResourceDictionary.MergedDictionaries>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.txt

@@ -24,7 +24,7 @@
             This example demonstrates how to define your own custom content. This is done by setting the BusyContent property.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <local:DemoView.Resources>
       <ResourceDictionary>
          <ResourceDictionary.MergedDictionaries>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.txt

@@ -25,9 +25,9 @@
             The ButtonSpinner control allows you to add button spinners to any element and then respond to the Spin event to manipulate that element. The Spin event lets the developer know which direction the buttons are spinning; SpinDirection.Increase indicates an increment, SpinDirection.Decrease indicates a decrement.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <local:DemoView.Resources>
-       
+
       <x:Array x:Key="names" Type="s:String">
          <s:String>John Smith</s:String>
          <s:String>Janel Leverling</s:String>
@@ -40,7 +40,7 @@
          <s:String>Naomi Suyama</s:String>
       </x:Array>       
    </local:DemoView.Resources>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.txt

@@ -24,7 +24,7 @@
             The Calculator is a control used for performing mathematical calculations.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.cs.txt

@@ -14,9 +14,6 @@
 
   ************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System.Windows.Controls;
 using System;
@@ -29,119 +26,33 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
   /// </summary>
   public partial class ChartAxisView : DemoView
   {
-#if !OPEN_SOURCE
-    #region Members
-
-    private static DataPointsList<DataPoint> _numericDataPoints = new DataPointsList<DataPoint>() 
-                                                                  {   new DataPoint(1, 1)
-                                                                    , new DataPoint(2, 2)
-                                                                    , new DataPoint(1.5, 3)
-                                                                    , new DataPoint(5, 3.5) 
-                                                                  };
-    private static DataPointsList<DataPoint> _dateTimeDataPoints = new DataPointsList<DataPoint>()
-                                                                  {
-                                                                      new DataPoint( new System.DateTime( 2000, 1, 1 ).ToOADate(), 1 )
-                                                                    , new DataPoint( new System.DateTime( 2001, 1, 1 ).ToOADate(), 2 )
-                                                                    , new DataPoint( new System.DateTime( 2002, 5, 5 ).ToOADate(), 4 )
-                                                                    , new DataPoint( new System.DateTime( 2003, 1, 1 ).ToOADate(), 3 )
-                                                                  };
-    private static DataPointsList<DataPoint> _labelsDataPoints = new DataPointsList<DataPoint>()
-                                                                  {
-                                                                      new DataPoint( 0, 5, "Zeus" )
-                                                                    , new DataPoint( 0, 2, "Poseidon" )
-                                                                    , new DataPoint( 0, 3, "Hades" )
-                                                                    , new DataPoint( 0, 4, "Hestia" )
-                                                                    , new DataPoint( 0, 1, "Hera" )
-                                                                  };
-    #endregion
 
 
-    #region Dependency Properties
 
-    public static readonly DependencyProperty SelectedAxisProperty = DependencyProperty.Register(
-     "SelectedAxis",
-     typeof( Axis ),
-     typeof( ChartAxisView ),
-     new UIPropertyMetadata( null ) );
 
-    #endregion
 
-    #region Properties
 
-    public Axis SelectedAxis
-    {
-      get
-      {
-        return ( Axis )GetValue( SelectedAxisProperty );
-      }
-      set
-      {
-        SetValue( SelectedAxisProperty, value );
-      }
-    }
 
-    #endregion
-#endif
+
 
     #region Initialization
 
     public ChartAxisView()
     {
       InitializeComponent();
-#if !OPEN_SOURCE
-      _axisComboBox.SelectedIndex = 0;
-      _xAxis.DateTimeFormat = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
-#endif
     }
 
     #endregion
 
-#if !OPEN_SOURCE
-    #region Event Handlers
 
-    private void OnAxisComboBoxSelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox comboBox = ( ComboBox )sender;
-      
-      this.SelectedAxis = ( comboBox.SelectedIndex == 0 ) ? _xAxis : _yAxis;
-    }
 
-    private void OnAxisLabelsTypeChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ComboBox comboBox = ( ComboBox )sender;
-
-      switch( (LabelsType)comboBox.SelectedItem )
-      {
-        case LabelsType.Numeric: 
-          this.SetSeriesDataPoints( _numericDataPoints ); 
-          break;
-        case LabelsType.DateTime:
-          this.SetSeriesDataPoints( _dateTimeDataPoints );
-          break;
-        case LabelsType.Labels : 
-          this.SetSeriesDataPoints( _labelsDataPoints ); 
-          this.SelectedAxis.GraduationMode = AxisGraduationMode.Manual; 
-          break;
-      }
-    }
 
-    #endregion
-#endif
+
+
 
     #region Implementation
 
-#if !OPEN_SOURCE
-    private void SetSeriesDataPoints( DataPointsList<DataPoint> list )
-    {
-      if( _series != null )
-      {
-        _series.DataPoints.Clear();
 
-        foreach( DataPoint dataPoint in list )
-          _series.DataPoints.Add( dataPoint );
-      }
-    }
-#endif
     #endregion
   }
 }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.txt

@@ -25,196 +25,29 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>The chart's Axis class represents the x- and y-axis of an area (Area class) in a chart. They can be individually configured with many properties.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <ObjectDataProvider x:Key="AxisLabelsType" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:LabelsType" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-        
-        <ObjectDataProvider x:Key="AxisGraduationMode" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:AxisGraduationMode" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-        
-        <ObjectDataProvider x:Key="AxisScaleMode" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:AxisScaleMode" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-        
-        <ObjectDataProvider x:Key="AxisLabelLayout" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:AxisLabelLayout" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-        
-        <x:Array x:Key="AxisArray" Type="sys:String">
-            <sys:String>X Axis</sys:String>
-            <sys:String>Y Axis</sys:String>
-        </x:Array>
-        
-        <conv:GraduationModeToComboBoxConverter x:Key="GraduationModeToComboBoxConverter" />
-        <conv:LabelsTypeToPropertyEnabledConverter x:Key="LabelsTypeToPropertyEnabledConverter" />
-        <conv:ScaleModeToPropertyEnabledConverter x:Key="ScaleModeToPropertyEnabledConverter" />
-        <conv:AxesLabelsTypePropertyEnabledConverter x:Key="AxesLabelsTypePropertyEnabledConverter" />
-        
-        <sys:String x:Key="AxisLabelsLayoutTooltip">
-            Resize the window along the orientation of the selected axis to see all labels (staggered) or only the ones that fit (every second, third label, etc., is omitted).
-        </sys:String>
-    </local:DemoView.Resources>
-    
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5" HorizontalAlignment="Left">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <!-- 1st column -->
-            <TextBlock Text="Axis: " VerticalAlignment="Center" FontWeight="Bold" FontSize="13"/>
-            <ComboBox x:Name="_axisComboBox" FontWeight="Bold" FontSize="13" Grid.Column="1" ItemsSource="{StaticResource AxisArray}" SelectionChanged="OnAxisComboBoxSelectionChanged" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
-            <TextBlock Text="Labels Type: " Grid.Row="1" VerticalAlignment="Center" />
-            <ComboBox x:Name="_labelsType" Grid.Row="1" Grid.Column="1" ItemsSource="{Binding Source={StaticResource AxisLabelsType}}" SelectedItem="{Binding SelectedAxis.LabelsType, ElementName=_demo}" SelectionChanged="OnAxisLabelsTypeChanged" IsEnabled="{Binding SelectedIndex, ElementName=_axisComboBox, Converter={StaticResource AxesLabelsTypePropertyEnabledConverter}}"  Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Graduation Mode: " Grid.Row="2" VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_graduationMode}" />
-            <ComboBox x:Name="_graduationMode" Grid.Row="2" Grid.Column="1" ItemsSource="{Binding Source={StaticResource AxisGraduationMode}}" Width="100" IsEnabled="{Binding SelectedItem, ElementName=_labelsType, Converter={StaticResource LabelsTypeToPropertyEnabledConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5">
-                <ComboBox.SelectedItem>
-                    <MultiBinding Converter="{StaticResource GraduationModeToComboBoxConverter}" >
-                       <Binding Path="SelectedAxis.GraduationMode" ElementName="_demo" />
-                       <Binding Path="SelectedAxis.LabelsType" ElementName="_demo" />
-                    </MultiBinding>
-                </ComboBox.SelectedItem>
-            </ComboBox>
-            <TextBlock Text="Scale Mode: " Grid.Row="3" VerticalAlignment="Center" />
-            <ComboBox x:Name="_scaleMode" Grid.Row="3" Grid.Column="1" ItemsSource="{Binding Source={StaticResource AxisScaleMode}}" SelectedItem="{Binding SelectedAxis.ScaleMode, ElementName=_demo}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Custom Range Start: " Grid.Row="4" VerticalAlignment="Center" IsEnabled="{Binding SelectedItem, ElementName=_scaleMode, Converter={StaticResource ScaleModeToPropertyEnabledConverter}}" Style="{StaticResource DisableGrayText}"/>
-            <xctk:DoubleUpDown x:Name="_customRangeStart" Grid.Row="4" Grid.Column="1" Minimum="0" Maximum="{Binding Value, ElementName=_customRangeEnd}" Value="{Binding SelectedAxis.CustomRangeStart, ElementName=_demo}" Width="100" IsEnabled="{Binding SelectedItem, ElementName=_scaleMode, Converter={StaticResource ScaleModeToPropertyEnabledConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Custom Range End: " Grid.Row="5" VerticalAlignment="Center" IsEnabled="{Binding SelectedItem, ElementName=_scaleMode, Converter={StaticResource ScaleModeToPropertyEnabledConverter}}" Style="{StaticResource DisableGrayText}"/>
-            <xctk:DoubleUpDown x:Name="_customRangeEnd" Grid.Row="5" Grid.Column="1" Minimum="{Binding Value, ElementName=_customRangeStart}" Maximum="100" Value="{Binding SelectedAxis.CustomRangeEnd, ElementName=_demo}" Width="100" IsEnabled="{Binding SelectedItem, ElementName=_scaleMode, Converter={StaticResource ScaleModeToPropertyEnabledConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            
-            <!-- 2nd column -->
-            <TextBlock Text="Title: " Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <TextBox Grid.Column="3" Text="{Binding SelectedAxis.Title, ElementName=_demo, UpdateSourceTrigger=PropertyChanged}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Title Margin: " Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Row="1" Grid.Column="3" Minimum="0" Maximum="100" Value="{Binding SelectedAxis.TitleMargin, ElementName=_demo}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Axis Labels Layout: " Grid.Row="2" Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <ComboBox Grid.Row="2" Grid.Column="3" ItemsSource="{Binding Source={StaticResource AxisLabelLayout}}" SelectedItem="{Binding SelectedAxis.AxisLabelsLayout, ElementName=_demo}" ToolTip="{StaticResource AxisLabelsLayoutTooltip}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Ticks Count: " Grid.Row="3" Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Row="3" Grid.Column="3" Minimum="0" Maximum="100" Value="{Binding SelectedAxis.TicksCount, ElementName=_demo}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Reversed: " Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Row="4" Grid.Column="3" IsChecked="{Binding SelectedAxis.Reversed, ElementName=_demo}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            
-            <!-- 3rd column -->
-            <TextBlock Text="Show Arrow: " Grid.Column="4" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Column="5" IsChecked="{Binding SelectedAxis.ShowArrow, ElementName=_demo}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Show Axis: " Grid.Row="1" Grid.Column="4" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Row="1" Grid.Column="5" IsChecked="{Binding SelectedAxis.ShowAxis, ElementName=_demo}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Show Grid Lines: " Grid.Row="2" Grid.Column="4" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Row="2" Grid.Column="5" IsChecked="{Binding SelectedAxis.ShowGridLines, ElementName=_demo}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Show Ticks: " Grid.Row="3" Grid.Column="4" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Row="3" Grid.Column="5" IsChecked="{Binding SelectedAxis.ShowTicks, ElementName=_demo}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Show Tick Labels: " Grid.Row="4" Grid.Column="4" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Row="4" Grid.Column="5" IsChecked="{Binding SelectedAxis.ShowTickLabels, ElementName=_demo}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Show Axis Label: " Grid.Row="5" Grid.Column="4" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Row="5" Grid.Column="5" IsChecked="{Binding SelectedAxis.ShowAxisLabel, ElementName=_demo}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-        </Grid>
-      </GroupBox>
-      
-      <TextBlock Grid.Row="1" Text="Usage:" Style="{StaticResource Header}" Margin="10"/>
-
-      <xctk:Chart Grid.Row="2" MinHeight="200" ShowLegend="False">
-         <xctk:Chart.Areas>
-            <xctk:Area Title="Area #1">
-               <xctk:Area.XAxis>
-					<xctk:Axis x:Name="_xAxis" 
-                                 LabelsType="Numeric"
-                                 GraduationMode="Automatic" 
-                                 TicksCount="10"
-                                 ScaleMode="Automatic"
-                                 CustomRangeStart="0"
-                                 CustomRangeEnd="10"
-                                 Title="X Axis"
-                                 TitleMargin="10"
-                                 AxisLabelsLayout="ShowAll"
-                                 ShowArrow="False"
-                                 ShowAxis="True"
-                                 ShowGridLines="True"
-                                 ShowTicks="True"
-                                 ShowTickLabels="True"
-                                 ShowAxisLabel="True"
-                                 Reversed="False"/>
-				</xctk:Area.XAxis>
-               <xctk:Area.YAxis>
-					<xctk:Axis x:Name="_yAxis" 
-                                 LabelsType="Numeric"
-                                 GraduationMode="Automatic" 
-                                 TicksCount="10"
-                                 ScaleMode="Automatic"
-                                 CustomRangeStart="0"
-                                 CustomRangeEnd="10"
-                                 Title="Y Axis"
-                                 TitleMargin="10"
-                                 AxisLabelsLayout="ShowAll"
-                                 ShowArrow="False"
-                                 ShowAxis="True"
-                                 ShowGridLines="True"
-                                 ShowTicks="True"
-                                 ShowTickLabels="True"
-                                 ShowAxisLabel="True"
-                                 Reversed="False"/>
-				</xctk:Area.YAxis>
-               <xctk:Area.Series>
-                     <xctk:Series x:Name="_series"
-                                 DefaultInterior="Red">
-                        <xctk:Series.Layout>
-							<xctk:ColumnLayout/>
-						</xctk:Series.Layout>
-                     </xctk:Series>
-               </xctk:Area.Series>
-            </xctk:Area>
-         </xctk:Chart.Areas>
-      </xctk:Chart>
-    </Grid>
- <!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ChartAxis.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.cs.txt

@@ -14,9 +14,6 @@
 
   **************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System.Diagnostics;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.txt

@@ -28,135 +28,24 @@
             <LineBreak />
             <LineBreak />
             <Run>A legend can be moved around, resized, and docked. Please note that a legend can be resized only when its Dock property is set to Float and if the AllowResize property is set to true.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->      
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <ObjectDataProvider x:Key="LegendDock" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:LegendDock" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-    </local:DemoView.Resources>
-    
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <!-- 1st column-->
-            <TextBlock Text="Dock: " VerticalAlignment="Center" />
-            <ComboBox Grid.Column="1" ItemsSource="{Binding Source={StaticResource LegendDock}}" SelectedItem="{Binding Dock, ElementName=_legend}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Title: " Grid.Row="1" VerticalAlignment="Center" />
-            <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Title, ElementName=_legend, UpdateSourceTrigger=PropertyChanged}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-             
-            <!-- 2nd column-->
-            <TextBlock Text="Allow Resize: " Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox Grid.Column="3" IsChecked="{Binding AllowResize, ElementName=_legend}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Allow Move: " Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <CheckBox x:Name="_allowMove" Grid.Row="1" Grid.Column="3" IsChecked="{Binding AllowMove, ElementName=_legend}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            
-            <!--3rd column-->
-            <TextBlock Text="Allow Dock: " Grid.Column="4" VerticalAlignment="Center" IsEnabled="{Binding IsChecked, ElementName=_allowMove}" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}"/>
-            <CheckBox Grid.Column="5" IsChecked="{Binding AllowDock, ElementName=_legend}" IsEnabled="{Binding IsChecked, ElementName=_allowMove}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-        </Grid>
-      </GroupBox>
-      
-      <TextBlock Grid.Row="1" Text="Usage:" Style="{StaticResource Header}" Margin="10"/>
-
-      <xctk:Chart Grid.Row="2" MinHeight="350">
-         <xctk:Chart.Legend>
-               <xctk:Legend x:Name="_legend"
-                              Dock="Left"
-                              AllowResize="True"
-                              AllowDock="True"
-                              AllowMove="True"
-                              Title="Legend"/>
-            </xctk:Chart.Legend>
-         <xctk:Chart.Areas>
-            <xctk:Area Title="Wins/month">
-               <xctk:Area.XAxis>
-                     <xctk:Axis ShowAxisLabel="False" ShowTickLabels="False" ShowTicks="False"/>
-               </xctk:Area.XAxis>
-               <xctk:Area.YAxis>
-                     <xctk:Axis  ShowAxisLabel="False" ShowTickLabels="False" ShowTicks="False"/>
-               </xctk:Area.YAxis>
-               <xctk:Area.Series>
-                     <xctk:Series  Title="Months"
-                                 DefaultInterior="Green"
-                                 ShowPointsInLegend="True"
-                                 ShowHintLabels="True">
-                        <xctk:Series.Layout>
-                           <xctk:PieLayout />
-                        </xctk:Series.Layout>
-                        <xctk:Series.DataPoints>
-                           <xctk:DataPoint X="6" Y="6" Label="Jan" />
-                           <xctk:DataPoint X="7" Y="7" Label="Feb"/>
-                           <xctk:DataPoint X="4" Y="4" Label="Mar" />
-                           <xctk:DataPoint X="2" Y="2" Label="Apr"/>
-                        </xctk:Series.DataPoints>
-                     </xctk:Series>
-               </xctk:Area.Series>
-            </xctk:Area>
-                    
-            <xctk:Area Title="Goals/player">
-               <xctk:Area.XAxis>
-                     <xctk:Axis Title="Player's Name" LabelsType="Labels" GraduationMode="Manual"/>
-               </xctk:Area.XAxis>
-               <xctk:Area.YAxis>
-                     <xctk:Axis Title="Goals" AxisLabelsLayout="ShowToFit"/>
-               </xctk:Area.YAxis>
-               <xctk:Area.Series>
-                     <xctk:Series  Title="Players"
-                                 DefaultInterior="Orange">
-                        <xctk:Series.Layout>
-                           <xctk:ColumnLayout />
-                        </xctk:Series.Layout>
-                        <xctk:Series.DataPoints>
-                           <xctk:DataPoint Y="36" Label="Tom" />
-                           <xctk:DataPoint Y="7" Label="Steven"/>
-                           <xctk:DataPoint Y="24" Label="Kirk" />
-                           <xctk:DataPoint Y="12" Label="Erik"/>
-                           <xctk:DataPoint Y="10" Label="Scott"/>
-                        </xctk:Series.DataPoints>
-                     </xctk:Series>
-               </xctk:Area.Series>
-            </xctk:Area>
-         </xctk:Chart.Areas>
-      </xctk:Chart>
-   </Grid>
-<!--##END-->  
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ChartLegend.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.cs.txt

@@ -14,9 +14,6 @@
 
   *************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System.Windows;
 using Xceed.Wpf.Toolkit.Panels;
@@ -29,16 +26,8 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
   /// </summary>
   public partial class ChartSeriesBasicTypesView : DemoView
   {
-#if !OPEN_SOURCE
-    #region Members
 
-    private Series _columnSeries;
-    private Series _lineSeries;
-    private Series _pieSeries;
-    private Series _areaSeries;
 
-    #endregion
-#endif
 
     #region Initialization
 
@@ -49,126 +38,15 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 
     #endregion
 
-#if !OPEN_SOURCE
-    #region Envent Handlers
 
-    private void OnSeriesCollectionChecked( object sender, RoutedEventArgs e )
-    {
-      this.AddDefaultSeries();
-    }
 
-    private void OnSeriesCollectionUnchecked( object sender, RoutedEventArgs e )
-    {
-      this.CleanDefaultSeries();
-    }
 
-    private void OnLayoutSelectionChanged( object sender, RoutedEventArgs e )
-    {
-      if( _seriesCollectionCheckBox.IsChecked.HasValue && _seriesCollectionCheckBox.IsChecked.Value )
-      {
-        this.CleanDefaultSeries();
-        this.AddDefaultSeries();
-      }
-    }
 
-    #endregion
-#endif
 
     #region Implementation
 
-#if !OPEN_SOURCE
 
-    private void CleanDefaultSeries()
-    {
-      if( _area1.Series.Contains( _pieSeries ) )
-      {
-        _area1.Series.Remove( _pieSeries );
-      }
-      if( _area1.Series.Contains( _areaSeries ) )
-      {
-        _area1.Series.Remove( _areaSeries );
-      }
-      if( _area1.Series.Contains( _columnSeries ) )
-      {
-        _area1.Series.Remove( _columnSeries );
-      }
-      if( _area1.Series.Contains( _lineSeries ) )
-      {
-        _area1.Series.Remove( _lineSeries );
-      }
-    }
 
-    private void AddDefaultSeries()
-    {
-      if( _series.Layout.LayoutType != PredefinedLayoutTypes.Pie )
-      {
-        if( _pieSeries == null )
-        {
-          //init pieSeries
-          _pieSeries = new Series();
-          _pieSeries.DataPoints.Add( new DataPoint( 0, 1, "Cars" ) );
-          _pieSeries.DataPoints.Add( new DataPoint( 1, 2, "Toys" ) );
-          _pieSeries.DataPoints.Add( new DataPoint( 2, 2.5, "Trees" ) );
-          _pieSeries.DataPoints.Add( new DataPoint( 3, 4, "Pens" ) );
-          _pieSeries.Layout = new PieLayout();
-          _pieSeries.Title = "Pie Series";
-          _pieSeries.ShowPointsInLegend = true;
-          _pieSeries.DefaultInterior = Brushes.YellowGreen;
-        }
-        _area1.Series.Add( _pieSeries );
-      }
-      if( _series.Layout.LayoutType != PredefinedLayoutTypes.Area )
-      {
-        if( _areaSeries == null )
-        {
-          //init areaSeries
-          _areaSeries = new Series();
-          _areaSeries.DataPoints.Add( new DataPoint( -2, 0 ) );
-          _areaSeries.DataPoints.Add( new DataPoint( 0, 3.5 ) );
-          _areaSeries.DataPoints.Add( new DataPoint( 3, 1 ) );
-          _areaSeries.DataPoints.Add( new DataPoint( 5, 2.8 ) );
-          _areaSeries.DataPoints.Add( new DataPoint( 4, 1.5 ) );
-          _areaSeries.Layout = new AreaLayout();
-          _areaSeries.Title = "Area Series";
-          _areaSeries.DefaultInterior = Brushes.Orange;
-        }
-        _area1.Series.Add( _areaSeries );
-      }
-      if( _series.Layout.LayoutType != PredefinedLayoutTypes.Column )
-      {
-        if( _columnSeries == null )
-        {
-          //init columnSeries
-          _columnSeries = new Series();
-          _columnSeries.DataPoints.Add( new DataPoint( 1, 1 ) );
-          _columnSeries.DataPoints.Add( new DataPoint( 2, 2 ) );
-          _columnSeries.DataPoints.Add( new DataPoint( 2.5, 4 ) );
-          _columnSeries.DataPoints.Add( new DataPoint( 4, 3 ) );
-          _columnSeries.Title = "Column Series";
-          _columnSeries.DefaultInterior = Brushes.Red;
-        }
-        _area1.Series.Add( _columnSeries );
-      }
-      if( _series.Layout.LayoutType != PredefinedLayoutTypes.Line )
-      {
-        if( _lineSeries == null )
-        {
-          //init lineSeries
-          _lineSeries = new Series();
-          _lineSeries.DataPoints.Add( new DataPoint( 1, 1 ) );
-          _lineSeries.DataPoints.Add( new DataPoint( 2, 1 ) );
-          _lineSeries.DataPoints.Add( new DataPoint( 0.5, 1.5 ) );
-          _lineSeries.DataPoints.Add( new DataPoint( 3, 3 ) );
-          _lineSeries.DataPoints.Add( new DataPoint( 6, 2 ) );
-          _lineSeries.DataPoints.Add( new DataPoint( 5, 0.5 ) );
-          _lineSeries.Layout = new LineLayout();
-          _lineSeries.Title = "Line Series";
-          _lineSeries.DefaultInterior = Brushes.Black;
-        }
-        _area1.Series.Add( _lineSeries );
-      }
-    }
-#endif
 
     #endregion
   }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.txt

@@ -25,139 +25,26 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>A series contains DataPoint objects and are layed out in an area (Area class) of a chart. They can be displayed with predefined layouts, such as column (bar), line, area, or pie, or they can be displayed using a custom layout (not implemented in this sample).</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <ObjectDataProvider x:Key="SeriesLayout" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:PredefinedLayoutTypes" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-        
-        <conv:LayoutEngineToPredefinedLayoutConverter x:Key="LayoutEngineToPredefinedLayoutConverter" />
-        <conv:PredefinedLayoutToPropertyEnabledConverter x:Key="PredefinedLayoutToPropertyEnabledConverter" />
-        <conv:LineLengthToPropertyEnabledConverter x:Key="LineLengthToPropertyEnabledConverter" />
-        <xctkconv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-               
-        <Style x:Key="ComboBoxItemStyle" TargetType="{x:Type ComboBoxItem}">
-            <Style.Triggers>
-                <DataTrigger Binding="{Binding}" Value="Custom">
-                    <Setter Property="IsEnabled" Value="False"/>
-                </DataTrigger>
-            </Style.Triggers>
-        </Style>
-    </local:DemoView.Resources>
-    
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <!-- 1st column-->
-            <TextBlock Text="Layout: " VerticalAlignment="Center" />
-            <ComboBox x:Name="_layoutComboBox" Grid.Column="1" SelectedValue="{Binding Layout, ElementName=_series, Converter={StaticResource LayoutEngineToPredefinedLayoutConverter}}" SelectedValuePath="Content" ItemContainerStyle="{StaticResource ComboBoxItemStyle}" SelectionChanged="OnLayoutSelectionChanged" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5">
-               <ComboBoxItem Content="{x:Static xctk:PredefinedLayoutTypes.Area}" />
-               <ComboBoxItem Content="{x:Static xctk:PredefinedLayoutTypes.Column}" />
-               <ComboBoxItem Content="{x:Static xctk:PredefinedLayoutTypes.Line}" />
-               <ComboBoxItem Content="{x:Static xctk:PredefinedLayoutTypes.Pie}" />
-            </ComboBox>
-            <TextBlock Grid.Row="1" Text="Title: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_title}"/>
-            <TextBox x:Name="_title" Grid.Row="1" Grid.Column="1" Text="{Binding Title, ElementName=_series, UpdateSourceTrigger=PropertyChanged}" Width="75" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=title}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Grid.Row="2" Text="Default Interior: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_defaultInterior}"/>
-            <xctk:ColorPicker x:Name="_defaultInterior" Grid.Row="2" Grid.Column="1"  SelectedColor="{Binding DefaultInterior, ElementName=_series, Converter={StaticResource SolidColorBrushToColorConverter}}" Width="75" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=defaultInterior}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            
-            <!-- 2nd column-->
-            <TextBlock Grid.Column="2" Text="Show Hint Labels: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_showHintLabels}" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}"/>
-            <CheckBox x:Name="_showHintLabels" Grid.Column="3" IsChecked="{Binding ShowHintLabels, ElementName=_series}" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=showHintLabels}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Grid.Row="1" Grid.Column="2" Text="Show Points in Legend: " IsEnabled="{Binding IsEnabled, ElementName=_showPointsInLegend}" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}"/>
-            <CheckBox x:Name="_showPointsInLegend" Grid.Row="1" Grid.Column="3" IsChecked="{Binding ShowPointsInLegend, ElementName=_series}" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=showPointsInLegend}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />         
-            
-            <!-- 3rd column-->
-            <TextBlock Grid.Column="4" Text="Hint Line Length: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_hintLineLength}" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}"/>
-            <xctk:IntegerUpDown x:Name="_hintLineLength" Grid.Column="5" Minimum="0" Maximum="200" Value="{Binding HintLineLength, ElementName=_series}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5">
-                <xctk:IntegerUpDown.IsEnabled>
-                    <MultiBinding Converter="{StaticResource LineLengthToPropertyEnabledConverter}">
-                        <Binding Path="SelectedItem" ElementName="_layoutComboBox" Converter="{StaticResource PredefinedLayoutToPropertyEnabledConverter}" ConverterParameter="hintLineLength" />
-                        <Binding Path="IsChecked" ElementName="_showHintLabels" />
-                    </MultiBinding>
-                </xctk:IntegerUpDown.IsEnabled>
-            </xctk:IntegerUpDown>
-            <TextBlock Grid.Row="1" Grid.Column="4" Text="Spacing: " VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_spacing}" Margin="10,0,0,0" Style="{StaticResource DisableGrayText}"/>
-            <xctk:IntegerUpDown x:Name="_spacing" Grid.Row="1" Grid.Column="5" Minimum="0" Maximum="100" Value="{Binding Spacing, ElementName=_series}" Width="75" IsEnabled="{Binding SelectedItem, ElementName=_layoutComboBox, Converter={StaticResource PredefinedLayoutToPropertyEnabledConverter}, ConverterParameter=spacing}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-        </Grid>
-      </GroupBox>
-      
-      <TextBlock  Grid.Row="1" Text="Usage:" Style="{StaticResource Header}" Margin="10"/>
-
-      <xctk:Chart Grid.Row="2" MinHeight="200">
-            <xctk:Chart.Areas>
-               <xctk:Area x:Name="_area1" Title="Area #1">
-                  <xctk:Area.Series>
-                        <xctk:Series x:Name="_series"
-                                    DefaultInterior="BlueViolet"
-                                    Spacing="20"
-                                    Title="Average"
-                                    ShowPointsInLegend="false"
-                                    ShowHintLabels="false"
-                                    HintLineLength="20">
-                           <xctk:Series.Layout>
-                              <xctk:LineLayout />
-                           </xctk:Series.Layout>
-                           <xctk:Series.DataPoints>
-                              <xctk:DataPoint X="1" Y="1" Label="Oct" />
-                              <xctk:DataPoint X="2" Y="2" Label="Jan"/>
-                              <xctk:DataPoint X="2.5" Y="1.5" Label="Feb" />
-                              <xctk:DataPoint X="4" Y="1" Label="Jun"/>
-                              <xctk:DataPoint X="1.5" Y="3" Label="Dec"/>
-                              <xctk:DataPoint X="5" Y="5" Label="Apr"/>
-                              <xctk:DataPoint X="3" Y="1" Label="Nov"/>
-                              <xctk:DataPoint X="4.5" Y="7" Label="Jul"/>
-                              <xctk:DataPoint X="3.5" Y="4.5" Label="Aug"/>
-                           </xctk:Series.DataPoints>
-                        </xctk:Series>
-                  </xctk:Area.Series>
-               </xctk:Area>
-            </xctk:Chart.Areas>
-      </xctk:Chart>
-          
-      <TextBlock Grid.Row="3" Text="A collection of Series instances can be added to an Area. Use the following Checkbox to display 3 new Series along with the current one." TextWrapping="Wrap" Margin="0,15,0,5" />
-      <CheckBox Grid.Row="4" x:Name="_seriesCollectionCheckBox" IsChecked="False" Checked="OnSeriesCollectionChecked" Unchecked="OnSeriesCollectionUnchecked" Content="Display 4 Series in one Area" Margin="0,0,0,10" />
-   </Grid>
- <!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ChartBasicTypes.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.cs.txt

@@ -14,9 +14,6 @@
 
   ************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System;
 using System.Collections.ObjectModel;

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.txt

@@ -26,57 +26,17 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>The DataPoint objects of a chart's series can be set by binding with the Series.DataPointsSource property. From there, a DataPointBinding can be set on the X, Y, or Label property of a DataPoint.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xced Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <sample:Persons x:Key="Persons"/>
-        <CollectionViewSource x:Key="PersonCollection" Source="{Binding Source={StaticResource Persons}, Path=PersonList}" />
-    </local:DemoView.Resources>
-    
-   <Grid Margin="10">
-        <xctk:Chart MinHeight="300" ShowLegend="False">
-            <xctk:Chart.Areas>
-                <xctk:Area>
-                    <xctk:Area.XAxis>
-						<xctk:Axis Title="Persons" GraduationMode="Manual" LabelsType="Labels"/>
-					</xctk:Area.XAxis>
-                     <xctk:Area.YAxis>
-						<xctk:Axis Title="Skill Level" />
-					</xctk:Area.YAxis>
-                    <xctk:Area.Series>
-                        <xctk:Series DataPointsSource="{Binding Source={StaticResource PersonCollection}}">
-                            <xctk:Series.DataPointBindings>
-								<xctk:BindingInfo PropertyName="Y">
-									<xctk:BindingInfo.Binding>
-										<Binding Path="Skill"/>
-									</xctk:BindingInfo.Binding>
-								</xctk:BindingInfo>
-								<xctk:BindingInfo PropertyName="Label">
-									<xctk:BindingInfo.Binding>
-										<Binding Path="Name"/>
-									</xctk:BindingInfo.Binding>
-								</xctk:BindingInfo>
-							</xctk:Series.DataPointBindings>
-                        </xctk:Series>
-                    </xctk:Area.Series>
-                </xctk:Area>
-            </xctk:Chart.Areas>
-        </xctk:Chart>
 
-    </Grid>
- <!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
     <Image Source="..\OpenSourceImages\ChartSeriesDataPointsBinding.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.cs.txt

@@ -14,9 +14,6 @@
 
   ************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System.Windows.Controls;
 using System;

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.txt

@@ -24,178 +24,32 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>This sample shows how AxesGrid elements can be styled using a DataTemplate.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <DataTemplate x:Key="BackgroundTemplate">
-			<Rectangle Margin="-5,-5,-5,-5" RadiusX="25" RadiusY="25" StrokeThickness="3" Stroke="Blue" Fill="#FFFFE1">
-				<Rectangle.BitmapEffect>
-					<DropShadowBitmapEffect/>
-				</Rectangle.BitmapEffect>
-			</Rectangle>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="AxisTitleTemplate">
-			<Border DockPanel.Dock="Top" BorderThickness="1" CornerRadius="4">
-				<Border.Background>
-					<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-						<GradientStop Color="White" Offset="0.0" />
-						<GradientStop Color="SkyBlue" Offset="1.0" />
-					</LinearGradientBrush>
-				</Border.Background>
-
-				<TextBlock FontFamily="Comic Sans MS" FontSize="18" Margin="2,2,2,1"
-				            HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Path=Text}">
-					<TextBlock.Foreground>
-						<SolidColorBrush Color="Black"/>
-					</TextBlock.Foreground>
-				</TextBlock>
-			</Border>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="GridTemplateX">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-				<Polyline Points="{Binding Path=Points}" StrokeThickness="1" Stroke="Red" StrokeDashArray="1 5 1 1" />
-			</Canvas>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="GridTemplateY">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-                <Polyline  Points="{Binding Path=Points}" StrokeThickness="1" Stroke="Green" StrokeDashArray="8 3 1 3"/>
-			</Canvas>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="TickTemplateX">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-				<Line X1="{Binding Path=XStart}" Y1="{Binding Path=YStart}" X2="{Binding Path=XEnd}" Y2="{Binding Path=YEnd}" StrokeThickness="5" Stroke="Red"/>
-			</Canvas>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="TickTemplateY">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-				<Line  X1="{Binding Path=XStart}" Y1="{Binding Path=YStart}" X2="{Binding Path=XEnd}" Y2="{Binding Path=YEnd}" StrokeThickness="5" Stroke="Green"/>
-			</Canvas>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="ArrowTemplate">
-			<Polyline Points="{Binding Path=Points}"
-					  StrokeThickness="2" Stroke="Blue"/>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="LabelTemplateX">
-			<Border DockPanel.Dock="Top" BorderThickness="1" CornerRadius="4">
-				<Border.Background>
-					<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-						<GradientStop Color="Yellow" Offset="0.0" />
-						<GradientStop Color="Red" Offset="1.0" />
-					</LinearGradientBrush>
-				</Border.Background>
-
-				<TextBlock FontFamily="Comic Sans MS" FontSize="18" Margin="2,2,2,1"
-				  HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Path=Text}">
-					<TextBlock.Foreground>
-						<SolidColorBrush Color="Black"/>
-					</TextBlock.Foreground>
-				</TextBlock>
-			</Border>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="LabelTemplateY">
-			<Border DockPanel.Dock="Top" BorderThickness="1" CornerRadius ="4">
-				<Border.Background>
-					<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-						<GradientStop Color="Yellow" Offset="0.0" />
-						<GradientStop Color="LimeGreen" Offset="1.0" />
-					</LinearGradientBrush>
-				</Border.Background>
-
-				<TextBlock FontFamily="Comic Sans MS" FontSize="18" Margin="2,2,2,1"
-				  HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Path=Text}">
-					<TextBlock.Foreground>
-						<SolidColorBrush Color="Black"/>
-					</TextBlock.Foreground>
-				</TextBlock>
-			</Border>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="AxisTemplate">
-			<Polyline Points="{Binding Path=Points}"
-				  StrokeThickness="2" Stroke="Blue"/>
-		</DataTemplate>
-    </local:DemoView.Resources>
-    
-   <Grid>
-            <xctk:Chart MinHeight="300" ShowLegend="False">
-                <xctk:Chart.Areas>
-                    <xctk:Area BackgroundTemplate="{StaticResource BackgroundTemplate}" Margin="25,25,25,25">
-                        <xctk:Area.XAxis>
-						    <xctk:Axis AxisTitleTemplate="{StaticResource AxisTitleTemplate}"
-                                        GridTemplate="{StaticResource GridTemplateX}"
-                                        TickTemplate="{StaticResource TickTemplateX}"
-                                        ArrowTemplate="{StaticResource ArrowTemplate}"
-                                        LabelTemplate="{StaticResource LabelTemplateX}">
-                                <xctk:Axis.Template>
-								    <ControlTemplate TargetType="{x:Type xctk:Axis}">
-									    <ContentPresenter ContentTemplate="{StaticResource AxisTemplate}"/>
-								    </ControlTemplate>
-							    </xctk:Axis.Template>
-                                
-                                <xctk:Axis.Arrow>
-								    <xctk:Arrow Length="20" Thickness="10"/>
-							    </xctk:Axis.Arrow>
-                            </xctk:Axis>
-					    </xctk:Area.XAxis>
-
-                        <xctk:Area.YAxis>
-                            <xctk:Axis Reversed="true"
-                                        AxisTitleTemplate="{StaticResource AxisTitleTemplate}"
-                                        GridTemplate="{StaticResource GridTemplateY}"
-                                        TickTemplate="{StaticResource TickTemplateY}"
-                                        ArrowTemplate="{StaticResource ArrowTemplate}"
-                                        LabelTemplate="{StaticResource LabelTemplateY}">
-                                <xctk:Axis.Template>
-								    <ControlTemplate TargetType="{x:Type xctk:Axis}">
-									    <ContentPresenter ContentTemplate="{StaticResource AxisTemplate}"/>
-								    </ControlTemplate>
-							    </xctk:Axis.Template>
-                                
-                                <xctk:Axis.Arrow>
-								    <xctk:Arrow Length="20" Thickness="10"/>
-							    </xctk:Axis.Arrow>
-                            </xctk:Axis>
-                        </xctk:Area.YAxis>
-
-                        <xctk:Area.Series>
-						    <xctk:Series>
-							    <xctk:Series.DataPoints>
-								    <xctk:DataPoint X="1" Y="1" />
-								    <xctk:DataPoint X="2" Y="3"/>
-								    <xctk:DataPoint X="3" Y="2"/>
-								    <xctk:DataPoint X="4" Y="5"/>
-								    <xctk:DataPoint X="5" Y="4"/>
-							    </xctk:Series.DataPoints>
-							    <xctk:Series.Layout>
-								    <xctk:LineLayout/>
-							    </xctk:Series.Layout>
-						    </xctk:Series>
-					    </xctk:Area.Series>
-                    </xctk:Area>
-                </xctk:Chart.Areas>
-            </xctk:Chart>
-    </Grid>
- <!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ChartStylingAxesGrid.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.cs.txt

@@ -14,9 +14,6 @@
 
   *************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System.Windows.Controls;
 using System.Diagnostics;

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.txt

@@ -25,175 +25,26 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>This sample shows how a series with a column layout type and a legend can be styled using DataTemplates.</Run>
-            <!--##EXCLUDE_OPEN_SOURCE-->
-            <Run>Please move mouse on line and markers to see simple effects.</Run>
-            <!--##END-->
-            
-       <!--##INCLUDE_OPEN_SOURCE
+
             <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <sample:Persons x:Key="persons"/>
-        <CollectionViewSource x:Key="PersonCollection" Source="{Binding Source={StaticResource persons}, Path=PersonList}"/>
-        
-        <DataTemplate x:Key="legendTemplate">
-          <DockPanel VerticalAlignment="Center">
-            <Image Source="{Binding Path=Photo}" Width="32"  Height="32" Margin="5,1,1,1"/>
-            <TextBlock Text="{Binding Path=Name}" FontSize="11" VerticalAlignment="Center" Margin="5,1,2,1"/>
-          </DockPanel>
-        </DataTemplate>
-        
-        <Style  x:Key="TextBoxTextStyle" TargetType="TextBlock">
-          <Setter Property="HorizontalAlignment" Value="Center" />
-          <Setter Property="FontFamily" Value="Comic Sans MS"/>
-          <Setter Property="FontSize" Value="12"/>
-          <Style.Triggers>
-            <EventTrigger RoutedEvent="Mouse.MouseEnter">
-              <EventTrigger.Actions>
-                <BeginStoryboard>
-                  <Storyboard>
-                    <DoubleAnimation Storyboard.TargetProperty="FontSize" To="19" Duration="0:0:0.4"/>
-                  </Storyboard>
-                </BeginStoryboard>
-              </EventTrigger.Actions>
-            </EventTrigger>
-
-            <EventTrigger RoutedEvent="Mouse.MouseLeave">
-              <EventTrigger.Actions>
-                <BeginStoryboard>
-                  <Storyboard>
-                    <DoubleAnimation Storyboard.TargetProperty="FontSize" To="12" Duration="0:0:0.4" />
-                  </Storyboard>
-                </BeginStoryboard>
-              </EventTrigger.Actions>
-            </EventTrigger>
-          </Style.Triggers>
-        </Style>
-        
-         <Style TargetType="Button">
-           <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <ContentPresenter/>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-             
-             <Setter Property="ContentTemplate">
-                <Setter.Value>
-                   <DataTemplate>
-			           <Grid Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}" 
-                             Height="{Binding Path=ActualHeight, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}">
-				           <Rectangle RadiusX="5" RadiusY="5" >
-					            <Rectangle.Triggers>
-						            <EventTrigger RoutedEvent="Mouse.MouseEnter">
-							            <EventTrigger.Actions>
-								            <BeginStoryboard>
-									            <Storyboard>
-										            <DoubleAnimation Storyboard.TargetProperty="Opacity" To="0.5" Duration="0:0:0.4"/>
-									            </Storyboard>
-								            </BeginStoryboard>
-							            </EventTrigger.Actions>
-						            </EventTrigger>
-
-						            <EventTrigger RoutedEvent="Mouse.MouseLeave">
-							            <EventTrigger.Actions>
-								            <BeginStoryboard>
-									            <Storyboard>
-										            <DoubleAnimation Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:0.4" />
-									            </Storyboard>
-								            </BeginStoryboard>
-							            </EventTrigger.Actions>
-						            </EventTrigger>
-					            </Rectangle.Triggers>
-					
-					            <Rectangle.Fill>
-						            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-							            <GradientStop Color="Yellow" Offset="0.0" />
-							            <GradientStop Color="Orange" Offset="0.25" />
-							            <GradientStop Color="CornflowerBlue" Offset="0.75" />
-							            <GradientStop Color="LimeGreen" Offset="1.0" />
-						            </LinearGradientBrush>
-					            </Rectangle.Fill>
-				            </Rectangle> 
-                           <ContentPresenter VerticalAlignment="Center" Content="{Binding Path=Content, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}"/>
-			           </Grid>
-		            </DataTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        
-        <DataTemplate x:Key="seriesTemplate">
-          <Button x:Name="Bar">
-            <StackPanel>
-              <DockPanel>
-                <TextBlock Text="Name: " Style="{StaticResource TextBoxTextStyle}" />
-                <TextBlock Text="{Binding Path=Content.Name}" Style="{StaticResource TextBoxTextStyle}" />
-              </DockPanel>
-              <DockPanel>
-                <TextBlock Text="Skill: " Style="{StaticResource TextBoxTextStyle}" />
-                <TextBlock Text="{Binding Path=Content.Skill}" Style="{StaticResource TextBoxTextStyle}" />
-              </DockPanel>
-              <TextBlock Text="Photo:" Style="{StaticResource TextBoxTextStyle}"/>
-              <Image Source="{Binding Path=Content.Photo}"/>
-            </StackPanel>
-          </Button>
-       </DataTemplate>
-    </local:DemoView.Resources>
-    
-   <Grid>
-     <xctk:Chart MinHeight="400">
-        <xctk:Chart.Legend>
-            <xctk:Legend ItemTemplate="{StaticResource legendTemplate}" ItemsSource="{Binding Source={StaticResource PersonCollection}}" Title="Persons"/>
-        </xctk:Chart.Legend>
-        <xctk:Chart.Areas>
-            <xctk:Area >
-                <xctk:Area.XAxis>
-                    <xctk:Axis GraduationMode="Manual" LabelsType="Labels"/>
-                </xctk:Area.XAxis>
-                <xctk:Area.YAxis>
-                    <xctk:Axis Title="Skill"/>
-                </xctk:Area.YAxis>
-                
-                <xctk:Area.Series>
-					<xctk:Series DataPointsSource="{Binding Source={StaticResource PersonCollection}}"
-                                  Template="{StaticResource seriesTemplate}"
-                                  ShowPointsInLegend="true">
-						<xctk:Series.DataPointBindings>
-                            <xctk:BindingInfo PropertyName="X">
-                              <xctk:BindingInfo.Binding>
-                                <Binding Path="Age"/>
-                              </xctk:BindingInfo.Binding>
-                            </xctk:BindingInfo>
-                            <xctk:BindingInfo PropertyName="Y">
-                              <xctk:BindingInfo.Binding>
-                                <Binding Path="Skill"/>
-                              </xctk:BindingInfo.Binding>
-                            </xctk:BindingInfo>
-                            <xctk:BindingInfo PropertyName="Label">
-                              <xctk:BindingInfo.Binding>
-                                <Binding Path="Name"/>
-                              </xctk:BindingInfo.Binding>
-                            </xctk:BindingInfo>
-                          </xctk:Series.DataPointBindings>
-				    </xctk:Series>
-			    </xctk:Area.Series>
-            </xctk:Area>
-        </xctk:Chart.Areas>
-     </xctk:Chart>
-   </Grid>
-<!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ChartStylingColumnSeries.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.cs.txt

@@ -14,9 +14,6 @@
 
   *************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System.Windows.Controls;
 using System.Windows;
@@ -34,16 +31,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
       InitializeComponent();
     }
 
-#if !OPEN_SOURCE
-    #region Event Handler
 
-    private void LegendButtonClick( object sender, RoutedEventArgs e )
-    {
-      Random r = new Random();
-      _series.DataPoints.Add( new DataPoint( _series.DataPoints.Count, r.NextDouble() ) );
-    }
 
-    #endregion
-#endif
   }
 }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.txt

@@ -24,144 +24,23 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>This sample demonstrates how a series with a line layout type and a legend can be styled via DataTemplates. The legend contains a button to add new DataPoints.</Run>
-            <!--##EXCLUDE_OPEN_SOURCE-->
-            <Run>Please move mouse along the line and over the markers to see simple effects.</Run>
-            <!--##END-->
-            
-       <!--##INCLUDE_OPEN_SOURCE
+
             <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <DataTemplate x:Key="legendTemplate">
-			<DockPanel VerticalAlignment="Center">
-				<Path Width="32" Height="32" StrokeThickness="3" Data="M 0,24 Q 8,0 16,16 Q 24,32 32,8" >
-					<Path.Stroke>
-						<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-							<GradientStop Color="Green" Offset="1" />
-							<GradientStop Color="Yellow" Offset="0.5" />
-							<GradientStop Color="Red" Offset="0" />
-						</LinearGradientBrush>
-					</Path.Stroke>
-				</Path>
-				<TextBlock Text="{Binding Path=Text}" FontSize="11" VerticalAlignment="Center" Margin="5,1,2,1"/>
-                <Button Click="LegendButtonClick">Add DataPoint</Button>
-			</DockPanel>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="seriesTemplate">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-				<Polyline Points="{Binding Path=Points}" StrokeThickness="10" >
-					<Polyline.Triggers>
-						<EventTrigger RoutedEvent="Mouse.MouseEnter">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetProperty="StrokeThickness" To="20" Duration="0:0:0.4"/>
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-
-						<EventTrigger RoutedEvent="Mouse.MouseLeave">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetProperty="StrokeThickness" To="10" Duration="0:0:0.4" />
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-					</Polyline.Triggers>
-					
-					<Polyline.Stroke>
-						<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-							<GradientStop Color="Green" Offset="1" />
-							<GradientStop Color="Yellow" Offset="0.75" />
-							<GradientStop Color="Red" Offset="0" />
-						</LinearGradientBrush>
-					</Polyline.Stroke>
-				</Polyline>
-			</Canvas>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="markerTemplate">
-			<Ellipse Width="20" Height="20" >
-				<Ellipse.Triggers>
-					<EventTrigger RoutedEvent="Mouse.MouseEnter">
-						<EventTrigger.Actions>
-							<BeginStoryboard>
-								<Storyboard>
-									<DoubleAnimation Storyboard.TargetProperty="Width" To="30" Duration="0:0:0.4"/>
-									<DoubleAnimation Storyboard.TargetProperty="Height"	To="30" Duration="0:0:0.4"/>
-								</Storyboard>
-							</BeginStoryboard>
-						</EventTrigger.Actions>
-					</EventTrigger>
-
-					<EventTrigger RoutedEvent="Mouse.MouseLeave">
-						<EventTrigger.Actions>
-							<BeginStoryboard>
-								<Storyboard>
-									<DoubleAnimation Storyboard.TargetProperty="Width" To="20" Duration="0:0:0.4" />
-									<DoubleAnimation Storyboard.TargetProperty="Height"	To="20" Duration="0:0:0.4"/>
-								</Storyboard>
-							</BeginStoryboard>
-						</EventTrigger.Actions>
-					</EventTrigger>
-				</Ellipse.Triggers>
-				
-				<Ellipse.Fill>
-					<RadialGradientBrush Center="0.3, 0.3" RadiusX="0.6" RadiusY="0.6">
-						<GradientStop Color="LightBlue" Offset="0" />
-						<GradientStop Color="Blue" Offset="1" />
-					</RadialGradientBrush>
-				</Ellipse.Fill>			
-		</Ellipse>
-		</DataTemplate>
-    </local:DemoView.Resources>
-    
-   <Grid>
-     <xctk:Chart MinHeight="300">
-        <xctk:Chart.Legend>
-            <xctk:Legend ItemTemplate="{StaticResource legendTemplate}"/>
-        </xctk:Chart.Legend>
-        <xctk:Chart.Areas>
-            <xctk:Area Title="Area1">
-                <xctk:Area.Series>
-					<xctk:Series x:Name="_series"
-                                  Title="Average/Month"
-                                  Template="{StaticResource seriesTemplate}"
-                                  MarkerTemplate="{StaticResource markerTemplate}">
-						<xctk:Series.DataPoints>
-						    <xctk:DataPoint X="0" Y="0" />
-						    <xctk:DataPoint X="1" Y="0.1" />
-						    <xctk:DataPoint X="2" Y="0.3" />
-						    <xctk:DataPoint X="3" Y="0.5" />
-						    <xctk:DataPoint X="4" Y="0.88" />
-						    <xctk:DataPoint X="5" Y="0.9" />
-						    <xctk:DataPoint X="6" Y="0.95" />
-					    </xctk:Series.DataPoints>
-					    <xctk:Series.Layout>
-						    <xctk:LineLayout/>
-					    </xctk:Series.Layout>
-				    </xctk:Series>
-			    </xctk:Area.Series>
-            </xctk:Area>
-        </xctk:Chart.Areas>
-     </xctk:Chart>
-   </Grid>
- <!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ChartStylingLineSeries.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.cs.txt

@@ -14,9 +14,6 @@
 
   *************************************************************************************/
 
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Chart;
-#endif
 using System.Windows.Media;
 using System.Windows.Controls;
 using System;

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.txt

@@ -24,175 +24,26 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>This sample demonstrates how a series with a pie layout type can be styled via DataTemplates. The series, hint line, and hint label are all styled.</Run>
-            <!--##EXCLUDE_OPEN_SOURCE-->
-            <Run>Please move the mouse over the pie slices to view the tooltips of the pie layout DataTemplate.</Run>
-            <!--##END-->
 
-       <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <sys:String x:Key="Name1">Mary</sys:String>
-        <sys:String x:Key="Name2">Brad</sys:String>
-        <sys:String x:Key="Name3">Anne</sys:String>
-        <sys:String x:Key="Name4">Eric</sys:String>
-        <sys:String x:Key="Name5">Lisa</sys:String>
-        <sys:String x:Key="Name6">Carl</sys:String>
-        <sys:String x:Key="Name7">Whole Team</sys:String>
-
-        <DataTemplate x:Key="GridBackgroundTemplate">
-			<Rectangle Width="{Binding Path=W}" Height="{Binding Path=H}" Margin="-5,-5,-5,-5"
-					   RadiusX="25" RadiusY="25" StrokeThickness="1" Stroke="Gray" Fill="#FFFFE1">
-				<Rectangle.BitmapEffect>
-					<DropShadowBitmapEffect/>
-				</Rectangle.BitmapEffect>
-			</Rectangle>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="PieTemplate">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-				<Path x:Name="PieSlice" Stroke="Gray" StrokeThickness="2" Data="{Binding Path=Geometry}" Fill="{Binding Path=Interior}">
-					<Path.ToolTip>
-						<ToolTip>
-							<StackPanel Orientation="Vertical">
-								<TextBlock Text="Name:"/>
-								<TextBlock Text="{Binding Path=DataPoint.Label}"/>
-								<TextBlock Text="Skills:"/>
-								<TextBlock Text="{Binding Path=DataPoint.Y}"/>
-							</StackPanel>
-						</ToolTip>
-					</Path.ToolTip>
-					<Path.Triggers>
-						<EventTrigger RoutedEvent="Mouse.MouseEnter">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetProperty="Opacity" To="0.3" Duration="0:0:0.4"/>
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-
-						<EventTrigger RoutedEvent="Mouse.MouseLeave">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:0.4" />
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-					</Path.Triggers>
-				</Path>
-			</Canvas>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="HintLineTemplate">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-                <Polyline Points="{Binding Path=Points}" StrokeThickness="3" StrokeDashArray="2 1">
-                     <Polyline.Stroke>
-                        <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-                              <GradientStop Color="Orange" Offset="1" />
-                              <GradientStop Color="Blue" Offset="0.50" />
-                              <GradientStop Color="Green" Offset="0" />
-                        </LinearGradientBrush>
-                  </Polyline.Stroke>
-                </Polyline>
-            </Canvas>
-		</DataTemplate>
-        
-        <DataTemplate x:Key="HintLabelTemplate">
-			<Border DockPanel.Dock="Top" BorderThickness="1" CornerRadius ="4">
-				<Border.BorderBrush>
-					<SolidColorBrush Color="Gray"/>
-				</Border.BorderBrush>
-				<Border.Background>
-                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                        <GradientStop Color="White" Offset="0.0" />
-                        <GradientStop Color="SkyBlue" Offset="1.0" />
-                    </LinearGradientBrush>
-                </Border.Background>
-
-                <StackPanel>
-				    <TextBlock FontFamily="Sans Serif" FontSize="18" FontStyle="Oblique" Margin="2,2,2,1"
-				               HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Path=DataPoint.Label}"/>
-                    <Image x:Name="_image" Width="20" Height="20"/>
-                </StackPanel>
-			</Border>
-            
-            <DataTemplate.Triggers>
-                 <DataTrigger Binding="{Binding DataPoint.Label}" Value="{StaticResource Name1}">
-                    <Setter Property="Source" Value="../Photo/1.bmp" TargetName="_image" />
-                 </DataTrigger>
-                <DataTrigger Binding="{Binding DataPoint.Label}" Value="{StaticResource Name2}">
-                   <Setter Property="Source" Value="../Photo/2.bmp" TargetName="_image" />
-                </DataTrigger>
-                <DataTrigger Binding="{Binding DataPoint.Label}" Value="{StaticResource Name3}">
-                   <Setter Property="Source" Value="../Photo/3.bmp" TargetName="_image" />
-                </DataTrigger>
-                <DataTrigger Binding="{Binding DataPoint.Label}" Value="{StaticResource Name4}">
-                   <Setter Property="Source" Value="../Photo/4.bmp" TargetName="_image" />
-                </DataTrigger>
-                <DataTrigger Binding="{Binding DataPoint.Label}" Value="{StaticResource Name5}">
-                   <Setter Property="Source" Value="../Photo/5.bmp" TargetName="_image" />
-                </DataTrigger>
-                <DataTrigger Binding="{Binding DataPoint.Label}" Value="{StaticResource Name6}">
-                   <Setter Property="Source" Value="../Photo/6.bmp" TargetName="_image" />
-                </DataTrigger>
-            </DataTemplate.Triggers>
-		</DataTemplate>
-
-    </local:DemoView.Resources>
-    
-   <Grid>
-     <xctk:Chart  MinHeight="400">
-        <xctk:Chart.Areas >
-            <xctk:Area Title="Area1" BackgroundTemplate="{StaticResource GridBackgroundTemplate}" Margin="10,25,20,25">
-               <xctk:Area.XAxis>
-                    <xctk:Axis ShowAxisLabel="false" ShowGridLines="false" ShowAxis="false" ShowArrow="false" ShowTickLabels="false" ShowTicks="false" />
-                </xctk:Area.XAxis>
-				   <xctk:Area.YAxis>
-                    <xctk:Axis ShowAxisLabel="false" ShowGridLines="false" ShowAxis="false" ShowArrow="false" ShowTickLabels="false" ShowTicks="false" />
-                </xctk:Area.YAxis>
-                
-               <xctk:Area.Series>
-					   <xctk:Series Title="Family Members"
-                                 ShowPointsInLegend="true"
-                                 Template="{StaticResource PieTemplate}"
-                                 ShowHintLabels="true"
-                                 HintLineTemplate="{StaticResource HintLineTemplate}"
-                                 HintLabelTemplate="{StaticResource HintLabelTemplate}"
-                                 HintLineLength="30">
-						   <xctk:Series.DataPoints>
-						       <xctk:DataPoint Y="-3" Label="{StaticResource Name1}" />
-							   <xctk:DataPoint Y="-2" Label="{StaticResource Name2}" />
-							   <xctk:DataPoint Y="-1" Label="{StaticResource Name3}" />
-							   <xctk:DataPoint Y="1" Label="{StaticResource Name4}"/>
-							   <xctk:DataPoint Y="1" Label="{StaticResource Name5}"/>
-							   <xctk:DataPoint Y="2" Label="{StaticResource Name6}"/>
-							   <xctk:DataPoint Y="5" Label="{StaticResource Name7}"/>
-					       </xctk:Series.DataPoints>
-					       <xctk:Series.Layout>
-						       <xctk:PieLayout/>
-					       </xctk:Series.Layout>
-				       </xctk:Series>
-			       </xctk:Area.Series>
-            </xctk:Area>
-        </xctk:Chart.Areas>
-     </xctk:Chart>
-    </Grid>
-<!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\ChartStylingPieSeries.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.txt

@@ -26,7 +26,7 @@
             The CheckListBox and CheckComboBox controls represent a list of selected items that are displayed as CheckBoxes. Besides the common SelectedItem and SelectedItems properties, these controls give developers more alternatives for managing and handling selections.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <local:DemoView.Resources>
       <x:Array x:Key="personProperties" Type="s:String">
          <s:String>ID</s:String>
@@ -34,7 +34,7 @@
          <s:String>LastName</s:String>
       </x:Array>
    </local:DemoView.Resources>
-   
+
    <Grid >
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
@@ -56,7 +56,7 @@
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            
+
             <TextBlock Grid.Row="0" Grid.Column="0" 
                        Text="Delimiter:" 
                        Margin="2,5,5,5"/>
@@ -98,7 +98,7 @@
                      HorizontalAlignment="Left"
                      IsEnabled="False"
                      Text="IsSelected" />
-            
+
             <TextBlock Grid.Row="1" Grid.Column="2" 
                        Text="DisplayMemberPath:" 
                        Margin="5"/>
@@ -137,12 +137,12 @@
             </StackPanel>
          </Grid>
       </GroupBox>
-      
+
       <GroupBox Header="Item Models" Grid.Row="1" Margin="5">
          <ListBox DisplayMemberPath="ModelDisplay" FontFamily="Global Monospace"
                   ItemsSource="{Binding}"/>
       </GroupBox>
-      
+
       <Grid Grid.Row="2">
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.txt

@@ -25,7 +25,6 @@
      <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>The ChildWindow control can be used to create a window that is displayed within the bounds of a specific parent container.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <LineBreak />
             <Run>In addition to the following features, the "Plus" version allows ChildWindow to be resizable and to use a Maximize/Restore button.</Run>
@@ -33,14 +32,13 @@
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
 
    <local:DemoView.Resources>
       <conv:IntToBoolConverter x:Key="IntToBoolConverter" />
       <xctkconv:VisibilityToBoolConverter x:Key="VisibilityToBoolConverter" Inverted="True"/>
-       
+
       <ObjectDataProvider x:Key="WindowStates" MethodName="GetValues"
                           ObjectType="{x:Type sys:Enum}">
          <ObjectDataProvider.MethodParameters>
@@ -54,7 +52,7 @@
          </ObjectDataProvider.MethodParameters>
       </ObjectDataProvider>
    </local:DemoView.Resources>
-    
+
 
    <Grid>
       <Grid.RowDefinitions>
@@ -84,7 +82,7 @@
 
             <TextBlock Grid.Row="2" Name="textBlock3" Text="Top:" Margin="2" VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_txtTop}" Style="{StaticResource DisableGrayText}"/>
             <xctk:DoubleUpDown x:Name="_txtTop" Grid.Column="1" Grid.Row="2" Value="0" Minimum="0" VerticalAlignment="Center" Margin="5" IsEnabled="{Binding SelectedIndex, ElementName=_cboWindowStartupLocations}"/>
-             
+
             <TextBlock Text="IsModal:" VerticalAlignment="Center" Margin="10,2,2,2" Grid.Column="2" />
             <CheckBox x:Name="_chkIsModal" Grid.Column="3" VerticalAlignment="Center" Margin="5" IsChecked="True" />
 

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.txt

@@ -39,7 +39,7 @@
             </Trigger>
          </Style.Triggers>
       </Style>
-      
+
       <ObjectDataProvider x:Key="ColorModeOptions" MethodName="GetValues"
                           ObjectType="{x:Type sys:Enum}">
          <ObjectDataProvider.MethodParameters>
@@ -217,6 +217,8 @@
                   <RowDefinition Height="Auto" />
                   <RowDefinition Height="Auto" />
                   <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
                </Grid.RowDefinitions>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="Auto" />
@@ -295,9 +297,21 @@
                          IsChecked="{Binding ElementName=_colorPicker, Path=UsingAlphaChannel, Mode=TwoWay}" />
                <TextBlock Grid.Column="0"
                           Grid.Row="12"
-                          Text="SelectedColorText:" />
+                          Text="AdvancedButtonHeader:" />
                <TextBox Grid.Column="1"
                         Grid.Row="12"
+                        Text="{Binding ElementName=_colorPicker, Path=AdvancedButtonHeader, Mode=TwoWay}" />
+               <TextBlock Grid.Column="0"
+                          Grid.Row="13"
+                          Text="StandardButtonHeader:" />
+               <TextBox Grid.Column="1"
+                        Grid.Row="13"
+                        Text="{Binding ElementName=_colorPicker, Path=StandardButtonHeader, Mode=TwoWay}" />
+               <TextBlock Grid.Column="0"
+                          Grid.Row="14"
+                          Text="SelectedColorText:" />
+               <TextBox Grid.Column="1"
+                        Grid.Row="14"
                         IsEnabled="False"
                         Text="{Binding ElementName=_colorPicker, Path=SelectedColorText}" />
             </Grid>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.txt

@@ -33,12 +33,12 @@
             </Hyperlink>
         </Paragraph>
     </local:DemoView.Description>
-   
+
    <local:DemoView.Resources>
       <xcdg:ImageConverter x:Key="imageConverter" />
       <!-- Converter used to return a BitmapImage from a Country name -->
       <conv:FlagPathConverter x:Key="flagPathConverter" />
-      
+
       <!-- DataTemplate to display an Employee object -->
       <DataTemplate x:Key="employeeDataTemplate">
          <Grid MaxHeight="30"
@@ -59,13 +59,13 @@
             </StackPanel>
          </Grid>
       </DataTemplate>
-      
+
        <!-- DataTemplate to display the $ in Freight column -->
       <DataTemplate x:Key="freightDataTemplate">
          <TextBlock Text="{Binding StringFormat=\{0:C\}}"
                     VerticalAlignment="Center" />
       </DataTemplate>
-      
+
        <!-- DataTemplate to display a Country -->
       <DataTemplate x:Key="countryDataTemplate">
          <StackPanel Orientation="Horizontal"
@@ -82,9 +82,9 @@
                        VerticalAlignment="Center" />
          </StackPanel>
       </DataTemplate>
-           
+
    </local:DemoView.Resources>
-   
+
     <Grid>
         <Grid.Resources>
             <xcdg:DataGridCollectionViewSource x:Key="cvsOrders" 
@@ -109,38 +109,38 @@
                              Width="100"
                              IsMainColumn="True">
                 </xcdg:Column>
-               
+
                 <xcdg:Column FieldName="Employee"
                              Title="Employee"
                              Width="160"
                              CellContentTemplate="{StaticResource employeeDataTemplate}" 
                              GroupValueTemplate="{StaticResource employeeDataTemplate}"/>
-               
+
                 <xcdg:Column FieldName="Customer.CompanyName"
                              Title="Customer"
                              Width="185"/>
-               
+
                 <xcdg:Column FieldName="OrderDate"
                              Title="Order Date"
                              Width="120" />
-               
+
                 <xcdg:Column FieldName="Shipper.CompanyName"
                              Title="Ship Via" />
-               
+
                 <xcdg:Column FieldName="Freight"
                              Width="100"
                              CellContentTemplate="{StaticResource freightDataTemplate}"
                              GroupValueTemplate="{StaticResource freightDataTemplate}"/>
-               
+
                 <xcdg:Column FieldName="ShipCity"
                              Title="City"
                              Width="80" />
-               
+
                 <xcdg:Column FieldName="ShipCountry"
                              Title="Country"
                              CellContentTemplate="{StaticResource countryDataTemplate}"
                              GroupValueTemplate="{StaticResource countryDataTemplate}"/>
-               
+
                 <xcdg:Column FieldName="ShipAddress"
                              Title="Address"
                              Width="200" />
@@ -148,7 +148,7 @@
                 <xcdg:Column FieldName="ShipPostalCode"
                              Title="Postal Code"
                              Width="120" />
-               
+
                 <xcdg:Column FieldName="RequiredDate"
                              Title="Required Date"
                              Width="140" />
@@ -156,7 +156,7 @@
                 <xcdg:Column FieldName="ShippedDate"
                              Title="Shipped Date"
                              Width="140" />               
-               
+
                 <xcdg:Column FieldName="ShipName"
                               Visible="False" />
 

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.txt

@@ -27,16 +27,11 @@
             The DateTimePicker and TimePicker controls let you select the date and the time in several ways. The TimePicker is used in the DateTimePicker.
         </Paragraph>
     </local:DemoView.Description>
-    
+
     <local:DemoView.Resources>
       <conv:DateTimeToTimeSpanConverter x:Key="dateTimeToTimeSpanConverter" />
       <conv:CustomFormatToBoolConverter x:Key="CustomFormatToBoolConverter" />
 
-      <ObjectDataProvider x:Key="enumTimeFormatData" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="xctk:TimeFormat"/>
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
       <ObjectDataProvider x:Key="enumDateFormatData" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
          <ObjectDataProvider.MethodParameters>
             <x:Type TypeName="xctk:DateTimeFormat"/>
@@ -100,7 +95,7 @@
             <CheckBox x:Name="_timePickerShowButtonSpinner" Grid.Row="7" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5,5,25,5"/>
 
             <TextBlock Text="TimeFormat:" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />
-            <ComboBox x:Name="_timeFormat" Grid.Row="0" Grid.Column="3" SelectedIndex="1" ItemsSource="{Binding Source={StaticResource enumTimeFormatData}}" Width="190" Margin="5"/>
+            <ComboBox x:Name="_timeFormat" Grid.Row="0" Grid.Column="3" SelectedIndex="7" ItemsSource="{Binding Source={StaticResource enumDateFormatData}}" Width="190" Margin="5"/>
             <TextBlock Text="Time FormatString:" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_timeFormatString}" Style="{StaticResource DisableGrayText}"/>
             <TextBox x:Name="_timeFormatString" Grid.Row="1" Grid.Column="3" Text="H:mm" Width="190"  IsEnabled="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem, Converter={StaticResource CustomFormatToBoolConverter}}" Margin="5"/>            
             <TextBlock Text="TimeWatermark:" Grid.Row="2" Grid.Column="2" VerticalAlignment="Center"/>
@@ -160,7 +155,7 @@
 
               <StackPanel>
                 <TextBlock Text="TimePicker Usage: " Style="{StaticResource Header}" />
-                <xctk:TimePicker x:Name="_timePicker"
+            <xctk:TimePicker x:Name="_timePicker"
                                  VerticalAlignment="Top"
                                  Format="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem}"
                                  FormatString="{Binding Text, ElementName=_timeFormatString}"

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.Designer.cs.txt

@@ -10,8 +10,8 @@
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
     using System;
-    
-    
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -23,15 +23,15 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class DisplayLocalizationRes {
-        
+
         private static global::System.Resources.ResourceManager resourceMan;
-        
+
         private static global::System.Globalization.CultureInfo resourceCulture;
-        
+
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal DisplayLocalizationRes() {
         }
-        
+
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
@@ -45,7 +45,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return resourceMan;
             }
         }
-        
+
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
@@ -59,7 +59,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 resourceCulture = value;
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Details.
         /// </summary>
@@ -68,7 +68,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("DetailsCategory", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Favorite actor 1 (no DisplayName).
         /// </summary>
@@ -77,7 +77,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FavoriteActor1", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to This property&apos;s type is an enum whose values have no DisplayName attributes. These values displayed are provided by the ToString() method..
         /// </summary>
@@ -86,7 +86,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FavoriteActor1Desc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Favorite actor 2 (with DisplayName).
         /// </summary>
@@ -95,7 +95,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FavoriteActor2", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to This property&apos;s type is an enum whose values are decorated with the ExtendedDisplayName attribute. Combined with the EnumDisplayNameConverter, this allows display values to be customized..
         /// </summary>
@@ -104,7 +104,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FavoriteActor2Desc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Favorite actor 3.
         /// </summary>
@@ -113,7 +113,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FavoriteActor3", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to &quot;(Not listed)&quot; enum value shows that enum values can also be localized..
         /// </summary>
@@ -122,7 +122,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FavoriteActor3Desc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to First name.
         /// </summary>
@@ -131,7 +131,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FirstName", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to First name of that person.
         /// </summary>
@@ -140,7 +140,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("FirstNameDesc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Information.
         /// </summary>
@@ -149,7 +149,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("InfoCategory", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Last name.
         /// </summary>
@@ -158,7 +158,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("LastName", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Usually the familly name of the person.
         /// </summary>
@@ -167,7 +167,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
                 return ResourceManager.GetString("LastNameDesc", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to (Not listed).
         /// </summary>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.fr.resx.txt

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="DetailsCategory" xml:space="preserve">
+    <value>Détails</value>
+  </data>
+  <data name="FavoriteActor1" xml:space="preserve">
+    <value>Acteur favori 1 (aucun DisplayName)</value>
+  </data>
+  <data name="FavoriteActor1Desc" xml:space="preserve">
+    <value>Le type de cette propriété est un enum où les valeurs n'ont aucun attribut "DisplayName". Les valeurs affichées sont retournées par la méthode ToString().</value>
+  </data>
+  <data name="FavoriteActor2" xml:space="preserve">
+    <value>Acteur favori 2 (avec DisplayName)</value>
+  </data>
+  <data name="FavoriteActor2Desc" xml:space="preserve">
+    <value>Le type de cette propriété est un enum où les valeurs sont décorés avec l'attribut "DisplayName". Les valeurs affichées sont celles spécifiées par l'attribut ExtendedDisplayName.</value>
+  </data>
+  <data name="FavoriteActor3" xml:space="preserve">
+    <value>Acteur favori 3</value>
+  </data>
+  <data name="FavoriteActor3Desc" xml:space="preserve">
+    <value>La valeur "(Non proposé)" démontre que les valeurs des enums peuvent aussi être localisées.</value>
+  </data>
+  <data name="FirstName" xml:space="preserve">
+    <value>Prénom</value>
+  </data>
+  <data name="FirstNameDesc" xml:space="preserve">
+    <value>Prénom de la personne</value>
+  </data>
+  <data name="InfoCategory" xml:space="preserve">
+    <value>Information</value>
+  </data>
+  <data name="LastName" xml:space="preserve">
+    <value>Nom de famille</value>
+  </data>
+  <data name="LastNameDesc" xml:space="preserve">
+    <value>Le nom de famille de la personne</value>
+  </data>
+  <data name="NotListed" xml:space="preserve">
+    <value>(Non proposé)</value>
+  </data>
+</root>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.resx.txt

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="DetailsCategory" xml:space="preserve">
+    <value>Details</value>
+  </data>
+  <data name="FavoriteActor1" xml:space="preserve">
+    <value>Favorite actor 1 (no DisplayName)</value>
+  </data>
+  <data name="FavoriteActor1Desc" xml:space="preserve">
+    <value>This property's type is an enum whose values have no DisplayName attributes. These values displayed are provided by the ToString() method.</value>
+  </data>
+  <data name="FavoriteActor2" xml:space="preserve">
+    <value>Favorite actor 2 (with DisplayName)</value>
+  </data>
+  <data name="FavoriteActor2Desc" xml:space="preserve">
+    <value>This property's type is an enum whose values are decorated with the ExtendedDisplayName attribute. Combined with the EnumDisplayNameConverter, this allows display values to be customized.</value>
+  </data>
+  <data name="FavoriteActor3" xml:space="preserve">
+    <value>Favorite actor 3</value>
+  </data>
+  <data name="FavoriteActor3Desc" xml:space="preserve">
+    <value>"(Not listed)" enum value shows that enum values can also be localized.</value>
+  </data>
+  <data name="FirstName" xml:space="preserve">
+    <value>First name</value>
+  </data>
+  <data name="FirstNameDesc" xml:space="preserve">
+    <value>First name of that person</value>
+  </data>
+  <data name="InfoCategory" xml:space="preserve">
+    <value>Information</value>
+  </data>
+  <data name="LastName" xml:space="preserve">
+    <value>Last name</value>
+  </data>
+  <data name="LastNameDesc" xml:space="preserve">
+    <value>Usually the familly name of the person</value>
+  </data>
+  <data name="NotListed" xml:space="preserve">
+    <value>(Not listed)</value>
+  </data>
+</root>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.txt

@@ -27,7 +27,7 @@
             <Run>The SplitButton control is a button that can be clicked and also provides a drop down in which you can place any custom content within.</Run>
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
         <Grid.RowDefinitions>
            <RowDefinition Height="Auto" />
@@ -53,7 +53,7 @@
                </StackPanel>
             </xctk:DropDownButton.DropDownContent>
          </xctk:DropDownButton>
-       
+
          <TextBlock Text="SplitButton Usage:" Grid.Column="1" Style="{StaticResource Header}" />
          <xctk:SplitButton x:Name="_splitButton"
                            Grid.Row="1"

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.cs.txt

@@ -0,0 +1,34 @@
+/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2014 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Windows;
+using System.Windows.Data;
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views
+{
+  /// <summary>
+  /// Interaction logic for FilePickerView.xaml
+  /// </summary>
+  public partial class FilePickerView : DemoView
+  {
+    public FilePickerView()
+    {
+      InitializeComponent();
+    }
+
+  }
+}

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.txt

@@ -0,0 +1,58 @@
+<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2014 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views.FilePickerView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
+                xmlns:sample="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                Title="FilePicker">   
+   <local:DemoView.Description>
+      <Paragraph FontSize="14"
+                 FontFamily="Segoe">
+         <Run>The FilePicker is a control that can be used to select one or more files in a browsing window.</Run>
+         <LineBreak />
+         <LineBreak />
+         <Run>This feature is only available in the "Plus" version.</Run>
+         <LineBreak />
+         <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+            Click here for more details about Xceed Extended WPF Toolkit Plus.
+         </Hyperlink>
+      </Paragraph>
+   </local:DemoView.Description>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\FilePicker.png" Width="600" Height="400"/>
+</local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.cs.txt

@@ -32,17 +32,9 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Views
 
     public ListBoxView()
     {
-#if !OPEN_SOURCE
-      this.DataContext = SampleDataProvider.GetOrders();
-#endif
 
       InitializeComponent();
 
-#if !OPEN_SOURCE
-      //Add the default GroupDescriptions to the ListBox's GroupDescriptions collection.
-      _listBox.GroupDescriptions.Add( this.Resources[ "shipCountryGroupDescription" ] as GroupDescription );
-      _listBox.GroupDescriptions.Add( this.Resources[ "shipCityGroupDescription" ] as GroupDescription );
-#endif
     }
 
     #endregion

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.txt

@@ -27,7 +27,7 @@
             The Magnifier control allows the user to magnify parts of an application.
         </Paragraph>
     </local:DemoView.Description>
-    
+
     <local:DemoView.Resources>
         <conv:ColorConverter x:Key="colorConverter" />
         <conv:VisibilityConverter x:Key="visibilityConverter" />
@@ -39,7 +39,7 @@
             </ObjectDataProvider.MethodParameters>
         </ObjectDataProvider>
     </local:DemoView.Resources>
-    
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.txt

@@ -25,7 +25,7 @@
            The MaskedTextBox control lets you display and edit values based on a mask.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
 
       <Grid.RowDefinitions>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.cs.txt

@@ -30,32 +30,9 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views
   {
     public MultiColumnComboBoxView()
     {
-#if !OPEN_SOURCE
-      this.DataContext = SampleDataProvider.GetOrders();
-#endif
       InitializeComponent();
     }
 
-#if !OPEN_SOURCE
-    private void OnGroupCheck( object sender, System.Windows.RoutedEventArgs e )
-    {
-      DataGridCollectionView collectionView = ( DataGridCollectionView )_combo.ItemsSource;
-      bool isChecked = ( ( CheckBox )sender ).IsChecked.GetValueOrDefault( false );
-      bool isGrouped = ( collectionView.GroupDescriptions.Count > 0 );
-
-      if( isGrouped != isChecked )
-      {
-        if( isChecked )
-        {
-          collectionView.GroupDescriptions.Add( new PropertyGroupDescription( "ShipCountry" ) );
-          collectionView.GroupDescriptions.Add( new PropertyGroupDescription( "ShipCity" ) );
-        }
-        else
-        {
-          collectionView.GroupDescriptions.Clear();
-        }
-      }
-    }
-#endif
+
   }
 }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.txt

@@ -24,137 +24,25 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>The multi-column combo box uses the power of Xceed's datagrid control to create an advanced ComboBox.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <Run>This Control is only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <xcdg:DataGridCollectionViewSource x:Key="cvsOrder" 
-                                         Source="{Binding}" >
-         <xcdg:DataGridCollectionViewSource.GroupDescriptions>
-            <PropertyGroupDescription PropertyName="ShipCountry" />
-            <PropertyGroupDescription PropertyName="ShipCity" />
-         </xcdg:DataGridCollectionViewSource.GroupDescriptions>
-      </xcdg:DataGridCollectionViewSource>
-      
-      <!--Important! Base the style on the predefined default style for the DataGrid-->
-      <Style x:Key="baseStyle" TargetType="{x:Type xcdg:DataGridControl}"
-                   BasedOn="{StaticResource {x:Static xcdg:MultiColumnComboBox.DefaultDataGridStyleResourceKey}}">
-          <Setter Property="View">
-            <Setter.Value>
-               <!-- Setting a view to allow group drop-down navigation. -->
-               <!-- Because it declare a new view, this style can only -->
-               <!-- be used by one MultiColumnComboBox instance -->
-               <xcdg:TableflowView />
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="coloredDataGridStyle" TargetType="{x:Type xcdg:DataGridControl}" BasedOn="{StaticResource baseStyle}" >
-         <Style.Resources>
-            <Style TargetType="{x:Type xcdg:DataRow}">
-               <Setter Property="Background" Value="LemonChiffon" />
-            </Style>
-         </Style.Resources>
-      </Style>
- 
-      <conv:FlagPathConverter x:Key="flagPathConverter" />
-      
-       <!-- DataTemplate to display a Country -->
-      <DataTemplate x:Key="countryDataTemplate">
-         <StackPanel Orientation="Horizontal"
-                     VerticalAlignment="Center"
-                     Margin="5,0,0,0">
-            <!--The flagPathConverter resource changes the value of a
-                               group (e.g., "Canada") to an image. -->
-            <Image MaxHeight="15"
-                   Margin="0, 0, 5, 0"
-                   Source="{Binding Converter={StaticResource flagPathConverter}}" />
-
-            <TextBlock Text="{Binding}"
-                       TextTrimming="WordEllipsis"
-                       VerticalAlignment="Center" />
-         </StackPanel>
-      </DataTemplate>
-
-   </local:DemoView.Resources>
-   <StackPanel>
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition />
-               <RowDefinition />
-            </Grid.RowDefinitions>
-            <!-- Show headers option -->
-            <TextBlock  Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
-                        Text="ShowColumnHeaders: "/>
-            <CheckBox Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Margin="5"
-                      IsChecked="{Binding ShowColumnHeaders, ElementName=_combo}" />
-
-            <!-- Show GroupBy control option -->
-            <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
-                       Text="ShowGroupByControl: " />
-            <CheckBox Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="5"
-                      IsChecked="{Binding ShowGroupByControl, ElementName=_combo}" />
-
-            <!-- Group source option -->
-            <TextBlock  Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"
-                        Text="Grouped: " />
-            <CheckBox Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" Margin="5"
-                      IsChecked="True"
-                      Click="OnGroupCheck"/>
-
-            <!-- DataGrid Styling -->
-            <TextBlock  Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0"
-                        Text="Applied DataGrid Style: "/>
-            <ComboBox x:Name="styles" Grid.Row="1" Grid.Column="3" SelectedIndex="0" Width="225" VerticalAlignment="Center" Margin="5">
-               <ComboBoxItem Content="No Style" Tag="{StaticResource baseStyle}" />
-               <ComboBoxItem Content="Styled with yellow row background" Tag="{StaticResource coloredDataGridStyle}" />
-            </ComboBox>
-
-         </Grid>
-      </GroupBox>
-      <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-      <xcdg:MultiColumnComboBox x:Name="_combo" 
-                                Width="200" 
-                                HorizontalAlignment="Left" 
-                                AutoCreateColumns="False"
-                                ItemsSource="{Binding Source={StaticResource cvsOrder}}" 
-                                DataGridStyle="{Binding ElementName=styles, Path=SelectedItem.Tag}">
-         <xcdg:MultiColumnComboBox.Columns>
-            <xcdg:Column FieldName="OrderID" Title="Order ID" />
-            <xcdg:Column FieldName="CustomerID" Title="Customer ID" />
-            <xcdg:Column FieldName="ShipCountry" Title="Ship Country" CellContentTemplate="{StaticResource countryDataTemplate}"/>
-            <xcdg:Column FieldName="ShipCity" Title="Ship City" />
-         </xcdg:MultiColumnComboBox.Columns>
-         <xcdg:MultiColumnComboBox.ItemTemplate>
-            <DataTemplate>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding OrderID}" />
-                  <TextBlock Margin="10,0,0,0"
-                             Text="{Binding CustomerID, StringFormat= ({0})}"/>
-               </StackPanel>
-            </DataTemplate>
-         </xcdg:MultiColumnComboBox.ItemTemplate>
-      </xcdg:MultiColumnComboBox>
-   </StackPanel>
-<!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\MultiColumnsComboBox.png" Width="500" Height="300"/>
-##END-->
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.txt

@@ -26,7 +26,7 @@
            The MultiLineTextEditor is a TextBox that allows you to edit text that is too long to display in a regular TextBox. The popup is resizable to accommodate any text.
         </Paragraph>
     </local:DemoView.Description>
-    
+
     <local:DemoView.Resources>
         <DataTemplate x:Key="multiLineTextEditorStyle" >
             <xctk:MultiLineTextEditor
@@ -38,7 +38,7 @@
                Height="24" />
         </DataTemplate>
     </local:DemoView.Resources>
-    
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.txt

@@ -35,7 +35,7 @@
             <Run>All these numeric types support the following properties.</Run>
         </Paragraph>
     </local:DemoView.Description>
-    
+
     <local:DemoView.Resources>
         <x:Array x:Key="FormatStringComboBox" Type="numeric:FormatObject">
             <numeric:FormatObject Value="C2" DisplayValue="Currency" />
@@ -56,7 +56,7 @@
                 <x:Type TypeName="xctk:AllowedSpecialValues" />
             </ObjectDataProvider.MethodParameters>
         </ObjectDataProvider>
-       
+
         <ObjectDataProvider x:Key="ButtonSpinnerLocationComboBox" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
             <ObjectDataProvider.MethodParameters>
                 <x:Type TypeName="xctk:Location" />
@@ -77,12 +77,12 @@
                 </Trigger>
             </Style.Triggers>
         </Style>
-        
+
         <sys:String x:Key="allowInputSpecialValuesTooltip">Infinity and -Infinity input will not be accepted if Maximum and/or Minimum values does not allow them.</sys:String>
         <sys:String x:Key="parsingNumberStyleTooltip">HexNumber is not a valid choice when used with a DoubleUpDown (current control used in this sample). It will work with the following controls: IntegerUpDown, ByteUpDown, LongUpDown, and ShortUpDown.</sys:String>
 
     </local:DemoView.Resources>
-    
+
    <StackPanel>
       <Grid>
            <Grid.RowDefinitions>
@@ -114,7 +114,7 @@
                        <ColumnDefinition Width="Auto" />
                        <ColumnDefinition Width="125" />
                    </Grid.ColumnDefinitions>
-                   
+
                    <!-- 1st column -->
                    <TextBlock Text="Mouse Wheel:" Grid.Row="0" VerticalAlignment="Center" />
                    <ComboBox Grid.Row="0" Grid.Column="1" SelectedItem="{Binding MouseWheelActiveTrigger, ElementName=_doubleUpDown}" Margin="5" VerticalAlignment="Center" >
@@ -126,21 +126,21 @@
 
                    <TextBlock Text="Show Button Spinner:" Grid.Row="1" VerticalAlignment="Center" />
                    <CheckBox Grid.Row="1" Grid.Column="1" IsChecked="{Binding ShowButtonSpinner, ElementName=_doubleUpDown}"  ClickMode="Press" Margin="5" VerticalAlignment="Center" />
-                  
+
                    <TextBlock Text="Is Read Only:" Grid.Row="2" VerticalAlignment="Center" ToolTip="Prevent from using button spinners or editing text." />
                    <CheckBox Grid.Row="2" Grid.Column="1" IsChecked="{Binding IsReadOnly, ElementName=_doubleUpDown}"  ClickMode="Press" Margin="5" VerticalAlignment="Center" />
 
                    <TextBlock Text="Allow Spin:" Grid.Row="3" VerticalAlignment="Center" />
                    <CheckBox Grid.Row="3" Grid.Column="1" IsChecked="{Binding AllowSpin, ElementName=_doubleUpDown}" ClickMode="Press" Margin="5" VerticalAlignment="Center"
                              IsEnabled="{Binding IsReadOnly, ElementName=_doubleUpDown, Converter={StaticResource InverseBoolConverter}}" />
-                  
+
                    <TextBlock Text="Allow TextInput:" Grid.Row="4" VerticalAlignment="Center" />
                    <CheckBox Grid.Row="4" Grid.Column="1" IsChecked="{Binding AllowTextInput, ElementName=_doubleUpDown}"  ClickMode="Press" Margin="5" VerticalAlignment="Center"
                              IsEnabled="{Binding IsReadOnly, ElementName=_doubleUpDown, Converter={StaticResource InverseBoolConverter}}"/>
-                  
+
                    <TextBlock Text="Clip Value to Min Max:" Grid.Row="5"  VerticalAlignment="Center" />
                    <CheckBox Grid.Row="5" Grid.Column="1" IsChecked="{Binding ClipValueToMinMax, ElementName=_doubleUpDown, Mode=TwoWay}" ClickMode="Press" Margin="5" VerticalAlignment="Center"/>
-                  
+
                    <TextBlock Text="DisplayDefaultValueOnEmptyText:" Grid.Row="6" VerticalAlignment="Center" />
                    <CheckBox Grid.Row="6" Grid.Column="1" IsChecked="{Binding DisplayDefaultValueOnEmptyText, ElementName=_doubleUpDown}" ClickMode="Press" Margin="5" VerticalAlignment="Center" />
 
@@ -159,11 +159,11 @@
 
                    <TextBlock Grid.Column="2" Grid.Row="4" Text="Maximum" VerticalAlignment="Center" Margin="10,0,0,0"/>
                    <xctk:DoubleUpDown Grid.Column="3" Grid.Row="4" Value="{Binding Maximum, ElementName=_doubleUpDown}" AllowInputSpecialValues="PositiveInfinity" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="5" />
-     
+
                    <!-- 3rd column -->
                    <TextBlock Grid.Column="4" Text="ButtonSpinnerLocation:" VerticalAlignment="Center" Margin="10,0,0,0"/>
                    <ComboBox Grid.Column="5" ItemsSource="{Binding Source={StaticResource ButtonSpinnerLocationComboBox}}" SelectedValue="{Binding ButtonSpinnerLocation, ElementName=_doubleUpDown}" HorizontalAlignment="Stretch" Margin="5" />
-                  
+
                    <TextBlock Grid.Column="4" Grid.Row="1" Text="ParsingNumberStyle:" VerticalAlignment="Center" Margin="10,0,0,0"/>
                    <ComboBox Grid.Column="5" Grid.Row="1" ItemsSource="{Binding Source={StaticResource ParsingNumberStyleComboBox}}" SelectedValue="{Binding ParsingNumberStyle, ElementName=_doubleUpDown}" ToolTip="{StaticResource parsingNumberStyleTooltip}" HorizontalAlignment="Stretch" Margin="5" />
 
@@ -178,7 +178,7 @@
 
                    <TextBlock Text="Text:" Grid.Column="4" Grid.Row="5" VerticalAlignment="Center" Margin="10,0,0,0"/>
                    <TextBox Grid.Column="5" Grid.Row="5" Text="{Binding Text, ElementName=_doubleUpDown}" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="5" />
-                   
+
                    <!-- last rows -->
                    <TextBlock Text="(DoubleUpDown and SingleUpDown support the AllowInputSpecialValues property)" Grid.Row="7" Grid.ColumnSpan="6" VerticalAlignment="Center" Margin="0,5,0,0"/>
                    <TextBlock Text="Allow Input Special Values:" VerticalAlignment="Center" Grid.Row="8" Grid.ColumnSpan="2"/>
@@ -209,11 +209,11 @@
                                   DefaultValue="10"
                                   Value="25" />
          </StackPanel>
-          
+
            <TextBlock Grid.Row="2" Margin="10,15,0,0"
                       Text="CalculatorUpDown is a DecimalUpDown with all the properties from a NumericUpDown. It provides a Calculator dropdown which allows you to perform mathematical calculations."
                       TextWrapping="Wrap" />
-          
+
            <GroupBox Header="CalculatorUpDown Features" Grid.Row="3" Margin="5,15,0,0">
                 <StackPanel Orientation="Horizontal" Margin="5" HorizontalAlignment="Left">
                     <TextBlock Text="Enter closes calculator:" VerticalAlignment="Center" />
@@ -222,7 +222,7 @@
                     <xctk:IntegerUpDown Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" Minimum="0" Value="{Binding Precision, ElementName=_calculatorUpDown}" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />
                 </StackPanel>
             </GroupBox>
-          
+
            <StackPanel Grid.Row="4" Orientation="Horizontal" Margin="10" HorizontalAlignment="Left">
              <TextBlock Text="CalculatorUpDown Usage:" Style="{StaticResource Header}" />
              <xctk:CalculatorUpDown x:Name="_calculatorUpDown"

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.txt

@@ -25,8 +25,8 @@
             Obviously, the Pie control can be used to create a pie chart.
         </Paragraph>
     </local:DemoView.Description>
-    
-   
+
+
    <local:DemoView.Resources>
       <XmlDataProvider x:Key="XMLData">
          <x:XData>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.txt

@@ -24,7 +24,7 @@
             The Pie control properties can be animated to create various effects and controls like this circular progress bar.
         </Paragraph>
     </local:DemoView.Description>
-   
+
    <local:DemoView.Resources>
       <ControlTemplate x:Key="PieProgressTemplate"
                        TargetType="{x:Type ProgressBar}">
@@ -69,7 +69,7 @@
          </DoubleAnimationUsingKeyFrames>
       </Storyboard>
    </local:DemoView.Resources>
-   
+
    <local:DemoView.Triggers>
       <EventTrigger RoutedEvent="ButtonBase.Click"
                     SourceName="SimulateProgressButton">

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.txt

@@ -25,7 +25,7 @@
             The Pie shape is a WPF shape that represents a portion of an ellipse.  It is in the same shape as a slice of pie (hence the name).  More precisely, the Pie shape is represented as either a full ellipse (Slice = 1.0), nothing (Slice = 0.0), or an arc of an ellipse joined to its center by two line segments.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <local:DemoView.Resources>
       <xctk:ColorToSolidColorBrushConverter x:Key="colorConverter" />
    </local:DemoView.Resources>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.cs.txt

@@ -37,140 +37,30 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Views
 
     public PileFlowPanelView()
     {
-#if !OPEN_SOURCE
-      this.DataContext = SampleDataProvider.SharedEmployees;
-#endif
 
       InitializeComponent();
-#if !OPEN_SOURCE
-      _pileFlowPanel.PileFlowItemActivated += new Xceed.Wpf.Toolkit.PileFlowPanel.PileFlowItemActivatedHandler( this.PileFlowItemActivated );
-      _pileFlowPanel.PileFlowItemDeactivated += new Xceed.Wpf.Toolkit.PileFlowPanel.PileFlowItemDeactivatedHandler( this.PileFlowItemDeactivated );
-
-      ObservableCollection<Product> products = SampleDataProvider.GetProducts();
-      foreach( Product product in products )
-      {
-        this.AddImage( product );
-      }
-#endif
+
     }
 
     #endregion
 
-#if !OPEN_SOURCE
-    #region Event Handlers
 
-    private void PileFlowItemActivated( object sender, Xceed.Wpf.Toolkit.PileFlowPanel.PileFlowActivationEventArgs e )
-    {
-      //# Modify the text label.
-      _pileFlowPanel.ContentLabel.Visibility = Visibility.Visible;
-      _pileFlowLabel.Text = e.Item.Element.Tag as string;
-
-      //# Enable the first PileFlowItem.
-      if( object.Equals( ( ( PileFlowItem )sender ).Element, _employeesPileFlowCard ) )
-      {
-        _employeeListBox.IsEnabled = true;
-      }
-    }
 
-    private void PileFlowItemDeactivated( object sender, EventArgs e )
-    {
-      //# Hide the text Label.
-      _pileFlowPanel.ContentLabel.Visibility = Visibility.Collapsed;
-      _pileFlowLabel.Text = null;
-
-      //# Enable the first PileFlowItem.
-      if( object.Equals( ( ( PileFlowItem )sender ).Element, _employeesPileFlowCard ) )
-      {
-        _employeeListBox.IsEnabled = false;
-      }
-    }
 
-    private void OnEmployeeButtonPress( object sender, EventArgs e )
-    {
-      Xceed.Wpf.Toolkit.MessageBox.Show( "Employee data has been saved.", "Employee", MessageBoxButton.OK, MessageBoxImage.Asterisk);
-    }
 
-    private void OnShowReflectionsClick( object sender, RoutedEventArgs e )
-    {
-      CheckBox checkBox = ( CheckBox )sender;
-      foreach( UIElement item in _pileFlowPanel.Children )
-      {
-        if( item is PileFlowCard )
-        {
-          (( PileFlowCard )item).ShowReflection = ( bool )checkBox.IsChecked;
-        }
-      }
-    }
 
-    private void OnBeginReflectionOpacityChanged( object sender, RoutedPropertyChangedEventArgs<object> e )
-    {
-      this.ModifyReflection( sender, true );      
-    }
 
-    private void OnEndReflectionOpacityChanged( object sender, RoutedPropertyChangedEventArgs<object> e )
-    {
-      this.ModifyReflection( sender, false );        
-    }
-    
-    #endregion
 
-#endif
+
+
+
 
     #region Implementation
 
-#if !OPEN_SOURCE
-    private void ModifyReflection( object sender, bool isBeginReflectionOpacity )
-    {
-      if( _pileFlowPanel != null )
-      {
-        DoubleUpDown opacity = ( DoubleUpDown )sender;
-        foreach( UIElement item in _pileFlowPanel.Children )
-        {
-          if( item is PileFlowCard )
-          {
-            PileFlowCard card = ( PileFlowCard )item;
-            double opacityValue = ( opacity.Value != null ) ? ( double )opacity.Value : 0d;
-            if( isBeginReflectionOpacity )
-            {
-              card.BeginReflectionOpacity = opacityValue;
-            }
-            else
-            {
-              card.EndReflectionOpacity = opacityValue;
-            }
-          }
-        }
-      }
-    }
 
-    private void AddImage( Product product )
-    {
-      BitmapImage imageSource = null;
-      byte[] imageBytes = product.Photo;
-      if( imageBytes != null )
-      {
-        Stream imageStream = new MemoryStream( imageBytes );
-        imageSource = new BitmapImage();
-        imageSource.BeginInit();
-        imageSource.CacheOption = BitmapCacheOption.OnLoad;
-        imageSource.StreamSource = imageStream;
-        imageSource.EndInit();
-
-        //# Use a border to delimit the photos
-        Border border = new Border();
-        border.BorderBrush = new SolidColorBrush( Colors.Black );
-        border.BorderThickness = new Thickness( 2 );        
-        border.Background = new ImageBrush( imageSource );
-
-        //# Use a PileFlowCard to use Reflection.
-        PileFlowCard card = new PileFlowCard();
-        card.Child = border;
-        card.Tag = product.ProductName;
-
-        _pileFlowPanel.Children.Add( card );
-      }
-    }
-#endif
+
+
+
 
     #endregion
   }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.txt

@@ -31,300 +31,40 @@
             <LineBreak />
             <Run>
                 The PileFlowPanel class also contains a label that can be configured to display the PileFlowItem data via the property ContentLabel. When the PileFlowPanel has focus, this sample lets the arrow buttons or the mouse wheel modify the selection.</Run>
-         <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->
       </Paragraph>
    </local:DemoView.Description>
 
-   <!--##EXCLUDE_OPEN_SOURCE-->
-   <local:DemoView.Resources>
-      <Style TargetType="{x:Type Border}" x:Key="BorderStyle">
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="CornerRadius" Value="5"/>
-      <Setter Property="BorderBrush">
-        <Setter.Value>
-          <SolidColorBrush Color="Black"/>
-        </Setter.Value>
-      </Setter>
-    </Style>
-      
-      <conv:SizeToIntegerConverter x:Key="SizeToIntegerConverter" />
-      <conv:FullNameStringConverter x:Key="FullNameStringConverter" />
-      
-      <SolidColorBrush x:Key="mouseOverBrush" Color="Blue" />
-      <SolidColorBrush x:Key="mouseOverLabelBrush" Color="LightBlue" />
-      <SolidColorBrush x:Key="normalLabelBrush" Color="Snow" />
-      
-      <DataTemplate x:Key="seriesTemplate">
-			<Canvas Width="{Binding Path=W}" Height="{Binding Path=H}">
-            <Rectangle x:Name="rect" RadiusX="5" RadiusY="5" Width="{Binding Path=W}" Height="{Binding Path=H}" Fill="{Binding Path=Interior}">
-               <Rectangle.Triggers>
-                  <EventTrigger RoutedEvent="Mouse.MouseEnter">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="rect" Storyboard.TargetProperty="Fill">
-                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{StaticResource mouseOverBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-                  
-                  <EventTrigger RoutedEvent="Mouse.MouseLeave">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="rect" Storyboard.TargetProperty="Fill">
-                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{Binding Path=Interior}" />
-                              </ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-               </Rectangle.Triggers>
-            </Rectangle>
-			</Canvas>
-		</DataTemplate>
-      
-       <DataTemplate x:Key="LabelTemplate">
-			<Border x:Name="border" DockPanel.Dock="Top" BorderThickness="1" CornerRadius ="4" Background="{StaticResource normalLabelBrush}">
-			   <Border.BorderBrush>
-				   <SolidColorBrush Color="Black"/>
-			   </Border.BorderBrush>
-
-			   <TextBlock FontFamily="Sans Serif" FontSize="12" Margin="2,2,2,1"
-			     HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Path=Text}">
-				   <TextBlock.Foreground>
-					   <SolidColorBrush Color="Navy"/>
-				   </TextBlock.Foreground>
-			   </TextBlock>
-            
-            <Border.Triggers>
-                  <EventTrigger RoutedEvent="Mouse.MouseEnter">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="border" Storyboard.TargetProperty="Background">
-                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{StaticResource mouseOverLabelBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-                  
-                  <EventTrigger RoutedEvent="Mouse.MouseLeave">
-							<EventTrigger.Actions>
-								<BeginStoryboard>
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="border" Storyboard.TargetProperty="Background">
-                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{StaticResource normalLabelBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger.Actions>
-						</EventTrigger>
-               </Border.Triggers>
-		   </Border>
-		</DataTemplate>
-      
-   </local:DemoView.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-      
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="Auto" />
-         <ColumnDefinition Width="*"/>
-      </Grid.ColumnDefinitions>
-
-      <GroupBox Header="PileFlowPanel Features" Grid.Row="0" Margin="0,5,0,5">
-         <Grid Margin="0,5,5,5" HorizontalAlignment="Left">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <!-- 1st column -->
-            <TextBlock Text="Content Label Offset Y: " VerticalAlignment="Center" />
-            <xctk:IntegerUpDown Grid.Column="1" Minimum="-150" Maximum="170" Value="{Binding ContentLabelOffsetY, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Content Label Size X: " Grid.Row="1" VerticalAlignment="Center" />
-            <xctk:IntegerUpDown Grid.Row="1" Grid.Column="1" Minimum="0" Maximum="500" Value="{Binding ContentLabelSize, ElementName=_pileFlowPanel, Converter={StaticResource SizeToIntegerConverter}, ConverterParameter=width}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Content Label Size Y: " Grid.Row="2" VerticalAlignment="Center" />
-            <xctk:IntegerUpDown Grid.Row="2" Grid.Column="1" Minimum="0" Maximum="500" Value="{Binding ContentLabelSize, ElementName=_pileFlowPanel, Converter={StaticResource SizeToIntegerConverter}, ConverterParameter=height}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Animation Duration: " Grid.Row="3" VerticalAlignment="Center" />
-            <xctk:IntegerUpDown Grid.Row="3" Grid.Column="1" Minimum="0" Maximum="3000" Increment="10" Value="{Binding AnimationDuration, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Last Move decelarion Ratio: " Grid.Row="4" VerticalAlignment="Center" />
-            <xctk:DoubleUpDown Grid.Row="4" Grid.Column="1" FormatString="N1" Minimum="0" Maximum="1" Increment="0.1" Value="{Binding LastMoveDecelerationRatio, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Center Offset X " Grid.Row="5" VerticalAlignment="Center" />
-            <xctk:IntegerUpDown Grid.Row="5" Grid.Column="1" Minimum="0" Maximum="300" Increment="2" Value="{Binding CenterOffsetX, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            
-            <!-- 2nd column -->            
-            <TextBlock Text="Flow Items Count: " Grid.Column="2" VerticalAlignment="Center" Margin="5,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Column="3" Minimum="1" Value="{Binding FlowItemsCount, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Flow Items Ratio: " Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Margin="5,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Row="1" Grid.Column="3" Minimum="0" Maximum="100" Value="{Binding FlowItemRatio, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Item Width: " Grid.Row="2" Grid.Column="2" VerticalAlignment="Center" Margin="5,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Row="2" Grid.Column="3" Minimum="0" Maximum="300" Value="{Binding ItemWidth, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Item Height: " Grid.Row="3" Grid.Column="2" VerticalAlignment="Center" Margin="5,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Row="3" Grid.Column="3" Minimum="0" Maximum="300" Value="{Binding ItemHeight, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Flow Offset X " Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" Margin="5,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Row="4" Grid.Column="3" Minimum="0" Maximum="300" Value="{Binding FlowOffsetX, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Flow Offset Y " Grid.Row="5" Grid.Column="2" VerticalAlignment="Center" Margin="5,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Row="5" Grid.Column="3" Minimum="0" Maximum="300" Value="{Binding FlowOffsetY, ElementName=_pileFlowPanel}" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" />
-          </Grid>
-      </GroupBox>
-      
-      <GroupBox Header="PileFlowCard Features" Grid.Row="0" Grid.Column="1" Margin="0,5,2,5">
-         <Grid Margin="0,5,2,5" HorizontalAlignment="Left">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="Show Reflection: " VerticalAlignment="Center" />
-            <CheckBox x:Name="_showReflection" Grid.Column="1" IsChecked="True" Click="OnShowReflectionsClick" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,5,2,5" />
-            <TextBlock Text="Begin Reflection Opacity: " Grid.Row="1" VerticalAlignment="Center" IsEnabled="{Binding IsChecked, ElementName=_showReflection}" Style="{StaticResource DisableGrayText}"/>
-            <xctk:DoubleUpDown Grid.Row="1" Grid.Column="1" Minimum="0" Maximum="1" Increment="0.02" AllowInputSpecialValues="None" Value="0.58" ValueChanged="OnBeginReflectionOpacityChanged" IsEnabled="{Binding IsChecked, ElementName=_showReflection}" Width="50" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,5,2,5" />
-            <TextBlock Text="End Reflection Opacity: " Grid.Row="2" VerticalAlignment="Center" IsEnabled="{Binding IsChecked, ElementName=_showReflection}" Style="{StaticResource DisableGrayText}"/>
-            <xctk:DoubleUpDown Grid.Row="2" Grid.Column="1" Minimum="0" Maximum="1" Increment="0.02" AllowInputSpecialValues="None" Value="0" ValueChanged="OnEndReflectionOpacityChanged" IsEnabled="{Binding IsChecked, ElementName=_showReflection}" Width="50" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,5,2,5" />
-         </Grid>
-      </GroupBox>
-      
-      <TextBlock Grid.Row="1" Text="Usage:" Style="{StaticResource Header}" />
-
-      <ScrollViewer Grid.Row="2" Grid.ColumnSpan="2" VerticalScrollBarVisibility="Hidden" HorizontalScrollBarVisibility="Visible" CanContentScroll="true">
-         <xctk:PileFlowPanel x:Name="_pileFlowPanel" 
-                              MinHeight="175"
-                              ContentLabelOffsetY="100" 
-                              ContentLabelSize="200,28" 
-                              AnimationDuration="1000" 
-                              LastMoveDecelerationRatio="0.6" 
-                              FlowItemsCount="6" 
-                              FlowItemRatio="70" 
-                              ItemWidth="200" 
-                              ItemHeight="200" 
-                              FlowOffsetX="20" 
-                              FlowOffsetY="20" 
-                              CenterOffsetX="30">
-            <xctk:PileFlowPanel.ContentLabel>
-               <Border Background="#ffff50" DockPanel.Dock="Left" Style="{StaticResource BorderStyle}">
-                  <TextBlock x:Name="_pileFlowLabel" Margin="0,5,0,0" TextAlignment="Center" />
-
-                  <Border.BitmapEffect>
-                     <DropShadowBitmapEffect />
-                  </Border.BitmapEffect>
-
-               </Border>
-            </xctk:PileFlowPanel.ContentLabel>
-
-            <xctk:PileFlowCard x:Name="_employeesPileFlowCard" Tag="Employees">
-               <StackPanel>
-                  <TextBlock Text="List of Employees" TextAlignment="Center" />
-                  <xctk:CheckListBox x:Name="_employeeListBox" ItemsSource="{Binding}" DisplayMemberPath="LastName" />
-               </StackPanel>
-            </xctk:PileFlowCard>
-
-            <xctk:PileFlowCard>
-               <xctk:PileFlowCard.Tag>
-                  <MultiBinding Converter="{StaticResource FullNameStringConverter}">
-                     <Binding Path="[0].FirstName" />
-                     <Binding Path="[0].LastName" />
-                  </MultiBinding>
-               </xctk:PileFlowCard.Tag>
-               <Border Background="Beige">
-                  <Grid>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition />
-                        <ColumnDefinition Width="Auto" />
-                     </Grid.ColumnDefinitions>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                     </Grid.RowDefinitions>
-
-                     <Image Grid.RowSpan="5" Source="{Binding Path=[0].Photo}" VerticalAlignment="Center" />
-                     <TextBlock Grid.Column="1" Text="{Binding Path=[0].FirstName}" />
-                     <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=[0].LastName}" />
-                     <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=[0].Title}" />
-                     <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=[0].Title}" />
-                     <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding Path=[0].HomePhone}" />
-                     <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=[0].Address}" />
-                     <TextBlock Grid.Row="5" Grid.ColumnSpan="2" Text="This employee has been working at IBM since March 10, 1999." TextWrapping="Wrap" />
-                     <Button Grid.Row="6" Grid.ColumnSpan="2" Content="Save" Width="75" Click="OnEmployeeButtonPress" />
-                  </Grid>
-               </Border>
-            </xctk:PileFlowCard>
-
-            <xctk:PileFlowCard Tag="sale's price relative to distance">
-               <Border Background="LightGray">
-                  <xctk:Chart>
-                     <xctk:Chart.Legend>
-                        <xctk:Legend Visibility="Collapsed" />
-                     </xctk:Chart.Legend>
-                     <xctk:Chart.Areas>
-                        <xctk:Area>
-                           <xctk:Area.XAxis>
-                              <xctk:Axis AxisLabelsLayout="ShowToFit" ShowAxisLabel="False" LabelTemplate="{StaticResource LabelTemplate}"/>
-                           </xctk:Area.XAxis>
-                           <xctk:Area.YAxis>
-                              <xctk:Axis AxisLabelsLayout="ShowToFit" ShowAxisLabel="False" LabelTemplate="{StaticResource LabelTemplate}"/>
-                           </xctk:Area.YAxis>
-                           <xctk:Area.Series>
-                              <xctk:Series DefaultInterior="Red" Template="{StaticResource seriesTemplate}">
-                                 <xctk:Series.DataPoints>
-                                    <xctk:DataPoint X="125" Y="6" />
-                                    <xctk:DataPoint X="150" Y="7" />
-                                    <xctk:DataPoint X="50" Y="4" />
-                                    <xctk:DataPoint X="25" Y="2" />
-                                 </xctk:Series.DataPoints>
-                                 <xctk:Series.Layout>
-                                    <xctk:ColumnLayout />
-                                 </xctk:Series.Layout>
-                              </xctk:Series>
-                           </xctk:Area.Series>
-                        </xctk:Area>
-                     </xctk:Chart.Areas>
-                  </xctk:Chart>
-               </Border>
-            </xctk:PileFlowCard>
-
-         </xctk:PileFlowPanel>
-      </ScrollViewer>
-   </Grid>
-   <!--##END-->
-
-   <!--##INCLUDE_OPEN_SOURCE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <Image Source="..\OpenSourceImages\PileFlowPanel.png" Width="600" Height="400"/>
-##END-->
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.cs.txt

@@ -33,7 +33,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     public PropertyGridAttributesView()
     {
       InitializeComponent();
-      
+
       var person = new Man();
       person.FirstName = "John";
       person.LastName = "Doe";
@@ -52,9 +52,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
   [CategoryOrder("Information", 0)]
   [CategoryOrder( "Conections", 1 )]
   [CategoryOrder( "Other", 2 )]
-#if !OPEN_SOURCE
-  [ExpandedCategory( "Conections", false )]
-#endif
   public abstract class Person
   {
     // All properties have their own "[Category(...)]" attribute to specify which category they
@@ -68,9 +65,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     [Category( "Information" )]
     [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'FirstNameEditor' class. In the Plus version, it also depends on the IsMale property to change its foreground and source." )]
     [Editor( typeof( FirstNameEditor ), typeof( FirstNameEditor ) )]
-#if !OPEN_SOURCE
-    [DependsOn( "IsMale" )]
-#endif
     public string FirstName { get; set; }
 
     [Category( "Information" )]
@@ -110,7 +104,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     public string NameInParentheses { get; set; }
 
     [Category( "Other" )]
-    //# TODODOC
     [Description( "This property uses the [Browsable(false)] attribute to not display the property" )]
     [BrowsableAttribute( false )]
     public string InvisibleProperty
@@ -155,36 +148,16 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
   {
     public FrameworkElement ResolveEditor( Xceed.Wpf.Toolkit.PropertyGrid.PropertyItem propertyItem )
     {
-#if !OPEN_SOURCE
-      ComboBox comboBox = new ComboBox();
-      if( ( ( Person )propertyItem.Instance ).IsMale )
-      {
-        comboBox.Foreground = new SolidColorBrush( Colors.Green );
-        comboBox.ItemsSource = new List<string>() {"Tom", "Mark", "Bryan"};
-      }
-      else
-      {
-        comboBox.Foreground = new SolidColorBrush( Colors.Red );
-        comboBox.ItemsSource = new List<string>() { "Kathy", "Christine", "Tammy" };
-      }
-      comboBox.SelectedIndex = 0;
-#else
       TextBox textBox = new TextBox();
       textBox.Background = new SolidColorBrush( Colors.Red );
-#endif
       //create the binding from the bound property item to the editor
       var _binding = new Binding( "Value" ); //bind to the Value property of the PropertyItem
       _binding.Source = propertyItem;
       _binding.ValidatesOnExceptions = true;
       _binding.ValidatesOnDataErrors = true;
       _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
-#if !OPEN_SOURCE
-      BindingOperations.SetBinding( comboBox, ComboBox.SelectedItemProperty, _binding );
-      return comboBox;
-#else
       BindingOperations.SetBinding( textBox, TextBox.TextProperty, _binding );
       return textBox;
-#endif
     }
   }
 

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.txt

@@ -71,7 +71,7 @@
          LocalizedDescriptionAttribute
       </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
@@ -89,11 +89,11 @@
                     FontStyle="Italic"
                     Margin="0,10,0,0"/>
       </StackPanel>
-      
+
       <xctk:PropertyGrid Grid.Row="1" x:Name="_propertyGrid" Width="450" MaxHeight="650" Margin="10" 
                          SelectedObject="{Binding}"
                          ShowDescriptionByTooltip="True">
       </xctk:PropertyGrid>      
-      
+
    </Grid>
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.txt

@@ -31,13 +31,13 @@
    <local:DemoView.Resources>
       <conv:DimensionsConverter x:Key="DimensionsConverter" />
    </local:DemoView.Resources>
-   
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
          <RowDefinition Height="*" />
       </Grid.RowDefinitions>
-      
+
       <TextBlock Text="The solution to this problem is to create a custom editor and provide an IValueConverter to handle the proper conversion of the Struct values." TextWrapping="Wrap" />
       <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Row="1" Width="450" MaxHeight="250" Margin="10">
          <xctk:PropertyGrid.EditorDefinitions>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.txt

@@ -31,7 +31,7 @@
             <Run>The PropertyGrid on the right uses the CategoryOrder attribute to order the categories in the desired order.</Run>
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="*" />
@@ -43,7 +43,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
          </Grid.RowDefinitions>
-         
+
          <TextBlock Text="Non-Ordered Categories:" FontSize="16" FontWeight="Bold" HorizontalAlignment="Stretch" Margin="10"/>
          <xctk:PropertyGrid x:Name="_propertyGrid1" Grid.Row="1" Width="290" MaxHeight="350" VerticalAlignment="Top" Margin="10"/>
       </Grid>
@@ -53,7 +53,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
          </Grid.RowDefinitions>
-         
+
          <TextBlock Grid.Column="1" Text="Ordered Categories:" FontSize="16" FontWeight="Bold" Margin="10"/>
          <xctk:PropertyGrid x:Name="_propertyGrid2" Grid.Row="1" Grid.Column="1" Width="290" MaxHeight="350" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10"/>
       </Grid>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.cs.txt

@@ -102,7 +102,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 
       [Category( "Information" )]
       [Description( "This property uses the default editor because no EditorDefinition targets this property name or type." )]
-      public System.Windows.Media.Color FavoriteColor
+      public System.Windows.Media.Color? FavoriteColor
       {
         get;
         set;

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.txt

@@ -27,7 +27,7 @@
             This example demonstrates the various methods of assigning custom editors to the properties. You can supply your own editor DataTemplate based on a Type, a property name, or both. To supply your own editor for a property, you must create an EditorDefinition for the PropertyGrid.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
@@ -56,7 +56,7 @@
                         <TextBox Background="Green"  Text="{Binding Value}" />
                         <!-- 
                         When using SelectedObject[s] bind to the "Value" property 
-                        
+
                         When using PropertiesSource or Properties to specify your items,
                         your DataContext will be the item itself, so bind directly to the 
                         property of your underlying item, hence, probably the same path as 

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.cs.txt

@@ -35,16 +35,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     }
   }
 
-#if !OPEN_SOURCE
-  public struct Coords
-  {
-    public int X { get; set; }
-    public int Y { get; set; }
 
-    public override string ToString()
-    {
-      return string.Format( "{0}, {1}", X, Y );
-    }
-  }
-#endif
 }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.txt

@@ -25,7 +25,6 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
          Using the CustomPropertyItems class, you can flexibly modify the display of each of your properties.
-         <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
            <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
@@ -33,10 +32,9 @@
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->           
       </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
@@ -45,13 +43,7 @@
       <StackPanel Grid.Row="0" Margin="10">
          <TextBlock Text="This sample adds 'CustomPropertyItem' to the 'Properties' collection and directly controls the display of each item."
                     TextWrapping="Wrap"/>
-         <!--##EXCLUDE_OPEN_SOURCE-->
-         <TextBlock Text="(Click the XAML and Code tabs to see details.)" 
-                    FontStyle="Italic"
-                    Margin="0,10,0,0"/>
-         <!--##END-->
       </StackPanel>
-      <!--##INCLUDE_OPEN_SOURCE
       <ScrollViewer Grid.Row="1" 
                     VerticalScrollBarVisibility="Auto"
                     HorizontalScrollBarVisibility="Auto">
@@ -60,57 +52,10 @@
             <local:XamlBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/CustomProperty.xaml.txt" />
          </StackPanel>
       </ScrollViewer>      
-      ##END-->
-<!--##EXCLUDE_OPEN_SOURCE-->
-      <!-- 
-      No assignement of either PropertyNameBinding or PropertyValueBinding. CustomProperties
-      will each have all the values directly set.
-      -->
-      <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Row="1" Width="350" MaxHeight="280">
-         <xctk:PropertyGrid.EditorDefinitions>
-            <xctk:EditorTextDefinition TargetProperties="firstName,lastName" 
-                                       FontWeight="Bold" 
-                                       FontStyle="Italic"/>
-         </xctk:PropertyGrid.EditorDefinitions>
-         <xctk:PropertyGrid.Properties>
-            <!--Use CustomPropertyItem to control each of their characteristics. -->
-            <!--Here we specify a DefinitionKey to assign a specific CUSTOM editor. -->
-            <xctk:CustomPropertyItem DisplayName="First Name" Value="Nancy" Category="Name"
-                                     DefinitionKey="firstName" />
-            <xctk:CustomPropertyItem DisplayName="Last Name" Value="Davolio" Category="Name"
-                                     DefinitionKey="lastName"/>
 
-            <!-- Here we specify a DefinitionKey to assign a specific DEFAULT editor. -->
-            <!-- Since the XAML parser will parse "29" as a string, the TypeConverter defined
-            on Int32 struct will automatically make the conversion. -->
-            <xctk:CustomPropertyItem DisplayName="Age" Value="29" Category="Other"
-                                     DefinitionKey="{x:Type s:Int32}" />
-            
-            <!-- For thoses values where no TypeConverter supporting strings is defined, you must
-            use property element syntax to define the value. -->
-            <xctk:CustomPropertyItem DisplayName="Coordinates" Category="Other" 
-                                     Description="Location on the state map">
-               <xctk:CustomPropertyItem.Value>
-                  <v:Coords X="12" Y="15"/>
-               </xctk:CustomPropertyItem.Value>
-            </xctk:CustomPropertyItem>
 
-            <!--Here we define a specific editor directly. No value -->
-            <xctk:CustomPropertyItem DisplayName="Picture" Category="Other">
-               <xctk:CustomPropertyItem.Editor>
-                  <Image Source="/Samples/PropertyGrid/Resources/woman.png" 
-                         Stretch="None"
-                         HorizontalAlignment="Left"/>
-               </xctk:CustomPropertyItem.Editor>
-            </xctk:CustomPropertyItem>
-            
-         </xctk:PropertyGrid.Properties>
-         
-         <!-- You must specify that the grouping is based on the value of "Category" property. -->
-         <xctk:PropertyGrid.CategoryGroupDescription>
-            <PropertyGroupDescription PropertyName="Category"/>
-         </xctk:PropertyGrid.CategoryGroupDescription>
-      </xctk:PropertyGrid>
-<!--##END-->      
+
+
+
    </Grid>      
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.cs.txt

@@ -17,6 +17,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.IO;
 using System.Windows;
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
@@ -117,7 +118,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       public System.TimeSpan TimeSpan { get; set; }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a ColorPicker as the default editor." )]
-      public System.Windows.Media.Color Color { get; set; }
+      public System.Windows.Media.Color? Color { get; set; }
       [Category( "Non-Numeric Editors" )]
       [Description( "(C# enum type) This property uses a ComboBox as the default editor. The ComboBox is auto-populated with the enum values." )]
       public HorizontalAlignment Enum { get; set; }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.txt

@@ -28,7 +28,7 @@
            IList<T> (primtive type), IList<T> (custom type),
       </Paragraph>
     </local:DemoView.Description>
-   
+
    <DockPanel>
       <TextBlock DockPanel.Dock="Top" 
                  Text="Click on each property and see the description for details on the underlying editor."
@@ -36,5 +36,5 @@
       <xctk:PropertyGrid x:Name="_propertyGrid" SelectedObject="{Binding}"  Width="450" Margin="10,30,0,0" />
    </DockPanel>
 
-   
+
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.cs.txt

@@ -28,26 +28,8 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     public PropertyGridDefinitionKeyView()
     {
       InitializeComponent();
-#if !OPEN_SOURCE      
-      var person = new Person();
-      person.FirstName = "John";
-      person.LastName = "Smith";
-      person.ReferenceNo = 252521;
-
-      this.DataContext = person;
-#endif
-    }
 
-#if !OPEN_SOURCE
-    private class Person
-    {
-      [DefinitionKey( "nameType" )]
-      public string FirstName { get; set; }
-      [DefinitionKey( "nameType" )]
-      public string LastName { get; set; }
-      [DefinitionKey( typeof( int? ) )]
-      public object ReferenceNo { get; set; }
     }
-#endif
+
   }
 }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.txt

@@ -32,7 +32,6 @@
          <LineBreak/>
          <LineBreak/>
            It can also be used to specify a specific default editor when a property type does not resolve to a valid editor (e.g., Object).
-         <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
            <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
@@ -40,7 +39,6 @@
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->
       </Paragraph>
     </local:DemoView.Description>
 
@@ -56,13 +54,7 @@
          <TextBlock Text="The ReferenceNo property, declare a DefinitionKey to 'int?' to displayed the content with a IntegerUpDown dispite it's type is 'object'" 
                     TextWrapping="Wrap"
                     Margin="0,0,0,10"/>
-         <!--##EXCLUDE_OPEN_SOURCE-->
-         <TextBlock Text="(Click XAML and Code tabs to see details)" 
-                    FontStyle="Italic"
-                    Margin="0,10,0,0"/>
-         <!--##END-->
       </StackPanel>
-      <!--##INCLUDE_OPEN_SOURCE
       <ScrollViewer Grid.Row="1" 
                     VerticalScrollBarVisibility="Auto"
                     HorizontalScrollBarVisibility="Auto">
@@ -73,15 +65,5 @@
             <local:XamlBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/DefinitionKey.xaml.txt" />
          </StackPanel>
       </ScrollViewer>      
-      ##END-->
-      <!--##EXCLUDE_OPEN_SOURCE-->
-      <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Row="1" HorizontalAlignment="Stretch" Width="350" MaxHeight="200"
-                         SelectedObject="{Binding}">
-         <xctk:PropertyGrid.EditorDefinitions>
-            <!-- This EditorDefinition will be used for FirstName and LastName -->
-            <xctk:EditorTextDefinition TargetProperties="nameType" FontStyle="Italic" FontWeight="Bold" />
-         </xctk:PropertyGrid.EditorDefinitions>
-      </xctk:PropertyGrid>
-      <!--##END-->
    </Grid>
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.cs.txt

@@ -20,9 +20,6 @@ using System.ComponentModel;
 using System.Windows;
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-#if !OPEN_SOURCE
-using Xceed.Wpf.Toolkit.Core.Attributes;
-#endif
 using Xceed.Wpf.Toolkit.Core;
 using System.Windows.Controls;
 using System.Globalization;
@@ -41,90 +38,16 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     public PropertyGridDisplayLocalizationView()
     {
       InitializeComponent();
-#if !OPEN_SOURCE
-      var person = new Person();
-      person.FirstName = "John";
-      person.LastName = "Doe";
-      person.FavoriteActor1 = ActorNoDisplayName.billcosby;
-      person.FavoriteActor2 = ActorWithDisplayName.bradpitt;
-      person.FavoriteActor3 = ActorWithDisplayName.NotInThisList;
-
-      _propertyGrid.SelectedObject = person;
-#endif
-    }
 
-#if !OPEN_SOURCE
-    private void ComboBox_SelectionChanged( object sender, System.Windows.Controls.SelectionChangedEventArgs e )
-    {
-      DisplayLocalizationRes.Culture = object.Equals(( ( ComboBox )sender ).SelectedItem,"French" )
-        ? new CultureInfo( "fr" )
-        : CultureInfo.InvariantCulture;
-
-      // This will refresh the PropertyGrid.
-      if( _propertyGrid != null )
-      {
-        var selected = _propertyGrid.SelectedObject;
-        _propertyGrid.SelectedObject = null;
-        _propertyGrid.SelectedObject = selected;
-      }
     }
 
-    public enum ActorNoDisplayName
-    {
-      alpacino,
-      arnoldschwarzenegger,
-      benaffleck,
-      billcosby,
-      bradpitt,
-      NotInThisList
-    };
-
-    [TypeConverter(typeof(EnumDisplayNameConverter))]
-    public enum ActorWithDisplayName
-    {
-      [ExtendedDisplayName( "Al Pacino" )]
-      alpacino,
-      [ExtendedDisplayName( "Arnold Schwarzenegger" )]
-      arnoldschwarzenegger,
-      [ExtendedDisplayName( "Ben Affleck" )]
-      benaffleck,
-      [ExtendedDisplayName( "Bill Cosby" )]
-      billcosby,
-      [ExtendedDisplayName( "Brad Pitt" )]
-      bradpitt,
-      [LocalizedDisplayName( "NotListed", typeof(DisplayLocalizationRes) )]
-      NotInThisList
-    };
-
-    [CategoryOrder( "InfoCategory", 1 )]
-    [CategoryOrder( "DetailsCategory", 2 )]
-    public class Person
-    {
-      [LocalizedDisplayName( "FirstName", typeof( DisplayLocalizationRes ) )]
-      [LocalizedDescription( "FirstNameDesc", typeof( DisplayLocalizationRes ) )]
-      [LocalizedCategory( "InfoCategory", typeof( DisplayLocalizationRes ) )]
-      public string FirstName { get; set; }
-
-      [LocalizedDisplayName( "LastName", typeof( DisplayLocalizationRes ) )]
-      [LocalizedDescription( "LastNameDesc", typeof( DisplayLocalizationRes ) )]
-      [LocalizedCategory( "InfoCategory", typeof( DisplayLocalizationRes ) )]
-      public string LastName { get; set; }
-
-      [LocalizedDisplayName( "FavoriteActor1", typeof( DisplayLocalizationRes ) )]
-      [LocalizedDescription( "FavoriteActor1Desc", typeof( DisplayLocalizationRes ) )]
-      [LocalizedCategory( "DetailsCategory", typeof( DisplayLocalizationRes ) )]
-      public ActorNoDisplayName FavoriteActor1 { get; set; }
-
-      [LocalizedDisplayName( "FavoriteActor2", typeof( DisplayLocalizationRes ) )]
-      [LocalizedDescription( "FavoriteActor2Desc", typeof( DisplayLocalizationRes ) )]
-      [LocalizedCategory( "DetailsCategory", typeof( DisplayLocalizationRes ) )]
-      public ActorWithDisplayName FavoriteActor2 { get; set; }
-
-      [LocalizedDisplayName( "FavoriteActor3", typeof( DisplayLocalizationRes ) )]
-      [LocalizedDescription( "FavoriteActor3Desc", typeof( DisplayLocalizationRes ) )]
-      [LocalizedCategory( "DetailsCategory", typeof( DisplayLocalizationRes ) )]
-      public ActorWithDisplayName FavoriteActor3 { get; set; }
-    }
-#endif
+
+
+
+
+
+
+
+
   }
 }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.txt

@@ -31,46 +31,17 @@
             <Run>LocalizedDisplayName, LocalizedDescription, LocalizedCategory:</Run>
             <LineBreak/>
             <Run>Theses attributes allow to easily localize the DisplayName, Description, and Category attributes values using standard Resx resource files.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
-    
-<!--##EXCLUDE_OPEN_SOURCE-->
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-      
-      <TextBlock Text="In this sample, the properties names and descriptions where localized.&#x0a;Select 'Favorite Actor' properties and see description:" />
-      <Grid Grid.Row="1" VerticalAlignment="Top">
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-         </Grid.RowDefinitions>
-         
-         <StackPanel Orientation="Horizontal" Margin="30" Width="450" Height="22">
-            <TextBlock Text="Language:" Margin="0,0,5,30" />
-            <ComboBox SelectionChanged="ComboBox_SelectionChanged" SelectedIndex="0" Width="150">
-               <ComboBox.Items>
-                  <s:String>English (Default)</s:String>
-                  <s:String>French</s:String>
-               </ComboBox.Items>
-            </ComboBox>
-         </StackPanel>
-         <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Row="1" NameColumnWidth="250" Width="450" MaxHeight="280" />
-      </Grid>
-   </Grid>
-<!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
+
+
     <Image Source="..\OpenSourceImages\Localization.png" Width="400" Height="300"/>
-##END-->
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.cs.txt

@@ -17,6 +17,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.IO;
 using System.Windows;
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
@@ -31,55 +32,10 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     public PropertyGridEditorDefinitionsView()
     {
       InitializeComponent();
-#if !OPEN_SOURCE
-      var selectedObject = new EditorDefinitionsSampleObject();
-      selectedObject.Boolean = true;
-      selectedObject.Color = Colors.Red;
-      selectedObject.ColorCombo = Colors.Blue;
-      selectedObject.DateTime = System.DateTime.Now;
-      selectedObject.Int32 = 42;
-      selectedObject.PersonTemplate = new Person() { FirstName = "John", LastName = "Smith" };
-      selectedObject.String = "This is a string";
-      selectedObject.StringCombo = "String Value 1";
 
-      this.DataContext = selectedObject;
-#endif
     }
 
-#if !OPEN_SOURCE
-    public class EditorDefinitionsSampleObject
-    {
-      [PropertyOrder( 0 )]
-      public string String { get; set; }
-      [PropertyOrder( 1 )]
-      public bool Boolean { get; set; }
-      [PropertyOrder( 2 )]
-      public int Int32 { get; set; }
-      [PropertyOrder( 3 )]
-      public System.DateTime DateTime { get; set; }
-      [PropertyOrder( 4 )]
-      public System.Windows.Media.Color Color { get; set; }
-      [PropertyOrder( 5 )]
-      public string StringCombo { get; set; }
-      [PropertyOrder( 6 )]
-      public System.Windows.Media.Color? ColorCombo { get; set; }
-      [PropertyOrder( 7 )]
-      public Person PersonTemplate { get; set; }
-    }
 
-    public class Person
-    {
-      public string FirstName { get; set; }
-      public string LastName { get; set; }
-    }
-#endif
-  }
-#if !OPEN_SOURCE
-  public class ColorSampleItem
-  {
-    public System.Windows.Media.Color? Color { get; set; }
-    public string DisplayString { get; set; }
   }
-#endif
 
 }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.txt

@@ -17,34 +17,17 @@
                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                 xmlns:s="clr-namespace:System;assembly=mscorlib"
+                xmlns:sys="clr-namespace:System.IO;assembly=mscorlib"
                 xmlns:sm="clr-namespace:System.Windows.Media;assembly=PresentationCore"
                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
                 xmlns:v="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views"
                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
                 VerticalScrollBarVisibility="Disabled"
                 Title="Ready-to-use EditorDefinitions">
-<!--##EXCLUDE_OPEN_SOURCE-->   
-   <local:DemoView.Resources>
-      
-      <x:Array x:Key="comboSource1" Type="s:String" >
-         <s:String>String Value 1</s:String>
-         <s:String>String Value 2</s:String>
-         <s:String>String Value 3</s:String>
-      </x:Array>
-
-      <x:Array x:Key="comboSource2" Type="s:Object" >
-         <v:ColorSampleItem Color="{x:Null}" DisplayString="(No color selected)"/>
-         <v:ColorSampleItem Color="{x:Static sm:Colors.Red}" DisplayString="Red Color"/>
-         <v:ColorSampleItem Color="{x:Static sm:Colors.Green}" DisplayString="Green Color"/>
-         <v:ColorSampleItem Color="{x:Static sm:Colors.Blue}" DisplayString="Blue Color"/>
-      </x:Array>
-      
-      <Style x:Key="textBoxStyle" TargetType="TextBox">
-         <Setter Property="Background" Value="LightBlue"/>
-      </Style>
-      
-   </local:DemoView.Resources>
-<!--##END-->   
+
+
+
+
    <local:DemoView.Description>
       <Paragraph FontSize="14" FontFamily="Segoe">
          Using the various EditorDefinitions provided with the PropertyGrid, you can easily customize and reuse the existing default editor to suit your needs. Style the editing element or use one of the common properties directly provided on the editor definition class. The provided editor definitions are the following:
@@ -53,6 +36,8 @@
          EditorCheckBoxDefinition
          <LineBreak/>
          EditorColorPickerDefinition
+         <LineBreak />
+         EditorFilePickerDefinition
          <LineBreak/>
          EditorComboBoxDefinition
          <LineBreak/>
@@ -69,7 +54,6 @@
          EditorIntegerUpDownDefinition
          <LineBreak />
          EditorDoubleUpDownDefinition
-         <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
          <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
@@ -77,7 +61,6 @@
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->
          etc.
       </Paragraph>
    </local:DemoView.Description>
@@ -86,13 +69,7 @@
       <StackPanel DockPanel.Dock="Top">
          <TextBlock Text="Each of the displayed properties has their display or behavior affected by an different EditorDefinition "
                  TextWrapping="Wrap"/>
-         <!--##EXCLUDE_OPEN_SOURCE-->
-         <TextBlock Text="(Click XAML and Code tabs to see details)" 
-                    FontStyle="Italic"
-                    Margin="0,10,0,0"/>
-         <!--##END-->
       </StackPanel>
-      <!--##INCLUDE_OPEN_SOURCE
       <ScrollViewer VerticalScrollBarVisibility="Auto"
                     HorizontalScrollBarVisibility="Auto">
          <StackPanel>
@@ -100,67 +77,13 @@
             <local:XamlBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/EditorDefinitions.xaml.txt" />
          </StackPanel>
       </ScrollViewer>      
-      ##END-->      
-      <!--##EXCLUDE_OPEN_SOURCE-->
-      <xctk:PropertyGrid x:Name="_propertyGrid" SelectedObject="{Binding}"  Width="450" MaxHeight="320" Margin="10" >
-         <xctk:PropertyGrid.EditorDefinitions>
-            <!-- 
-            Only the "integer" is demonstrated here. 
-            But all other numeric types are also supported (eg. EditorDoubleUpDownDefinition, etc.)  
-            -->
-            <xctk:EditorIntegerUpDownDefinition TargetProperties="{x:Type s:Int32}" 
-                                                TextAlignment="Right" />
-            <!-- CheckBox -->
-            <xctk:EditorCheckBoxDefinition TargetProperties="{x:Type s:Boolean}" 
-                                           IsThreeState="True" />
-
-            <!-- ColorPicker -->
-            <xctk:EditorColorPickerDefinition TargetProperties="{x:Type sm:Color}" 
-                                              DisplayColorAndName="False" 
-                                              ShowDropDownButton="False"/>
-
-            <!-- DateTimeUpDown -->
-            <xctk:EditorDateTimeUpDownDefinition TargetProperties="{x:Type s:DateTime}" 
-                                                 Format="Custom" 
-                                                 FormatString="yyyy-MM" />
-
-            <!-- TextBox -->
-            <!-- On any EditorDefintion, you can use the "EditingElementStyle" to have a more complete customization 
-            of the underlying editor -->
-            <xctk:EditorTextDefinition TargetProperties="{x:Type s:String}" 
-                                       FontStyle="Italic" 
-                                       FontWeight="Bold" 
-                                       EditingElementStyle="{StaticResource textBoxStyle}" />
-
-            <!-- ComboBox (simple) -->
-            <!-- When using SelectedObject[s], the DataContext will be the PropertyItem. Bind to the "Value" property. -->
-            <xctk:EditorComboBoxDefinition TargetProperties="StringCombo"
-                                           ItemsSource="{StaticResource comboSource1}"
-                                           SelectedItemBinding="{Binding Value}" />
-
-            <!-- ComboBox (complex) -->
-            <xctk:EditorComboBoxDefinition TargetProperties="ColorCombo"
-                                           ItemsSource="{StaticResource comboSource2}"
-                                           DisplayMemberPath="DisplayString"
-                                           SelectedValuePath="Color"
-                                           SelectedValueBinding="{Binding Value}" />
-
-            <!-- Custom DataTemplate -->
-            <xctk:EditorTemplateDefinition TargetProperties="PersonTemplate">
-               <xctk:EditorTemplateDefinition.EditingTemplate>
-                  <DataTemplate>
-                     <StackPanel Orientation="Horizontal">
-                        <!-- When using SelectedObject[s], the DataContext will be the PropertyItem. Bind to the "Value" property. -->
-                        <TextBlock Text="{Binding Value.LastName}" FontWeight="Bold" />
-                        <TextBlock Text=", " />
-                        <TextBlock Text="{Binding Value.FirstName}" />
-                     </StackPanel>
-                  </DataTemplate>
-               </xctk:EditorTemplateDefinition.EditingTemplate>
-            </xctk:EditorTemplateDefinition>
-         </xctk:PropertyGrid.EditorDefinitions>
-      </xctk:PropertyGrid>
-      <!--##END-->
+
+
+
+
+
+
+
    </DockPanel>
 
 

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.cs.txt

@@ -39,9 +39,6 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     public PropertyGridMultiSelectedObjectsView()
     {
       InitializeComponent();
-#if !OPEN_SOURCE
-      _propertyGrid.SelectedObjectsOverride = new List<object>() { _textBox, _button, _comboBox };
-#endif
     }
   }
 }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.txt

@@ -24,51 +24,18 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
             <Run>When many objects are assigned to a PropertyGrid, the PpropertyGrid will show all the common properties so that they can be changed simultaneously on each object.</Run>
-       <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->
         </Paragraph>
     </local:DemoView.Description>
- 
-<!--##EXCLUDE_OPEN_SOURCE-->
-    <local:DemoView.Resources>
-        <x:Array Type="sys:String" x:Key="_comboBoxSource" >
-            <sys:String>Green</sys:String>
-            <sys:String>Red</sys:String>
-            <sys:String>Blue</sys:String>
-        </x:Array>
-    </local:DemoView.Resources>
 
-        <Grid Margin="10">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
 
-        <StackPanel >
-            <TextBlock Text="Selected Object 1 : a TextBox" />
-            <TextBox x:Name="_textBox" Text="This is my TextBox" Margin="10" Width="150" Foreground="Red"/>
-            <TextBlock Text="Selected Object 2 : a Button"/>
-            <Button x:Name="_button" Content="My Button" Margin="10" Width="150" Foreground="Red"/>
-            <TextBlock Text="Selected Object 3 : a ComboBox" />
-            <ComboBox x:Name="_comboBox" ItemsSource="{StaticResource _comboBoxSource}" SelectedIndex="0" Margin="10" Width="150" Foreground="Red"/>
-        </StackPanel>
 
-         <xctk:PropertyGrid Grid.Column="1" x:Name="_propertyGrid" ShowAdvancedOptions="True" AutoGenerateProperties="False" MaxHeight="350" VerticalAlignment="Top">
-            <xctk:PropertyGrid.PropertyDefinitions>
-                  <xctk:PropertyDefinition 
-                     TargetProperties="FontSize,FontWeight,Foreground,Background,HorizontalContentAlignment,Width,Margin,ToolTip" />
-            </xctk:PropertyGrid.PropertyDefinitions>
-         </xctk:PropertyGrid>
-    </Grid>
-<!--##END-->
-    
-<!--##INCLUDE_OPEN_SOURCE
+
+
     <Image Source="..\OpenSourceImages\MultiSelectedObjects.png" Width="660" Height="430"/>
-##END-->
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.cs.txt

@@ -32,59 +32,10 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     public PropertyGridPropertiesSourceView()
     {
       InitializeComponent();
-#if !OPEN_SOURCE
-      var list = new ObservableCollection<object>();
-      list.Add( new MyData( "string", "First text" ) );
-      list.Add( new MyData( "Second string", "Second text" ) );
-      list.Add( new MyData( "Color", Colors.Blue ) );
-      list.Add( new MyData( "DateTime", System.DateTime.Now ) );
-      list.Add( new MyData( "TimeSpan", System.TimeSpan.FromMinutes( 120 ) ) );
-      list.Add( new MyData( "HorizontalAlignment", System.Windows.HorizontalAlignment.Center ) );
-      list.Add( new MyData( "bool", true ) );
-      list.Add( new MyData( "decimal", ( decimal )1 ) );
-      list.Add( new MyData( "int", ( int )2 ) );
-      list.Add( new MyData( "Second int", ( int )2 ) );
-      list.Add( new MyData( "short", ( short )3 ) );
-      list.Add( new MyData( "long", ( long )4 ) );
-      list.Add( new MyData( "float", ( float )5 ) );
-      list.Add( new MyData( "byte", ( byte )6 ) );
-      list.Add( new MyData( "sbyte", ( sbyte )7 ) );
-      list.Add( new MyData( "uint", ( uint )8 ) );
-      list.Add( new MyData( "ulong", ( ulong )8 ) );
-      list.Add( new MyData( "ushort", ( ushort )10 ) );
-      list.Add( new MyData( "FontFamily", Fonts.SystemFontFamilies.First() ) );
-      list.Add( new MyData( "FontStyle", FontStyles.Italic ) );
-      list.Add( new MyData( "FontStretch", FontStretches.ExtraExpanded ) );
-      
-      // PropertyGrid PropertiesSource property is bound to the DataContext
-      this.DataContext = list;
-#endif
-    }
 
-#if !OPEN_SOURCE
-    private void InsertProperty( object sender, RoutedEventArgs e )
-    {
-      ( ( IList<object> )this.DataContext ).Insert( 0, new MyData( "New string", "new data" ) );
     }
 
-    private void RemoveProperty( object sender, RoutedEventArgs e )
-    {
-      if( _propertyGrid.SelectedProperty != null )
-      {
-        ( ( IList<object> )this.DataContext ).Remove( _propertyGrid.SelectedProperty );
-      }
-    }
 
-    private class MyData
-    {
-      public MyData( string name, object value )
-      {
-        this.MyName = name;
-        this.MyValue = value;
-      }
-      public string MyName { get; set; }
-      public object MyValue { get; set; }
-    }
-#endif
+
   }
 }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.txt

@@ -24,7 +24,6 @@
     <local:DemoView.Description>
         <Paragraph FontSize="14" FontFamily="Segoe">
            When setting the PropertiesSource or Properties property, you can provide your own data to be displayed in the PropertyGrid. This allows you to easily insert and remove properties at runtime. The usage scheme is similar to the one used for the standard ItemsControl.
-         <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
            <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
@@ -32,10 +31,9 @@
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->           
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
@@ -45,13 +43,7 @@
       <StackPanel Grid.Row="0" Margin="10">
          <TextBlock Text="This sample uses the 'PropertiesSource', 'PropertyNameBinding', and 'PropertyValueBinding', as well as collection of generic objects to display its properties."
                     TextWrapping="Wrap"/>
-         <!--##EXCLUDE_OPEN_SOURCE-->
-         <TextBlock Text="(Click the XAML and Code tabs to see details.)" 
-                    FontStyle="Italic"
-                    Margin="0,10,0,0"/>
-         <!--##END-->
       </StackPanel>
-      <!--##INCLUDE_OPEN_SOURCE
       <ScrollViewer Grid.Row="2" 
                     VerticalScrollBarVisibility="Auto"
                     HorizontalScrollBarVisibility="Auto">
@@ -62,52 +54,11 @@
             <local:XamlBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/PropertiesSource.xaml.txt" />
          </StackPanel>
       </ScrollViewer>      
-      ##END-->
-      <!--##EXCLUDE_OPEN_SOURCE-->
-      
-      <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center">
-         <Button Content="Insert new property" Click="InsertProperty" Margin="20" Padding="5"/>
-         <Button Content="Remove selected property" Click="RemoveProperty" Margin="20" Padding="5"/>
-      </StackPanel>
-      
-      
-      <!-- 
-      The PropertyNameBinding and PropertyValueBinding properties provide the bindings that will be used
-      on each item of the properties' source in order to provide the Name and Value of each property.
-      -->
-      <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Row="2" Width="350" MaxHeight="600"
-                         IsCategorized="False"
-                         ShowSortOptions="False"
-                         PropertiesSource="{Binding}"
-                         PropertyNameBinding="{Binding MyName}"
-                         PropertyValueBinding="{Binding MyValue}" >
-         <xctk:PropertyGrid.Resources>
-            <xctk:EditorTimeSpanConverter x:Key="timeSpanConv"/>
-         </xctk:PropertyGrid.Resources>
-         
-         <xctk:PropertyGrid.EditorDefinitions>
-            <!-- The property with the name "Second string" will have this special editor. -->
-            <xctk:EditorTextDefinition TargetProperties="Second string"
-                                       FontStyle="Italic"
-                                       FontWeight="Bold" >
-               <xctk:EditorTextDefinition.EditingElementStyle>
-                  <Style TargetType="{x:Type TextBox}"
-                        BasedOn="{StaticResource  {x:Type TextBox}}">
-                     <Setter Property="Background" Value="LightBlue"/>
-                  </Style>
-               </xctk:EditorTextDefinition.EditingElementStyle>
-               
-            </xctk:EditorTextDefinition>
 
-            <!-- All properties whose value type is TimeSpan will use this special editor. -->
-            <!--Here we use a DateTimeUpDown editor in conjunction with a built-in converter to 
-            create a TimeSpanEditor-->
-            <xctk:EditorDateTimeUpDownDefinition TargetProperties="{x:Type s:TimeSpan}"
-                                                 Format="Custom"
-                                                 FormatString="HH:mm"
-                                                 Binding="{Binding MyValue, Converter={StaticResource timeSpanConv}}" />
-         </xctk:PropertyGrid.EditorDefinitions>
-      </xctk:PropertyGrid>
-      <!--##END-->
+
+
+
+
+
    </Grid>      
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.cs.txt

@@ -34,17 +34,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       InitializeComponent();
     }
   }
-#if !OPEN_SOURCE
-  public class Employee
-  {
-    public string Name { get; set; }
-    public bool IsConfirmed { get; set; }
-    public string Department { get; set; }
-  }
 
-  public class Representent : Employee
-  {
-    public string Details { get; set; }
-  }
-#endif
 }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.txt

@@ -28,7 +28,6 @@
          <LineBreak/>
          <LineBreak/>
            The sample also demonstrate the usage of CategoryGroupDescription to control the categorization of the elements.
-         <!--##INCLUDE_OPEN_SOURCE
             <LineBreak />
            <LineBreak />
             <Run>This feature is only available in the "Plus" version.</Run>
@@ -36,10 +35,9 @@
             <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Extended WPF Toolkit Plus.
             </Hyperlink>
-        ##END-->           
       </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
@@ -48,13 +46,7 @@
       <StackPanel Grid.Row="0" Margin="10">
          <TextBlock Text="This sample adds Employee items directly under the Properties property and defines the editor through the DefaultEditorDefinition property."
                     TextWrapping="Wrap"/>
-         <!--##EXCLUDE_OPEN_SOURCE-->
-         <TextBlock Text="(Click the XAML and Code tabs to see details.)" 
-                    FontStyle="Italic"
-                    Margin="0,10,0,0"/>
-         <!--##END-->
       </StackPanel>
-      <!--##INCLUDE_OPEN_SOURCE
       <ScrollViewer Grid.Row="1" 
                     VerticalScrollBarVisibility="Auto"
                     HorizontalScrollBarVisibility="Auto">
@@ -65,72 +57,11 @@
             <local:XamlBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/Properties.xaml.txt" />
          </StackPanel>
       </ScrollViewer>      
-      ##END-->      
-<!--##EXCLUDE_OPEN_SOURCE-->
-      <!-- 
-      PropertyNameBinding will be used to determine the property name's display text.
-      Value will be specified through DefaultEditorDefinition.
-      -->
-      <DockPanel Grid.Row="1">
-         <StackPanel DockPanel.Dock="Top" Margin="20" 
-                     Orientation="Horizontal">
-            <TextBlock Margin="0,0,10,0" VerticalAlignment="Center"
-                       Text="Category GroupDescription Property:" />
-            <ComboBox x:Name="categoryGroupCombo" Width="150"
-                      IsEnabled="{Binding IsCategorized, ElementName=_propertyGrid}"
-                      DisplayMemberPath="PropertyName"
-                      SelectedIndex="0">
-               <PropertyGroupDescription PropertyName="Department"/>
-               <PropertyGroupDescription PropertyName="IsConfirmed"/>
-            </ComboBox>
 
-         </StackPanel>
 
-         <xctk:PropertyGrid x:Name="_propertyGrid" Width="350" MaxHeight="275" VerticalAlignment="Top"
-                         PropertyNameBinding="{Binding Name}"
-                         CategoryGroupDescription="{Binding SelectedItem, ElementName=categoryGroupCombo}"
-                         SelectedObjectName="Meeting" >
-            <xctk:PropertyGrid.Properties>
-               <!--Here we define the items to be displayed in the property grid (a list of Employees). -->
-               <v:Employee Name="Tom" IsConfirmed="True" Department="Sales"/>
-               <v:Employee Name="John" IsConfirmed="false" Department="Management"/>
-               <v:Representent Name="Brad" IsConfirmed="True" 
-                            Department="Sales"
-                            Details="On the phone"/>
-               <v:Employee Name="Kevin" IsConfirmed="false" Department="Management"/>
-               <v:Employee Name="Jane" IsConfirmed="True" Department="Management"/>
-               <v:Employee Name="Sean" IsConfirmed="True" Department="Sales"/>
-            </xctk:PropertyGrid.Properties>
 
-            <xctk:PropertyGrid.DefaultEditorDefinition>
-               <!-- This editor will be the default editor for items of the property grid. -->
-               <xctk:EditorCheckBoxDefinition Binding="{Binding IsConfirmed}"/>
-            </xctk:PropertyGrid.DefaultEditorDefinition>
 
-            <xctk:PropertyGrid.EditorDefinitions>
-               <!--
-            Define a specific editor for the Representent with a "details" field.
-            
-            Since no PropertyValueBinding is defined, the type of the item itself
-            will be used as a key to detect the possible defined editor.
-            -->
-               <xctk:EditorTemplateDefinition TargetProperties="{x:Type v:Representent}">
-                  <xctk:EditorTemplateDefinition.EditingTemplate>
-                     <DataTemplate >
-                        <StackPanel HorizontalAlignment="Stretch">
-                           <CheckBox IsChecked="{Binding IsConfirmed}" Margin="5,0,0,0" />
-                           <DockPanel HorizontalAlignment="Stretch">
-                              <TextBlock DockPanel.Dock="Left" Text="Details: " VerticalAlignment="Center"/>
-                              <TextBox Text="{Binding Details}" FontStyle="Italic" HorizontalAlignment="Stretch" />
-                           </DockPanel>
-                        </StackPanel>
-                     </DataTemplate>
-                  </xctk:EditorTemplateDefinition.EditingTemplate>
-               </xctk:EditorTemplateDefinition>
 
-            </xctk:PropertyGrid.EditorDefinitions>
-         </xctk:PropertyGrid>
-      </DockPanel>
-<!--##END-->
+
    </Grid>      
 </local:DemoView>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.cs.txt

@@ -37,7 +37,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 
       var selObject = new Person();
       selObject.Friend = new Person();
-      
+
       this.DataContext = selObject;
     }
 

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.txt

@@ -29,7 +29,7 @@
          <Bold>PreparePropertyItem</Bold> event to customize the display of the PropertyGrid content.
       </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.cs.txt

@@ -87,12 +87,10 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
         set;
       }
 
-      //# TODODOC
-      //# Those attribute will be overrien in xaml
       [Category( "Information" )]
       [DisplayName( "Favorite Color" )]
       [Description( "This property uses the ColorPicker as the default editor." )]
-      public System.Windows.Media.Color FavoriteColor
+      public System.Windows.Media.Color? FavoriteColor
       {
         get;
         set;

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.txt

@@ -26,26 +26,14 @@
            By default the propertyGrid will autogenerate all the properties for a given object.  You can override this behavior by setting the AutoGenerateProperties property to False, and then provide a collection of PropertyDefinitions of the properties you would like to show.
         </Paragraph>
     </local:DemoView.Description>
-    
+
    <Grid>      
       <xctk:PropertyGrid x:Name="_propertyGrid"
                          Width="450" 
                          MaxHeight="245"
                          Margin="10"
                          AutoGenerateProperties="False">
-         <!--##EXCLUDE_OPEN_SOURCE-->
-         <!-- //# TODODOC
-         The following categories DisplayOrder will be overriden -->
-         <xctk:PropertyGrid.CategoryDefinitions>
-            <xctk:CategoryDefinition Name="Information"
-                                     DisplayOrder="0" />
-            <xctk:CategoryDefinition Name="Connections"
-                                     DisplayOrder="2" />
-            <xctk:CategoryDefinition Name="Clothes"
-                                     DisplayOrder="1" />
-         </xctk:PropertyGrid.CategoryDefinitions>
-         <!--##END-->
-         
+
          <xctk:PropertyGrid.PropertyDefinitions>
             <!-- //# TODODOC 
                The following properties will be displayed in the PropertyGrid 
@@ -58,7 +46,7 @@
                                      IsExpandable="True"/>
             <!-- And all properties of type Boolean will be displayed in the PropertyGrid-->
             <xctk:PropertyDefinition TargetProperties="{x:Type s:Boolean}" DisplayOrder="1"/>
-            
+
             <!-- //# TODODOC
                This Property won't be displayed -->
              <xctk:PropertyDefinition TargetProperties="WritingHand" IsBrowsable="False"/>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.txt

@@ -15,29 +15,32 @@
   ************************************************************************************-->
 <local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridView"
                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"  
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
                 xmlns:s="clr-namespace:System;assembly=mscorlib"
                 VerticalScrollBarVisibility="Disabled"
                 Title="PropertyGrid">
-    <local:DemoView.Description>
-        <Paragraph FontSize="14" FontFamily="Segoe">
+   <local:DemoView.Description>
+      <Paragraph FontSize="14"
+                 FontFamily="Segoe">
          The PropertyGrid control allows you to view and edit the properties of a specific object instance, 
            or values from a list of custom objects. This PropertyGrid allows you to autogenerate all properties 
            or specify the specific properties you want to display. You can use the standard editors that are provided 
            with the PropertyGrid or you can use custom editors that target a type, specific properties, or both.  
            The PropertyGrid also supports complex properties, which allows you to drill down into a nested property hierarchy.
-        </Paragraph>
-    </local:DemoView.Description>
-    
+      </Paragraph>
+   </local:DemoView.Description>
+
    <Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto" />
-         <RowDefinition Height="*"/>
+         <RowDefinition Height="*" />
       </Grid.RowDefinitions>
 
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+      <GroupBox Header="Features"
+                Grid.Row="0"
+                Margin="5">
          <Grid Margin="5">
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto" />
@@ -52,53 +55,126 @@
                <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
 
-            <TextBlock Text="Show Sumary:" VerticalAlignment="Center" />
-            <CheckBox x:Name="_showSummary" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Shows/Hides the summary panel of the PropertyGrid." />
-
-            <TextBlock Text="Filter:" VerticalAlignment="Center" Grid.Row="1" />
-            <xctk:WatermarkTextBox x:Name="_filter" 
-                                   Grid.Row="1" 
+            <!-- 1st column-->
+            <TextBlock Text="Show Sumary:"
+                       VerticalAlignment="Center" />
+            <CheckBox Grid.Column="1"
+                      IsChecked="{Binding ShowSummary, ElementName=_propertyGrid}"
+                      VerticalAlignment="Center"
+                      Margin="5"
+                      ToolTip="Shows/Hides the summary panel of the PropertyGrid." />
+            <TextBlock Text="Filter:"
+                       VerticalAlignment="Center"
+                       Grid.Row="1" />
+            <xctk:WatermarkTextBox Grid.Row="1"
                                    Grid.Column="1"
                                    Width="175"
-                                   Watermark="Search" 
-                                   VerticalAlignment="Center" Margin="5" ToolTip="Filters the properties within the PropertyGrid." />
-
-            <TextBlock Text="Is Categorized:" VerticalAlignment="Center" Grid.Column="2" Margin="10,0,0,0"/>
-            <CheckBox x:Name="_isCategorized" Grid.Column="3" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Gets/Sets the layout of the PropertyGrid." />
-
-            <TextBlock Text="Show Advanced Options:" VerticalAlignment="Center" Grid.Row="1" Grid.Column="2"  Margin="10,0,0,0"/>
-            <CheckBox x:Name="_showAdvancedOptions" Grid.Row="1" Grid.Column="3" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Shows/Hides the advanced options menu next to a property." />
-            <TextBlock Text="IsReadOnly:" VerticalAlignment="Center" Grid.Row="2" Grid.Column="0" />
-            <CheckBox x:Name="_isReadOnly" Grid.Row="2" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5" ToolTip="Set the IsReadOnly property to true or false." />
-            <TextBlock Text="UpdateTextBoxSourceOnEnterKey:" VerticalAlignment="Center" Grid.Row="2" Grid.Column="2"  Margin="10,0,0,0"/>
-            <CheckBox x:Name="_updateTextBoxSourceOnEnterKey" Grid.Row="2" Grid.Column="3" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Update the source of a TextBox when True and Enter key is pressed." />
-            <TextBlock Text="ShowPreview:" VerticalAlignment="Center" Grid.Row="3" Grid.Column="0"/>
-            <CheckBox x:Name="_showPreview" Grid.Row="3" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Shows/Hides the selected object preview." />
+                                   Watermark="Search"
+                                   Text="{Binding Filter, ElementName=_propertyGrid}"
+                                   VerticalAlignment="Center"
+                                   Margin="5"
+                                   ToolTip="Filters the properties within the PropertyGrid." />
+            <TextBlock Text="IsReadOnly:"
+                       VerticalAlignment="Center"
+                       Grid.Row="2"
+                       Grid.Column="0" />
+            <CheckBox Grid.Row="2"
+                      Grid.Column="1"
+                      IsChecked="{Binding IsReadOnly, ElementName=_propertyGrid}"
+                      VerticalAlignment="Center"
+                      Margin="5"
+                      ToolTip="Set the IsReadOnly property to true or false." />
+            <TextBlock Text="ShowPreview:"
+                       VerticalAlignment="Center"
+                       Grid.Row="3"
+                       Grid.Column="0" />
+            <CheckBox Grid.Row="3"
+                      Grid.Column="1"
+                      IsChecked="{Binding ShowPreview, ElementName=_propertyGrid}"
+                      VerticalAlignment="Center"
+                      Margin="5"
+                      ToolTip="Shows/Hides the selected object preview." />
+
+            <!--2nd column-->
+            <TextBlock Text="Is Categorized:"
+                       VerticalAlignment="Center"
+                       Grid.Column="2"
+                       Margin="10,0,0,0" />
+            <CheckBox Grid.Column="3"
+                      IsChecked="{Binding IsCategorized, ElementName=_propertyGrid}"
+                      VerticalAlignment="Center"
+                      Margin="5"
+                      ToolTip="Gets/Sets the layout of the PropertyGrid." />
+            <TextBlock Text="Is Misc Category Label Hidden:"
+                       VerticalAlignment="Center"
+                       Grid.Row="1"
+                       Grid.Column="2"
+                       Margin="10,0,0,0" />
+            <CheckBox Grid.Row="1"
+                      Grid.Column="3"
+                      IsChecked="{Binding IsMiscCategoryLabelHidden, ElementName=_propertyGrid}"
+                      VerticalAlignment="Center"
+                      Margin="5"
+                      ToolTip="Gets/Sets is the Misc Category label should be hidden." />
+            <TextBlock Text="Show Advanced Options:"
+                       VerticalAlignment="Center"
+                       Grid.Row="2"
+                       Grid.Column="2"
+                       Margin="10,0,0,0" />
+            <CheckBox Grid.Row="2"
+                      Grid.Column="3"
+                      IsChecked="{Binding ShowAdvancedOptions, ElementName=_propertyGrid}"
+                      VerticalAlignment="Center"
+                      Margin="5"
+                      ToolTip="Shows/Hides the advanced options menu next to a property." />
+            <TextBlock Text="UpdateTextBoxSourceOnEnterKey:"
+                       VerticalAlignment="Center"
+                       Grid.Row="3"
+                       Grid.Column="2"
+                       Margin="10,0,0,0" />
+            <CheckBox Grid.Row="3"
+                      Grid.Column="3"
+                      IsChecked="{Binding UpdateTextBoxSourceOnEnterKey, ElementName=_propertyGrid}"
+                      VerticalAlignment="Center"
+                      Margin="5"
+                      ToolTip="Update the source of a TextBox when True and Enter key is pressed." />
+
+
+
          </Grid>
       </GroupBox>
 
-      <DockPanel Grid.Row="1" Margin="10">
-         
-         <TextBlock DockPanel.Dock="Top" Text="Usage:" Style="{StaticResource Header}" />
-         <TextBlock DockPanel.Dock="Top" 
+      <DockPanel Grid.Row="1"
+                 Margin="10">
+
+         <TextBlock DockPanel.Dock="Top"
+                    Text="Usage:"
+                    Style="{StaticResource Header}" />
+         <TextBlock DockPanel.Dock="Top"
                     Text="Edit the values in the PropertyGrid to see the effect on the button."
                     TextWrapping="Wrap" />
          <Grid Margin="10">
             <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="150"/>
+               <ColumnDefinition Width="150" />
                <ColumnDefinition MaxWidth="530" />
             </Grid.ColumnDefinitions>
-            <Button x:Name="_button" Height="100" Width="100" Margin="20" HorizontalAlignment="Center" VerticalAlignment="Center">Button</Button>
-            
+            <Button x:Name="_button"
+                    Height="100"
+                    Width="100"
+                    Margin="20"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center">Button</Button>
+
             <xctk:PropertyGrid Grid.Column="1"
                                x:Name="_propertyGrid"
-                               ShowSummary="{Binding IsChecked, ElementName=_showSummary}"
-                               Filter="{Binding Text, ElementName=_filter, Mode=TwoWay}"
-                               IsCategorized="{Binding IsChecked, ElementName=_isCategorized, Mode=TwoWay}"
-                               ShowAdvancedOptions="{Binding IsChecked, ElementName=_showAdvancedOptions}" 
-                               IsReadOnly="{Binding IsChecked, ElementName=_isReadOnly}"
-                               UpdateTextBoxSourceOnEnterKey="{Binding IsChecked, ElementName=_updateTextBoxSourceOnEnterKey}"
-                               ShowPreview="{Binding IsChecked, ElementName=_showPreview}"
+                               ShowSummary="True"
+                               Filter=""
+                               IsCategorized="True"
+                               ShowAdvancedOptions="True"
+                               IsReadOnly="False"
+                               UpdateTextBoxSourceOnEnterKey="True"
+                               IsMiscCategoryLabelHidden="False"
+                               ShowPreview="True"
                                SelectedObject="{Binding ElementName=_button}">
             </xctk:PropertyGrid>
          </Grid>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.cs.txt

@@ -32,32 +32,9 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Gauge.Views
       InitializeComponent();
     }
 
-#if !OPEN_SOURCE
-    private void BackgroundPortionsButton_Click( object sender, RoutedEventArgs e )
-    {
-      CollectionControlDialog diag = new CollectionControlDialog();
-      diag.ItemsSource = _gauge.BGPortions;
-      diag.NewItemTypes = new List<System.Type>() { typeof( GaugePortion ) };
-      diag.ShowDialog();
-    }
 
-    private void BorderPortionsButton_Click( object sender, RoutedEventArgs e )
-    {
-      CollectionControlDialog diag = new CollectionControlDialog();
-      diag.ItemsSource = _gauge.BorderPortions;
-      diag.NewItemTypes = new List<System.Type>() { typeof( BorderGaugePortion ) };
 
-      diag.ShowDialog();
-    }
 
-    private void MarkersButton_Click( object sender, RoutedEventArgs e )
-    {
-      CollectionControlDialog diag = new CollectionControlDialog();
-      diag.ItemsSource = _gauge.Markers;
-      diag.NewItemTypes = new List<System.Type>() { typeof( Marker ) };
 
-      diag.ShowDialog();
-    }
-#endif
   }
 }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.txt

@@ -425,7 +425,6 @@
    </local:DemoView.Resources>
 
    <local:DemoView.Description>
-      <!-- //#TODODOC -->
       <Paragraph FontSize="14"
                  FontFamily="Segoe">
          The RangeSlider control lets you set a range with 2 slider thumbs. The lower limit is marked with the right side of the left thumb while the higher limit is marked with the left side of the right thumb.
@@ -694,4 +693,4 @@
          </xctk:RangeSlider>
       </StackPanel>
    </Grid>
-</local:DemoView>
+</local:DemoView>