Fix a run-time error in MultiBinding

Also fix start-up URL and StartContent; update Plugin Info localisation
Yuubari · Sep 3, 2015 · ef3a715 · ef3a715
1 parent 5feb6bd
commit ef3a715
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 28 deletions.
diff --git a/source/Grabacr07.KanColleViewer/App.config b/source/Grabacr07.KanColleViewer/App.config
@@ -11,7 +11,7 @@
     <applicationSettings>
         <Grabacr07.KanColleViewer.Properties.Settings>
             <setting name="KanColleUrl" serializeAs="String">
-                <value>http://www.dmm.com/netgame/social/application/-/detail/=/app_id=854854/</value>
+                <value>http://www.dmm.com/netgame/social/-/gadgets/=/app_id=854854/</value>
             </setting>
             <setting name="UIContentHight" serializeAs="String">
                 <value>333</value>

diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
@@ -1312,7 +1312,19 @@ HTTP proxy settings are applied immediately. Settings for all other protocols ar
   <data name="StateDetail_MoraleRecovered" xml:space="preserve">
     <value>Morale recovered</value>
   </data>
-  <data name="StateDetail_MoraleTimerTemplate" xml:space="preserve">
-    <value>Morale recovers in: {0}</value>
+  <data name="Settings_Plugins_PluginInfo_Configuration" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Settings_Plugins_PluginInfo_NotificationFrom" xml:space="preserve">
+    <value>Notifies</value>
+  </data>
+  <data name="Settings_Plugins_PluginInfo_Notifications" xml:space="preserve">
+    <value>Notifier</value>
+  </data>
+  <data name="Settings_Plugins_PluginInfo_Test" xml:space="preserve">
+    <value>(Test)</value>
+  </data>
+  <data name="Settings_Plugins_PluginInfo_ToolWindow" xml:space="preserve">
+    <value>Tool</value>
   </data>
 </root>
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.resx
@@ -1316,7 +1316,19 @@ HTTP プロトコルの通信は自動構成も含め「インターネット
   <data name="StateDetail_MoraleRecovered" xml:space="preserve">
     <value>疲労回復済み</value>
   </data>
-  <data name="StateDetail_MoraleTimerTemplate" xml:space="preserve">
-    <value>疲労回復まで: {0}</value>
+  <data name="Settings_Plugins_PluginInfo_Configuration" xml:space="preserve">
+    <value>設定</value>
+  </data>
+  <data name="Settings_Plugins_PluginInfo_NotificationFrom" xml:space="preserve">
+    <value>プラグインからの通知</value>
+  </data>
+  <data name="Settings_Plugins_PluginInfo_Notifications" xml:space="preserve">
+    <value>通知機能</value>
+  </data>
+  <data name="Settings_Plugins_PluginInfo_Test" xml:space="preserve">
+    <value>(テスト)</value>
+  </data>
+  <data name="Settings_Plugins_PluginInfo_ToolWindow" xml:space="preserve">
+    <value>ツール表示</value>
   </data>
 </root>
diff --git a/source/Grabacr07.KanColleViewer/Properties/Settings.Designer.cs b/source/Grabacr07.KanColleViewer/Properties/Settings.Designer.cs
diff --git a/source/Grabacr07.KanColleViewer/Properties/Settings.settings b/source/Grabacr07.KanColleViewer/Properties/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="KanColleUrl" Type="System.Uri" Scope="Application">
-      <Value Profile="(Default)">http://www.dmm.com/netgame/social/application/-/detail/=/app_id=854854/</Value>
+      <Value Profile="(Default)">http://www.dmm.com/netgame/social/-/gadgets/=/app_id=854854/</Value>
     </Setting>
     <Setting Name="UIContentHight" Type="System.Double" Scope="Application">
       <Value Profile="(Default)">333</Value>

diff --git a/source/Grabacr07.KanColleViewer/Views/Contents/StateDetailIndicator.xaml b/source/Grabacr07.KanColleViewer/Views/Contents/StateDetailIndicator.xaml
@@ -31,7 +31,8 @@
 								   Style="{DynamicResource DefaultTextStyleKey}"
 								   Foreground="{DynamicResource ActiveForegroundBrushKey}">
 							<TextBlock.Text>
