From a9d964c3091bb3cc717d7e9e8e202284041f3582 Mon Sep 17 00:00:00 2001
From: Grabacr07 <grabacr07+github@gmail.com>
Date: Sat, 1 Feb 2014 00:16:20 +0900
Subject: [PATCH] =?UTF-8?q?version=202.0=20=E5=85=AC=E9=96=8B=E3=81=AB?=
 =?UTF-8?q?=E5=90=91=E3=81=91=E3=81=9F=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Properties/AssemblyInfo.cs                |  2 +-
 .../Catalogs/ShipCatalogWindowViewModel.cs    |  2 +-
 .../Catalogs/SlotItemCatalogViewModel.cs      |  1 +
 .../Views/Catalogs/SlotItemCatalogWindow.xaml | 18 ++++-
 .../Views/Settings/Others.xaml                | 70 +++++++++----------
 .../Views/StartContent.xaml                   | 37 +++++++---
 6 files changed, 82 insertions(+), 48 deletions(-)

diff --git a/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs b/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
index 363335e7d..e896e3437 100644
--- a/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
+++ b/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
@@ -51,4 +51,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
diff --git a/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogWindowViewModel.cs b/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogWindowViewModel.cs
index 1b9c6cee1..4017bec4e 100644
--- a/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogWindowViewModel.cs
+++ b/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogWindowViewModel.cs
@@ -150,7 +150,7 @@ public ShipCatalogWindowViewModel()
 
 			this.updateSource
 				.Do(_ => this.IsReloading = true)
-				.Throttle(TimeSpan.FromMilliseconds(500.0))
+				.Throttle(TimeSpan.FromMilliseconds(7.0))
 				.Do(_ => this.UpdateCore())
 				.Subscribe(_ => this.IsReloading = false);
 			this.CompositeDisposable.Add(this.updateSource);
diff --git a/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCatalogViewModel.cs b/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCatalogViewModel.cs
index daa7ed204..b292dad40 100644
--- a/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCatalogViewModel.cs
+++ b/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCatalogViewModel.cs
@@ -38,6 +38,7 @@ public IReadOnlyCollection<SlotItemViewModel> SlotItems
 
 		public SlotItemCatalogViewModel()
 		{
+			this.Title = "所有装備一覧";
 			this.UpdateCore();
 		}
 
diff --git a/Grabacr07.KanColleViewer/Views/Catalogs/SlotItemCatalogWindow.xaml b/Grabacr07.KanColleViewer/Views/Catalogs/SlotItemCatalogWindow.xaml
index fb43525fb..2ed8229c3 100644
--- a/Grabacr07.KanColleViewer/Views/Catalogs/SlotItemCatalogWindow.xaml
+++ b/Grabacr07.KanColleViewer/Views/Catalogs/SlotItemCatalogWindow.xaml
@@ -66,5 +66,21 @@
 		</Border>
 		<!-- #endregion -->
 
+		<StackPanel Grid.Row="1"
+					VerticalAlignment="Center"
+					Opacity="0.5">
+			<TextBlock Text="ヾ(๑╹◡╹)ﾉ"
+					   FontSize="80"
+					   HorizontalAlignment="Center" />
+
+			<TextBlock Text="まだ完成してません"
+					   FontSize="30"
+					   Margin="0,30,0,0"
+					   HorizontalAlignment="Center" />
+
+			<TextBlock Text="近日公開予定..."
+					   FontSize="20"
+					   HorizontalAlignment="Center" />
+		</StackPanel>
 	</Grid>
-</metro:MetroWindow>
+</metro:MetroWindow>
\ No newline at end of file
diff --git a/Grabacr07.KanColleViewer/Views/Settings/Others.xaml b/Grabacr07.KanColleViewer/Views/Settings/Others.xaml
index f38f775c6..2b8f0a0ce 100644
--- a/Grabacr07.KanColleViewer/Views/Settings/Others.xaml
+++ b/Grabacr07.KanColleViewer/Views/Settings/Others.xaml
@@ -1,15 +1,15 @@
-<UserControl x:Class="Grabacr07.KanColleViewer.Views.Settings.Others"
-			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-			 xmlns:metro="http://schemes.grabacr.net/winfx/2014/controls"
-			 xmlns:metro2="clr-namespace:Grabacr07.Desktop.Metro.Controls;assembly=Desktop.Metro"
-			 xmlns:properties="clr-namespace:Grabacr07.KanColleViewer.Properties"
-			 xmlns:viewModels="clr-namespace:Grabacr07.KanColleViewer.ViewModels"
-			 mc:Ignorable="d"
-			 d:DesignWidth="500"
-			 d:DesignHeight="300"
+<UserControl x:Class="Grabacr07.KanColleViewer.Views.Settings.Others"
+			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+			 xmlns:metro="http://schemes.grabacr.net/winfx/2014/controls"
+			 xmlns:metro2="clr-namespace:Grabacr07.Desktop.Metro.Controls;assembly=Desktop.Metro"
+			 xmlns:properties="clr-namespace:Grabacr07.KanColleViewer.Properties"
+			 xmlns:viewModels="clr-namespace:Grabacr07.KanColleViewer.ViewModels"
+			 mc:Ignorable="d"
+			 d:DesignWidth="500"
+			 d:DesignHeight="300"
 			 d:DataContext="{d:DesignInstance viewModels:SettingsViewModel}">
 	<UserControl.Resources>
 		<ResourceDictionary>
