diff options
| author | Roy <Roy.mail.net@gmail.com> | 2023-05-23 10:42:21 +0300 |
|---|---|---|
| committer | Roy <Roy.mail.net@gmail.com> | 2023-05-23 10:42:21 +0300 |
| commit | 304735006580cb2f6728bedeb3393dbefc2e14f5 (patch) | |
| tree | 8650d4baeb0b4db1f68b0fae3a0a8ddb7e66bdc0 /Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj | |
| parent | 79cc4b56962ca4a508be501f7f2fb42938a3a073 (diff) | |
| parent | b981d43669a2cdcd9f7971e897ded9f1422f5b31 (diff) | |
| download | Tango-304735006580cb2f6728bedeb3393dbefc2e14f5.tar.gz Tango-304735006580cb2f6728bedeb3393dbefc2e14f5.zip | |
Merge branch 'eureka' of https://twinetfs.visualstudio.com/Tango/_git/Tango into eureka
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj index 120001ea3..51600b0e8 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj @@ -158,6 +158,7 @@ <DependentUpon>WiFiAuthenticationView.xaml</DependentUpon> </Compile> <Compile Include="Connectivity\WiFiAuthenticationViewVM.cs" /> + <Compile Include="Controls\JobOutlineControl.cs" /> <Compile Include="Controls\MachineStatusControl.xaml.cs"> <DependentUpon>MachineStatusControl.xaml</DependentUpon> </Compile> @@ -173,6 +174,7 @@ <Compile Include="Converters\LiquidTypeToBrushConverter.cs" /> <Compile Include="Converters\MidTankLevelToElementRectConverter.cs" /> <Compile Include="Converters\ProgressLengthSpoolConverter.cs" /> + <Compile Include="Converters\ProgressUnitSpoolConverter.cs" /> <Compile Include="Converters\ProgressWeightSpoolConverter.cs" /> <Compile Include="Dialogs\BitResultsView.xaml.cs"> <DependentUpon>BitResultsView.xaml</DependentUpon> @@ -181,6 +183,10 @@ <Compile Include="Dialogs\CartridgeValidationView.xaml.cs"> <DependentUpon>CartridgeValidationView.xaml</DependentUpon> </Compile> + <Compile Include="Dialogs\GeneralInformationView.xaml.cs"> + <DependentUpon>GeneralInformationView.xaml</DependentUpon> + </Compile> + <Compile Include="Dialogs\GeneralInformationViewVM.cs" /> <Compile Include="Dialogs\InsufficientLiquidQuantityView.xaml.cs"> <DependentUpon>InsufficientLiquidQuantityView.xaml</DependentUpon> </Compile> @@ -349,6 +355,10 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> + <Page Include="Dialogs\GeneralInformationView.xaml"> + <SubType>Designer</SubType> + <Generator>MSBuild:Compile</Generator> + </Page> <Page Include="Dialogs\InsufficientLiquidQuantityView.xaml"> <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> @@ -952,7 +962,7 @@ if $(ConfigurationName) == Eureka copy /Y "$(ProjectDir)Intro.wmv" "$(TargetDir) </PropertyGroup> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> <Import Project="..\..\packages\WPFMediaKit.2.2.0\build\WPFMediaKit.targets" Condition="Exists('..\..\packages\WPFMediaKit.2.2.0\build\WPFMediaKit.targets')" /> |