push

MrRowey · Jul 19, 2024 · d194787 · d194787
1 parent 7f3fd53
commit d194787
Show file tree

Hide file tree

Showing 21 changed files with 106 additions and 50 deletions.
diff --git a/.vs/UCalc/FileContentIndex/2919e754-8df4-4e92-9f32-94a3cb497f54.vsidx b/.vs/UCalc/FileContentIndex/2919e754-8df4-4e92-9f32-94a3cb497f54.vsidx
diff --git a/.vs/UCalc/FileContentIndex/71c5bb2b-d82e-4893-839f-f73037a1a9c0.vsidx b/.vs/UCalc/FileContentIndex/71c5bb2b-d82e-4893-839f-f73037a1a9c0.vsidx
diff --git a/.vs/UCalc/v17/.suo b/.vs/UCalc/v17/.suo
diff --git a/.vs/UCalc/v17/DocumentLayout.json b/.vs/UCalc/v17/DocumentLayout.json
@@ -0,0 +1,52 @@
+{
+  "Version": 1,
+  "WorkspaceRootPath": "C:\\Users\\rowjo\\Documents\\GitHub\\UnitCaculator\\",
+  "Documents": [
+    {
+      "AbsoluteMoniker": "D:0:0:{D4566A4A-9162-40E4-9632-C90FF9A10F80}|UCalc\\UCalc.csproj|c:\\users\\rowjo\\documents\\github\\faftoolbox\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{D4566A4A-9162-40E4-9632-C90FF9A10F80}|UCalc\\UCalc.csproj|C:\\Users\\rowjo\\Documents\\GitHub\\UnitCaculator\\ucalc\\app.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
+      "RelativeMoniker": "D:0:0:{D4566A4A-9162-40E4-9632-C90FF9A10F80}|UCalc\\UCalc.csproj|solutionrelative:ucalc\\app.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
+    }
+  ],
+  "DocumentGroupContainers": [
+    {
+      "Orientation": 0,
+      "VerticalTabListWidth": 256,
+      "DocumentGroups": [
+        {
+          "DockedWidth": 200,
+          "SelectedChildIndex": 1,
+          "Children": [
+            {
+              "$type": "Document",
+              "DocumentIndex": 1,
+              "Title": "App.xaml",
+              "DocumentMoniker": "C:\\Users\\rowjo\\Documents\\GitHub\\UnitCaculator\\UCalc\\App.xaml",
+              "RelativeDocumentMoniker": "UCalc\\App.xaml",
+              "ToolTip": "C:\\Users\\rowjo\\Documents\\GitHub\\UnitCaculator\\UCalc\\App.xaml",
+              "RelativeToolTip": "UCalc\\App.xaml",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
+              "WhenOpened": "2024-07-17T17:38:52.731Z",
+              "IsPinned": true,
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 0,
+              "Title": "MainWindow.xaml",
+              "DocumentMoniker": "C:\\Users\\rowjo\\Documents\\GitHub\\FAFToolbox\\MainWindow.xaml",
+              "RelativeDocumentMoniker": "..\\FAFToolbox\\MainWindow.xaml",
+              "ToolTip": "C:\\Users\\rowjo\\Documents\\GitHub\\FAFToolbox\\MainWindow.xaml",
+              "RelativeToolTip": "..\\FAFToolbox\\MainWindow.xaml",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
+              "WhenOpened": "2024-07-17T17:38:54.399Z",
+              "EditorCaption": ""
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/UCalc/MainWindow.xaml b/UCalc/MainWindow.xaml
@@ -156,7 +156,7 @@
             </StackPanel>
 
             <!-- Cost Multipliers Results -->
-            <StackPanel Grid.Column="3" Grid.Row="4" Orientation="Vertical" HorizontalAlignment="Center" Background="#393e46">
+            <StackPanel Grid.Column="3" Grid.Row="4" Orientation="Vertical" Background="#393e46">
                 <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="30"/>

diff --git a/UCalc/bin/Debug/UCalc.application b/UCalc/bin/Debug/UCalc.application
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>oEcpvFvKz/PECBrwKviwS38D4kxWx4C8u8uondPQG0Q=</dsig:DigestValue>
+        <dsig:DigestValue>YKraEZG3T/zVZ9L1wCJUwMZLL7QoNIwqiZJZxnvvhY0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/UCalc/bin/Debug/UCalc.exe b/UCalc/bin/Debug/UCalc.exe
diff --git a/UCalc/bin/Debug/UCalc.exe.manifest b/UCalc/bin/Debug/UCalc.exe.manifest
@@ -49,7 +49,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>Ixyk//RduS4d3/BCnUTV7wa/8FgTrfrpWowab1q8LWk=</dsig:DigestValue>
+        <dsig:DigestValue>pHrQ3aW/3mssFEbg6ZaXeE9mvVNeTbWFBsY+4cl5OTM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/UCalc/bin/Debug/UCalc.pdb b/UCalc/bin/Debug/UCalc.pdb
diff --git a/UCalc/bin/Debug/app.publish/UCalc.exe b/UCalc/bin/Debug/app.publish/UCalc.exe
diff --git a/UCalc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/UCalc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/UCalc/obj/Debug/MainWindow.baml b/UCalc/obj/Debug/MainWindow.baml
diff --git a/UCalc/obj/Debug/MainWindow.g.cs b/UCalc/obj/Debug/MainWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6AE9CEECC77033014C380E76456E3378BC7B3205AA08DF9903497E63FBBDAD3C"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "83D0414D9CA303C59497C95AA1111E7213473443E6B6E90848EFDE3A25ED2C4E"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -41,111 +41,111 @@ namespace UCalc {
     public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
 
 
-        #line 35 "..\..\MainWindow.xaml"
+        #line 38 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Label Title;
 
         #line default
         #line hidden
 
 
-        #line 55 "..\..\MainWindow.xaml"
+        #line 58 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Label CostTitle;
 
         #line default
         #line hidden
 
 
-        #line 60 "..\..\MainWindow.xaml"
+        #line 63 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox EnergyCostInput;
 
         #line default
         #line hidden
 
 
-        #line 63 "..\..\MainWindow.xaml"
+        #line 66 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox MassCostInput;
 
         #line default
         #line hidden
 
 
-        #line 66 "..\..\MainWindow.xaml"
+        #line 69 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox BuildTimeCostInput;
 
         #line default
         #line hidden
 
 
-        #line 72 "..\..\MainWindow.xaml"
+        #line 75 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button Button_Calculate;
 
         #line default
         #line hidden
 
 
-        #line 79 "..\..\MainWindow.xaml"
+        #line 82 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button Button_Clear;
 
         #line default
         #line hidden
 
 
-        #line 100 "..\..\MainWindow.xaml"
+        #line 103 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock MulitResult;
 
         #line default
         #line hidden
 
 
-        #line 127 "..\..\MainWindow.xaml"
+        #line 130 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox NewEMultiInput;
 
         #line default
         #line hidden
 
 
-        #line 130 "..\..\MainWindow.xaml"
+        #line 133 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox NewMCostInput;
 
         #line default
         #line hidden
 
 
-        #line 133 "..\..\MainWindow.xaml"
+        #line 136 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox NewBTMultiInput;
 
         #line default
         #line hidden
 
 
-        #line 139 "..\..\MainWindow.xaml"
+        #line 142 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button Button_ReCalculate;
 
         #line default
         #line hidden
 
 
-        #line 146 "..\..\MainWindow.xaml"
+        #line 149 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button Button_Clear2;
 
         #line default
         #line hidden
 
 
-        #line 167 "..\..\MainWindow.xaml"
+        #line 170 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock NewCostResult;
 
@@ -200,7 +200,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
             case 6:
             this.Button_Calculate = ((System.Windows.Controls.Button)(target));
 
-            #line 72 "..\..\MainWindow.xaml"
+            #line 75 "..\..\MainWindow.xaml"
             this.Button_Calculate.Click += new System.Windows.RoutedEventHandler(this.Button_Caculate_Mulit_Click);
 
             #line default
@@ -209,7 +209,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
             case 7:
             this.Button_Clear = ((System.Windows.Controls.Button)(target));
 
-            #line 79 "..\..\MainWindow.xaml"
+            #line 82 "..\..\MainWindow.xaml"
             this.Button_Clear.Click += new System.Windows.RoutedEventHandler(this.Button_Clear_Mulitplier_Click);
 
             #line default
@@ -230,7 +230,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
             case 12:
             this.Button_ReCalculate = ((System.Windows.Controls.Button)(target));
 
-            #line 139 "..\..\MainWindow.xaml"
+            #line 142 "..\..\MainWindow.xaml"
             this.Button_ReCalculate.Click += new System.Windows.RoutedEventHandler(this.Button_Calculate_Cost_Click);
 
             #line default
@@ -239,7 +239,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
             case 13:
             this.Button_Clear2 = ((System.Windows.Controls.Button)(target));
 
-            #line 146 "..\..\MainWindow.xaml"
+            #line 149 "..\..\MainWindow.xaml"
             this.Button_Clear2.Click += new System.Windows.RoutedEventHandler(this.Button_Clear_Cost_Click);
 
             #line default