From 471a285bde55ce048485361543458d281b931424 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Sun, 31 Mar 2019 16:39:56 +0300
Subject: Added new Images to AddNewControl and to ToolBar

---
 .../Tango.Scripting.IDE/Dialogs/AddNewControl.xaml           | 12 +++++++-----
 .../Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml        |  2 +-
 .../Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml.cs     | 10 ++++++++++
 .../Tango.Scripting.IDE/Dialogs/NewProjectDialogVM.cs        |  3 +++
 4 files changed, 21 insertions(+), 6 deletions(-)

(limited to 'Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs')

diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/AddNewControl.xaml b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/AddNewControl.xaml
index e5857e5a5..e49925dad 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/AddNewControl.xaml
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/AddNewControl.xaml
@@ -26,6 +26,7 @@
             <Style TargetType="Label">
                 <Setter Property="Foreground" Value="{DynamicResource ControlTextBrush}" />
             </Style>
+            <BooleanToVisibilityConverter x:Key="BoolToVis" />
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid Background="{DynamicResource Window.Background}">
@@ -115,13 +116,14 @@
 
                 <TextBlock Grid.Column="0" Grid.Row="0">Name:</TextBlock>
                 <TextBox Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" Text="{Binding ProjectName}"/>
-                <TextBlock Grid.Column="0" Grid.Row="2" >Location</TextBlock>
-                <Border Background="{DynamicResource ListBorder}" Grid.Column="1" Grid.Row="2" Margin="0,2,0,2" BorderBrush="{DynamicResource Button.Static.Border}">
+
+                <TextBlock Grid.Column="0" Grid.Row="2" Visibility="{Binding Path=IsNewSolutionDialog, Converter={StaticResource BoolToVis}}" Text="Location"/>
+                <Border Background="{DynamicResource ListBorder}" Grid.Column="1" Grid.Row="2" Margin="0,2,0,2" BorderBrush="{DynamicResource Button.Static.Border}" Visibility="{Binding Path=IsNewSolutionDialog, Converter={StaticResource BoolToVis}}">
                     <ComboBox Style="{DynamicResource TangoComboboxStyle}"  VerticalAlignment="Stretch" SelectedItem="{Binding ProjectLocation}" ItemsSource="{Binding Locations}" HorizontalAlignment="Stretch"  BorderBrush="Transparent"/>
                 </Border>
-                <Button Style="{DynamicResource TangoButtonStyle}" Grid.Column="2" Grid.Row="2" Width="80" HorizontalAlignment="Left" Margin="20,0,0,0"> Browse...</Button>
-                <TextBlock Grid.Column="0" Grid.Row="4" >Solution name:</TextBlock>
-                <TextBox Grid.Column="1" Grid.Row="4" VerticalAlignment="Center" Text="{Binding SolutionName}"/>
+                <Button Style="{DynamicResource TangoButtonStyle}" Grid.Column="2" Grid.Row="2" Width="80" HorizontalAlignment="Left" Margin="20,0,0,0" Visibility="{Binding Path=IsNewSolutionDialog, Converter={StaticResource BoolToVis}}" Content="Browse..."/>
+                <TextBlock Grid.Column="0" Grid.Row="4" Visibility="{Binding Path=IsNewSolutionDialog, Converter={StaticResource BoolToVis}}" Text="Solution name:"/>
+                <TextBox Grid.Column="1" Grid.Row="4" VerticalAlignment="Center" Text="{Binding SolutionName}" Visibility="{Binding Path=IsNewSolutionDialog, Converter={StaticResource BoolToVis}}"/>
 
             </Grid>
         </Border>
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml
index 9fa8422c9..914740ede 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml
@@ -24,7 +24,7 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="40"/>
         </Grid.RowDefinitions>
-        <local:AddNewControl Grid.Row="0" Margin="10,10,10,0"/>
+        <local:AddNewControl x:Name="AddNewControl" Grid.Row="0" Margin="10,10,10,0"/>
         <Border Grid.Row="1">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" >
                 <Button Style="{DynamicResource TangoButtonStyle}" Click="OKDialog" IsDefault="True" Width="80" Height="24">OK</Button>
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml.cs b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml.cs
index f3e05e35f..24c9511e7 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml.cs
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml.cs
@@ -32,8 +32,18 @@ namespace Tango.Scripting.IDE.Dialogs
 
             InitializeComponent();
             Title = bNewProject ? _sAddNewProjectTitle : _sNewProjectTitle;
+            Loaded += DialogLoaded;
+           
             
         }
+        private void DialogLoaded(object sender, RoutedEventArgs e)
+        {
+            if (AddNewControl.DataContext is NewProjectDialogVM)
+            {
+                (AddNewControl.DataContext as NewProjectDialogVM).IsNewSolutionDialog = _bNewProject;
+            }
+        }
+
         private void CancelDialog(object sender, RoutedEventArgs e)
         {
             // Dialog box canceled
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialogVM.cs b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialogVM.cs
index f7e31b75a..1dd0e3205 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialogVM.cs
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialogVM.cs
@@ -64,6 +64,9 @@ namespace Tango.Scripting.IDE.Dialogs
             get { return _solutionName; }
             set { _solutionName = value; RaisePropertyChangedAuto(); }
         }
+
+        bool _isNewSolutionDialog = false;
+        public bool IsNewSolutionDialog { get { return _isNewSolutionDialog; } set { _isNewSolutionDialog = value; RaisePropertyChangedAuto(); } }
         public NewProjectDialogVM() : base()
         {
             ProjectTypes = new ObservableCollection<IProjectType>();
-- 
cgit v1.3.1