@@ -18,9 +18,9 @@
 			</ResourceDictionary.MergedDictionaries>
 		</ResourceDictionary>
 	</UserControl.Resources>
-	
+
 	<StackPanel>
-		<TextBlock Text="{Binding Source={x:Static properties:Resources.Settings_Screenshot}}"
+		<TextBlock Text="{Binding Source={x:Static properties:Resources.Settings_Screenshot}}"
 				   Style="{DynamicResource HeaderTextBlockStyleKey}" />
 		<Grid Margin="15,0,0,10">
 			<Grid.RowDefinitions>
@@ -37,46 +37,46 @@
 						<Run Text="{Binding Source={x:Static properties:Resources.Settings_Screenshot_FolderTextBox_Label}, Mode=OneWay}" />
 						<Run Text=": " />
 			</TextBlock>
-			<metro:PromptTextBox Grid.Row="0"
-								 Grid.Column="1"
-								 Text="{Binding ScreenshotFolder, UpdateSourceTrigger=PropertyChanged}"
+			<metro:PromptTextBox Grid.Row="0"
+								 Grid.Column="1"
+								 Text="{Binding ScreenshotFolder, UpdateSourceTrigger=PropertyChanged}"
 								 Prompt="{Binding Source={x:Static properties:Resources.Settings_Screenshot_FolderTextBox_Prompt}, Mode=OneWay}" />
-			<metro2:CallMethodButton Grid.Row="0"
-									 Grid.Column="2"
-									 Content="{Binding Source={x:Static properties:Resources.Settings_Screenshot_FolderSelectionDialog_OpenButton}}"
-									 MethodName="OpenScreenshotFolderSelectionDialog"
+			<metro2:CallMethodButton Grid.Row="0"
+									 Grid.Column="2"
+									 Content="{Binding Source={x:Static properties:Resources.Settings_Screenshot_FolderSelectionDialog_OpenButton}}"
+									 MethodName="OpenScreenshotFolderSelectionDialog"
 									 Margin="6,0" />
-			<metro2:CallMethodButton Grid.Row="0"
-									 Grid.Column="3"
-									 Content="{Binding Source={x:Static properties:Resources.Settings_Screenshot_OpenFolderButton}}"
-									 IsEnabled="{Binding CanOpenScreenshotFolder}"
-									 MethodName="OpenScreenshotFolder"
+			<metro2:CallMethodButton Grid.Row="0"
+									 Grid.Column="3"
+									 Content="{Binding Source={x:Static properties:Resources.Settings_Screenshot_OpenFolderButton}}"
+									 IsEnabled="{Binding CanOpenScreenshotFolder}"
+									 MethodName="OpenScreenshotFolder"
 									 Margin="0" />
 
-			<TextBlock Grid.Row="1"
-					   Grid.Column="0"
+			<TextBlock Grid.Row="1"
+					   Grid.Column="0"
 					   Margin="0,6">
 						<Run Text="{Binding Source={x:Static properties:Resources.Settings_Screenshot_ImageFormat_Label}, Mode=OneWay}" />
 						<Run Text=": " />
 			</TextBlock>
-			<StackPanel Grid.Row="1"
-						Grid.Column="1"
-						Grid.ColumnSpan="3"
+			<StackPanel Grid.Row="1"
+						Grid.Column="1"
+						Grid.ColumnSpan="3"
 						Orientation="Horizontal">
 				<RadioButton IsChecked="{Binding ScreenshotImageFormat, Mode=TwoWay, ConverterParameter=Png, Converter={StaticResource EnumToBooleanConverter}}">
 					<TextBlock Text="PNG" />
 				</RadioButton>
-				<RadioButton Margin="10,0,0,0"
+				<RadioButton Margin="10,0,0,0"
 							 IsChecked="{Binding ScreenshotImageFormat, Mode=TwoWay, ConverterParameter=Jpeg, Converter={StaticResource EnumToBooleanConverter}}">
 					<TextBlock Text="JPG" />
 				</RadioButton>
 			</StackPanel>
 		</Grid>
 
-		<Rectangle Height="1"
+		<Rectangle Height="1"
 				   Style="{DynamicResource SeparatorRectangleStyleKey}" />
 
-		<TextBlock Text="テーマ"
+		<!--<TextBlock Text="テーマ"
 				   Style="{DynamicResource HeaderTextBlockStyleKey}"
 				   Margin="0,10" />
 
@@ -97,7 +97,7 @@
 		</WrapPanel>
 
 		<Rectangle Height="1"
-				   Style="{DynamicResource SeparatorRectangleStyleKey}" />
+				   Style="{DynamicResource SeparatorRectangleStyleKey}" />-->
 
 	</StackPanel>
 </UserControl>
