From d545b2a0dedf842081f893a2576236b21020d9a7 Mon Sep 17 00:00:00 2001
From: Anders Laub <anders.laub@gmail.com>
Date: Mon, 19 Jun 2017 20:07:07 +0200
Subject: [PATCH] minor fixes - started on checkbox token input form

---
 .../HelixTemplating/Tokens/TokenInputForm.cs  |   3 +-
 .../Dialogs/Dialogs/ManifestDialog.xaml       |   2 +-
 .../Dialogs/Dialogs/ManifestDialog.xaml.cs    |  14 ++++---
 .../Dialogs/Dialogs/SettingsDialog.xaml       |   2 +-
 .../Dialogs/Dialogs/SettingsDialog.xaml.cs    |  15 +++----
 .../Dialogs/Dialogs/TokenCheckboxInput.xaml   |  21 ++++++++++
 .../Dialogs/TokenCheckboxInput.xaml.cs        |  39 ++++++++++++++++++
 .../Dialogs/Dialogs/TokenInputControl.cs      |   5 +++
 ...ubPlusCo.VisualStudio.Helix.Dialogs.csproj |   7 ++++
 .../Dialogs/Resources/StandardTemplates.zip   | Bin 54092 -> 54092 bytes
 VisualStudio/Wizard/HelixTemplateWizard.cs    |  14 +++++++
 11 files changed, 106 insertions(+), 16 deletions(-)
 create mode 100644 VisualStudio/Dialogs/Dialogs/TokenCheckboxInput.xaml
 create mode 100644 VisualStudio/Dialogs/Dialogs/TokenCheckboxInput.xaml.cs

diff --git a/Foundation/HelixTemplating/Tokens/TokenInputForm.cs b/Foundation/HelixTemplating/Tokens/TokenInputForm.cs
index 998f531..811985c 100644
--- a/Foundation/HelixTemplating/Tokens/TokenInputForm.cs
+++ b/Foundation/HelixTemplating/Tokens/TokenInputForm.cs
@@ -10,6 +10,7 @@ public enum TokenInputForm
   {
     Text,
     Folder,
-    Selection
+    Selection,
+    Checkbox
   }
 }
diff --git a/VisualStudio/Dialogs/Dialogs/ManifestDialog.xaml b/VisualStudio/Dialogs/Dialogs/ManifestDialog.xaml
index 605529e..56d1a53 100644
--- a/VisualStudio/Dialogs/Dialogs/ManifestDialog.xaml
+++ b/VisualStudio/Dialogs/Dialogs/ManifestDialog.xaml
@@ -56,7 +56,7 @@
     <Grid VerticalAlignment="Center" HorizontalAlignment="Stretch" Grid.Row="1" Grid.Column="1" Margin="10,0,10,10">
       <StackPanel HorizontalAlignment="Stretch">
         <Label>Available Helix Templates</Label>
-        <ComboBox HorizontalAlignment="Left" Width="Auto" MaxWidth="550" MinWidth="450" Height="25" Name="AvailableManifests" ItemsSource="{Binding AvailableManifestsCollection}" SelectedItem="{Binding SelectedManifestComboItem}" >
+        <ComboBox HorizontalAlignment="Left" Width="Auto" MaxWidth="550" MinWidth="450" Height="25" Name="AvailableManifestsComboBox" ItemsSource="{Binding AvailableManifestsCollection}" SelectedItem="{Binding SelectedManifestComboItem}" >
         </ComboBox>
         <TextBlock FontSize="10" HorizontalAlignment="Left" Name="TemplateDescription" Width="Auto" MaxWidth="450" TextWrapping="WrapWithOverflow" Margin="0,0,10,5"></TextBlock>
         <TextBlock FontStyle="Italic" HorizontalAlignment="Left" FontSize="10" Name="TemplateAuthor" MaxWidth="450" Width="Auto" TextWrapping="WrapWithOverflow"></TextBlock>
