Skip to content

Commit

Permalink
Move inspector templates into UserControls
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aurumaker72
Aurumaker72 committed Oct 3, 2023
1 parent 02c7675 commit fde0884
Show file tree
Hide file tree
Showing 14 changed files with 248 additions and 114 deletions.
121 changes: 12 additions & 109 deletions RsrcArchitect.Views.WPF/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
xmlns:wpf="clr-namespace:RsrcArchitect.Views.WPF"
xmlns:viewModels="clr-namespace:RsrcArchitect.ViewModels;assembly=RsrcArchitect.ViewModels"
xmlns:userControls="clr-namespace:RsrcArchitect.Views.WPF.UserControls"
xmlns:controls1="clr-namespace:RsrcArchitect.Views.WPF.UserControls.Controls"
mc:Ignorable="d"
x:Name="Window"
Title="RsrcArchitect" Height="450" Width="800"
Expand Down Expand Up @@ -111,7 +112,8 @@
<Setter Property="Content">
<Setter.Value>
<StackPanel Orientation="Vertical">
<userControls:ControlInspector DataContext="{Binding SelectedControlViewModel}"/>
<userControls:ControlInspector
DataContext="{Binding SelectedControlViewModel}" />
</StackPanel>
</Setter.Value>
</Setter>
Expand Down Expand Up @@ -161,7 +163,7 @@
VerticalAlignment="Center"
HorizontalAlignment="Center" />
<TextBox Grid.Row="0" Grid.Column="1"
Text="{Binding DialogViewModel.Identifier, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
Text="{Binding DialogViewModel.Identifier, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

<TextBlock Grid.Row="1" Grid.Column="0"
Text="Caption"
Expand Down Expand Up @@ -193,126 +195,27 @@
<ContentControl.Resources>

<DataTemplate DataType="{x:Type controls:ButtonViewModel}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>


<TextBlock Grid.Row="0" Grid.Column="0" Text="Caption"
VerticalAlignment="Center" HorizontalAlignment="Left" />
<TextBox Grid.Row="0" Grid.Column="1"
Text="{Binding Caption, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

</Grid>
<controls1:ButtonInspector />
</DataTemplate>


<DataTemplate DataType="{x:Type controls:CheckBoxViewModel}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>


<TextBlock Grid.Row="0" Grid.Column="0" Text="Caption"
VerticalAlignment="Center" HorizontalAlignment="Left" />
<TextBox Grid.Row="0" Grid.Column="1"
Text="{Binding Caption, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>

</Grid>
<controls1:CheckBoxInspector />
</DataTemplate>

<DataTemplate DataType="{x:Type controls:GroupBoxViewModel}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>


<TextBlock Grid.Row="0" Grid.Column="0" Text="Caption"
VerticalAlignment="Center" HorizontalAlignment="Left" />
<TextBox Grid.Row="0" Grid.Column="1"
Text="{Binding Caption, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

</Grid>
<controls1:GroupBoxInspector />
</DataTemplate>

<DataTemplate DataType="{x:Type controls:TextBoxViewModel}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>


<TextBlock Grid.Row="0" Grid.Column="0" Text="Is Writable"
VerticalAlignment="Center" HorizontalAlignment="Left" />
<TextBox Grid.Row="0" Grid.Column="1"
Text="{Binding IsWritable, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
<TextBlock Grid.Row="1" Grid.Column="0"
Text="Allows Horizontal Scrolling"
VerticalAlignment="Center" HorizontalAlignment="Left" />
<TextBox Grid.Row="1" Grid.Column="1"
Text="{Binding AllowHorizontalScroll, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

</Grid>
<controls1:TextBoxInspector />
</DataTemplate>



<DataTemplate DataType="{x:Type controls:ComboBoxViewModel}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>


<TextBlock Grid.Row="0" Grid.Column="0" Text="Is Sorted"
VerticalAlignment="Center" HorizontalAlignment="Left" />
<TextBox Grid.Row="0" Grid.Column="1"
Text="{Binding IsSorted, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>

</Grid>
<controls1:ComboBoxInspector />
</DataTemplate>



<DataTemplate DataType="{x:Type controls:LabelViewModel}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>


<TextBlock Grid.Row="0" Grid.Column="0" Text="Caption"
VerticalAlignment="Center" HorizontalAlignment="Left" />
<TextBox Grid.Row="0" Grid.Column="1"
Text="{Binding Caption, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

</Grid>
<controls1:LabelInspector />
</DataTemplate>

</ContentControl.Resources>
Expand Down
6 changes: 1 addition & 5 deletions RsrcArchitect.Views.WPF/UserControls/ControlInspector.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,10 @@
</Grid.RowDefinitions>

<CheckBox Grid.Row="0" Grid.Column="0"
Grid.ColumnSpan="2"
IsChecked="{Binding IsEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Content="Enabled" />

<TextBlock Grid.Row="1" Grid.Column="0"
Text="Identifier" VerticalAlignment="Center"
HorizontalAlignment="Left" />
<TextBox Grid.Row="1" Grid.Column="1"
<TextBox Grid.Row="0" Grid.Column="1"
Text="{Binding Identifier, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