diff --git a/Grabacr07.KanColleViewer/Views/StartContent.xaml b/Grabacr07.KanColleViewer/Views/StartContent.xaml
index 1c0bd57c6..19c9d5463 100644
--- a/Grabacr07.KanColleViewer/Views/StartContent.xaml
+++ b/Grabacr07.KanColleViewer/Views/StartContent.xaml
@@ -142,7 +142,7 @@
 			</StackPanel>
 
 			<Grid Grid.Column="1"
-				  Margin="0,8,6,0"
+				  Margin="0,8,0,0"
 				  Visibility="{Binding ElementName=InformationTab, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="Auto" />
@@ -154,7 +154,7 @@
 								  Height="200"
 								  HorizontalAlignment="Right"
 								  VerticalAlignment="Bottom"
-								  Margin="0,0,10,0"
+								  Margin="0,0,30,-4"
 								  Opacity="0.25" />
 
 				<Border Grid.Column="0"
@@ -164,17 +164,17 @@
 								  Padding="10,0,20,14">
 						<StackPanel Margin="0,-9,0,0">
 							<TextBlock>
-								<Run Text="KanColleViewer"
+								<Run Text="{Binding Source={x:Static root:App.ProductInfo}, Path=Product, Mode=OneWay}"
 									 FontFamily="Segoe UI Light"
 									 FontSize="30"
 									 Foreground="{DynamicResource ActiveForegroundBrushKey}" />
 								<LineBreak />
-								<Run Text="提督業も忙しい！"
+								<Run Text="{Binding Source={x:Static root:App.ProductInfo}, Path=Title, Mode=OneWay}"
 									 FontSize="16" />
 							</TextBlock>
 
 							<TextBlock Margin="0,8,0,0">
-								<Run Text="Version 1.2.1"
+								<Run Text="{Binding Source={x:Static root:App.ProductInfo}, Path=VersionString, StringFormat=Version {0}, Mode=OneWay}"
 									 FontFamily="Segoe UI Light"
 									 FontSize="20"
 									 Foreground="{DynamicResource ActiveForegroundBrushKey}" />
@@ -229,8 +229,7 @@
 						   Grid.Column="1" />
 
 				<Border Grid.Column="1">
-					<FlowDocumentScrollViewer VerticalScrollBarVisibility="Auto"
-											  Padding="0,-18,0,0">
+					<FlowDocumentScrollViewer Padding="0,-18,0,0">
 						<FlowDocument FontSize="12"
 									  Foreground="{DynamicResource ForegroundBrushKey}"
 									  FontFamily="Meiryo UI"
@@ -246,17 +245,35 @@
 								<Run Text="艦これは、内臓された Internet Explorer (IE) 上で動作します。通信内容の変更、サーバーに対する情報の送信、Flash 抽出、マクロ・チートの類は一切行っていません。" />
 							</Paragraph>
 							<Paragraph Language="ja-jp">
-								<Run Text="ゲームが正しく表示されない等の現象が発生した場合は、IE の設定や、IE 上で Flash が表示できるかどうかをご確認ください。また、艦これ本体のアップデート後などにスクリプトエラーが頻発する場合は、IE のキャッシュを削除してください。" />
+								<Run Text="ゲームが正しく表示されない場合や、スクリプトエラーが頻発する場合は、IE のキャッシュを削除してみてください。改善しない場合は、IE の設定や、通常の IE 上で Flash が表示できるかどうか等をご確認ください。" />
 							</Paragraph>
 							<BlockUIContainer>
 								<metro2:CallMethodButton Content="{Binding DeleteInternetCacheButtonContent}"
 														 MethodName="DeleteInternetCache"
 														 IsEnabled="{Binding CanDeleteInternetCache}"
 														 HorizontalAlignment="Left"
-														 Padding="30,5" />
+														 Padding="30,5"
+														 SnapsToDevicePixels="True" />
+							</BlockUIContainer>
+							<BlockUIContainer>
+								<Rectangle Height="1"
+										   Style="{DynamicResource SeparatorRectangleStyleKey}"
+										   Margin="0,16,0,0"
+										   SnapsToDevicePixels="True" />
 							</BlockUIContainer>
 							<Paragraph Language="ja-jp">
-								<Run Text="" />
+								<Run Text="ツールは不定期に更新されています。適宜、更新の確認をお願いします。" />
+								<LineBreak />
+								<LineBreak />
+								<Run Text="Project home:" />
+								<metro2:HyperlinkEx Uri="http://grabacr.net/kancolleviewer">
+									<Run Text="http://grabacr.net/kancolleviewer" />
+								</metro2:HyperlinkEx>
+								<LineBreak />
+								<Run Text="Source code:" />
+								<metro2:HyperlinkEx Uri="https://github.com/Grabacr07/KanColleViewer">
+									<Run Text="https://github.com/Grabacr07/KanColleViewer" />
+								</metro2:HyperlinkEx>
 							</Paragraph>
 						</FlowDocument>
 					</FlowDocumentScrollViewer>