From 73cd219b4f895ca4dfd5b72b868ec873d1cd7580 Mon Sep 17 00:00:00 2001
From: Khaja Nizamuddin <khajanizamuddin@hotmail.com>
Date: Wed, 30 Aug 2017 05:23:13 +0530
Subject: [PATCH 1/2] Button name added. Studio  UX improved, Next Node, Prev
 Node Buttons, Node search added. Sticky mouse issue fixed.

---
 .../ButtonActionCommand.cs                    |   3 +
 ANAConversationSimulator/Styles/Custom.xaml   |  10 +-
 .../ViewModels/MainPageViewModel.cs           |   6 +
 .../ANAConversationStudio.csproj              |   5 +-
 ANAConversationStudio/App.xaml                |   2 +-
 ANAConversationStudio/Helpers/Utilities.cs    |  54 ++++++-
 .../Models/Chat/BaseContent.cs                |  14 ++
 .../Models/Chat/BaseEntity.cs                 |  13 +-
 ANAConversationStudio/Models/Chat/Button.cs   |  25 +++-
 .../Models/Chat/Sections/Section.cs           |   2 +-
 .../Models/ChatFlowSearchItem.cs              |  11 ++
 .../Styles/EditorTemplates.xaml               |   9 +-
 .../UIHelpers/IsStartNodeToBrushConverter.cs  |   2 +-
 .../ViewModels/MainWindowViewModel.cs         |  24 +++-
 .../ViewModels/NetworkViewModel.cs            |   1 +
 .../ViewModels/NodeViewModel.cs               |   3 +
 ANAConversationStudio/Views/MainWindow.xaml   | 125 ++++++++++++----
 .../Views/MainWindow.xaml.cs                  | 135 +++++++++++++-----
 18 files changed, 349 insertions(+), 95 deletions(-)
 create mode 100644 ANAConversationStudio/Models/ChatFlowSearchItem.cs

diff --git a/ANAConversationSimulator/Services/ChatInterfaceServices/ButtonActionCommand.cs b/ANAConversationSimulator/Services/ChatInterfaceServices/ButtonActionCommand.cs
index 7ddec2b..014befc 100644
--- a/ANAConversationSimulator/Services/ChatInterfaceServices/ButtonActionCommand.cs
+++ b/ANAConversationSimulator/Services/ChatInterfaceServices/ButtonActionCommand.cs
@@ -32,6 +32,9 @@ public async void Execute(object parameter)
                 if (Utils.IsSectionTypePresentInNode(parentNode, SectionTypeEnum.PrintOTP))
                     button.VariableValue = PrintOTPSection.OTP;
 
