Items fully skinned, added zh-CN, V1.9

Just2good · Jul 10, 2019 · bf15083 · bf15083
1 parent 75eab4e
commit bf15083
Show file tree

Hide file tree

Showing 30 changed files with 1,871 additions and 892 deletions.
diff --git a/App.xaml b/App.xaml
@@ -13,6 +13,7 @@
             <FontFamily x:Key="Cabin">pack://application:,,,/ReferencedAssembly;component/Font/Cabin.ttf</FontFamily>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Resource\Items.xaml"/>
+                <ResourceDictionary Source="Resource\ItemsTextless.xaml"/>
                 <ResourceDictionary Source="Resource\Localization\ItemStrings.xaml"/>
                 <ResourceDictionary Source="Resource\Charts.xaml"/>
                 <ResourceDictionary Source="Resource\ClassOrigins.xaml"/>

diff --git a/Images/cstyle/items/cursed_blade.png b/Images/cstyle/items/cursed_blade.png
diff --git a/Images/cstyle/items/dragons_claw.png b/Images/cstyle/items/dragons_claw.png
diff --git a/Images/cstyle/items/frozen_heart.png b/Images/cstyle/items/frozen_heart.png
diff --git a/Images/cstyle/items/guinsoos_rageblade.png b/Images/cstyle/items/guinsoos_rageblade.png
diff --git a/Images/cstyle/items/hush.png b/Images/cstyle/items/hush.png
diff --git a/Images/cstyle/items/ionic_spark.png b/Images/cstyle/items/ionic_spark.png
diff --git a/Images/cstyle/items/locket_of_the_iron_solari.png b/Images/cstyle/items/locket_of_the_iron_solari.png
diff --git a/Images/cstyle/items/ludens_echo.png b/Images/cstyle/items/ludens_echo.png
diff --git a/Images/cstyle/items/morellonomicon.png b/Images/cstyle/items/morellonomicon.png
diff --git a/Images/cstyle/items/phantom_dancer.png b/Images/cstyle/items/phantom_dancer.png
diff --git a/Images/cstyle/items/rabadons_deathcap.png b/Images/cstyle/items/rabadons_deathcap.png
diff --git a/Images/cstyle/items/rapid_firecannon.png b/Images/cstyle/items/rapid_firecannon.png
diff --git a/Images/cstyle/items/red_buff.png b/Images/cstyle/items/red_buff.png
diff --git a/Images/cstyle/items/redemption.png b/Images/cstyle/items/redemption.png
diff --git a/Images/cstyle/items/seraphs_embrace.png b/Images/cstyle/items/seraphs_embrace.png
diff --git a/Images/cstyle/items/statikk_shiv.png b/Images/cstyle/items/statikk_shiv.png
diff --git a/Images/cstyle/items/sword_breaker.png b/Images/cstyle/items/sword_breaker.png
diff --git a/Images/cstyle/items/thornmail.png b/Images/cstyle/items/thornmail.png
diff --git a/Images/cstyle/items/titanic_hydra.png b/Images/cstyle/items/titanic_hydra.png
diff --git a/Images/cstyle/items/warmogs_armor.png b/Images/cstyle/items/warmogs_armor.png
diff --git a/Images/cstyle/items/zephyr.png b/Images/cstyle/items/zephyr.png
diff --git a/MainWindow.xaml b/MainWindow.xaml
@@ -147,7 +147,6 @@
                                                     <MenuItem x:Name="Lock" Header="Lock" IsChecked="{Binding Source={x:Static p:Settings.Default}, Path=Lock}" Click="MenuItem_Click_Lock" Foreground="Black"/>
                                                     <MenuItem x:Name="ResizeLock" Header="Resize" IsChecked="False" IsCheckable="True" Foreground="Black"/>
                                                     <MenuItem x:Name="OnTop" Header="Always On Top" IsChecked="True" IsCheckable="True" Click="MenuItem_Click_OnTop" Foreground="Black"/>
-                                                    <MenuItem x:Name="AutoDim" Header="Auto-Dim" Click="AutoDim_Click" IsChecked="{Binding Source={x:Static p:Settings.Default}, Path=AutoDim}" Foreground="Black"/>
                                                     <Separator Width="Auto" Height="2"/>
                                                     <MenuItem x:Name="Localization"  Header="Language" Foreground="Black">
                                                         <MenuItem Header="English">
@@ -176,6 +175,7 @@
                                                             <MenuItem Header="vi-VN" Click="VN_Click"/>
                                                         </MenuItem>
                                                         <MenuItem Header="中文">