diff --git a/VisualStudio/Dialogs/Dialogs/ManifestDialog.xaml.cs b/VisualStudio/Dialogs/Dialogs/ManifestDialog.xaml.cs
index ee9a4c5..7c679c7 100644
--- a/VisualStudio/Dialogs/Dialogs/ManifestDialog.xaml.cs
+++ b/VisualStudio/Dialogs/Dialogs/ManifestDialog.xaml.cs
@@ -62,7 +62,8 @@ public void Initialize(string rootDirectory, string solutionRoot, IDictionary<st
         return;
       }
       SetAvailableManifestsCollection(_manifests);
-      AvailableManifests.SelectedIndex = 0;
+      AvailableManifestsComboBox.Items.Refresh();
+      AvailableManifestsComboBox.SelectedIndex = 0;
     }
 
     protected void SetAvailableManifestsCollection(IEnumerable<HelixTemplateManifest> helixTemplateManifests)
@@ -73,13 +74,13 @@ protected void SetAvailableManifestsCollection(IEnumerable<HelixTemplateManifest
         {
           Content = helixTemplateManifest.Name + " " + helixTemplateManifest.Version
         });
-      AvailableManifests.SelectionChanged += SelectionChanged;
+      AvailableManifestsComboBox.SelectionChanged += SelectionChanged;
     }
 
     protected void SelectionChanged(object sender, SelectionChangedEventArgs selectionChangedEventArgs)
     {
-      SelectedManifestComboItem = AvailableManifestsCollection[AvailableManifests.SelectedIndex];
-      _selectedManifest = _manifests[AvailableManifests.SelectedIndex];
+      SelectedManifestComboItem = AvailableManifestsCollection[AvailableManifestsComboBox.SelectedIndex];
+      _selectedManifest = _manifests[AvailableManifestsComboBox.SelectedIndex];
       SetSelectedManifest();
     }
 
@@ -125,9 +126,10 @@ protected void SettingsButton_Clicked(object sender, RoutedEventArgs e)
       var settingsUpdated = settingsDialog.ShowDialog();
       if (!settingsUpdated.HasValue || !settingsUpdated.Value)
         return;
+
       var rootDirectory = settingsDialog.RootDirectory;
       Initialize(rootDirectory, SolutionRoot, _initialTokens, _isSolutionCreation);
-      _selectedManifest = _manifests[AvailableManifests.SelectedIndex];
+      _selectedManifest = _manifests[AvailableManifestsComboBox.SelectedIndex];
       SetSelectedManifest();
     }
 
@@ -179,7 +181,7 @@ private void HelixLogo_Clicked(object sender, RoutedEventArgs e)
 
     private void LaubLogo_Clicked(object sender, RoutedEventArgs e)
     {
-      Process.Start(new ProcessStartInfo("https://laubplusco.net"));
+      Process.Start(new ProcessStartInfo("https://laubplusco.net/?origin=vstemplates"));
       e.Handled = true;
     }
 
diff --git a/VisualStudio/Dialogs/Dialogs/SettingsDialog.xaml b/VisualStudio/Dialogs/Dialogs/SettingsDialog.xaml
index 87fd6a9..00951df 100644
--- a/VisualStudio/Dialogs/Dialogs/SettingsDialog.xaml
+++ b/VisualStudio/Dialogs/Dialogs/SettingsDialog.xaml
@@ -35,7 +35,7 @@
       <Label Margin="5,5,5,0" FontWeight="DemiBold">Helix Templates root folder</Label>
       <TextBox Height="25" Width="350" Name="RootDirectoryPath" Margin="5" />
       <Button Content="OK" IsDefault="True" Click="SaveSettings_Click" Margin="5" />
-      <Button Style="{StaticResource ImageButton}" Background="{StaticResource UnpackButtonImage}" BorderThickness="0" MinHeight="80" MinWidth="81" HorizontalAlignment="Center" Margin="0,20,0,0" Click="UnpackTemplates_Clicked" />
+      <Button Style="{StaticResource ImageButton}" Background="{StaticResource UnpackButtonImage}" BorderThickness="0" MinHeight="80" MinWidth="81" HorizontalAlignment="Center" Margin="0,20,0,0" Click="UnpackTemplates_Clicked" Name="UnpackBuiltInButton" />
       <Label HorizontalAlignment="Center" FontSize="10" Margin="0" >
         <TextBlock  FontWeight="DemiBold" HorizontalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center">Install/re-install<LineBreak/> built-in templates</TextBlock>
 </Label>
