diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-04-27 18:35:17 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-04-27 18:35:17 +0200 |
| commit | 737ff8b9f3cb72220bce50a44013a5aedd58efd1 (patch) | |
| tree | 08cf9ffd8779c1ba4a97b499975041c413f5ac03 /Software/Visual_Studio/Utilities/Tango.UITests | |
| parent | a4fe52cb35c01fa02b7b69ae0e5efd7194c06e43 (diff) | |
| download | Tango-737ff8b9f3cb72220bce50a44013a5aedd58efd1.tar.gz Tango-737ff8b9f3cb72220bce50a44013a5aedd58efd1.zip | |
Added ColorPicker Slider control and CoorPickerNumericUpDown control. Preliminary edition version.
Related Work Items: #2746
Diffstat (limited to 'Software/Visual_Studio/Utilities/Tango.UITests')
| -rw-r--r-- | Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml | 6 | ||||
| -rw-r--r-- | Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml b/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml index 13e741d8e..c4462d736 100644 --- a/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml +++ b/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml @@ -4,16 +4,18 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI" + xmlns:colorpic="clr-namespace:Tango.ColorPickers;assembly=Tango.ColorPickers" mc:Ignorable="d" Title="MainWindow" Height="700" Width="800" DataContext="{Binding RelativeSource={RelativeSource Self}}" > <Grid> <Border> - <controls:MultiSelectComboBox Width="250" Height="60" Background="White" Foreground="Black" + <!--<controls:MultiSelectComboBox Width="250" Height="60" Background="White" Foreground="Black" x:Name="MSCombobox" BorderBrush="Gainsboro" BorderThickness="0.8" Items="{Binding Items}" - SelectedItemsList ="{Binding SelectedItems}"/> + SelectedItemsList ="{Binding SelectedItems}"/>--> + <colorpic:ColorPickerControl Width="300" Height="80" Background="White" Foreground="Black" BorderBrush="LightGray" BorderThickness="0.8"/> </Border> </Grid> </Window> diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj b/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj index 9ac2e3105..cd5aaf983 100644 --- a/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj +++ b/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj @@ -144,6 +144,10 @@ <Project>{F441FEEE-322A-4943-B566-110E12FD3B72}</Project> <Name>Tango.BL</Name> </ProjectReference> + <ProjectReference Include="..\..\Tango.ColorPickers\Tango.ColorPickers.csproj"> + <Project>{f9df9435-a4f3-43c5-a6cd-aad6689b42ae}</Project> + <Name>Tango.ColorPickers</Name> + </ProjectReference> <ProjectReference Include="..\..\Tango.Core\Tango.Core.csproj"> <Project>{A34EE0F0-649D-41C8-8489-B6F1CC6924EE}</Project> <Name>Tango.Core</Name> @@ -184,7 +188,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file |