Moved some controls and components to separate classes

StefanKert · Mar 16, 2019 · f4ccea4 · f4ccea4
1 parent b97a25d
commit f4ccea4
Show file tree

Hide file tree

Showing 39 changed files with 976 additions and 583 deletions.
diff --git a/src/BuildVision.Contracts/BuildVision.Contracts.csproj b/src/BuildVision.Contracts/BuildVision.Contracts.csproj
@@ -66,6 +66,7 @@
     <Compile Include="Models\ErrorsBox.cs" />
     <Compile Include="Enums\ProjectState.cs" />
     <Compile Include="Models\IBuildInformationModel.cs" />
+    <Compile Include="Models\IBuildProgressViewModel.cs" />
     <Compile Include="Models\IProjectItem.cs" />
     <Compile Include="Models\ISolutionModel.cs" />
     <Compile Include="ProjectNotFoundException.cs" />

diff --git a/src/BuildVision.Contracts/Models/IBuildInformationModel.cs b/src/BuildVision.Contracts/Models/IBuildInformationModel.cs
@@ -18,7 +18,6 @@ public interface IBuildInformationModel
         int UpToDateProjectsCount { get; set; }
         int WarnedProjectsCount { get; set; }
         int WarningsCount { get; set; }
-
         BuildResultState GetBuildState();
     }
 }
diff --git a/src/BuildVision.Contracts/Models/IBuildProgressViewModel.cs b/src/BuildVision.Contracts/Models/IBuildProgressViewModel.cs
@@ -0,0 +1,16 @@
+namespace BuildVision.Contracts.Models
+{
+    public interface IBuildProgressViewModel
+    {
+        bool ActionProgressIsPaused { get; set; }
+        bool ActionProgressIsVisible { get; set; }
+        int CurrentQueuePosOfBuildingProject { get; }
+
+        void OnBuildBegin(int projectsCount);
+        void OnBuildCancelled();
+        void OnBuildDone();
+        void OnBuildProjectBegin();
+        void OnBuildProjectDone(bool success);
+        void ResetTaskBarInfo(bool ifTaskBarProgressEnabled = true);
+    }
+}
diff --git a/src/BuildVision.UI/App.xaml b/src/BuildVision.UI/App.xaml
@@ -6,6 +6,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Themes/Generic.xaml"/>
                 <ResourceDictionary Source="Styles/DarkStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>

diff --git a/src/BuildVision.UI/BuildVision.UI.csproj b/src/BuildVision.UI/BuildVision.UI.csproj
@@ -73,6 +73,21 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Controls\BuildVisionProgressBar.xaml.cs">
+      <DependentUpon>BuildVisionProgressBar.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\Buttons\CleanSolutionButton.cs" />
+    <Compile Include="Controls\Buttons\BuildSolutionButton.cs" />
+    <Compile Include="Controls\Buttons\RebuildSolutionButton.cs" />
+    <Compile Include="Controls\Buttons\CancelButton.cs" />
+    <Compile Include="Controls\Indicators\ErrorsIndicator.cs" />
+    <Compile Include="Controls\Indicators\MessagesIndicator.cs" />
+    <Compile Include="Controls\Indicators\SuccessProjectsIndicator.cs" />
+    <Compile Include="Controls\Indicators\UpToDateProjectsIndicator.cs" />
+    <Compile Include="Controls\Indicators\ValueIndicator.cs" />
+    <Compile Include="Controls\Indicators\ErrorProjectsIndicator.cs" />
+    <Compile Include="Controls\Indicators\WarningProjectsIndicator.cs" />
+    <Compile Include="Controls\Indicators\WarningsIndicator.cs" />
     <Compile Include="Enums\ResetTaskBarItemInfoCondition.cs" />
     <Compile Include="Helpers\SortDescription.cs" />
     <Compile Include="Enums\SortOrder.cs" />
@@ -84,9 +99,6 @@
     <Compile Include="Settings\Models\BuildProgressSettings.cs" />
     <Compile Include="Common\Logging\BindingErrorListener.cs" />
     <Compile Include="Common\Logging\TraceManager.cs" />
-    <Compile Include="Components\ControlHeader.xaml.cs">
-      <DependentUpon>ControlHeader.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Components\ErrorsGrid.xaml.cs">
       <DependentUpon>ErrorsGrid.xaml</DependentUpon>
     </Compile>
@@ -208,10 +220,6 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Components\ControlHeader.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Components\ControlView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -228,6 +236,20 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Controls\BuildVisionProgressBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Controls\Buttons\Buttons.Test.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Page>
+    <Page Include="Controls\Indicators\Indicators.Test.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Page>
     <Page Include="MainWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -343,6 +365,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Themes\Generic.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BuildVision.Common\BuildVision.Common.csproj">