+                                                            <MenuItem Header="zh-CN" Click="CN_Click"/>
                                                             <MenuItem Header="zh-TW" Click="TW_Click"/>
                                                         </MenuItem>
                                                         <Separator Width="Auto" Height="2"/>
@@ -185,7 +185,8 @@
                                                     <MenuItem Header="About" Click="MenuItem_Click_About" Foreground="Black"/>
                                                     <MenuItem Header="Credits" Click="MenuItem_Click_Credits" Foreground="Black"/>
                                                     <Separator Width="Auto" Height="2"/>
-                                                    <MenuItem x:Name="AutoUpdate" Header="Check for Updates (Re-Launch)" IsChecked="False" IsCheckable="True" Click="MenuItem_AutoUpdate" Foreground="Black"/>
+                                                    <MenuItem x:Name="AutoDim" Header="Auto-Dim" Click="AutoDim_Click" IsChecked="{Binding Source={x:Static p:Settings.Default}, Path=AutoDim}" Foreground="Black"/>
+                                                    <MenuItem x:Name="AutoUpdate" Header="Auto-Updater" IsChecked="{Binding Source={x:Static p:Settings.Default}, Path=AutoUpdate}" Click="MenuItem_AutoUpdate" Foreground="Black"/>
                                                     <Separator Width="Auto" Height="2"/>
                                                     <MenuItem Header="Exit" Click="MenuItem_Click" Foreground="Black"/>
                                                 </ContextMenu>
@@ -222,31 +223,31 @@
                     <!--IsChecked-->
                     <!--Bar Buttons-->
                     <DataTrigger Binding="{Binding ElementName=Bow, Path=IsChecked}" Value="True">
-                        <Setter TargetName="Frame" Property="ContentTemplate" Value="{StaticResource Recurve}"/>
+                        <Setter TargetName="Frame" Property="ContentTemplate" Value="{StaticResource Recurve1}"/>
                         <Setter TargetName="Modifier" Property="IsChecked" Value="True"/>
                     </DataTrigger>
                     <DataTrigger Binding="{Binding ElementName=BFS, Path=IsChecked}" Value="True">
                         <Setter TargetName="Frame" Property="ContentTemplate" Value="{StaticResource BFSword1}"/>
                         <Setter TargetName="Modifier" Property="IsChecked" Value="True"/>
                     </DataTrigger>
                     <DataTrigger Binding="{Binding ElementName=Rod, Path=IsChecked}" Value="True">
-                        <Setter TargetName="Frame" Property="ContentTemplate" Value="{StaticResource NLRod}"/>
+                        <Setter TargetName="Frame" Property="ContentTemplate" Value="{StaticResource NLRod1}"/>
                         <Setter TargetName="Modifier" Property="IsChecked" Value="True"/>
                     </DataTrigger>
                     <DataTrigger Binding="{Binding ElementName=Tear, Path=IsChecked}" Value="True">
-                        <Setter TargetName="Frame" Property="ContentTemplate" Value="{StaticResource Mana}"/>
+                        <Setter TargetName="Frame" Property="ContentTemplate" Value="{StaticResource Mana1}"/>
                         <Setter TargetName="Modifier" Property="IsChecked" Value="True"/>
                     </DataTrigger>
                     <DataTrigger Binding="{Binding ElementName=Vest, Path=IsChecked}" Value="True">
-                        <Setter TargetName="Frame" Property="ContentTemplate" Value="{StaticResource ChainVest}"/>
+                        <Setter TargetName="Frame" Property="ContentTemplate" Value="{StaticResource ChainVest1}"/>
                         <Setter TargetName="Modifier" Property="IsChecked" Value="True"/>
                     </DataTrigger>
                     <DataTrigger Binding="{Binding ElementName=Cape, Path=IsChecked}" Value="True">
-                        <Setter TargetName="Frame" Property="ContentTemplate" Value="{StaticResource Negatron}"/>
+                        <Setter TargetName="Frame" Property="ContentTemplate" Value="{StaticResource Negatron1}"/>
                         <Setter TargetName="Modifier" Property="IsChecked" Value="True"/>
                     </DataTrigger>
                     <DataTrigger Binding="{Binding ElementName=Belt, Path=IsChecked}" Value="True">
