Merge branch 'master-horizontal' of https://github.com/Zharay/KanColl…

…eViewer
yuyuvn · Mar 19, 2014 · eb67eb3 · eb67eb3
2 parents 307e7dc + b63346b
commit eb67eb3
Show file tree

Hide file tree

Showing 85 changed files with 4,276 additions and 1,183 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -2,6 +2,40 @@
 	KCV Change Log
 ========================
 
+v2.3.0 r350 - 3/17/2014 M-M-Monster Update
+The following is all new things only available to this fork of KCV (for now).
+	* *NEW* Equipment Info - Mousing over equipment and in the equipment page
+		will now show extended equipment info such as firepower and more.
+	* *NEW* Tools Menu - Contains a reworked rankings and calculator page.
+	* *NEW* Calculator - Found under the Tools menu. Select a ship or type in
+		a base level, set the target level, set the map and any other params
+		and it will calculate the total number of times you must run a map to
+		get there.
+	* *NEW* Option to notify you when a ship hits critical condition. Found in
+		the Behaviour tab in settings.
+	* *NEW* Option to change the window accent color when a ship hits critical
+		condition. The color will only revert back when the ship is healed, removed,
+		or sunk.
+	* *NEW* Updater - Check for updates online for both the app and the translations.
+		Download new translations at a click of a button.
+	* *NEW* Check for updates to the program on startup.
+	* *NEW* Automatically download the latest translations on startup.
+	* *NEW* Horizontal - Horizontal tab menu and reworked Overview page. Now it is even 
+		tighter!
+	* Ship List - It will now correctly sort by ship name rather than Card Number.
+	* Fixed bug with non-updating fleet total level text.
+	* Updated to newest ships, items, and quests (3/13 update)
+Notes:
+	* All your options will reset with this update. Please re-do anything that needs doing.
+	* Updater will only obtain translations for your currently selected UI language.
+	* As of right now, there is no way to quickly revert the window color when a ship is
+		in critical condition other than to go to options and turn it off and on.
+	* Calculator is built to correct your mistake of choosing a target level lower than 
+		your current level.
+	* Calculator can take your ship's current exp count to do calculations by default
+	* Updater will not write over your current translations until it can determine if the 
+		file is error free.
+
 v2.3.0 r328 - 3/9/2014 **Minor Update**
 	* In fleet view we now have both total fleet level and and the average.
 	* Vertical - Tightened middle column to by 20px.

diff --git a/Grabacr07.KanColleViewer/App.config b/Grabacr07.KanColleViewer/App.config
@@ -41,6 +41,12 @@
             <setting name="FeatureBrowserEmulation" serializeAs="String">
                 <value>8000</value>
             </setting>
+            <setting name="XMLTransUrl" serializeAs="String">
+                <value>https://raw.github.com/Zharay/KanColleViewer/prototype/resources/translations/</value>
+            </setting>
+            <setting name="KCVUpdateUrl" serializeAs="String">
+                <value>https://raw.github.com/Zharay/KanColleViewer/prototype/resources/Version.xml</value>
+            </setting>
         </Grabacr07.KanColleViewer.Properties.Settings>
     </applicationSettings>
 </configuration>
diff --git a/Grabacr07.KanColleViewer/App.xaml.cs b/Grabacr07.KanColleViewer/App.xaml.cs
@@ -45,12 +45,52 @@ protected override void OnStartup(StartupEventArgs e)
 			KanColleClient.Current.Proxy.UpstreamProxyHost = Settings.Current.ProxyHost;
 			KanColleClient.Current.Proxy.UpstreamProxyPort = Settings.Current.ProxyPort;
 
+            ResourceService.Current.ChangeCulture(Settings.Current.Culture);
+
+            // Initialize translations
             KanColleClient.Current.Homeport.Translations.EnableTranslations = Settings.Current.EnableTranslations;
             KanColleClient.Current.Homeport.Translations.EnableAddUntranslated = Settings.Current.EnableAddUntranslated;
-
-			ResourceService.Current.ChangeCulture(Settings.Current.Culture);
             KanColleClient.Current.Homeport.Translations.ChangeCulture(Settings.Current.Culture);
 
+            // Update notification and download new translations (if enabled)
+            if (KanColleClient.Current.Updater.LoadVersion(AppSettings.Default.KCVUpdateUrl.AbsoluteUri))
+            {
+                if (Settings.Current.EnableUpdateNotification && KanColleClient.Current.Updater.IsOnlineVersionGreater(0, ProductInfo.VersionString))
+                {
+                    WindowsNotification.Notifier.Show(
+                        KanColleViewer.Properties.Resources.Updater_Notification_Title,
+                        string.Format(KanColleViewer.Properties.Resources.Updater_Notification_NewAppVersion, KanColleClient.Current.Updater.GetOnlineVersion(0)),
+                        () => App.ViewModelRoot.Activate());
+                }
+
+                if (Settings.Current.EnableUpdateTransOnStart)
+                {
+                    if (KanColleClient.Current.Updater.UpdateTranslations(AppSettings.Default.XMLTransUrl.AbsoluteUri, Settings.Current.Culture, KanColleClient.Current.Homeport.Translations) > 0)
+                    {
+                        WindowsNotification.Notifier.Show(
+                            KanColleViewer.Properties.Resources.Updater_Notification_Title,
+                            KanColleViewer.Properties.Resources.Updater_Notification_TransUpdate_Success,
+                            () => App.ViewModelRoot.Activate());
+
+                        KanColleClient.Current.Homeport.Translations.ChangeCulture(Settings.Current.Culture);
+                    }
+                }
+            }
+
+            KanColleClient.Current.Homeport.Translations.Firepower = KanColleViewer.Properties.Resources.Stats_Firepower;
+            KanColleClient.Current.Homeport.Translations.AntiAir = KanColleViewer.Properties.Resources.Stats_AntiAir;
+            KanColleClient.Current.Homeport.Translations.Accuracy = KanColleViewer.Properties.Resources.Stats_Accuracy;
+            KanColleClient.Current.Homeport.Translations.Torpedo = KanColleViewer.Properties.Resources.Stats_Torpedo;
+            KanColleClient.Current.Homeport.Translations.AntiSub = KanColleViewer.Properties.Resources.Stats_AntiSub;
+            KanColleClient.Current.Homeport.Translations.Evasion = KanColleViewer.Properties.Resources.Stats_Evasion;
+            KanColleClient.Current.Homeport.Translations.SightRange = KanColleViewer.Properties.Resources.Stats_SightRange;
+            KanColleClient.Current.Homeport.Translations.Luck = KanColleViewer.Properties.Resources.Stats_Luck;
+            KanColleClient.Current.Homeport.Translations.Speed = KanColleViewer.Properties.Resources.Stats_Speed;
+            KanColleClient.Current.Homeport.Translations.Armor = KanColleViewer.Properties.Resources.Stats_Armor;
+            KanColleClient.Current.Homeport.Translations.Health = KanColleViewer.Properties.Resources.Stats_Health;
+            KanColleClient.Current.Homeport.Translations.AttackRange = KanColleViewer.Properties.Resources.Stats_AttackRange;
+            KanColleClient.Current.Homeport.Translations.DiveBomb = KanColleViewer.Properties.Resources.Stats_DiveBomb;
+
             KanColleClient.Current.Homeport.Logger.EnableLogging = Settings.Current.EnableLogging;
 
 			ThemeService.Current.Initialize(this, Theme.Dark, Accent.Purple);