Removed all x:Name attributes from all XamlDisplayerPanel

wongjiahau · wongjiahau · commit 3291c19d669b · 2017-08-13T22:35:16.000+08:00
- because they are not needed anymore
diff --git a/MainDemo.Wpf/Buttons.xaml b/MainDemo.Wpf/Buttons.xaml
@@ -26,7 +26,7 @@
             <materialDesignConverters:BooleanToVisibilityConverter x:Key="InvertedBooleanToVisibilityConverter" TrueValue="Collapsed" FalseValue="Visible" />
         </ResourceDictionary>
     </UserControl.Resources>
-    <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel"  >
+    <codeDisplayer:XamlDisplayerPanel   >
 
 
         <Button Style="{StaticResource MaterialDesignRaisedLightButton}" Width="100"
diff --git a/MainDemo.Wpf/Cards.xaml b/MainDemo.Wpf/Cards.xaml
@@ -18,7 +18,7 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel">
+    <codeDisplayer:XamlDisplayerPanel >
         <materialDesign:Card Margin="4 4 0 0" Width="200">
             <Grid>
                 <Grid.RowDefinitions>
diff --git a/MainDemo.Wpf/Chips.xaml b/MainDemo.Wpf/Chips.xaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <ScrollViewer>
-        <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel" Margin="32">
+        <codeDisplayer:XamlDisplayerPanel  Margin="32">
             <TextBlock Style="{StaticResource MaterialDesignTitleTextBlock}">Chips</TextBlock>
             <materialDesign:Chip Content="James Willock" Margin="0 0 6 4">
                 <materialDesign:Chip.Icon>
diff --git a/MainDemo.Wpf/ColorZones.xaml b/MainDemo.Wpf/ColorZones.xaml
@@ -8,7 +8,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="800" d:DesignWidth="600">
     <ScrollViewer>
-        <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel">
+        <codeDisplayer:XamlDisplayerPanel >
             <StackPanel Margin="16">
                 <TextBlock FontSize="16">Colour Zones</TextBlock>
                 <TextBlock TextWrapping="Wrap" MaxWidth="200" Margin="0 16 0 0">The ColorZone control allows you to  easily define striking blocks of colour to give your application extra clarity and style, whilst still remaining within the bounds of your Material Design palette.</TextBlock>
diff --git a/MainDemo.Wpf/Dialogs.xaml b/MainDemo.Wpf/Dialogs.xaml
@@ -17,7 +17,7 @@
     </UserControl.Resources>
 
     <ScrollViewer HorizontalScrollBarVisibility="Auto" >
-        <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel">
+        <codeDisplayer:XamlDisplayerPanel >
             <TextBlock TextWrapping="Wrap" MaxWidth="300" Margin="32">Dialogs are supported via the DialogHost control which was designed to work with MVVM/binding, code-behind, routed commands, and a pure code-based API.</TextBlock>
             <TextBlock TextWrapping="Wrap" MaxWidth="300" HorizontalAlignment="Center" VerticalAlignment="Top"
                            Margin="8 0 8 0"
diff --git a/MainDemo.Wpf/Drawers.xaml b/MainDemo.Wpf/Drawers.xaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <ScrollViewer>
-        <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel">
+        <codeDisplayer:XamlDisplayerPanel >
             <materialDesign:DrawerHost Margin="64" HorizontalAlignment="Center" VerticalAlignment="Center" BorderThickness="2" BorderBrush="{DynamicResource MaterialDesignDivider}">
                 <materialDesign:DrawerHost.LeftDrawerContent>
                     <StackPanel Margin="16">
diff --git a/MainDemo.Wpf/Expander.xaml b/MainDemo.Wpf/Expander.xaml
@@ -14,7 +14,7 @@
         </Style>
     </UserControl.Resources>
     <ScrollViewer>
-        <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel">
+        <codeDisplayer:XamlDisplayerPanel >
             <StackPanel>
                 <Expander HorizontalAlignment="Stretch"
                       Header="Expander Example 1a">
