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

…eViewer

Changelog.txt

@@ -2,6 +2,13 @@
 	KCV Change Log
 ========================
 
+v2.6.0 β r426 - 4/23/2014 The Spring Time Youth
+	* Direct fix from the main man himself, @Grabacr07.
+	* Back end - All it was is just file name changes and a few additional packets.
+The following has changed from how things worked previously:
+	* **Fatigue values only update when you advance or withdraw from battle, not after battle.**
+	* Rearrangement of the fleets will only update when you return to homeport (main menu).
+
 v2.5.0 r420 - 4/22/2014 The Spring Event
 Note: Setting have been reset with this version! Please review them.
 	* *New* Custom sound alerts. Works on all versions of windows. Will randomly pick

Grabacr07.KanColleViewer/App.config

@@ -36,7 +36,7 @@
 }
 
 #flashWrap {
-    position:fixed;
+    position:free;
     z-index:1;
     margin:0;
 }

Grabacr07.KanColleViewer/Models/ProductInfo.cs

@@ -57,9 +57,9 @@ public Version Version
 		public string VersionString
 		{
 #if BETA
-			get { return this.Version.ToString(3) + " β"; }
+			get { return this.Version.ToString() + " β"; }
 #else
-			get { return this.Version.ToString(3); }
+			get { return this.Version.ToString(); }
 #endif
 		}
 

Grabacr07.KanColleViewer/Models/ProductInfo.cs.orig

@@ -1,95 +1,3 @@
-<<<<<<< HEAD
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Grabacr07.KanColleViewer.Models
-{
-	public class ProductInfo
-	{
-		private readonly Assembly assembly = Assembly.GetExecutingAssembly();
-		private string _Title;
-		private string _Description;
-		private string _Company;
-		private string _Product;
-		private string _Copyright;
-		private string _Trademark;
-		private Version _Version;
-		private IReadOnlyCollection<Library> _Libraries;
-
-		public string Title
-		{
-			get { return this._Title ?? (this._Title = ((AssemblyTitleAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyTitleAttribute))).Title); }
-		}
-
-		public string Description
-		{
-			get { return this._Description ?? (this._Description = ((AssemblyDescriptionAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyDescriptionAttribute))).Description); }
-		}
-
-		public string Company
-		{
-			get { return this._Company ?? (this._Company = ((AssemblyCompanyAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyCompanyAttribute))).Company); }
-		}
-
-		public string Product
-		{
-			get { return this._Product ?? (this._Product = ((AssemblyProductAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyProductAttribute))).Product); }
-		}
-
-		public string Copyright
-		{
-			get { return this._Copyright ?? (this._Copyright = ((AssemblyCopyrightAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyCopyrightAttribute))).Copyright); }
-		}
-
-		public string Trademark
-		{
-			get { return this._Trademark ?? (this._Trademark = ((AssemblyTrademarkAttribute)Attribute.GetCustomAttribute(this.assembly, typeof(AssemblyTrademarkAttribute))).Trademark); }
-		}
-
-		public Version Version
-		{
-			get { return this._Version ?? (this._Version = assembly.GetName().Version); }
-		}
-
-		public string VersionString
-		{
-			get { return this.Version.ToString(); }
-		}
-
-		public IReadOnlyCollection<Library> Libraries
-		{
-			get
-			{
-				return this._Libraries ?? (this._Libraries = new List<Library>
-				{
-					new Library("Reactive Extensions", new Uri("http://rx.codeplex.com/")),
-					new Library("Interactive Extensions", new Uri("http://rx.codeplex.com/")),
-					new Library("Windows API Code Pack", new Uri("http://archive.msdn.microsoft.com/WindowsAPICodePack")),
-					new Library("Livet", new Uri("http://ugaya40.net/livet")),
-					new Library("DynamicJson", new Uri("http://dynamicjson.codeplex.com/")),
-					new Library("FiddlerCore", new Uri("http://fiddler2.com/fiddlercore")),
-				});
-			}
-		}
-	}
-
-	public class Library
-	{
-		public string Name { get; private set; }
-		public Uri Url { get; private set; }
-
-		public Library(string name, Uri url)
-		{
-			this.Name = name;
-			this.Url = url;
-		}
-	}
-}
-=======
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -149,9 +57,15 @@ namespace Grabacr07.KanColleViewer.Models
 		public string VersionString
 		{
 #if BETA
+<<<<<<< HEAD
 			get { return this.Version.ToString(3) + " β"; }
 #else
 			get { return this.Version.ToString(3); }
+=======
+			get { return this.Version.ToString() + " β"; }
+#else
+			get { return this.Version.ToString(); }
+>>>>>>> 1b8861c2555e1b592155be4bbda72aeed1994484
 #endif
 		}
 