diff --git a/VisualStudio/Dialogs/Dialogs/SettingsDialog.xaml.cs b/VisualStudio/Dialogs/Dialogs/SettingsDialog.xaml.cs
index 27b1ccd..d963de3 100644
--- a/VisualStudio/Dialogs/Dialogs/SettingsDialog.xaml.cs
+++ b/VisualStudio/Dialogs/Dialogs/SettingsDialog.xaml.cs
@@ -72,27 +72,28 @@ private bool RootHasTemplateManifests(string selectedRootpath)
       return new DirectoryInfo(selectedRootpath).EnumerateFiles("template.manifest.xml", SearchOption.AllDirectories).Any();
     }
 
-    private void Cancel_Click(object sender, RoutedEventArgs e)
-    {
-      DialogResult = false;
-      Close();
-    }
-
     private void UnpackTemplates_Clicked(object sender, RoutedEventArgs e)
     {
       var rootDirectory = TemplatesRootDirectoryPathRepository.Get();
       if (string.IsNullOrEmpty(rootDirectory) || !Directory.Exists(rootDirectory))
-        MessageBox.Show(this, "You need to select a valid root directory.", "Error", MessageBoxButton.OK);
+      { 
+        MessageBox.Show(this, "You need to set a valid root directory.", "Error", MessageBoxButton.OK);
+        return;
+      }
+      UnpackBuiltInButton.IsEnabled = false;
       if (Directory.EnumerateDirectories(rootDirectory).Any())
       {
         var overwriteConfirmResult = MessageBox.Show("This will overwrite changes made to built-in templates in this root folder.\nAre you sure you want to continue?\n\nNote: Always make your modifications changes in copies and never directly in the built-in example templates.", "Confirm", MessageBoxButton.YesNo);
         if (overwriteConfirmResult != MessageBoxResult.Yes)
         {
+          UnpackBuiltInButton.IsEnabled = true;
           return;
         }
         DeleteExistingBuiltInTemplates(rootDirectory);
       }
       UnzipTemplatesArchive(rootDirectory);
+      MessageBox.Show("Built-in templates updated", "", MessageBoxButton.OK);
+      UnpackBuiltInButton.IsEnabled = true;
     }
 
     private void DeleteExistingBuiltInTemplates(string rootDirectory)