<TextBlock Grid.Row="2" Grid.Column="0" Text="X"
Expand Down
27 changes: 27 additions & 0 deletions RsrcArchitect.Views.WPF/UserControls/Controls/ButtonInspector.xaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<UserControl x:Class="RsrcArchitect.Views.WPF.UserControls.Controls.ButtonInspector"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:RsrcArchitect.Views.WPF.UserControls.Controls"
xmlns:controls="clr-namespace:RsrcArchitect.ViewModels.Controls;assembly=RsrcArchitect.ViewModels"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance controls:ButtonViewModel}"
d:DesignHeight="300" d:DesignWidth="300">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>


<TextBlock Grid.Row="0" Grid.Column="0" Text="Caption"
VerticalAlignment="Center" HorizontalAlignment="Left" />
<TextBox Grid.Row="0" Grid.Column="1"
Text="{Binding Caption, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

</Grid>
</UserControl>
12 changes: 12 additions & 0 deletions RsrcArchitect.Views.WPF/UserControls/Controls/ButtonInspector.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System.Windows;
using System.Windows.Controls;

namespace RsrcArchitect.Views.WPF.UserControls.Controls;

public partial class ButtonInspector : UserControl
{
public ButtonInspector()
{
InitializeComponent();
}
}
27 changes: 27 additions & 0 deletions RsrcArchitect.Views.WPF/UserControls/Controls/CheckBoxInspector.xaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<UserControl x:Class="RsrcArchitect.Views.WPF.UserControls.Controls.CheckBoxInspector"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:RsrcArchitect.Views.WPF.UserControls.Controls"
xmlns:controls="clr-namespace:RsrcArchitect.ViewModels.Controls;assembly=RsrcArchitect.ViewModels"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance controls:CheckBoxViewModel}"
d:DesignHeight="300" d:DesignWidth="300">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>


<TextBlock Grid.Row="0" Grid.Column="0" Text="Caption"
VerticalAlignment="Center" HorizontalAlignment="Left" />
<TextBox Grid.Row="0" Grid.Column="1"
Text="{Binding Caption, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>

</Grid>
</UserControl>
11 changes: 11 additions & 0 deletions RsrcArchitect.Views.WPF/UserControls/Controls/CheckBoxInspector.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System.Windows.Controls;

namespace RsrcArchitect.Views.WPF.UserControls.Controls;

public partial class CheckBoxInspector : UserControl
{
public CheckBoxInspector()
{
InitializeComponent();
}
}
27 changes: 27 additions & 0 deletions RsrcArchitect.Views.WPF/UserControls/Controls/ComboBoxInspector.xaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<UserControl x:Class="RsrcArchitect.Views.WPF.UserControls.Controls.ComboBoxInspector"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:RsrcArchitect.Views.WPF.UserControls.Controls"
xmlns:controls="clr-namespace:RsrcArchitect.ViewModels.Controls;assembly=RsrcArchitect.ViewModels"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance controls:ComboBoxViewModel}"
d:DesignHeight="300" d:DesignWidth="300">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>


<TextBlock Grid.Row="0" Grid.Column="0" Text="Is Sorted"
VerticalAlignment="Center" HorizontalAlignment="Left" />
<TextBox Grid.Row="0" Grid.Column="1"
Text="{Binding IsSorted, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>

</Grid>
</UserControl>
11 changes: 11 additions & 0 deletions RsrcArchitect.Views.WPF/UserControls/Controls/ComboBoxInspector.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System.Windows.Controls;

namespace RsrcArchitect.Views.WPF.UserControls.Controls;

public partial class ComboBoxInspector : UserControl
{
public ComboBoxInspector()
{
InitializeComponent();
}
}
27 changes: 27 additions & 0 deletions RsrcArchitect.Views.WPF/UserControls/Controls/GroupBoxInspector.xaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<UserControl x:Class="RsrcArchitect.Views.WPF.UserControls.Controls.GroupBoxInspector"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:RsrcArchitect.Views.WPF.UserControls.Controls"
xmlns:controls="clr-namespace:RsrcArchitect.ViewModels.Controls;assembly=RsrcArchitect.ViewModels"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance controls:GroupBoxViewModel}"
d:DesignHeight="300" d:DesignWidth="300">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>


<TextBlock Grid.Row="0" Grid.Column="0" Text="Caption"
VerticalAlignment="Center" HorizontalAlignment="Left" />
<TextBox Grid.Row="0" Grid.Column="1"
Text="{Binding Caption, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

</Grid>
</UserControl>
11 changes: 11 additions & 0 deletions RsrcArchitect.Views.WPF/UserControls/Controls/GroupBoxInspector.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System.Windows.Controls;

namespace RsrcArchitect.Views.WPF.UserControls.Controls;

public partial class GroupBoxInspector : UserControl
{
public GroupBoxInspector()
{
InitializeComponent();
}
}
27 changes: 27 additions & 0 deletions RsrcArchitect.Views.WPF/UserControls/Controls/LabelInspector.xaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<UserControl x:Class="RsrcArchitect.Views.WPF.UserControls.Controls.LabelInspector"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:RsrcArchitect.Views.WPF.UserControls.Controls"
xmlns:controls="clr-namespace:RsrcArchitect.ViewModels.Controls;assembly=RsrcArchitect.ViewModels"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance controls:LabelViewModel}"
d:DesignHeight="300" d:DesignWidth="300">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>


<TextBlock Grid.Row="0" Grid.Column="0" Text="Caption"
VerticalAlignment="Center" HorizontalAlignment="Left" />
<TextBox Grid.Row="0" Grid.Column="1"
Text="{Binding Caption, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

</Grid>
</UserControl>
Loading

0 comments on commit fde0884

Please sign in to comment.