Begin work integrating the git app in

Lyeeedar · Dec 30, 2019 · 5b52ef3 · 5b52ef3
1 parent 4d97005
commit 5b52ef3
Show file tree

Hide file tree

Showing 10 changed files with 163 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "StructuredXmlEditor/Tools/GitTool"]
+	path = StructuredXmlEditor/Tools/GitTool
+	url = https://github.com/Lyeeedar/GitApp.git
diff --git a/StructuredXmlEditor/Data/Workspace.cs b/StructuredXmlEditor/Data/Workspace.cs
@@ -237,6 +237,7 @@ public Workspace()
 			Tools.Add(new ProjectViewTool(this));
 			Tools.Add(new TemplateCreatorTool(this));
 			Tools.Add(new FocusTool(this));
+			Tools.Add(new GitTool(this));
 
 			Thread workerThread = new Thread(WorkerThreadLoop);
 			workerThread.IsBackground = true;

diff --git a/StructuredXmlEditor/MainWindow.xaml b/StructuredXmlEditor/MainWindow.xaml
@@ -310,6 +310,11 @@
 						DataType="{x:Type t:TemplateCreatorTool}">
 						<v:TemplateCreatorToolView />
 					</DataTemplate>
+					<DataTemplate
+						DataType="{x:Type t:GitTool}">
+						<ContentPresenter
+							Content="{Binding View}" />
+					</DataTemplate>
 				</dock:DockingManager.Resources>
 
 				<dock:DockingManager.LayoutItemContainerStyleSelector>

diff --git a/StructuredXmlEditor/Resources/Branch.png b/StructuredXmlEditor/Resources/Branch.png
diff --git a/StructuredXmlEditor/Resources/DownArrow.png b/StructuredXmlEditor/Resources/DownArrow.png
diff --git a/StructuredXmlEditor/Resources/Pull.png b/StructuredXmlEditor/Resources/Pull.png
diff --git a/StructuredXmlEditor/Resources/Push.png b/StructuredXmlEditor/Resources/Push.png
diff --git a/StructuredXmlEditor/StructuredXmlEditor.csproj b/StructuredXmlEditor/StructuredXmlEditor.csproj
@@ -142,6 +142,41 @@
     <Compile Include="Definition\ReferenceDefinition.cs" />
     <Compile Include="Definition\TreeDefinition.cs" />
     <Compile Include="Tools\FocusTool.cs" />
+    <Compile Include="Tools\GitTool.cs" />
+    <Compile Include="Tools\GitTool\GitApp\Util\Command.cs" />
+    <Compile Include="Tools\GitTool\GitApp\Util\Extensions.cs" />
+    <Compile Include="Tools\GitTool\GitApp\Util\Future.cs" />
+    <Compile Include="Tools\GitTool\GitApp\Util\NotifyPropertyChanged.cs" />
+    <Compile Include="Tools\GitTool\GitApp\Util\Pool.cs" />
+    <Compile Include="Tools\GitTool\GitApp\Util\ProcessUtils.cs" />
+    <Compile Include="Tools\GitTool\GitApp\ViewModel.cs" />
+    <Compile Include="Tools\GitTool\GitApp\ViewModelView.xaml.cs">
+      <DependentUpon>ViewModelView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Tools\GitTool\GitApp\View\CustomControls\AnimatedImage.xaml.cs">
+      <DependentUpon>AnimatedImage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Tools\GitTool\GitApp\View\CustomControls\AutoCompleteTextBox.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\CustomControls\ColourPicker\ColorCanvas.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\CustomControls\ColourPicker\ColorSpectrumSlider.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\CustomControls\ColourPicker\ColourUtilities.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\CustomControls\ColourPicker\HsvColor.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\CustomControls\ContentPopup.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\CustomControls\InsertionAdorner.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\CustomControls\MenuItemGroupHeader.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\CustomControls\Message.xaml.cs">
+      <DependentUpon>Message.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Tools\GitTool\GitApp\View\CustomControls\MultilineTextEditor.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\CustomControls\NumericTextBox.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\CustomControls\PromptTextBox.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\SharedResourceDictionary.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\ValueConverters\ColourMarkupConverter.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\ValueConverters\ContrastTextConverter.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\ValueConverters\ConverterBase.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\ValueConverters\NullImageConverter.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\ValueConverters\NullOrZeroConverter.cs" />
+    <Compile Include="Tools\GitTool\GitApp\View\ValueConverters\ValueTypeConverter.cs" />
     <Compile Include="Tools\ProjectView\ProjectItem.cs" />
     <Compile Include="Tools\ProjectView\ProjectViewTool.cs" />
     <Compile Include="Tools\StartPage.cs" />
@@ -239,6 +274,86 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="Tools\GitTool\GitApp\ViewModelView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\CustomControls\AnimatedImage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\CustomControls\Message.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\AutoCompleteTextBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\Brushes.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\Button.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\CheckBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\ColorCanvas.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\ComboBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\ContentPopup.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\GeneralStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\ListView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\Menu.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\MultilineTextEditor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\NumericTextBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\PromptTextBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\Scrollbar.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\Slider.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\TabControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Tools\GitTool\GitApp\View\Styles\TextBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\CustomControls\AnimatedImage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -443,6 +558,12 @@
   <ItemGroup>
     <Resource Include="Resources\DefIcon.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Branch.png" />
+    <Resource Include="Resources\DownArrow.png" />
+    <Resource Include="Resources\Pull.png" />
+    <Resource Include="Resources\Push.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Fody.4.2.1\build\Fody.targets" Condition="Exists('..\packages\Fody.4.2.1\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/StructuredXmlEditor/Tools/GitTool b/StructuredXmlEditor/Tools/GitTool
diff --git a/StructuredXmlEditor/Tools/GitTool.cs b/StructuredXmlEditor/Tools/GitTool.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using GitApp;
+using StructuredXmlEditor.Data;
+
+namespace StructuredXmlEditor.Tools
+{
+	public class GitTool : ToolBase
+	{
+		public ViewModelView View
+		{
+			get
+			{
+				if (m_view == null)
+				{
+					m_view = new GitApp.ViewModelView();
+				}
+
+				return m_view;
+			}
+		}
+		private GitApp.ViewModelView m_view;
+
+		public GitTool(Workspace workspace) : base(workspace, "Git Tool")
+		{
+			DefaultPositionDocument = ToolPosition.Document;
+		}
+	}
+}