Starting splitting PPC to modules.

5 files changed, 9 insertions, 72 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml
index 9415cf1b0..7addfdd13 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml
@@ -11,24 +11,15 @@
                 
                 <!--Touch-->
                 <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Resources/Colors.xaml"/>
-                <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Resources/Fonts.xaml"/>
-                <ResourceDictionary Source="pack://application:,,,/Tango.PPC.Common;component/Resources/Fonts.xaml"/>
-                <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Styles/TouchToggleButton.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Styles/TouchButton.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Styles/TouchIconButton.xaml" />
 
                 <!--Common-->
-                <ResourceDictionary Source="pack://application:,,,/Tango.PPC.Common;component/Resources/Styles.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Tango.PPC.Common;component/Resources/Merged.xaml" />
 
                 <!--Local-->
                 <ResourceDictionary Source="Resources/Colors.xaml"></ResourceDictionary>
                 <ResourceDictionary Source="Resources/Fonts.xaml"></ResourceDictionary>
                 <ResourceDictionary Source="Resources/Styles.xaml"></ResourceDictionary>
                 
-                <!--Converters-->
-                <ResourceDictionary>
-                    <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-                </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
 		</ResourceDictionary>
     </Application.Resources>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 18397f182..79627389a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -7,49 +7,4 @@ using System.Windows;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Tango.PPC.UI")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tango.PPC.UI")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                                     //(used if a resource is not found in the page,
-                                     // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                              //(used if a resource is not found in the page,
-                                              // app, or any theme specific resource dictionaries)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyTitle("Tango Panel PC Application")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Fonts.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Fonts.xaml
index 659970db2..c510f85e5 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Fonts.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Fonts.xaml
@@ -3,14 +3,6 @@
                     xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     xmlns:local="clr-namespace:Tango.PPC.UI.Resources">
 
-    <FontFamily x:Key="TangoFlexoFontFamily">Flexo</FontFamily>
-
-    <sys:Double x:Key="TangoDefaultFontSize">16</sys:Double>
-    <sys:Double x:Key="TangoKeyboardFontSize">20</sys:Double>
-    <sys:Double x:Key="TangoDataGridHeaderFontSize">16</sys:Double>
-    <sys:Double x:Key="TangoNavigationLinksFontSize">18</sys:Double>
-    <sys:Double x:Key="TangoHeaderFontSize">30</sys:Double>
-    <sys:Double x:Key="TangoButtonFontSize">20</sys:Double>
     <sys:Double x:Key="TangoMessageBoxTitleFontSize">30</sys:Double>
     <sys:Double x:Key="TangoMessageBoxMessageFontSize">20</sys:Double>
     
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Styles.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Styles.xaml
index f83d71e92..d2948f070 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Styles.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Styles.xaml
@@ -10,14 +10,6 @@
         <Setter Property="Margin" Value="5"></Setter>
     </Style>
 
-    <Style TargetType="{x:Type touch:TouchDataGrid}" BasedOn="{StaticResource {x:Type touch:TouchDataGrid}}">
-        <Style.Resources>
-            <Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
-                <Setter Property="FontSize" Value="{StaticResource TangoDataGridHeaderFontSize}"></Setter>
-            </Style>
-        </Style.Resources>
-    </Style>
-
     <Style TargetType="{x:Type touch:TouchButton}" BasedOn="{StaticResource {x:Type touch:TouchButton}}">
         <Setter Property="FontSize" Value="{StaticResource TangoButtonFontSize}"></Setter>
     </Style>
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 bad23c655..12b53248e 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
@@ -89,6 +89,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="..\..\Versioning\PPCVersionInfo.cs">
+      <Link>PPCVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="Navigation\DefaultNavigationManager.cs" />
     <Compile Include="Notifications\DefaultNotificationProvider.cs" />
     <Compile Include="Notifications\MessageBox.xaml.cs">
@@ -233,6 +236,10 @@
       <Project>{74e700b0-1156-4126-be40-ee450d3c3026}</Project>
       <Name>Tango.Transport</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules\Tango.PPC.Jobs\Tango.PPC.Jobs.csproj">
+      <Project>{096f16c8-6d06-4b5f-9496-b9d2df2d94a3}</Project>
+      <Name>Tango.PPC.Jobs</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Tango.PPC.Common\Tango.PPC.Common.csproj">
       <Project>{0be74eee-22cb-4dba-b896-793b9e1a3ac0}</Project>
       <Name>Tango.PPC.Common</Name>