Fixed wrong update required case; Added new pinned icon

KairuByte · Aug 23, 2019 · e35be8b · e35be8b
1 parent a9875e8
commit e35be8b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/Gw2 Launchbuddy/MainWindow.xaml b/Gw2 Launchbuddy/MainWindow.xaml
@@ -238,7 +238,7 @@
                     </TransformGroup>
                 </Image.RenderTransform>
             </Image>
-            <Label x:Name="Title" Grid.Row="0" Content="Gw2 Launchbuddy V2.0" FontSize="16" FontWeight="Bold" Foreground="White" HorizontalAlignment="Left"/>
+            <Label x:Name="Title" Grid.Row="0" Content="Gw2 Launchbuddy V2.0 Prerelease" FontSize="16" FontWeight="Bold" Foreground="White" HorizontalAlignment="Left"/>
         </Grid>
 
         <StackPanel Grid.Column="1" Grid.ColumnSpan="5" x:Name="WindowOptionsColum"  Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right" Background="#CC000000">
@@ -376,7 +376,7 @@
                             <ListView.ItemTemplate>
                                 <DataTemplate>
                                     <DockPanel ToolTip="{Binding Path=Client.Status}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" LastChildFill="False" IsEnabled="{Binding Path=Settings.Loginfile.IsUpToDate}">
-                                        <Label Height="32" Visibility="{Binding Path=Settings.Loginfile.IsOutdated, Converter={StaticResource BoolToVis}}" ToolTip="Loginfile is outdated" Foreground="Red" Content="UPDATE REQUIRED" DockPanel.Dock="Right"/>
+                                        <Label Height="32" Visibility="{Binding Path=Settings.LoginfileOutdated, Converter={StaticResource BoolToVis}}" ToolTip="Loginfile is outdated" Foreground="Red" Content="UPDATE REQUIRED" DockPanel.Dock="Right"/>
                                         <Image Height="32" Source="{Binding Path=Settings.Icon.Image}" DockPanel.Dock="Left"/>
                                         <Image Height="32" Source="{Binding Path=Client.StatusToIcon}" DockPanel.Dock="Right"/>
                                         <Image Height="32" Source="Resources/Icons/settings.png" Visibility="{Binding Path=Settings.HasArguments, Converter={StaticResource BoolToVis}}" ToolTip="Uses Arguments" DockPanel.Dock="Right"/>

diff --git a/Gw2 Launchbuddy/Modifiers/LocalDatManager.cs b/Gw2 Launchbuddy/Modifiers/LocalDatManager.cs
@@ -344,7 +344,7 @@ public class LocalDatFile
         public string Name { get { return System.IO.Path.GetFileNameWithoutExtension(Path); } }
         public string Gw2Build { get { return gw2build; } }
         public bool IsUpToDate { get { return Gw2Build == EnviromentManager.GwClientVersion; } }
-        public bool IsOutdated { get { return !(IsUpToDate); } }
+        public bool IsOutdated { get { return !(IsUpToDate && Valid); } }
         public bool Valid = false;
         public string MD5HASH {  get { return CalculateMD5(Path); } }
 

diff --git a/Gw2 Launchbuddy/ObjectManagers/AccountManager.cs b/Gw2 Launchbuddy/ObjectManagers/AccountManager.cs
@@ -378,6 +378,8 @@ public void SetRelaunched(uint MaxRelaunches)
         public bool HasAdvancedSettings { get { if (ProcessPriority != ProcessPriorityClass.Normal || RelaunchesMax > 0) { return true; } return false; } set { } }
         [XmlIgnore]
         public bool HasWindowConfig { get { return WinConfig != null; } }
+        [XmlIgnore]
+        public bool LoginfileOutdated {get { if(Loginfile != null)return Loginfile.IsOutdated; return false;}}
 
 
         public void SetLoginFile()

diff --git a/Gw2 Launchbuddy/ObjectManagers/EnviromentManager.cs b/Gw2 Launchbuddy/ObjectManagers/EnviromentManager.cs
@@ -19,7 +19,7 @@ namespace Gw2_Launchbuddy.ObjectManagers
 
     public static class EnviromentManager
     {
-        public static Version LBVersion = new Version("1.9.3");
+        public static Version LBVersion = new Version("2.0.0");
         public static LaunchOptions LaunchOptions;
 
         public static string LBAppdataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\Gw2 Launchbuddy\";

diff --git a/Gw2 Launchbuddy/Properties/AssemblyInfo.cs b/Gw2 Launchbuddy/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("TheCheatsrichter")]
 [assembly: AssemblyProduct("Gw2 Launchbuddy")]
-[assembly: AssemblyCopyright("Copyright ©  2018 TheCheatsrichter")]
+[assembly: AssemblyCopyright("Copyright ©  2019 TheCheatsrichter")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -48,6 +48,6 @@
 // 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.9.3.0")]
-[assembly: AssemblyFileVersion("1.9.3.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/Gw2 Launchbuddy/Resources/Icons/pinned.png b/Gw2 Launchbuddy/Resources/Icons/pinned.png