@@ -184,4 +98,3 @@ namespace Grabacr07.KanColleViewer.Models
 		}
 	}
 }
->>>>>>> bd6429b5f528059c563cbc7d110bb24ad5b0388c

Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs

@@ -8,10 +8,10 @@
 // アセンブリに関連付けられている情報を変更するには、
 // これらの属性値を変更してください。
 [assembly: AssemblyTitle("KanColleViewer!")]
-[assembly: AssemblyDescription("KanColleViewer!")]
+[assembly: AssemblyDescription("KanColleViewer! β")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("grabacr.net")]
-[assembly: AssemblyProduct("KanColleViewer!")]
+[assembly: AssemblyProduct("KanColleViewer! β")]
 [assembly: AssemblyCopyright("Copyright © 2013 Grabacr07")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -51,4 +51,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.6.0.0")]
+[assembly: AssemblyVersion("2.6.0.426")]

Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs.orig

@@ -8,10 +8,10 @@ using System.Windows;
 // アセンブリに関連付けられている情報を変更するには、
 // これらの属性値を変更してください。
 [assembly: AssemblyTitle("KanColleViewer!")]
-[assembly: AssemblyDescription("KanColleViewer!")]
+[assembly: AssemblyDescription("KanColleViewer! β")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("grabacr.net")]
-[assembly: AssemblyProduct("KanColleViewer!")]
+[assembly: AssemblyProduct("KanColleViewer! β")]
 [assembly: AssemblyCopyright("Copyright © 2013 Grabacr07")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -52,7 +52,7 @@ using System.Windows;
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
 <<<<<<< HEAD
-[assembly: AssemblyVersion("2.5.0.420")]
-=======
 [assembly: AssemblyVersion("2.6.0.0")]
->>>>>>> bd6429b5f528059c563cbc7d110bb24ad5b0388c
+=======
+[assembly: AssemblyVersion("2.6.0.426")]
+>>>>>>> 1b8861c2555e1b592155be4bbda72aeed1994484

Grabacr07.KanColleViewer/Properties/Settings.settings

@@ -23,7 +23,7 @@
 }
 
 #flashWrap {
-    position:fixed;
+    position:free;
     z-index:1;
     margin:0;
 }

Grabacr07.KanColleViewer/ViewModels/MainWindowViewModel.cs

@@ -46,9 +46,9 @@ public Mode Mode
 						// 今後の実装にご期待ください
 						ThemeService.Current.ChangeAccent(Accent.Orange);
 						break;
-                    case Mode.CriticalCondition:
-                        ThemeService.Current.ChangeAccent(Accent.Orange);
-                        break;
+					case Mode.CriticalCondition:
+						ThemeService.Current.ChangeAccent(Accent.Orange);
+						break;
 				}
 
 				this.RaisePropertyChanged();

Grabacr07.KanColleWrapper/Homeport.cs

@@ -277,7 +277,7 @@ private void Charge(kcsapi_charge charge)
 				if (target == null) continue;
 
 				target.Charge(ship.api_fuel, ship.api_bull, ship.api_onslot);
-			}
+	}
 
 			foreach (var f in Fleets.Values) f.UpdateShips();
 		}

Grabacr07.KanColleWrapper/KanColleClient.cs

@@ -43,10 +43,10 @@ public static KanColleClient Current
 		/// </summary>
 		public ObservableSynchronizedCollection<KanColleError> Errors { get; private set; }
 
-        /// <summary>
-        /// Application update notifications and downloads.
-        /// </summary>
-        public Updater Updater { get; private set; }
+		/// <summary>
+		/// Application update notifications and downloads.
+		/// </summary>
+		public Updater Updater { get; private set; }
 
 		#region IsStarted 変更通知プロパティ
 
@@ -77,7 +77,7 @@ private KanColleClient()
 			this.Proxy = new KanColleProxy();
 			//this.Master = new Master(this.Proxy);
 			this.Homeport = new Homeport(this.Proxy);
-            this.Updater = new Updater();
+			this.Updater = new Updater();
 
 			this.Proxy.ApiSessionSource.Where(x => x.PathAndQuery == "/kcsapi/api_start2")
 				.TryParse<kcsapi_start2>()

Grabacr07.KanColleWrapper/Translations.cs

@@ -304,7 +304,7 @@ public void AddTranslation(Object RawData, TranslationType Type)
                             ShipsVersion = "0.0.0";
                         }
 
-						kcsapi_mst_ship ShipData = RawData as kcsapi_mst_ship;
+                        kcsapi_mst_ship ShipData = RawData as kcsapi_mst_ship;
 
                         if (ShipData == null)
                             return;