-								<MultiBinding StringFormat="{Binding Resources.StateDetail_MoraleTimerTemplate, Source={x:Static models:ResourceService.Current}, Mode=OneWay}">
+                                <MultiBinding StringFormat="{}{0}: {1}">
+									<Binding Source="{x:Static models:ResourceService.Current}" Path="Resources.StateDetail_MoraleRecoveryTimer" />
 									<Binding Path="Condition.Remaining" />
 								</MultiBinding>
 							</TextBlock.Text>

diff --git a/source/Grabacr07.KanColleViewer/Views/Settings/PluginInfo.xaml b/source/Grabacr07.KanColleViewer/Views/Settings/PluginInfo.xaml
@@ -48,7 +48,7 @@
 																	 MethodTarget="{Binding}" />
 									</i:EventTrigger>
 								</i:Interaction.Triggers>
-								<Run Text="設定" />
+								<Run Text="{Binding Resources.Settings_Plugins_PluginInfo_Configuration, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
 							</Hyperlink>
 							<Run Text="　" />
 						</Span>
@@ -60,7 +60,7 @@
 						<Span Foreground="{DynamicResource ForegroundBrushKey}"
 							  FontFamily="{DynamicResource DefaultFontFamilyKey}"
 							  FontSize="{DynamicResource DetailFontSizeKey}">
-							<Run Text="通知機能" />
+							<Run Text="{Binding Resources.Settings_Plugins_PluginInfo_Notifications, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
 							<Hyperlink Foreground="{DynamicResource LinkForegroundBrushKey}"
 									   Cursor="Hand">
 								<i:Interaction.Triggers>
@@ -69,7 +69,7 @@
 																	 MethodTarget="{Binding}" />
 									</i:EventTrigger>
 								</i:Interaction.Triggers>
-								<Run Text="(テスト)" />
+								<Run Text="{Binding Resources.Settings_Plugins_PluginInfo_Test, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
 							</Hyperlink>
 							<Run Text="　" />
 						</Span>
@@ -81,7 +81,7 @@
 						<Span Foreground="{DynamicResource ForegroundBrushKey}"
 							  FontFamily="{DynamicResource DefaultFontFamilyKey}"
 							  FontSize="{DynamicResource DetailFontSizeKey}">
-							<Run Text="プラグインからの通知" />
+							<Run Text="{Binding Resources.Settings_Plugins_PluginInfo_NotificationFrom, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
 							<Run Text="　" />
 						</Span>
 					</controls:RichTextInlinePresenter>
@@ -92,7 +92,7 @@
 						<Span Foreground="{DynamicResource ForegroundBrushKey}"
 							  FontFamily="{DynamicResource DefaultFontFamilyKey}"
 							  FontSize="{DynamicResource DetailFontSizeKey}">
-							<Run Text="ツール表示" />
+							<Run Text="{Binding Resources.Settings_Plugins_PluginInfo_ToolWindow, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
 							<Run Text="　" />
 						</Span>
 					</controls:RichTextInlinePresenter>

diff --git a/source/Grabacr07.KanColleViewer/Views/StartContent.xaml b/source/Grabacr07.KanColleViewer/Views/StartContent.xaml
@@ -331,7 +331,7 @@
 
 					<TabItem>
 						<TabItem.Header>
-							<TextBlock Text="通知設定"
+							<TextBlock Text="{Binding Resources.Settings_Notifications, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 									   Style="{DynamicResource TabHeaderTextStyleKey}" />
 						</TabItem.Header>
 						<settings:Notification Margin="10,9" />
@@ -348,7 +348,7 @@
 
 					<TabItem>
 						<TabItem.Header>
-							<TextBlock Text="プラグイン"
+							<TextBlock Text="{Binding Resources.Settings_Plugins, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 									   Style="{StaticResource TabHeaderTextStyleKey}" />
 						</TabItem.Header>
 						<settings:Plugins Margin="10,9" />