Update Window Always Fix (#76)

Also Removed Misc Prints
WFCD · Mar 8, 2020 · 08955ce · 08955ce
1 parent c9a673c
commit 08955ce
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/WFInfo/Main.cs b/WFInfo/Main.cs
@@ -46,7 +46,6 @@ public Main()
 
         private void AutoUpdaterOnCheckForUpdateEvent(UpdateInfoEventArgs args)
         {
-            Console.WriteLine("Looks like you want to update");
             update = new UpdateDialogue(args);
         }
 

diff --git a/WFInfo/TreeNode.cs b/WFInfo/TreeNode.cs
@@ -726,7 +726,6 @@ public void MakeClickable(string eqmtRef)
 
         public void DecrementPartFunc()
         {
-            Console.WriteLine("Decrementing " + GetFullName());
             if (Parent.dataRef != null)
             {
                 JObject job = Main.dataBase.equipmentData[Parent.dataRef]["parts"][dataRef] as JObject;
@@ -750,7 +749,6 @@ public void DecrementPartFunc()
 
         public void IncrementPartFunc()
         {
-            Console.WriteLine("Incrementing " + GetFullName());
             if (Parent.dataRef != null)
             {
                 JObject job = Main.dataBase.equipmentData[Parent.dataRef]["parts"][dataRef] as JObject;

diff --git a/WFInfo/UpdateDialogue.xaml b/WFInfo/UpdateDialogue.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:WFInfo"
         mc:Ignorable="d"
-        Title="New Update Found" Height="400" Width="500" BorderBrush="#FF707070" WindowStyle="None" ResizeMode="NoResize">
+        Title="New Update Found" Height="320" Width="420" BorderBrush="#FF707070" WindowStyle="None" ResizeMode="NoResize">
     <Window.Resources>
         <Style TargetType="TextBlock" BasedOn="{StaticResource baseStyle}">
 
@@ -34,13 +34,13 @@
                 </TransformGroup>
             </Image.RenderTransform>
         </Image>
-        <TextBlock x:Name="NewVersionText" Text="WFInfo version 9.0.0 has been released!" HorizontalAlignment="Left" Margin="8,5,0,0" Grid.ColumnSpan="2" Grid.Row="1" VerticalAlignment="Top" FontFamily="{StaticResource Roboto_Black}"/>
-        <TextBlock x:Name="OldVersionText" Text="You have version 9.0.0 installed." HorizontalAlignment="Left" Margin="8,26,0,0" Grid.ColumnSpan="2" Grid.Row="1" VerticalAlignment="Top"/>
-        <TextBlock                         Text="Would you like to download it now?" HorizontalAlignment="Left" Margin="8,40,0,0" Grid.ColumnSpan="2" Grid.Row="1" VerticalAlignment="Top"/>
+        <TextBlock x:Name="NewVersionText" Text="WFInfo version 9.0.0 has been released!" HorizontalAlignment="Left" Margin="17,9,0,0" Grid.ColumnSpan="2" Grid.Row="1" VerticalAlignment="Top" FontFamily="{StaticResource Roboto_Black}"/>
+        <TextBlock x:Name="OldVersionText" Text="You have version 9.0.0 installed." HorizontalAlignment="Left" Margin="17,30,0,0" Grid.ColumnSpan="2" Grid.Row="1" VerticalAlignment="Top"/>
+        <TextBlock                         Text="Would you like to download it now?" HorizontalAlignment="Left" Margin="17,44,0,0" Grid.ColumnSpan="2" Grid.Row="1" VerticalAlignment="Top"/>
         <Button Content="No" Margin="143,76,101,0" VerticalAlignment="Top" Background="#FF0F0F0F" Click="Skip" Grid.Column="1" Height="0" Grid.Row="1"/>
         <TextBlock x:Name="TitleText" Text="New Update is Available!" Margin="7,3,0,0" Background="{x:Null}" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="16" FontFamily="{StaticResource Roboto_Black}" Grid.Column="1" Height="19" Width="178" />
         <Label MouseLeftButtonDown="Exit" Content="x" Style="{StaticResource Label_Button}" Margin="0,0,0,0" Grid.Column="2"/>
-        <TextBlock x:Name="ReleaseNotes_Header" Text="Release Notes:" HorizontalAlignment="Left" Margin="8,65,0,0" Grid.ColumnSpan="2" Grid.Row="1" FontFamily="{StaticResource Roboto_Black}" Height="14" VerticalAlignment="Top"/>
+        <TextBlock x:Name="ReleaseNotes_Header" Text="Release Notes:" HorizontalAlignment="Left" Margin="17,68,0,0" Grid.ColumnSpan="2" Grid.Row="1" FontFamily="{StaticResource Roboto_Black}" Height="14" VerticalAlignment="Top"/>
         <Border BorderBrush="#646464" BorderThickness="1" Margin="17,93,17,45" Grid.Row="1" Grid.ColumnSpan="3">
             <ScrollViewer Padding="5,5,5,5">
                 <StackPanel x:Name="ReleaseNotes">

diff --git a/WFInfo/UpdateDialogue.xaml.cs b/WFInfo/UpdateDialogue.xaml.cs
@@ -28,11 +28,9 @@ public UpdateDialogue(UpdateInfoEventArgs args)
             updateInfo = args;
 
             string version = args.CurrentVersion.ToString();
-            if(Settings.settingsObj.TryGetValue("ignored", out JToken val) && val.ToString() == version)
+            if(!args.IsUpdateAvailable || (Settings.settingsObj.TryGetValue("ignored", out JToken val) && val.ToString() == version))
                 return;
             version = version.Substring(0, version.LastIndexOf("."));
-            Console.WriteLine(version);
-            //TitleText.Text = "WFInfo " + version + " is available";
 
             NewVersionText.Text = "WFInfo version " + version + " has been released!";
             OldVersionText.Text = "You have version " + Main.BuildVersion + " installed.";
@@ -54,7 +52,6 @@ public UpdateDialogue(UpdateInfoEventArgs args)
                     tag.Text = tag_name;
                     tag.FontWeight = FontWeights.Bold;
                     ReleaseNotes.Children.Add(tag);
-                    Console.WriteLine(prop["body"]);
                     TextBlock body = new TextBlock();
                     body.Text = prop["body"].ToString() + "\n";
                     body.Padding = new Thickness(10, 0, 0, 0);