Version increased + cleanup + new feature description

Close #21
Triky313 · Feb 8, 2021 · 9d6562b · 9d6562b
1 parent 9fa8beb
commit 9d6562b
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/App.config b/StatisticsAnalysisTool/StatisticsAnalysisTool/App.config
@@ -108,7 +108,7 @@
                 <value>lootchests.json</value>
             </setting>
             <setting name="LootChestDataSourceUrl" serializeAs="String">
-                <value>https://raw.githubusercontent.com/Triky313/AlbionOnline-StatisticsAnalysis/master/StatisticsAnalysisTool/StatisticsAnalysisTool/GameFiles/lootchest.json</value>
+                <value>https://raw.githubusercontent.com/Triky313/AlbionOnline-StatisticsAnalysis/master/StatisticsAnalysisTool/StatisticsAnalysisTool/GameFiles/lootchests.json</value>
             </setting>
         </StatisticsAnalysisTool.Properties.Settings>
     </userSettings>

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/Common/LootChestController.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/Common/LootChestController.cs
@@ -113,9 +113,7 @@ public static Faction GetFaction(string value)
 
         public static async Task<bool> GetDataListFromJsonAsync()
         {
-            //var url = Settings.Default.LootChestDataSourceUrl;
-            // TODO: Add normal path
-            var url = "https://raw.githubusercontent.com/Triky313/AlbionOnline-StatisticsAnalysis/%2321-ViewOpenedChestsInaDungeon/StatisticsAnalysisTool/StatisticsAnalysisTool/GameFiles/lootchests.json";
+            var url = Settings.Default.LootChestDataSourceUrl;
             var localFilePath = $"{AppDomain.CurrentDomain.BaseDirectory}{Settings.Default.LootChestDataFileName}";
 
             if (string.IsNullOrEmpty(url))

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/Languages/en-US.xml b/StatisticsAnalysisTool/StatisticsAnalysisTool/Languages/en-US.xml
@@ -101,7 +101,7 @@
   <translation name="SHOW_NOT_AGAIN">Show not again</translation>
   <translation name="SHOW_INFO_WINDOW_ON_START">Show info window on start</translation>
   <translation name="NEW_FEATURE">New Feature</translation>
-  <translation name="FEATURE_DESCRIPTION">NEW FEATURE - DUNGEON TRACKING &#x0a;Current Fame, Respec or Silver values can now be seen. Additionally also per hour. (Npcap required)(ALPHA) &#x0a; https://nmap.org/npcap/ </translation>
+  <translation name="FEATURE_DESCRIPTION">NEW FEATURE - DUNGEON TRACKING &#x0a;(Npcap required) https://nmap.org/npcap/ </translation>
   <translation name="EQUIPABLE">Equipable</translation>
   <translation name="STACKABLE">Stackable</translation>
   <translation name="SHOW_IN_MARKET_PLACE">Show in market place</translation>

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/Properties/AssemblyInfo.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.0.*")]
-[assembly: AssemblyFileVersion("3.1.0.0")]
+[assembly: AssemblyVersion("3.2.0.*")]
+[assembly: AssemblyFileVersion("3.2.0.0")]
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/Properties/Settings.Designer.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/Properties/Settings.Designer.cs
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/Properties/Settings.settings b/StatisticsAnalysisTool/StatisticsAnalysisTool/Properties/Settings.settings
@@ -105,7 +105,7 @@
       <Value Profile="(Default)">lootchests.json</Value>
     </Setting>
     <Setting Name="LootChestDataSourceUrl" Type="System.String" Scope="User">
-      <Value Profile="(Default)">https://raw.githubusercontent.com/Triky313/AlbionOnline-StatisticsAnalysis/master/StatisticsAnalysisTool/StatisticsAnalysisTool/GameFiles/lootchest.json</Value>
+      <Value Profile="(Default)">https://raw.githubusercontent.com/Triky313/AlbionOnline-StatisticsAnalysis/master/StatisticsAnalysisTool/StatisticsAnalysisTool/GameFiles/lootchests.json</Value>
     </Setting>
   </Settings>
 </SettingsFile>
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/Resources/feature_image.png b/StatisticsAnalysisTool/StatisticsAnalysisTool/Resources/feature_image.png
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/StatisticsAnalysisTool.csproj b/StatisticsAnalysisTool/StatisticsAnalysisTool/StatisticsAnalysisTool.csproj
@@ -448,6 +448,9 @@
     <Resource Include="Resources\faction_undead_banner.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Resources\feature_image.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
     <Content Include="Sounds\alert1.wav">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/Views/InfoWindow.xaml b/StatisticsAnalysisTool/StatisticsAnalysisTool/Views/InfoWindow.xaml
@@ -22,8 +22,8 @@
             <Button x:Name="MinimizeButton" Style="{StaticResource WindowButtonStyle}" Content="0" Margin="0,0,28,0" Click="MinimizeButton_Click" />
         </Grid>
         <Grid Margin="0,33">
-            <TextBlock Text="{Binding Translation.FeatureDescription, FallbackValue=FEATURE_DESCRIPTION}" FontSize="20" Foreground="{StaticResource Solid.Color.Text.Gold}" TextAlignment="Center" Margin="10,10,10,205" TextWrapping="Wrap" />
-            <Image Style="{StaticResource Image.GoldChest}" Margin="0,115,0,-5" />
+            <TextBlock Text="{Binding Translation.FeatureDescription, FallbackValue=FEATURE_DESCRIPTION}" FontSize="20" Foreground="{StaticResource Solid.Color.Text.Gold}" TextAlignment="Center" Margin="10,10,10,272" TextWrapping="Wrap" />
+            <Image Source="../Resources/feature_image.png" Margin="0,115,0,-5" />
         </Grid>
         <Grid Height="33" VerticalAlignment="Bottom">
             <CheckBox Content="{Binding Translation.ShowNotAgainContent, FallbackValue=SHOW__NOT__AGAIN}" IsChecked="{Binding ShowNotAgainChecked, FallbackValue=false}" Foreground="{StaticResource SolidColorBrush.Foreground.First}" HorizontalAlignment="Left" VerticalContentAlignment="Center" Margin="10,0,0,10" VerticalAlignment="Bottom" Width="Auto" />