Merge branch 'develop'

andanteyk · Aug 9, 2017 · da8aedd · da8aedd
2 parents 539dd04 + 20156a3
commit da8aedd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/Browser/FormBrowser.cs b/Browser/FormBrowser.cs
@@ -1050,6 +1050,7 @@ private void ToolMenu_Other_LastScreenShot_CopyToClipboard_Click( object sender,
 				try {
 					using ( var img = new Bitmap( _lastScreenShotPath ) ) {
 						Clipboard.SetImage( img );
+						AddLog( 2, string.Format( "スクリーンショット {0} をクリップボードにコピーしました。", _lastScreenShotPath ) );
 					}
 				} catch ( Exception ex ) {
 					BrowserHost.AsyncRemoteRun( () =>

diff --git a/ElectronicObserver/Utility/SoftwareInformation.cs b/ElectronicObserver/Utility/SoftwareInformation.cs
@@ -35,7 +35,7 @@ public static string SoftwareNameEnglish {
 		/// </summary>
 		public static string VersionJapanese {
 			get {
-				return SoftwareNameJapanese + "二七型改";
+				return SoftwareNameJapanese + "二七型改甲";
 			}
 		}
 
@@ -44,7 +44,7 @@ public static string VersionJapanese {
 		/// </summary>
 		public static string VersionEnglish {
 			get {
-				return "2.7.1";
+				return "2.7.1.1";
 			}
 		}
 
@@ -54,7 +54,7 @@ public static string VersionEnglish {
 		/// </summary>
 		public static DateTime UpdateTime {
 			get {
-				return DateTimeHelper.CSVStringToTime( "2017/08/07 21:00:00" );
+				return DateTimeHelper.CSVStringToTime( "2017/08/09 21:00:00" );
 			}
 		}
 

diff --git a/ElectronicObserver/Window/Control/FleetState.cs b/ElectronicObserver/Window/Control/FleetState.cs
@@ -51,9 +51,13 @@ public bool AutoShorten {
 				}
 			}
 
+			private bool _enabled;
 			public bool Enabled {
-				get { return Label.Visible; }
-				set { Label.Visible = value; }
+				get { return _enabled; }
+				set {
+					_enabled = value;
+					Label.Visible = value;
+				}
 			}
 
 
@@ -428,7 +432,8 @@ public void RefreshFleetState() {
 		}
 
 		public int GetIconIndex() {
-			return StateLabels.OrderBy( s => s.State ).First().Label.ImageIndex;
+			var first = StateLabels.Where( s => s.Enabled ).OrderBy( s => s.State ).FirstOrDefault();
+			return first == null ? (int)ResourceManager.IconContent.FormFleet : first.Label.ImageIndex;
 		}
 
 	}

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@
 
 *このリンクの更新は遅れる可能性があります。最新版は[こちら](http://electronicobserver.blog.fc2.com/)で確認してください。*  
 
-[ver. 2.7.1 (2017/08/07)](http://bit.ly/2hCIp3e)  
+[ver. 2.7.1.1 (2017/08/09)](http://bit.ly/2vmsUzQ)  
 
 [更新内容・履歴はこちらで確認できます。](https://github.com/andanteyk/ElectronicObserver/wiki/ChangeLog)