diff --git a/VisualStudio/Dialogs/Dialogs/TokenCheckboxInput.xaml b/VisualStudio/Dialogs/Dialogs/TokenCheckboxInput.xaml
new file mode 100644
index 0000000..8735c75
--- /dev/null
+++ b/VisualStudio/Dialogs/Dialogs/TokenCheckboxInput.xaml
@@ -0,0 +1,21 @@
+<local:TokenInputControl x:Class="LaubPlusCo.VisualStudio.HelixTemplates.Dialogs.Dialogs.TokenCheckboxInput"
+                         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:LaubPlusCo.VisualStudio.HelixTemplates.Dialogs.Dialogs"
+                         mc:Ignorable="d" d:DesignWidth="400">
+  <Grid Margin="0,5,0,0">
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="Auto" />
+    </Grid.ColumnDefinitions>
+    <Grid.RowDefinitions>
+      <RowDefinition />
+      <RowDefinition />
+    </Grid.RowDefinitions>
+    <StackPanel Orientation="Horizontal" Grid.Row="1">
+      <CheckBox VerticalAlignment="Center" HorizontalAlignment="Left" Name="TokenInputCheckbox" />
+      <Label FontWeight="DemiBold" Width="Auto" HorizontalAlignment="Left" MaxWidth="430"  Name="TokenDisplayNameLabel" />
+    </StackPanel>
+  </Grid>
+</local:TokenInputControl>
\ No newline at end of file
diff --git a/VisualStudio/Dialogs/Dialogs/TokenCheckboxInput.xaml.cs b/VisualStudio/Dialogs/Dialogs/TokenCheckboxInput.xaml.cs
new file mode 100644
index 0000000..8e1454c
--- /dev/null
+++ b/VisualStudio/Dialogs/Dialogs/TokenCheckboxInput.xaml.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using LaubPlusCo.Foundation.HelixTemplating.Manifest;
+
+namespace LaubPlusCo.VisualStudio.HelixTemplates.Dialogs.Dialogs
+{
+  /// <summary>
+  /// Interaction logic for TokenCheckboxInput.xaml
+  /// </summary>
+  public partial class TokenCheckboxInput : TokenInputControl
+  {
+    public TokenCheckboxInput(TokenDescription tokenDescription)
+    {
+      InitializeComponent();
+      TokenDescription = tokenDescription;
+    }
+
+    public override string TokenValue
+    {
+      get => TokenInputCheckbox.IsChecked.HasValue && TokenInputCheckbox.IsChecked.Value ? bool.TrueString : bool.FalseString;
+      set => TokenInputCheckbox.IsChecked = bool.TryParse(value, out bool val) && val;
+    }
+
+    public override Label DisplayNameLabel => TokenDisplayNameLabel;
+    public override Control InputControl => TokenInputCheckbox;
+  }
+}
diff --git a/VisualStudio/Dialogs/Dialogs/TokenInputControl.cs b/VisualStudio/Dialogs/Dialogs/TokenInputControl.cs
index 2b899c3..4599a03 100644
--- a/VisualStudio/Dialogs/Dialogs/TokenInputControl.cs
+++ b/VisualStudio/Dialogs/Dialogs/TokenInputControl.cs
@@ -9,6 +9,11 @@ namespace LaubPlusCo.VisualStudio.HelixTemplates.Dialogs.Dialogs
 {
   public abstract class TokenInputControl : UserControl
   {
+    protected TokenInputControl()
+    {
+      
+    }
+
     public TokenInputControl[] DependendTokenInputs;
 
     public TokenDescription TokenDescription { get; set; }
diff --git a/VisualStudio/Dialogs/LaubPlusCo.VisualStudio.Helix.Dialogs.csproj b/VisualStudio/Dialogs/LaubPlusCo.VisualStudio.Helix.Dialogs.csproj
index 8b2faa5..facf5b5 100644
--- a/VisualStudio/Dialogs/LaubPlusCo.VisualStudio.Helix.Dialogs.csproj
+++ b/VisualStudio/Dialogs/LaubPlusCo.VisualStudio.Helix.Dialogs.csproj
@@ -73,6 +73,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Dialogs\TokenCheckboxInput.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Dialogs\TokenFolderInput.xaml">
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
@@ -102,6 +106,9 @@
     <Compile Include="Dialogs\SettingsDialog.xaml.cs">
       <DependentUpon>SettingsDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Dialogs\TokenCheckboxInput.xaml.cs">
+      <DependentUpon>TokenCheckboxInput.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Dialogs\TokenFolderInput.xaml.cs">
       <DependentUpon>TokenFolderInput.xaml</DependentUpon>
       <SubType>Code</SubType>
diff --git a/VisualStudio/Dialogs/Resources/StandardTemplates.zip b/VisualStudio/Dialogs/Resources/StandardTemplates.zip
index c049215ad05c7518259b9b90c0056ebc9c1f7bc4..84ba44704639af731bbeca9f5a0d2019c6573e4f 100644
GIT binary patch
delta 734
zcmX@JjQPwmX5IjAW)=|!5a24gyph-0kQqo%eqd-Yx%U#+<X%G#Fn@-jD^%PGOh@F%
zO;+#|-W+DMgb6J0*Tfl2$LE72G$y|f;R5rgnZ|+W&EHK$c)$!kr>_tr`JB8b*SFe%
zRWC4O1+v*Te`vL3+Wg<QhZ(H2FYp+|@bC~%uwjcs!oc*OkQA_j<WNP3q3wz1z}9V!
z$k_*TkKE)7`O>J~n;f4X05)KnDM;1<%>E8!Cmgn#>~F>~dC6gs&FuxNxxo^AP9O=3
z$pQO0Cg(V5L)n~@A8eJJ9JiHia(z<%=HA*R>`01rH`lk?vVjCP@9*9XaY=2T9azP_
zK5wuDPycytW^SO0d$V%czzn~I>g*uK<ew|F;GquUZ(m^#6$cx!*=pqvR<K#7>w~~_
z*ZNQ}{RqmBJt#dnXhT0(jO&o}<o_Ei!0ZGdJ9Hx?3g>Rj1Bq?s+vEdw;O5vZXCVyT
z?WPbXr|#SU)+Vtl5=@uuN(0k(ca?y(hV0IQ=s37{COE1l#~xe-R>5^B7)&P|N&wSy
zH%d>w2NmPnB)!@Hupz{X*e%kV=N;XI;N+c<f^fP|%>ZjvJM9Oi%TGsx=*?G88#94}
di~F1igrRi70L+*iddUYIPD?KNgXwRV!T{_TCcgjx

delta 734
zcmX@JjQPwmX5IjAW)=|!5GY}~u#wl<kQqo%eqd-Yx%U#+<X%G#Fn@-jD^%PGOh@F%
zO;+#|-W+DMgb6J0*Tfl2$LE72G$y|f;R5rgnZ|+W&EHK$c)$!kr>_tr`JB8b*SFe%
zRWC4O1+v*Te`vL3+Wg<QhZ(H2FYp+|@bC~%uwjcs!oc*OkQA_j<WNP3q3wz1z}9V!
z$k_*TkKE)7`O>J~n;f4X05)KnDM;1<%>E8!Cmgn#>~F>~dC6gs&FuxNxxo^AP9O=3
z$pQO0Cg(V5L)n~@A8eJJ9JiHia(z<%=HA*R>`01rH`lk?vVjCP@9*9XaY=2T9azP_
zK5wuDPycza`J3;}%7rNPTc{2(<mU=4lu+Nk!XB*k=L)b9o2^#<U<C`9t`7p!UF$=^
z^dl%g_Mr6Spbh<CF|I?>lmBn90J9T-?9h#nD4e@74<xpkZ<7z$ftzEuoP{uSx0^zo
zoVs%ZSewMINHATpD-BHF-BkkC8nQbJqT}G+nc%3J9D8sTSOwRiU@)C<C;?2*-6%cz
z9#o8Plk{f)!-fzmVz)?do_BN;f|GYb3c~3=H3O_w?X(}5E<YU&qBmbXZ49xL`<w`b
Xp>)9jq9yc_4_N7vOa5T`+odo7NVOy1

diff --git a/VisualStudio/Wizard/HelixTemplateWizard.cs b/VisualStudio/Wizard/HelixTemplateWizard.cs
index 3ea6df4..4aca550 100644
--- a/VisualStudio/Wizard/HelixTemplateWizard.cs
+++ b/VisualStudio/Wizard/HelixTemplateWizard.cs
@@ -15,6 +15,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Security.Principal;
+using System.Windows;
 using EnvDTE;
 using EnvDTE80;
 using LaubPlusCo.Foundation.HelixTemplating.TemplateEngine;
@@ -35,6 +37,12 @@ public class HelixTemplateWizard : IWizard
     private bool? _isExclusive;
     public void RunStarted(object automationObject, Dictionary<string, string> replacementTokens, WizardRunKind runKind, object[] customParams)
     {
+      if (!IsAdministrator())
+      {
+        MessageBox.Show("You need to run Visual Studio as administrator to use these templates.\n\nPlease close Visual Studio and start as Administrator.", "Security", MessageBoxButton.OK);
+        DeleteAutoCreatedDirectory();
+      }
+
       _dte = automationObject as DTE2;
       _replacementTokens = replacementTokens;
       _destinationDirectory = replacementTokens["$destinationdirectory$"];
@@ -48,6 +56,12 @@ public void RunStarted(object automationObject, Dictionary<string, string> repla
       ShowManifestDialog();
     }
 
+    private static bool IsAdministrator()
+    {
+      return (new WindowsPrincipal(WindowsIdentity.GetCurrent()))
+        .IsInRole(WindowsBuiltInRole.Administrator);
+    }
+
     public bool IsFirstRun => string.IsNullOrEmpty(TemplatesRootDirectoryPathRepository.Get()) || !Directory.Exists(TemplatesRootDirectoryPathRepository.Get());
 
     private void ShowInitSetupDialog()