Use concrete views instead of content presenters.

Author: chkr1011

Source/Pages/Connection/ConnectionOptionsView.axaml

@@ -215,8 +215,8 @@
 
             <Expander Header="User Properties"
                       Margin="0,10,0,0">
-                <ContentPresenter Margin="-6"
-                                  Content="{Binding SessionOptions.UserProperties}" />
+                <controls:UserPropertiesView Margin="-6"
+                                  DataContext="{Binding SessionOptions.UserProperties}" />
             </Expander>
         </StackPanel>
     </ScrollViewer>

Source/Pages/Publish/PublishItemView.axaml

@@ -107,9 +107,9 @@
                                    Grid.Column="0"
                                    Grid.Row="0"
                                    Content="Quality of service (QoS) level" />
-                            <ContentPresenter Grid.Column="1"
+                            <controls:QualityOfServiceLevelSelectorView Grid.Column="1"
                                               Grid.Row="0"
-                                              Content="{Binding QualityOfServiceLevel}" />
+                                              DataContext="{Binding QualityOfServiceLevel}" />
                             <!-- Retain -->
                             <Label Classes="caption"
                                    Grid.Column="0"

Source/Pages/Publish/PublishPageView.axaml

@@ -64,9 +64,9 @@
                           Width="1" />
 
             <!-- The selected item. -->
-            <ContentPresenter Margin="10"
+            <publish:PublishItemView Margin="10"
                               Grid.Column="2"
-                              Content="{Binding ElementName=PART_Items, Path=SelectedItem}" />
+                              DataContext="{Binding ElementName=PART_Items, Path=SelectedItem}" />
         </Grid>
 
     </controls:Overlay>

Source/Pages/Subscriptions/SubscriptionItemView.axaml

@@ -67,7 +67,7 @@
                        Grid.Column="0"
                        Grid.Row="0"
                        Content="Quality of Service level (QoS)" />
-                <ContentPresenter Content="{Binding QualityOfServiceLevel}"
+                <controls:QualityOfServiceLevelSelectorView DataContext="{Binding QualityOfServiceLevel}"
                                   Grid.Column="1"
                                   Grid.Row="0" />
 
@@ -91,18 +91,18 @@
                 <Label Grid.Row="3"
                        Grid.Column="0"
                        Classes="caption">Retain handling</Label>
-                <ContentPresenter Grid.Row="3"
+                <controls:RetainHandlingSelectorView Grid.Row="3"
                                   Grid.Column="1"
-                                  Content="{Binding RetainHandling}" />
+                                  DataContext="{Binding RetainHandling}" />
 
                 <!-- User properties -->
                 <Label Grid.Row="4"
                        Grid.Column="0"
                        Classes="caption">User Properties</Label>
-                <ContentPresenter Grid.Row="5"
+                <controls:UserPropertiesView Grid.Row="5"
                                   Grid.Column="0"
                                   Grid.ColumnSpan="2"
-                                  Content="{Binding UserProperties}" />
+                                  DataContext="{Binding UserProperties}" />
             </Grid>
         </Grid>
 
@@ -146,7 +146,7 @@
                 </TabItem>
                 <!-- The user properties -->
                 <TabItem Header="User properties">
-                    <ContentPresenter Content="{Binding Response.UserProperties}" />
+                    <controls:UserPropertiesView DataContext="{Binding Response.UserProperties}" />
                 </TabItem>
             </TabControl>
         </controls:GroupBox>

Source/Pages/Subscriptions/SubscriptionsPageView.axaml

@@ -58,9 +58,9 @@
                       Width="1" />
 
         <!-- The selected item. -->
-        <ContentPresenter Margin="10"
+        <subscriptions:SubscriptionItemView Margin="10"
                           Grid.Column="2"
-                          Content="{Binding ElementName=PART_Items, Path=SelectedItem}" />
+                          DataContext="{Binding ElementName=PART_Items, Path=SelectedItem}" />
     </Grid>
 
 </UserControl>