-                        <Setter TargetName="Frame" Property="ContentTemplate" Value="{StaticResource Giants}"/>
+                        <Setter TargetName="Frame" Property="ContentTemplate" Value="{StaticResource Giants1}"/>
                         <Setter TargetName="Modifier" Property="IsChecked" Value="True"/>
                     </DataTrigger>
                     <DataTrigger Binding="{Binding ElementName=Spatula, Path=IsChecked}" Value="True">

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -50,7 +50,7 @@ private void MenuItem_Click(object sender, RoutedEventArgs e)
 
         private void MenuItem_Click_About(object sender, RoutedEventArgs e)
         {
-            MessageBox.Show("TFT Information Overlay V" + CurrentVersion + " by J2GKaze/Jinsoku#4019\n\nDM me on Discord if you have any questions\n\nLast Updated: July 4th, 2019 @ 10:47PM PST", "About");
+            MessageBox.Show("TFT Information Overlay V" + CurrentVersion + " by J2GKaze/Jinsoku#4019\n\nDM me on Discord if you have any questions\n\nLast Updated: July 9th, 2019 @ 9PM PST", "About");
         }
 
         private void MenuItem_Click_Credits(object sender, RoutedEventArgs e)
@@ -67,8 +67,20 @@ private void MenuItem_Click_Lock(object sender, RoutedEventArgs e)
 
         private void MenuItem_AutoUpdate(object sender, RoutedEventArgs e)
         {
+            string state = Properties.Settings.Default.AutoUpdate == true ? "OFF" : "ON";
+
+            MessageBoxResult result = MessageBox.Show($"Would you like to turn {state} Auto-Update? This will restart the program.", "Auto-Updater", MessageBoxButton.OKCancel);
+
+            if (result != MessageBoxResult.OK)
+            {
+                return;
+            }
+
             Properties.Settings.Default.AutoUpdate = !Properties.Settings.Default.AutoUpdate;
             Properties.Settings.Default.Save();
+
+            System.Windows.Forms.Application.Restart();
+            Application.Current.Shutdown();
         }
 
         private void MenuItem_Click_OnTop(object sender, RoutedEventArgs e)
@@ -170,7 +182,7 @@ private void LoadStringResource(string locale)
         }
         private void Localization_Credits(object sender, RoutedEventArgs e)
         {
-            MessageBox.Show("es-AR: Oscarinom\nes-MX: Jukai#3434\nfr-FR: Darkneight\nit-IT: BlackTYWhite#0943\nJA: つかぽん＠PKMotion#8731\nPL: Czapson#9774\nRU: Jeremy Buttson#2586\nvi-VN: GodV759\nzh-TW: noheart#6977\n", "Localization Credits");
+            MessageBox.Show("es-AR: Oscarinom\nes-MX: Jukai#3434\nfr-FR: Darkneight\nit-IT: BlackTYWhite#0943\nJA: つかぽん＠PKMotion#8731\nPL: Czapson#9774\nRU: Jeremy Buttson#2586\nvi-VN: GodV759\nzh-CN: nevex#4441\nzh-TW: noheart#6977\n", "Localization Credits");
         }
 
         private void US_Click(object sender, RoutedEventArgs e)
@@ -218,6 +230,11 @@ private void VN_Click(object sender, RoutedEventArgs e)
             LoadStringResource("vi-VN");
         }
 
+        private void CN_Click(object sender, RoutedEventArgs e)
+        {
+            LoadStringResource("zh-CN");
+        }
+
         private void TW_Click(object sender, RoutedEventArgs e)
         {
             LoadStringResource("zh-TW");

diff --git a/README.md b/README.md
@@ -18,6 +18,16 @@
   -  [Click Here for instructions](https://github.com/Just2good/TFT-Overlay/blob/master/Localization.md)
 
 ## Version History  
+- **7.9.2019**  
+  - [1.9](https://github.com/Just2good/TFT-Overlay/releases/tag/V1.9)    
+     - Items are fully skinned.
+     - Window position, size, and draggable preferences saved on exit. (By ꙅꙅɘᴎTqAbɘbᴎɘld#1175) 
+     - Added Languages: es-AR, es-MX, fr-FR, it-IT, JA, PL, RU, vi-VN, zh-CN, zh-TW  
+     - Custom Cursor has been added to fit LoL theme.
+     - New additions to Context Menu 
+          `Auto-Dim (Sets Opacity of Program to 20% when League of Legends is not open)`
+          `Switch Language`  
+
 - **7.5.2019**  
   - [1.8.2](https://github.com/Just2good/TFT-Overlay/releases/tag/V1.8.2)  
     - Auto-Updater re-added (There is a section in Context Menu as well)