+                if (string.IsNullOrWhiteSpace(button.ButtonText))
+                    button.ButtonText = button.ButtonName;
+
                 var userData = new Dictionary<string, string>();
                 switch (button.ButtonType)
                 {
diff --git a/ANAConversationSimulator/Styles/Custom.xaml b/ANAConversationSimulator/Styles/Custom.xaml
index 10dd51e..cfb12e4 100644
--- a/ANAConversationSimulator/Styles/Custom.xaml
+++ b/ANAConversationSimulator/Styles/Custom.xaml
@@ -195,7 +195,7 @@
     <DataTemplate x:Key="ClickChatButtonTemplate">
         <!--Content="{Binding ButtonText}"-->
         <Button HorizontalAlignment="Stretch" Visibility="{Binding Visible, Converter={StaticResource C4FB2V}}" MinWidth="150" HorizontalContentAlignment="Stretch" Command="{Binding Action}" CommandParameter="{Binding}" Background="{StaticResource ButtonBackgroundBrush}">
-            <TextBlock Text="{Binding ButtonText}" TextWrapping="Wrap" TextAlignment="Center" />
+            <TextBlock Text="{Binding ButtonName}" TextWrapping="Wrap" TextAlignment="Center" />
         </Button>
     </DataTemplate>
 
@@ -218,7 +218,7 @@
                     </Core:EventTriggerBehavior>
                 </Interactivity:Interaction.Behaviors>
             </TextBox>
-            <Button Grid.Column="1" MaxWidth="120" Content="{Binding ButtonText, FallbackValue=Send}" Margin="5,0,0,0" Background="{StaticResource ButtonBackgroundBrush}">
+            <Button Grid.Column="1" MaxWidth="120" Content="{Binding ButtonName, FallbackValue=Send}" Margin="5,0,0,0" Background="{StaticResource ButtonBackgroundBrush}">
                 <Interactivity:Interaction.Behaviors>
                     <Behaviors:EventTriggerBehaviorBase EventName="Tapped" >
                         <Core:InvokeCommandAction Command="{Binding Action}" CommandParameter="{Binding}"/>
@@ -252,7 +252,7 @@
                     <TextBlock Text="{Binding PostfixText}" VerticalAlignment="Center"/>
                 </StackPanel>
             </ScrollViewer>
-            <Button Grid.Column="1" MaxWidth="120" Content="{Binding ButtonText, FallbackValue=Send}" Margin="5,0,0,0" Background="{StaticResource ButtonBackgroundBrush}">
+            <Button Grid.Column="1" MaxWidth="120" Content="{Binding ButtonName, FallbackValue=Send}" Margin="5,0,0,0" Background="{StaticResource ButtonBackgroundBrush}">
                 <Interactivity:Interaction.Behaviors>
                     <Behaviors:EventTriggerBehaviorBase EventName="Tapped" >
                         <Core:InvokeCommandAction Command="{Binding Action}" CommandParameter="{Binding}"/>
@@ -294,7 +294,7 @@
                     <TextBlock Text="{Binding PostfixText}" VerticalAlignment="Center"/>
                 </StackPanel>
             </ScrollViewer>
-            <Button Grid.Column="1" MaxWidth="120" Content="{Binding ButtonText, FallbackValue=Send}" Margin="5,0,0,0" Background="{StaticResource ButtonBackgroundBrush}">
+            <Button Grid.Column="1" MaxWidth="120" Content="{Binding ButtonName, FallbackValue=Send}" Margin="5,0,0,0" Background="{StaticResource ButtonBackgroundBrush}">
                 <Interactivity:Interaction.Behaviors>
                     <Behaviors:EventTriggerBehaviorBase EventName="Tapped" >
                         <Core:InvokeCommandAction Command="{Binding Action}" CommandParameter="{Binding}"/>
@@ -330,7 +330,7 @@
                     </Core:EventTriggerBehavior>
                 </Interactivity:Interaction.Behaviors>
             </AutoSuggestBox>
-            <Button Grid.Column="1" MaxWidth="120" Content="{Binding ButtonText, FallbackValue=Send}" Margin="5,0,0,0" Background="{StaticResource ButtonBackgroundBrush}">
+            <Button Grid.Column="1" MaxWidth="120" Content="{Binding ButtonName, FallbackValue=Send}" Margin="5,0,0,0" Background="{StaticResource ButtonBackgroundBrush}">
                 <Interactivity:Interaction.Behaviors>
                     <Behaviors:EventTriggerBehaviorBase EventName="Tapped" >
                         <Core:InvokeCommandAction Command="{Binding Action}" CommandParameter="{Binding}"/>
diff --git a/ANAConversationSimulator/ViewModels/MainPageViewModel.cs b/ANAConversationSimulator/ViewModels/MainPageViewModel.cs
index 3288a64..2c53962 100644
--- a/ANAConversationSimulator/ViewModels/MainPageViewModel.cs
+++ b/ANAConversationSimulator/ViewModels/MainPageViewModel.cs
@@ -326,6 +326,9 @@ public async Task ProcessButtonsAsync(JToken node)
             var allButtons = node["Buttons"].ToObject<List<Button>>();
             foreach (var btnSrc in allButtons.Where(x => x.Kind == ButtonKind.ClickInput))
             {
+                if (string.IsNullOrWhiteSpace(btnSrc.ButtonName))
+                    btnSrc.ButtonName = btnSrc.ButtonText;
+
                 var btn = btnSrc.DeepCopy();
                 if (btn.DoesRepeat)
                 {
@@ -359,6 +362,9 @@ public async Task ProcessButtonsAsync(JToken node)
 
             foreach (var btn in allButtons.Where(x => x.Kind == ButtonKind.TextInput))
             {
+                if (string.IsNullOrWhiteSpace(btn.ButtonName))
+                    btn.ButtonName = btn.ButtonText;
+
                 btn.VariableName = node["VariableName"] + "";
                 btn.NodeId = parsedNode.Id;
                 btn.ButtonName = VerbProcessor.Process(btn.ButtonName);
diff --git a/ANAConversationStudio/ANAConversationStudio.csproj b/ANAConversationStudio/ANAConversationStudio.csproj
index 713b7bd..70ffdd6 100644
--- a/ANAConversationStudio/ANAConversationStudio.csproj
+++ b/ANAConversationStudio/ANAConversationStudio.csproj
@@ -147,6 +147,7 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="Helpers\ChatFlowBuilder.cs" />
+    <Compile Include="Models\ChatFlowSearchItem.cs" />
     <Compile Include="Views\NodeEditWindow.xaml.cs">
       <DependentUpon>NodeEditWindow.xaml</DependentUpon>
     </Compile>
@@ -304,7 +305,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <WCFMetadata Include="Connected Services\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ANAConversationStudio/App.xaml b/ANAConversationStudio/App.xaml
index 3635f19..e87a7d7 100644
--- a/ANAConversationStudio/App.xaml
+++ b/ANAConversationStudio/App.xaml
@@ -65,7 +65,7 @@
             <!-- Chat Designer Colors -->
             <!-- The border brush for nodes. -->
             <SolidColorBrush x:Key="nodeBorderBrush" Color="Transparent" />
-            <SolidColorBrush x:Key="startNodeBorderBrush" Color="{Binding Color, Source={StaticResource PrimaryHueDarkBrush}}" />
+            <SolidColorBrush x:Key="startNodeHeaderBrush" Color="#AD4833" />
             <SolidColorBrush x:Key="nodeHeaderBorderBrush" Color="{Binding Color, Source={StaticResource PrimaryHueDarkBrush}}" />
             <!-- The fill brush for nodes. -->
             <SolidColorBrush x:Key="nodeFillBrush" Color="{Binding Color, Source={StaticResource PrimaryHueLightBrush}}"/>
diff --git a/ANAConversationStudio/Helpers/Utilities.cs b/ANAConversationStudio/Helpers/Utilities.cs
index 593eace..b7c2198 100644
--- a/ANAConversationStudio/Helpers/Utilities.cs
+++ b/ANAConversationStudio/Helpers/Utilities.cs
@@ -18,6 +18,7 @@
 using Newtonsoft.Json.Converters;
 using ANAConversationStudio.ViewModels;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace ANAConversationStudio.Helpers
 {
@@ -111,6 +112,7 @@ public static List<BaseContent> ExtractContentFromChatNodes(List<ChatNode> chatN
                         {
                             ButtonId = btn._id,
                             ButtonText = btn.ButtonText,
+                            ButtonName = btn.ButtonName,
                             NodeId = node.Id,
                             _id = btn.ContentId,
                             Emotion = btn.ContentEmotion,
@@ -242,7 +244,11 @@ public static void FillConnectionsFromButtonsOfChatNode(NodeViewModel node)
                         var destNode = node.Network.Nodes.FirstOrDefault(x => x.ChatNode.Id == btn.NextNodeId);
                         if (destNode != null)
                         {
-                            var conn = new ConnectionViewModel { SourceConnector = node.OutputConnectors.FirstOrDefault(x => x.Button._id == btn._id), DestConnector = destNode.InputConnectors.FirstOrDefault() };
+                            var conn = new ConnectionViewModel
+                            {
+                                SourceConnector = node.OutputConnectors.FirstOrDefault(x => x.Button._id == btn._id),
+                                DestConnector = destNode.InputConnectors.FirstOrDefault()
+                            };
                             conn.ConnectionChanged += ConnectionViewModelConnectionChanged;
                             if (conn.SourceConnector == null || conn.DestConnector == null) continue;
                             node.Network.Connections.Add(conn);
@@ -268,6 +274,52 @@ public static void ConnectionViewModelConnectionChanged(object s, EventArgs e)
 
     public static class Exts
     {
+        public static Models.ChatFlowSearchItem SearchNode(this ChatNode node, string searchKeywords)
+        {
+            if (node.ToString().IsMatch(searchKeywords))
+            {
+                return new Models.ChatFlowSearchItem
+                {
+                    NodeId = node.Id,
+                    NodeText = node.ToString()
+                };
+            }
+
+            foreach (var btn in node.Buttons)
+            {
+                if (btn.ToString().IsMatch(searchKeywords))
+                {
+                    return (new Models.ChatFlowSearchItem
+                    {
+                        NodeId = node.Id,
+                        NodeText = node.ToString(),
+                        ButtonText = btn.ToString()
+                    });
+                }
+            }
+
+            foreach (var sec in node.Sections)
+            {
+                if (sec.ToString().IsMatch(searchKeywords))
+                {
+                    return (new Models.ChatFlowSearchItem
+                    {
+                        NodeId = node.Id,
+                        NodeText = node.ToString(),
+                        SectionText = sec.ToString()
+                    });
+                }
+            }
+
+            return null;
+        }
+        public static bool IsMatch(this string text, string searchKeywords)
+        {
+            return Regex.IsMatch(text,
+                string.Join("|", searchKeywords.Split(new[] { " " }, StringSplitOptions.RemoveEmptyEntries)
+                    .Select(x => x.Trim())), RegexOptions.IgnoreCase);
+        }
+
         public static T DeepCopy<T>(this T source)
         {
             var json = source.ToJson();
diff --git a/ANAConversationStudio/Models/Chat/BaseContent.cs b/ANAConversationStudio/Models/Chat/BaseContent.cs
index 44f5972..4d3ffcb 100644
--- a/ANAConversationStudio/Models/Chat/BaseContent.cs
+++ b/ANAConversationStudio/Models/Chat/BaseContent.cs
@@ -242,6 +242,20 @@ public string ButtonText
                 }
             }
         }
+
+        private string _ButtonName;
+        public string ButtonName
+        {
+            get { return _ButtonName; }
+            set
+            {
+                if (_ButtonName != value)
+                {
+                    _ButtonName = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
     }
 
     public class CarouselButtonContent : BaseContent
diff --git a/ANAConversationStudio/Models/Chat/BaseEntity.cs b/ANAConversationStudio/Models/Chat/BaseEntity.cs
index de0ab69..c97e818 100644
--- a/ANAConversationStudio/Models/Chat/BaseEntity.cs
+++ b/ANAConversationStudio/Models/Chat/BaseEntity.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
@@ -58,10 +59,15 @@ public DateTime UpdatedOn
     public class BaseEntity : BaseIdEntity
     {
         private string _Alias;
-        [Category("Important")]
+        [JsonIgnore]
         public string Alias
         {
-            get { return _Alias; }
+            get
+            {
+                if (string.IsNullOrWhiteSpace(_Alias))
+                    FillAlias();
+                return _Alias;
+            }
             set
             {
                 if (_Alias != value)
@@ -72,6 +78,7 @@ public string Alias
             }
         }
 
+        protected virtual void FillAlias() { }
         public override string ToString()
         {
             return Alias;
diff --git a/ANAConversationStudio/Models/Chat/Button.cs b/ANAConversationStudio/Models/Chat/Button.cs
index 3e1554b..0452c40 100644
--- a/ANAConversationStudio/Models/Chat/Button.cs
+++ b/ANAConversationStudio/Models/Chat/Button.cs
@@ -12,10 +12,6 @@ namespace ANAConversationStudio.Models.Chat
 {
     public class Button : RepeatableBaseEntity
     {
-        public Button()
-        {
-            FillAlias();
-        }
 
         #region Important
         private ButtonTypeEnum _ButtonType = ButtonTypeEnum.NextNode;
@@ -252,6 +248,23 @@ public string ButtonText
             }
         }
 
+        private string _ButtonName;
+        [JsonIgnore]
+        public string ButtonName
+        {
+            get { return _ButtonName; }
+            set
+            {
+                if (_ButtonName != value)
+                {
+                    _ButtonName = value;
+
+                    FillAlias();
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         [JsonIgnore]
         [BsonIgnore]
         public IEnumerable<ButtonTypeEnum> ButtonTypes => Enum.GetValues(typeof(ButtonTypeEnum)).Cast<ButtonTypeEnum>();
@@ -304,9 +317,9 @@ public ChatNode ParentNode
         [BsonIgnore]
         public string ContentEmotion { get; set; }
 
-        private void FillAlias()
+        protected override void FillAlias()
         {
-            Alias = Utilities.TrimText(string.IsNullOrWhiteSpace(ButtonText) ? ButtonType + "" : ButtonText);
+            Alias = Utilities.TrimText(string.IsNullOrWhiteSpace(ButtonName) ? (string.IsNullOrWhiteSpace(ButtonText) ? ButtonType + "" : ButtonText) : ButtonName);
         }
 
         public override string ToString()
diff --git a/ANAConversationStudio/Models/Chat/Sections/Section.cs b/ANAConversationStudio/Models/Chat/Sections/Section.cs
index 0d233eb..292fe3f 100644
--- a/ANAConversationStudio/Models/Chat/Sections/Section.cs
+++ b/ANAConversationStudio/Models/Chat/Sections/Section.cs
@@ -60,7 +60,7 @@ public bool Hidden
             }
         }
 
-        protected virtual void FillAlias()
+        protected override void FillAlias()
         {
             Alias = Utilities.TrimText(SectionType + "");
         }
diff --git a/ANAConversationStudio/Models/ChatFlowSearchItem.cs b/ANAConversationStudio/Models/ChatFlowSearchItem.cs
new file mode 100644
index 0000000..02a0f61
--- /dev/null
+++ b/ANAConversationStudio/Models/ChatFlowSearchItem.cs
@@ -0,0 +1,11 @@
+namespace ANAConversationStudio.Models
+{
+    public class ChatFlowSearchItem
+    {
+        public string NodeId { get; set; }
+        public string NodeText { get; set; }
+        public string SectionText { get; set; }
+        public string ButtonText { get; set; }
+        public bool NoResults { get; set; }
+    }
+}
diff --git a/ANAConversationStudio/Styles/EditorTemplates.xaml b/ANAConversationStudio/Styles/EditorTemplates.xaml
index 850273b..2716e02 100644
--- a/ANAConversationStudio/Styles/EditorTemplates.xaml
+++ b/ANAConversationStudio/Styles/EditorTemplates.xaml
@@ -13,7 +13,7 @@
     <ui:ButtonSectionTypeSymbolConverter x:Key="ButtonSectionTypeSymbolConverter"/>
     <views:ButtonTypeToFieldVisibilityConverter x:Key="ButtonTypeToFieldVisibilityConverter"/>
     <BooleanToVisibilityConverter x:Key="B2V"/>
-    
+
     <Style x:Key="SectionTypeIconTextblockStyle" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="{StaticResource MDL2Assets}"/>
         <Setter Property="FontSize" Value="20"/>
@@ -50,7 +50,7 @@
         <Setter Property="Foreground" Value="White" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
-    
+
     <Style x:Key="MoveUpButtonStyle" BasedOn="{StaticResource ToolButtonStyle}" TargetType="Button">
         <Setter Property="Content" Value="&#xE96D;" />
         <Setter Property="Command" Value="{Binding MoveUp}" />
@@ -169,6 +169,11 @@
                     </uc:TableRowUserControl.Field>
                 </uc:TableRowUserControl>
                 <uc:TableRowUserControl Label="Text">
+                    <uc:TableRowUserControl.Field>
+                        <TextBox Text="{Binding ButtonName, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+                <uc:TableRowUserControl Label="Message">
                     <uc:TableRowUserControl.Field>
                         <TextBox Text="{Binding ButtonText, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
                     </uc:TableRowUserControl.Field>
diff --git a/ANAConversationStudio/UIHelpers/IsStartNodeToBrushConverter.cs b/ANAConversationStudio/UIHelpers/IsStartNodeToBrushConverter.cs
index f019183..600c991 100644
--- a/ANAConversationStudio/UIHelpers/IsStartNodeToBrushConverter.cs
+++ b/ANAConversationStudio/UIHelpers/IsStartNodeToBrushConverter.cs
@@ -15,7 +15,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         {
             var isStartNode = (bool)value;
 
-            return isStartNode ? Application.Current.Resources["startNodeBorderBrush"] : Application.Current.Resources["nodeBorderBrush"];
+            return isStartNode ? Application.Current.Resources["startNodeHeaderBrush"] : Application.Current.Resources["nodeHeaderBorderBrush"];
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/ANAConversationStudio/ViewModels/MainWindowViewModel.cs b/ANAConversationStudio/ViewModels/MainWindowViewModel.cs
index 235d2b4..d6f88ad 100644
--- a/ANAConversationStudio/ViewModels/MainWindowViewModel.cs
+++ b/ANAConversationStudio/ViewModels/MainWindowViewModel.cs
@@ -10,6 +10,7 @@
 using ANAConversationStudio.Helpers;
 using System.ComponentModel;
 using System.Threading.Tasks;
+using System.Collections.ObjectModel;
 
 namespace ANAConversationStudio.ViewModels
 {
@@ -529,20 +530,30 @@ public void DeleteConnection(ConnectionViewModel connection)
 
     public partial class MainWindowViewModel : AbstractModelBase
     {
-        private ChatNode _SelectedChatNode;
-        public ChatNode SelectedChatNode
+        private ObservableCollection<ChatFlowSearchItem> _SearchResults;
+        public ObservableCollection<ChatFlowSearchItem> SearchResults
         {
-            get { return _SelectedChatNode; }
+            get { return _SearchResults; }
             set
             {
-                if (_SelectedChatNode != value)
+                if (_SearchResults != value)
                 {
-                    _SelectedChatNode = value;
-                    OnPropertyChanged(nameof(SelectedChatNode));
+                    _SearchResults = value;
+                    OnPropertyChanged(nameof(SearchResults));
                 }
             }
         }
 
+        public void SearchInNodes(string keywords)
+        {
+            SearchResults = new ObservableCollection<ChatFlowSearchItem>(Network.Nodes.Select(node => node.ChatNode.SearchNode(keywords)).Where(x => x != null));
+            if (SearchResults.Count == 0)
+                SearchResults = new ObservableCollection<ChatFlowSearchItem>
+                {
+                    new ChatFlowSearchItem { NoResults = true  }
+                };
+        }
+
         public async Task SaveLoadedChat()
         {
             StudioContext.Current.ChatFlow.NodeLocations = this.Network.Nodes.ToDictionary(x => x.ChatNode.Id, x => new LayoutPoint(x.X, x.Y));
@@ -588,6 +599,7 @@ private void Connections_CollectionChanged(object sender, System.Collections.Spe
         {
             try
             {
+                if (!this.Network.ActOnButtonNextNodeIds) return;
                 if (e.NewItems != null)
                     foreach (ConnectionViewModel item in e.NewItems)
                     {
diff --git a/ANAConversationStudio/ViewModels/NetworkViewModel.cs b/ANAConversationStudio/ViewModels/NetworkViewModel.cs
index 4f049cf..afc2542 100644
--- a/ANAConversationStudio/ViewModels/NetworkViewModel.cs
+++ b/ANAConversationStudio/ViewModels/NetworkViewModel.cs
@@ -39,6 +39,7 @@ public ImpObservableCollection<NodeViewModel> Nodes
                 return nodes;
             }
         }
+        public bool ActOnButtonNextNodeIds = true;
 
         private void Nodes_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
diff --git a/ANAConversationStudio/ViewModels/NodeViewModel.cs b/ANAConversationStudio/ViewModels/NodeViewModel.cs
index 0ca3efc..4ca6eb8 100644
--- a/ANAConversationStudio/ViewModels/NodeViewModel.cs
+++ b/ANAConversationStudio/ViewModels/NodeViewModel.cs
@@ -96,7 +96,10 @@ public void InvalidateNode()
             if (this.Network != null)
             {
                 var connsToRemove = this.Network.Connections.Where(x => this.OutputConnectors.Contains(x.DestConnector) || this.OutputConnectors.Contains(x.SourceConnector)).ToArray();
+                //Normally, when connections are removed, Button.NextNodeId will be set to null. We don't want that behaviour here. 
+                this.Network.ActOnButtonNextNodeIds = false;
                 this.Network.Connections.RemoveRange(connsToRemove);
+                this.Network.ActOnButtonNextNodeIds = true;
             }
 
 
diff --git a/ANAConversationStudio/Views/MainWindow.xaml b/ANAConversationStudio/Views/MainWindow.xaml
index 173043e..a28c248 100644
--- a/ANAConversationStudio/Views/MainWindow.xaml
+++ b/ANAConversationStudio/Views/MainWindow.xaml
@@ -5,6 +5,7 @@
     xmlns:Controls="clr-namespace:ANAConversationStudio.Controls"
     xmlns:NetworkUI="clr-namespace:NetworkUI;assembly=NetworkUI"
     xmlns:UI="clr-namespace:ANAConversationStudio.UIHelpers"
+    xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit"
     xmlns:ZoomAndPan="clr-namespace:ZoomAndPan;assembly=ZoomAndPan"
     xmlns:ac="clr-namespace:AdornedControl;assembly=AdornedControl"
     Title="ANA Conversation Studio" 
@@ -319,7 +320,7 @@
                         SizeChanged="Node_SizeChanged"
                         Background="{StaticResource nodeFillBrush}"
                         BorderThickness="1.3"
-                        BorderBrush="{Binding ChatNode.IsStartNode, Converter={StaticResource IsStartNodeToBrushConverter}}"
+                        BorderBrush="{StaticResource nodeBorderBrush}"
                         CornerRadius="10"
                         >
 
@@ -354,13 +355,13 @@
                             <Border 
                                 CornerRadius="8"
                                 Margin="6,0,6,0"
-                                Background="{StaticResource nodeHeaderBorderBrush}"
+                                Background="{Binding ChatNode.IsStartNode, Converter={StaticResource IsStartNodeToBrushConverter}}"
                                 Grid.Column="0"
                                 Grid.ColumnSpan="3"
                                 Grid.Row="0">
                                 <!-- The name of the node. -->
                                 <Grid>
-                                    <Grid Height="18" Background="{StaticResource nodeHeaderBorderBrush}" VerticalAlignment="Bottom"/>
+                                    <Grid Height="18" Background="{Binding ChatNode.IsStartNode, Converter={StaticResource IsStartNodeToBrushConverter}}" VerticalAlignment="Bottom"/>
                                     <StackPanel
                                         Orientation="Horizontal"
                                         HorizontalAlignment="Center"
@@ -660,31 +661,72 @@
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <Menu BorderBrush="{StaticResource PrimaryHueLightBrush}" Foreground="{StaticResource FileMenuForegroundBrush}" BorderThickness="0,0,0,1" Grid.Row="0" x:Name="menu" HorizontalAlignment="Stretch" VerticalAlignment="Top" >
-            <MenuItem Header="File" x:Name="FileMenu" Height="30">
-                <MenuItem Header="New Chat Flow" Click="NewChatFlowClick"/>
-                <MenuItem Header="Open Chat Flow" HorizontalContentAlignment="Left" x:Name="SavedConnectionsFileMenu">
-                    <MenuItem.ItemTemplate>
-                        <DataTemplate>
-                            <MenuItem Header="{Binding}" HorizontalContentAlignment="Left" HorizontalAlignment="Left" Tag="{Binding}" Click="SavedConnectionClick"/>
-                        </DataTemplate>
-                    </MenuItem.ItemTemplate>
-                </MenuItem>
-                <MenuItem Header="Manage Chat Flows" Click="ManageChatFlowsClick"/>
-                <MenuItem Header="Export as image" Click="ExportAsImageClick"/>
-                <MenuItem Header="Settings" Click="SettingsClick"/>
-                <MenuItem Header="Exit" Click="ExitClick"/>
-            </MenuItem>
-            <MenuItem Header="Tools" Height="30">
-                <MenuItem Header="Launch Simulator" Click="ConvSimMenuClick"/>
-                <MenuItem Header="Launch Current Chat in Simulator (F5)" Click="ConvSimWithChatMenuClick"/>
-                <MenuItem Header="Copy Chat URL" Click="CopyChatURLClick"/>
-                <MenuItem Header="Copy Project Id" Click="CopyProjectIdClick"/>
-            </MenuItem>
-            <MenuItem Header="Help" Name="HelpMenu" Height="30">
-                <MenuItem Header="No Update Available!" Click="UpdateMenuClick" IsEnabled="False" Name="UpdateMenuItem"/>
-            </MenuItem>
-        </Menu>
+        <Border Grid.Row="0" BorderBrush="{StaticResource PrimaryHueLightBrush}" BorderThickness="0,0,0,1"  HorizontalAlignment="Stretch" VerticalAlignment="Top" >
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <Menu Foreground="{StaticResource FileMenuForegroundBrush}" x:Name="menu" >
+                    <MenuItem Header="File" x:Name="FileMenu" Height="30">
+                        <MenuItem Header="New Chat Flow" Click="NewChatFlowClick"/>
+                        <MenuItem Header="Open Chat Flow" HorizontalContentAlignment="Left" x:Name="SavedConnectionsFileMenu">
+                            <MenuItem.ItemTemplate>
+                                <DataTemplate>
+                                    <MenuItem Header="{Binding}" HorizontalContentAlignment="Left" HorizontalAlignment="Left" Tag="{Binding}" Click="SavedConnectionClick"/>
+                                </DataTemplate>
+                            </MenuItem.ItemTemplate>
+                        </MenuItem>
+                        <MenuItem Header="Manage Chat Flows" Click="ManageChatFlowsClick"/>
+                        <MenuItem Header="Export as image" Click="ExportAsImageClick"/>
+                        <MenuItem Header="Settings" Click="SettingsClick"/>
+                        <MenuItem Header="Exit" Click="ExitClick"/>
+                    </MenuItem>
+                    <MenuItem Header="Tools" Height="30">
+                        <MenuItem Header="Launch Simulator" Click="ConvSimMenuClick"/>
+                        <MenuItem Header="Launch Current Chat in Simulator (F5)" Click="ConvSimWithChatMenuClick"/>
+                        <MenuItem Header="Copy Chat URL" Click="CopyChatURLClick"/>
+                        <MenuItem Header="Copy Project Id" Click="CopyProjectIdClick"/>
+                    </MenuItem>
+                    <MenuItem Header="Help" Name="HelpMenu" Height="30">
+                        <MenuItem Header="No Update Available!" Click="UpdateMenuClick" IsEnabled="False" Name="UpdateMenuItem"/>
+                    </MenuItem>
+                </Menu>
+                <Grid Grid.Column="1" Margin="0,0,20,0">
+                    <toolkit:WatermarkTextBox VerticalAlignment="Center" Watermark="Search nodes" Width="200" KeyUp="SearchTextboxKeyUp" GotFocus="SearchTextboxGotFocus" />
+                    <Popup IsOpen="{Binding SearchResults, Converter={StaticResource N2B}}" MaxHeight="400" MaxWidth="300">
+                        <ListBox x:Name="SearchResultsListBox" Background="White" BorderThickness="1,1,1,0" BorderBrush="{StaticResource PrimaryHueDarkBrush}" ItemsSource="{Binding SearchResults}" SelectionChanged="SearchResultSelectedChanged">
+                            <ListBox.ItemContainerStyle>
+                                <Style TargetType="ListBoxItem">
+                                    <Setter Property="Margin" Value="0"/>
+                                    <Setter Property="Padding" Value="10"/>
+                                    <Setter Property="BorderBrush" Value="{StaticResource PrimaryHueDarkBrush}" />
+                                    <Setter Property="BorderThickness" Value="0,0,0,1" />
+                                </Style>
+                            </ListBox.ItemContainerStyle>
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel>
+                                        <TextBlock TextWrapping="Wrap" Visibility="{Binding NodeText, Converter={StaticResource N2V}}">
+                                            <Run FontStyle="Italic" Text="Node: "/><Run Text="{Binding NodeText}"/>
+                                        </TextBlock>
+                                        <TextBlock TextWrapping="Wrap" Visibility="{Binding SectionText, Converter={StaticResource N2V}}">
+                                            <Run FontStyle="Italic" Text="Section: "/><Run Text="{Binding SectionText}"/>
+                                        </TextBlock>
+                                        <TextBlock TextWrapping="Wrap" Visibility="{Binding ButtonText, Converter={StaticResource N2V}}">
+                                            <Run FontStyle="Italic" Text="Button: "/><Run Text="{Binding ButtonText}"/>
+                                        </TextBlock>
+                                        <TextBlock TextWrapping="Wrap" Foreground="Gray" Visibility="{Binding NoResults, Converter={StaticResource B2V}}">
+                                            <Run FontStyle="Italic" Text="No results"/>
+                                        </TextBlock>
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+                    </Popup>
+                </Grid>
+            </Grid>
+        </Border>
         <DockPanel Grid.Row="1" >
 
             <!-- Grid placed below the zoom and pan control that contains the zoom slider, zoom label and some buttons. -->
@@ -757,7 +799,31 @@
                 </Grid.ColumnDefinitions>
                 <Button Grid.Column="0" Click="SaveButtonClick" ToolTip="Save changes (Ctrl+S)" Content="Save"/>
                 <TextBlock x:Name="StatusTextBlock" Text="" VerticalAlignment="Center" Margin="5,4" Grid.Column="1" />
-                <Button Grid.Column="2" Content="Clone Node" Padding="5,0" Click="CloneSelectedNodeClick" ToolTip="Create a deep copy of the node along with content (Alt+C)"/>
+                <ItemsControl Grid.Column="2" >
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <VirtualizingStackPanel Orientation="Horizontal" />
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                    <ItemsControl.ItemContainerStyle>
+                        <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+                            <Setter Property="Margin" Value="5,0"/>
+                        </Style>
+                    </ItemsControl.ItemContainerStyle>
+                    <Button Padding="5,0" Command="{StaticResource Commands.PrevNode}" ToolTip="Jump to previous node in the flow (Ctrl + &lt;)">
+                        <TextBlock>
+                            <Run Text="&#xE96F;" FontFamily="{StaticResource MDL2Assets}" FontSize="10"/>
+                            <Run Text="Previous Node"/>
+                        </TextBlock>
+                    </Button>
+                    <Button Padding="5,0" Command="{StaticResource Commands.NextNode}" ToolTip="Jump to next node in the flow (Ctrl + &gt;)">
+                        <TextBlock>
+                            <Run Text="Next Node"/>
+                            <Run Text="&#xE970;" FontFamily="{StaticResource MDL2Assets}" FontSize="10"/>
+                        </TextBlock>
+                    </Button>
+                    <Button Content="Clone Node" Padding="5,0" Click="CloneSelectedNodeClick" ToolTip="Create a deep copy of the node along with content (Alt+C)"/>
+                </ItemsControl>
                 <!-- 
             The 'fit content' button.  Causes the content to be scaled so that all the graph nodes fit in the viewport.
             -->
@@ -896,7 +962,6 @@
                             QueryConnectionFeedback="networkControl_QueryConnectionFeedback"
                             ConnectionDragging="networkControl_ConnectionDragging"                            
                             ConnectionDragCompleted="networkControl_ConnectionDragCompleted"
-                            SelectionChanged="networkControl_SelectionChanged"
                             MouseDown="networkControl_MouseDown"
                             MouseUp="networkControl_MouseUp"
                             MouseMove="networkControl_MouseMove"
diff --git a/ANAConversationStudio/Views/MainWindow.xaml.cs b/ANAConversationStudio/Views/MainWindow.xaml.cs
index 058ade5..b98e320 100644
--- a/ANAConversationStudio/Views/MainWindow.xaml.cs
+++ b/ANAConversationStudio/Views/MainWindow.xaml.cs
@@ -18,6 +18,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
+using System.Windows.Threading;
 
 namespace ANAConversationStudio.Views
 {
@@ -117,7 +118,6 @@ private void networkControl_ConnectionDragCompleted(object sender, ConnectionDra
         private void DeleteSelectedNodes_Executed(object sender, ExecutedRoutedEventArgs e)
         {
             this.ViewModel.DeleteSelectedNodes();
-            ResetEditors();
         }
 
         /// <summary>
@@ -135,7 +135,6 @@ private void DeleteNode_Executed(object sender, ExecutedRoutedEventArgs e)
         {
             var node = (NodeViewModel)e.Parameter;
             this.ViewModel.DeleteNode(node);
-            ResetEditors();
         }
 
         /// <summary>
@@ -388,6 +387,52 @@ private void CopyChatURLClick(object sender, RoutedEventArgs e)
             if (StudioContext.IsProjectLoaded(true))
                 Clipboard.SetText(StudioContext.CurrentProjectUrl());
         }
+
+        private void SearchTextboxKeyUp(object sender, KeyEventArgs e)
+        {
+            var tb = sender as TextBox;
+            if (e.Key == Key.Escape || string.IsNullOrWhiteSpace(tb.Text))
+                this.ViewModel.SearchResults = null;
+            else
+                this.ViewModel.SearchInNodes(tb.Text);
+        }
+
+        DispatcherTimer searchTimer;
+        private void SearchResultSelectedChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var selectedItem = (sender as ListBox).SelectedItem as Models.ChatFlowSearchItem;
+            if (selectedItem == null) return;
+
+            if (!string.IsNullOrWhiteSpace(selectedItem.NodeId))
+            {
+                var selectedNode = this.ViewModel.Network.Nodes.FirstOrDefault(x => x.ChatNode.Id == selectedItem.NodeId);
+                networkControl.SelectedNode = selectedNode;
+                ZoomToNode(selectedNode);
+                //networkControl.BringSelectedNodesIntoView();
+
+                searchTimer = new DispatcherTimer() { Interval = TimeSpan.FromSeconds(1) };
+                searchTimer.Tick += (s, args) =>
+                {
+                    var t = s as DispatcherTimer;
+                    t.Stop();
+                    this.ViewModel.SearchResults = null;
+                };
+                searchTimer.Start();
+            }
+        }
+
+        private void ZoomToNode(NodeViewModel selectedNode)
+        {
+            var actualContentRect = DetermineAreaOfNodes(new List<NodeViewModel>() { selectedNode });
+            actualContentRect.Inflate(networkControl.ActualWidth / 40, networkControl.ActualHeight / 40);
+            zoomAndPanControl.AnimatedZoomTo(actualContentRect);
+        }
+
+        private void SearchTextboxGotFocus(object sender, RoutedEventArgs e)
+        {
+            if (sender is TextBox tb && !string.IsNullOrWhiteSpace(tb.Text))
+                this.ViewModel.SearchInNodes(tb.Text);
+        }
     }
 
     /// <summary>
@@ -629,18 +674,39 @@ private void networkControl_MouseDoubleClick(object sender, MouseButtonEventArgs
 
         private void OpenNodeEditor()
         {
-            if (this.ViewModel.SelectedChatNode != null)
+            var selectedNode = this.ViewModel.Network.Nodes.FirstOrDefault(x => x.IsSelected);
+            if (selectedNode != null)
             {
-                var editor = new NodeEditWindow(this.ViewModel.SelectedChatNode);
+                var editor = new NodeEditWindow(selectedNode.ChatNode);
                 var result = editor.ShowDialog();
+
+                //when editor window is opened, mouse is left captured with the selected node item, it has to be released.
+                var nodeUIItem = this.networkControl.FindAssociatedNodeItem(selectedNode);
+                if (nodeUIItem != null)
+                {
+                    if (Mouse.PrimaryDevice != null)
+                    {
+                        nodeUIItem.RaiseEvent(new MouseButtonEventArgs(Mouse.PrimaryDevice, 0, MouseButton.Left)
+                        {
+                            RoutedEvent = Mouse.MouseUpEvent,
+                            Source = this
+                        });
+                    }
+                }
+
                 if (result == true)
                 {
                     var nodeVM = this.ViewModel.Network.Nodes.FirstOrDefault(x => x.ChatNode.Id == editor.ChatNode.Id);
                     if (nodeVM != null)
                     {
                         nodeVM.ChatNode = editor.ChatNode;
+
+                        if (nodeVM.ChatNode.IsStartNode)
+                        {
+                            foreach (var otherStartNode in this.ViewModel.Network.Nodes.Where(x => x.ChatNode.Id != nodeVM.ChatNode.Id && x.ChatNode.IsStartNode))
+                                otherStartNode.ChatNode.IsStartNode = false;
+                        }
                     }
-                    SetSelectedChatNode(nodeVM.ChatNode);
                 }
             }
         }
@@ -983,26 +1049,7 @@ private async void MainWindow_Closing(object sender, System.ComponentModel.Cance
             }
         }
 
-        private void networkControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (networkControl.SelectedNode != null)
-                SetSelectedChatNode((networkControl.SelectedNode as NodeViewModel).ChatNode);
-        }
-        private void SetSelectedChatNode(ChatNode chatNode)
-        {
-            if (this.ViewModel.SelectedChatNode != null)
-                this.ViewModel.SelectedChatNode.PropertyChanged -= SelectedChatNode_PropertyChanged; //Remove old event handler
 
-            this.ViewModel.SelectedChatNode = null;
-            this.ViewModel.SelectedChatNode = chatNode;
-            this.ViewModel.SelectedChatNode.PropertyChanged += SelectedChatNode_PropertyChanged;
-        }
-        private void SelectedChatNode_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
-        {
-            var senderNode = sender as ChatNode;
-            if (e.PropertyName == nameof(ChatNode.IsStartNode)) //When is start node is changed
-                this.ViewModel.Network.Nodes.Select(x => x.ChatNode).Where(x => x.Id != senderNode.Id && x.IsStartNode).ToList().ForEach(x => x.IsStartNode = false);
-        }
 
         private async void SaveButtonClick(object sender, RoutedEventArgs e)
         {
@@ -1018,6 +1065,13 @@ private async Task SaveEditsAsync()
             try
             {
                 if (this.ViewModel.Network == null) return;
+
+                if (this.ViewModel.Network.Nodes.Count > 0 && !this.ViewModel.Network.Nodes.Any(x => x.ChatNode.IsStartNode))
+                {
+                    MessageBox.Show("Please mark a node in the chat flow as start node.", "Start node is not set!", MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
+
                 await this.ViewModel.SaveLoadedChat();
                 StatusTextBlock.Text = "Saved at " + DateTime.Now.ToShortTimeString();
             }
@@ -1067,32 +1121,32 @@ public async Task LoadProjectAsync(ANAProject proj)
 #pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
         }
 
-        private void ResetEditors()
-        {
-            this.ViewModel.SelectedChatNode = null;
-        }
-
         public void GotoNextNode(int position = 1)
         {
             try
             {
-                if (this.ViewModel.SelectedChatNode != null)
+                var selectedNode = this.ViewModel.Network.Nodes.FirstOrDefault(x => x.IsSelected);
+                if (selectedNode != null)
                 {
                     var nextNodeIds = new List<string>();
-                    if (this.ViewModel.SelectedChatNode.Buttons != null && this.ViewModel.SelectedChatNode.Buttons.Count > 0)
-                        nextNodeIds.AddRange(this.ViewModel.SelectedChatNode.Buttons.Select(x => x.NextNodeId));
-                    if (!string.IsNullOrWhiteSpace(this.ViewModel.SelectedChatNode.NextNodeId))
-                        nextNodeIds.Add(this.ViewModel.SelectedChatNode.NextNodeId);
+                    if (selectedNode.ChatNode.Buttons != null && selectedNode.ChatNode.Buttons.Count > 0)
+                        nextNodeIds.AddRange(selectedNode.ChatNode.Buttons.Select(x => x.NextNodeId));
+                    if (!string.IsNullOrWhiteSpace(selectedNode.ChatNode.NextNodeId))
+                        nextNodeIds.Add(selectedNode.ChatNode.NextNodeId);
                     if (position <= nextNodeIds.Count)
                     {
                         var node = networkControl.Nodes.Cast<NodeViewModel>().FirstOrDefault(x => x.ChatNode.Id == nextNodeIds[position - 1]);
                         if (node != null)
                         {
                             networkControl.SelectedNode = node;
-                            networkControl.BringSelectedNodesIntoView();
+                            ZoomToNode(node);
                         }
                     }
                 }
+                else
+                {
+                    MessageBox.Show("Please select a node and then try to go to the next one", "No node selected!", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
             }
             catch { }
         }
@@ -1101,9 +1155,10 @@ public void GotoPreviousNode(int position = 1)
         {
             try
             {
-                if (this.ViewModel.SelectedChatNode != null)
+                var selectedNode = this.ViewModel.Network.Nodes.FirstOrDefault(x => x.IsSelected);
+                if (selectedNode != null)
                 {
-                    var currentNodeId = this.ViewModel.SelectedChatNode.Id;
+                    var currentNodeId = selectedNode.ChatNode.Id;
 
                     var prevNodeIds = networkControl.Nodes.Cast<NodeViewModel>()
                         .Where(x => x.ChatNode.NextNodeId == currentNodeId ||
@@ -1115,10 +1170,14 @@ public void GotoPreviousNode(int position = 1)
                         if (node != null)
                         {
                             networkControl.SelectedNode = node;
-                            networkControl.BringSelectedNodesIntoView();
+                            ZoomToNode(node);
                         }
                     }
                 }
+                else
+                {
+                    MessageBox.Show("Please select a node and then try to go to the previous one", "No node selected!", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
             }
             catch { }
         }

From 2ce7695ed6b303df84e6ec25e4281f014a6ed70e Mon Sep 17 00:00:00 2001
From: Khaja Nizamuddin <khajanizamuddin@hotmail.com>
Date: Wed, 30 Aug 2017 05:37:37 +0530
Subject: [PATCH 2/2] Versions Updated

---
 ANAConversationSimulator/Package.appxmanifest             | 2 +-
 .../ANAConversationStudio.Setup.vdproj                    | 8 ++++----
 ANAConversationStudio/Properties/AssemblyInfo.cs          | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ANAConversationSimulator/Package.appxmanifest b/ANAConversationSimulator/Package.appxmanifest
index 1d329a4..4b772ea 100644
--- a/ANAConversationSimulator/Package.appxmanifest
+++ b/ANAConversationSimulator/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="44cabbc3-0a2f-4255-b5bb-b099cd5762f9" Publisher="CN=ProjectANA" Version="2.1.1.0" />
+  <Identity Name="44cabbc3-0a2f-4255-b5bb-b099cd5762f9" Publisher="CN=ProjectANA" Version="2.2.0.0" />
   <mp:PhoneIdentity PhoneProductId="44cabbc3-0a2f-4255-b5bb-b099cd5762f9" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ANA Conversation Simulator</DisplayName>
diff --git a/ANAConversationStudio.Setup/ANAConversationStudio.Setup.vdproj b/ANAConversationStudio.Setup/ANAConversationStudio.Setup.vdproj
index 0a9d1db..b779139 100644
--- a/ANAConversationStudio.Setup/ANAConversationStudio.Setup.vdproj
+++ b/ANAConversationStudio.Setup/ANAConversationStudio.Setup.vdproj
@@ -3346,19 +3346,19 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:ANA Conversation Studio"
-        "ProductCode" = "8:{C4240BA0-EC0E-4E57-BE05-9C372AEDC6A2}"
-        "PackageCode" = "8:{8D94ADE5-44E6-4737-BEA8-156389EA5C60}"
+        "ProductCode" = "8:{044D4B65-4A17-4D7E-BD97-3F9FF5F6F7C0}"
+        "PackageCode" = "8:{81B3B63F-1E15-41BC-ABC6-6F3653D5B1A0}"
         "UpgradeCode" = "8:{1BD9D39A-BCB0-4988-88FE-7481A5494FFF}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:4.4.0"
+        "ProductVersion" = "8:4.5.0"
         "Manufacturer" = "8:Project ANA"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://ana.chat"
-        "Title" = "8:ANA Conversation Studio 4.4.0"
+        "Title" = "8:ANA Conversation Studio 4.5.0"
         "Subject" = "8:"
         "ARPCONTACT" = "8:Project ANA"
         "Keywords" = "8:"
diff --git a/ANAConversationStudio/Properties/AssemblyInfo.cs b/ANAConversationStudio/Properties/AssemblyInfo.cs
index 8d11dfb..ee4a2c2 100644
--- a/ANAConversationStudio/Properties/AssemblyInfo.cs
+++ b/ANAConversationStudio/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.4.0.0")]
-[assembly: AssemblyFileVersion("4.4.0.0")]
+[assembly: AssemblyVersion("4.5.0.0")]
+[assembly: AssemblyFileVersion("4.5.0.0")]