diff --git a/MainDemo.Wpf/Grids.xaml b/MainDemo.Wpf/Grids.xaml
@@ -15,7 +15,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <ScrollViewer>
-        <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel">
+        <codeDisplayer:XamlDisplayerPanel >
             <TextBlock Style="{StaticResource MaterialDesignTitleTextBlock}">Custom Columns</TextBlock>
             <DataGrid Margin="0 8 0 0" ItemsSource="{Binding Items3}" CanUserSortColumns="True" CanUserAddRows="False" AutoGenerateColumns="False"
                       materialDesign:DataGridAssist.CellPadding="13 8 8 8" materialDesign:DataGridAssist.ColumnHeaderPadding="8">
diff --git a/MainDemo.Wpf/GroupBoxes.xaml b/MainDemo.Wpf/GroupBoxes.xaml
@@ -18,7 +18,7 @@
 
     </UserControl.Resources>
     <ScrollViewer>
-        <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel">
+        <codeDisplayer:XamlDisplayerPanel >
             <GroupBox Width="200" Height="100" Header="Default Look" Margin="16">
                 <TextBlock>My Content</TextBlock>
             </GroupBox>
diff --git a/MainDemo.Wpf/Lists.xaml b/MainDemo.Wpf/Lists.xaml
@@ -15,7 +15,7 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel" Margin="8" >
+    <codeDisplayer:XamlDisplayerPanel  Margin="8" >
         <TextBlock Style="{StaticResource MaterialDesignTitleTextBlock}">ListBox</TextBlock>
         <ListBox  IsEnabled="{Binding IsChecked, ElementName=EnableListBox}">
             <TextBlock>Plain</TextBlock>
diff --git a/MainDemo.Wpf/MenusAndToolBars.xaml b/MainDemo.Wpf/MenusAndToolBars.xaml
@@ -8,7 +8,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <ScrollViewer>
-        <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel">
+        <codeDisplayer:XamlDisplayerPanel >
             <Menu IsMainMenu="True">
                 <MenuItem Header="_File">
                     <MenuItem Header="Save">
diff --git a/MainDemo.Wpf/Pickers.xaml b/MainDemo.Wpf/Pickers.xaml
@@ -10,7 +10,7 @@
              d:DesignHeight="300" d:DesignWidth="300">
     <AdornerDecorator>
         <ScrollViewer>
-            <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel">
+            <codeDisplayer:XamlDisplayerPanel >
                 <TextBlock >Classic WPF DatePicker control with Material Design theme, and new TimePicker control:</TextBlock>
                 <DatePicker Width="100" HorizontalAlignment="Left" Margin="0 16 0 0" materialDesign:HintAssist.Hint="Pick Date" Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
                 <DatePicker x:Name="FutureDatePicker" Width="100" HorizontalAlignment="Left" Margin="0 16 0 0" 
diff --git a/MainDemo.Wpf/Progress.xaml b/MainDemo.Wpf/Progress.xaml
@@ -17,7 +17,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <ScrollViewer>
-        <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel">
+        <codeDisplayer:XamlDisplayerPanel >
             <ProgressBar Orientation="Vertical" Width="200" Height="10" Value="25"   />
             <ProgressBar Orientation="Vertical"  Width="200" Height="10" IsIndeterminate="True"    />
             <ProgressBar Value="25"   Width="200" Height="10" />
diff --git a/MainDemo.Wpf/Shadows.xaml b/MainDemo.Wpf/Shadows.xaml
@@ -8,7 +8,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <ScrollViewer>
-        <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel" >
+        <codeDisplayer:XamlDisplayerPanel  >
             <TextBlock>Raised controls have default shadows set, but the shadows can be overriden.</TextBlock>
             <Button Style="{DynamicResource MaterialDesignRaisedButton}"                    
                     >DEPTH 1</Button>
diff --git a/MainDemo.Wpf/Sliders.xaml b/MainDemo.Wpf/Sliders.xaml
@@ -16,7 +16,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <ScrollViewer>
-        <codeDisplayer:XamlDisplayerPanel DisplayMode="LeftRight" IsCodeDisplayed="{Binding Path=IsChecked, ElementName=ToggleButton}" x:Name="XamlDisplayerPanel" VerticalAlignment="Center">
+        <codeDisplayer:XamlDisplayerPanel DisplayMode="LeftRight" IsCodeDisplayed="{Binding Path=IsChecked, ElementName=ToggleButton}"  VerticalAlignment="Center">
             <Slider TickFrequency="5" Width="150" Orientation="Horizontal" Minimum="1" Maximum="50" Value="25" />
             <Slider TickFrequency="5" TickPlacement="BottomRight" Height="50" Orientation="Vertical" Minimum="1" Maximum="50" />
             <Slider TickFrequency="25"  Height="150" TickPlacement="TopLeft" Orientation="Vertical" Minimum="1" Maximum="50" IsEnabled="False" Margin="24 8 0 8" />
diff --git a/MainDemo.Wpf/Sliders.xaml.cs b/MainDemo.Wpf/Sliders.xaml.cs
@@ -3,9 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
@@ -14,7 +12,6 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Xml;
-using CodeDisplayer;
 
 namespace MaterialDesignColors.WpfExample
 {
@@ -27,15 +24,5 @@ public Sliders()
         {
             InitializeComponent();          
         }
-
-        private void ButtonBase_OnClick(object sender, RoutedEventArgs e) {
-            var b = sender as ToggleButton;
-            if (b.IsChecked.Value) {
-                XamlDisplayerPanel.DisplayMode = XamlDisplayer.DisplayModeEnum.LeftRight;
-            }
-            else {
-                XamlDisplayerPanel.DisplayMode = XamlDisplayer.DisplayModeEnum.TopBottom;
-            }
-        }
     }
 }
diff --git a/MainDemo.Wpf/Snackbars.xaml b/MainDemo.Wpf/Snackbars.xaml
@@ -10,7 +10,7 @@
              d:DesignHeight="300" d:DesignWidth="300">
     
     <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden">
-        <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel" Margin="0 0 0 4">
+        <codeDisplayer:XamlDisplayerPanel  Margin="0 0 0 4">
             <Border Background="{DynamicResource MaterialDesignSelection}" 
                     Padding="8 0 8 0">
                 <Grid Height="200">
diff --git a/MainDemo.Wpf/TextFields.xaml b/MainDemo.Wpf/TextFields.xaml
@@ -39,7 +39,7 @@
             </Style>
         </ResourceDictionary>
     </UserControl.Resources>
-    <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel">
+    <codeDisplayer:XamlDisplayerPanel >
         <TextBox  x:Name="NameTextBox"
 					materialDesign:HintAssist.Hint="Name">
             <TextBox.Text>
diff --git a/MainDemo.Wpf/TransitionsDemo/TransitionsDemoHome.xaml b/MainDemo.Wpf/TransitionsDemo/TransitionsDemoHome.xaml
@@ -16,7 +16,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <ScrollViewer>
-        <codeDisplayer:XamlDisplayerPanel MaxWidth="800" x:Name="XamlDisplayerPanel" DisplayMode="TopBottom">
+        <codeDisplayer:XamlDisplayerPanel MaxWidth="800"  DisplayMode="TopBottom">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
diff --git a/MainDemo.Wpf/Trees.xaml b/MainDemo.Wpf/Trees.xaml
@@ -16,7 +16,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <ScrollViewer>
-        <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel">
+        <codeDisplayer:XamlDisplayerPanel >
             <TreeView Grid.Column="0"
                   MinWidth="220">
                 <TreeViewItem Header="Fruit">
diff --git a/MainDemo.Wpf/Typography.xaml b/MainDemo.Wpf/Typography.xaml
@@ -11,7 +11,7 @@
             <Setter Property="Opacity" Value=".68"></Setter>
         </Style>
     </UserControl.Resources>
-    <codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel"  Margin="32">
+    <codeDisplayer:XamlDisplayerPanel   Margin="32">
         <TextBlock  Style="{StaticResource MaterialDesignDisplay4TextBlock}" Margin="0 4 0 4">Light 112sp</TextBlock>
         <TextBlock  Style="{StaticResource MaterialDesignDisplay4TextBlock}" Margin="0 4 0 4"><Hyperlink IsEnabled="False">(Disabled)</Hyperlink></TextBlock>
 
